diff options
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | net-fs/nfs-utils/Manifest | 15 | ||||
| -rw-r--r-- | net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch | 24 | ||||
| -rw-r--r-- | net-fs/nfs-utils/nfs-utils-1.2.4.ebuild | 6 |
4 files changed, 41 insertions, 10 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 59a8e3210aa6..6823c3b7fb33 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.185 2011/09/01 15:19:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.186 2011/09/01 23:10:15 flameeyes Exp $ + + 01 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org> nfs-utils-1.2.4.ebuild, + +files/nfs-utils-1.2.4-conditional.patch: + Fix build with USE=-nfsv4, by importing two (folded) patches from git. *nfs-utils-1.2.4 (01 Sep 2011) diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest index 9b7be97768da..8449c3001cec 100644 --- a/net-fs/nfs-utils/Manifest +++ b/net-fs/nfs-utils/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5 AUX nfs-utils-1.1.4-ascii-man.patch 571 RMD160 614759d4a361db8ab6ee8c8ee87fc8a93a5e6052 SHA1 745322de9b26acec667d7acf8764f12388e3a046 SHA256 5f1cd9789b4963df22df914f61a33412d61d3c8fdde9b71b8c9dd4c2506852f7 @@ -9,6 +9,7 @@ AUX nfs-utils-1.1.4-rpcgen-ioctl.patch 414 RMD160 f07264e24f374d6a65dbc8c2b1dfed AUX nfs-utils-1.2.2-nfsv4.patch 479 RMD160 2715fbde5c36a4e34af0d79b8760329bd2b185a8 SHA1 74377ed796f2c0e8e2734d1ac8f2c6fc9622fdb7 SHA256 ce601318e17f108c9fffcef9963430a01e2cb7dffb5189e4ca6de53413bb153f AUX nfs-utils-1.2.2-optional-libcap.patch 2213 RMD160 7182147365404bc6f4caa676018bfc45b90570ad SHA1 99f09ff9b5590346ef367ee9683bc94272eac2ce SHA256 75135cc2c90aacc7adb43c6ced308099ac5b2d9c8cfcc74d395ead4dc583a75a AUX nfs-utils-1.2.3-ti-rpc-static-ports.patch 10290 RMD160 079daaf913c61b1ff6dac7bef0d3522c377c37ef SHA1 386f76c3e957ef61706db4708423a96b39557374 SHA256 8f188be765d5aa41eaa9d15df7cf0dc6b7ba29413866e8ada6c54973b0a942e9 +AUX nfs-utils-1.2.4-conditional.patch 731 RMD160 6656f86707785f91142da8f5fb826fce604da86d SHA1 6d7b3aa5312c3f556dd4671ff56a241f165a2d26 SHA256 af8dd023a2200a2551826134943c8aa5eae70ceaa9806df00bb4476e88abdc57 AUX nfs-utils-1.2.4-exportfs-skip-dir.patch 1079 RMD160 062c6897c9d939df8b4b6bb12da55712e41e2baa SHA1 f6e974c4cf03a35e143ff838e9e531ce4d6a9524 SHA256 16476adcec288a302fded2c8e1dbfc8012a57f98a6710a182623c45c889f85e4 AUX nfs-utils-1.2.4-exportfs-xlog.patch 1757 RMD160 0da3208e243bcd794faa9e189fbd983dd949fa3f SHA1 9081b7b193d3e54ef246c5dc96b6d650699a536d SHA256 b9a7bcb4c4f619dee1b4a7faabbeb07875ff0e8ba04a97a77cd4cd2dbaac51ce AUX nfs.confd 948 RMD160 eee237aeb641e823d3b505371faf8c4a33582a51 SHA1 bf296a1ea20478d729307496b2d34299a493168c SHA256 22bba4ee5d58bae422650875c7c8a797a52fc121ddd02d48297c075b8a35401e @@ -35,13 +36,13 @@ EBUILD nfs-utils-1.2.1.ebuild 3120 RMD160 c97608ea950bb115875d1c2058112b67e50015 EBUILD nfs-utils-1.2.2-r2.ebuild 3387 RMD160 957cda2a26635d233322f2ca62a4466bbe2ad537 SHA1 bd0fc823c4e79d0c5a0025f31f9a416a3411da78 SHA256 9dd1368b530d093538f6adb4715ec6634fe050e664b6ae0b004f65a8fae9c4f4 EBUILD nfs-utils-1.2.3-r1.ebuild 3243 RMD160 fd7ff6d183dab514a48bb361d52d6e7aaf88f66a SHA1 0622a8f2007e56295f5090e02f75550ce59f59f4 SHA256 5660e204ebd82df18a3ea663115dd821bc73828192e9e54862b5bb01121c81b0 EBUILD nfs-utils-1.2.3.ebuild 3150 RMD160 03ce5a05c2bc11e3d0fa87c86faf590329307531 SHA1 2293dc44577dd9d4c91f0e234e22301989810d12 SHA256 b1c484e0cc4b032cd44ff66d9e73866e0dfcea87c22917994f2aa6312db1bcba -EBUILD nfs-utils-1.2.4.ebuild 3254 RMD160 6f4518e4624cfc513e796232568c4406d40f5140 SHA1 ec9bd6bc84f0cfc2874e78eaa1aaad7900067aad SHA256 a1e78a0bb40d2edef564669001fb21eb57fe2b70c32f9cb1ef087a5eb48a77b6 -MISC ChangeLog 29331 RMD160 3ffe9e09019d196b317ef1c462059fffd2ea6fb1 SHA1 467caecae5b65d5045244552d5b848b43e3e91f8 SHA256 b400e5982d39b7bdb74a4c76f613a4d4a0f12424296d729befe615b5dd3f7359 +EBUILD nfs-utils-1.2.4.ebuild 3332 RMD160 4a9e41eb8f31abef5c1a2f4d92ac953ab75ba997 SHA1 b325f950a2987eb1449a74da8dfc055bf1d61927 SHA256 e5885a13eb8b5ba8efc5212540bbf3bc65e17fb4768bcce3efdcf6c97b2af921 +MISC ChangeLog 29532 RMD160 a84fcf044e3053e0d823ff43f8a6a406717c2181 SHA1 2dfe8805f126987c5e8906a8fa92d1d126ff7f89 SHA256 f28bd7fe5b448e08d0745f54e1f502ef670d2760110eec8c5bff1768f4789422 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk5foo4ACgkQaC/OocHi7JaSDwD/dkslHz11At49hrBSu03RDqrp -JaFsaKSvpAza8/cZWpsA/jZOOM4MCGWV5t/cNGCdPvAbOBK9jipb2U8od0wZ07nl -=QUhD +iEYEARECAAYFAk5gEMUACgkQAiZjviIA2XiKuQCfedLQwRnzHetc8YQmSr1xVwuF +S/gAn3H5iJRbABUQI9QC+QiWpB6kP1A/ +=cxG/ -----END PGP SIGNATURE----- diff --git a/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch b/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch new file mode 100644 index 000000000000..b82b5b23e8fa --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-1.2.4-conditional.patch @@ -0,0 +1,24 @@ +diff --git a/configure.ac b/configure.ac +index ca12f9e..593808c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -256,9 +256,6 @@ if test "$enable_nfsv4" = yes; then + dnl check for nfsidmap libraries and headers + AC_LIBNFSIDMAP + +- dnl enable nfsidmap when its support by libnfsidmap +- AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"]) +- + dnl check for the keyutils libraries and headers + AC_KEYUTILS + +@@ -268,6 +265,9 @@ if test "$enable_nfsv4" = yes; then + AC_RPCSEC_VERSION + fi + fi ++dnl enable nfsidmap when its support by libnfsidmap ++AM_CONDITIONAL(CONFIG_NFSIDMAP, [test "$enable_nfsidmap" = "yes"]) ++ + + if test "$knfsd_cv_glibc2" = no; then + AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"]) diff --git a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild index 7ba8bbf98550..b15612e137e1 100644 --- a/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild +++ b/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2011 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.2.4.ebuild,v 1.1 2011/09/01 15:19:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.4.ebuild,v 1.2 2011/09/01 23:10:15 flameeyes Exp $ EAPI="2" -inherit eutils flag-o-matic multilib +inherit eutils flag-o-matic multilib autotools DESCRIPTION="NFS client and server daemons" HOMEPAGE="http://linux-nfs.org/" @@ -44,6 +44,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch epatch "${FILESDIR}"/${PN}-1.2.4-exportfs-xlog.patch epatch "${FILESDIR}"/${PN}-1.2.4-exportfs-skip-dir.patch + epatch "${FILESDIR}"/${PN}-1.2.4-conditional.patch + eautoreconf } src_configure() { |