diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2008-04-20 00:39:26 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2008-04-20 00:39:26 +0000 |
| commit | e0ce8d10ee5c205b3fb8f060e9b99ae38cbad647 (patch) | |
| tree | f60e97da7ebce3a5808f7db4ebfeeb61743858c8 /net-fs/nfs-utils | |
| parent | Version bump (diff) | |
| download | historical-e0ce8d10ee5c205b3fb8f060e9b99ae38cbad647.tar.gz historical-e0ce8d10ee5c205b3fb8f060e9b99ae38cbad647.tar.bz2 historical-e0ce8d10ee5c205b3fb8f060e9b99ae38cbad647.zip | |
Only leverage kerberos when USE="-nonfsv4" #212160.
Package-Manager: portage-2.2_pre5
Diffstat (limited to 'net-fs/nfs-utils')
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 5 | ||||
| -rw-r--r-- | net-fs/nfs-utils/Manifest | 10 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.1.1.ebuild | 23 |
3 files changed, 21 insertions, 17 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 1f78d6f6fd76..fed52276c298 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.119 2008/04/20 00:06:28 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.120 2008/04/20 00:39:26 vapier Exp $ + + 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.1.ebuild: + Only leverage kerberos when USE="-nonfsv4" #212160. 20 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfsmount.initd: Fix nfs4/idmapd detection #213384 by Marek Szuba. diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index c26bbdbdb46e..4a63ec245084 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -20,13 +20,13 @@ DIST nfs-utils-1.1.1.tar.gz 803906 RMD160 e56bd8f06ad116a48e79cb819dcc693ae0dc7c EBUILD nfs-utils-1.0.12-r1.ebuild 2853 RMD160 c85a60d376630bf9f1bbb31b4f1f0b1a894f9e12 SHA1 d509ac4c7a91df4bdd73d06ca24d4be4e7367e13 SHA256 79421617f5ba0c4fa790fa2ec001e391b7db5d465351950a2d94ad79702ef069 EBUILD nfs-utils-1.0.12-r5.ebuild 3069 RMD160 19926271be7634c6bd4494bf8cd7f05b5497b4f5 SHA1 b4058ab723ed620634661773b68fb2bea857759c SHA256 f8d1f87a679d0263be717a2a0d8f397d3f777f16f8b317492fe7d5b996a8868d EBUILD nfs-utils-1.1.0-r1.ebuild 3098 RMD160 3341a1bb0dab4fe01725cf54bb4398df046d9674 SHA1 70e7f7ad52bcf9b7c69168a0685b54cba99f84b6 SHA256 e32ee25657ff84823b6baed0c94fe5f0b2248e28d1bbad83ae27cfb1109f1e02 -EBUILD nfs-utils-1.1.1.ebuild 3427 RMD160 f7de6685b55a98f7bf9d278406a1b0576a95c338 SHA1 73c73a361ffd1fe33829210dcf61b398f79f44cf SHA256 8c9f6fb84710beecd856dcdd8a01f5f39d14212ef42f4d68032bf04ae1795341 -MISC ChangeLog 17930 RMD160 5af61bb34fe9abf45343b71ffae7361ce1b54975 SHA1 ddb7fe3810c4201886d1fe70197f8bf5f293b8b9 SHA256 368ab9aa7c3f56f47d1cf456fbd1cabbd81bad6fa5e806e8126c60d053915f7e +EBUILD nfs-utils-1.1.1.ebuild 3461 RMD160 87171e0a124d421fa28bf816cf560f5eb494cc24 SHA1 1b284db269b59ad63a8edc123ad8db2f3339b3cd SHA256 2a43baecee1139976d795fe38dc9b0cf3390f985bf2b18d006f523c29a8121cb +MISC ChangeLog 18059 RMD160 8e01fbf6c3ccbfaed57ea2ca4144152fba2f1cc2 SHA1 b8fb9c2eda6b49298c5ffd2aca0c746607501c5e SHA256 af259f61dd2419bed07d9fa7f82262af5b4a46a7bf3448d9954d29bc0a839372 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFICokJj9hvisErhMIRArecAKCRvhwAd1au2bDpM6tfhr4smep9cgCghtdd -mLIVk6TCfwbshLBOo9qlIIE= -=orms +iD8DBQFICpDEj9hvisErhMIRAmHrAJ405ODQv5gV3oKJFfyBL8y/u7QqjACeICx3 +ovYzQ7No2J1MX5fGf/O0kdw= +=TZ39 -----END PGP SIGNATURE----- diff --git a/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild index 85ce10a82958..a87170e0211c 100644 --- a/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild,v 1.1 2007/12/29 09:33:27 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild,v 1.2 2008/04/20 00:39:26 vapier Exp $ inherit eutils flag-o-matic multilib @@ -24,11 +24,11 @@ RDEPEND="tcpd? ( sys-apps/tcp-wrappers ) !nonfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.16 - ) - kerberos? ( - net-libs/librpcsecgss - net-libs/libgssglue - app-crypt/mit-krb5 + kerberos? ( + net-libs/librpcsecgss + net-libs/libgssglue + app-crypt/mit-krb5 + ) )" # util-linux dep is to prevent man-page collision DEPEND="${RDEPEND} @@ -53,9 +53,8 @@ src_compile() { --enable-secure-statd \ $(use_with tcpd tcp-wrappers) \ $(use_enable !nonfsv4 nfsv4) \ - $(use_enable kerberos gss) \ + $(use !nonfsv4 && use_enable kerberos gss) \ || die "Configure failed" - emake || die "Failed to compile" } @@ -80,8 +79,10 @@ src_install() { doins "${FILESDIR}"/exports local f list="" - use !nonfsv4 && list="${list} rpc.idmapd" - use kerberos && list="${list} rpc.gssd" + if use !nonfsv4 ; then + list="${list} rpc.idmapd" + use kerberos && list="${list} rpc.gssd" + fi for f in nfs nfsmount rpc.statd ${list} ; do newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}" done |