Revision bump to include the most recent patches + to fix bugs #157968 and #154797

Package-Manager: portage-2.1.5_rc6

3 files changed, 112 insertions, 2 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index d21af87544a4..0709c78d63c9 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/autofs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.69 2008/02/18 13:42:23 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.70 2008/04/28 13:32:32 stefaan Exp $
+
+*autofs-5.0.3-r3 (28 Apr 2008)
+
+  28 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org>
+  +autofs-5.0.3-r3.ebuild:
+  Revision bump to include the most recent patches + to fix bugs #157968 and
+  #154797
 
 *autofs-5.0.3-r2 (18 Feb 2008)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 4cfbb555171a..d4690024997d 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -29,11 +29,17 @@ DIST autofs-4.1.3-signal-race-fix.patch 635 RMD160 dd7fc2df1b4cb5ab59a81b5613887
 DIST autofs-4.1.3-sock-leak-fix.patch 1236 RMD160 09ca250b5711d04336f61fb7a227d99ae2b4d053 SHA1 995838278a74211eb537202f4c918302bd38fa38 SHA256 6aaa548688e7d48eb735dfa9acb1c097b82f8ef68a3ca30aab70a92b9b36453b
 DIST autofs-4.1.3-strict.patch 1626 RMD160 8527db5b40eb7d0bf7fcc6f47a5be5beb22905d3 SHA1 fa51323f0546a8b493bf3daebe7d5e40fd43b288 SHA256 518a7930cb6bad18f045dfc493ce39816e6fbce0f80c444dd75a33d722a8caff
 DIST autofs-4.1.3.tar.bz2 125234 RMD160 7df2839fce00222609bd7977a9d6275276e232b4 SHA1 ad7727e15c0ce35f3ad3a7cd2984197cf951f44f SHA256 9257a603815ee8c8d0f2935ff3c254b23f8007eee5fa8c9bf2e3661fdc171035
+DIST autofs-5.0.2-init-cb-on-load.patch 4410 RMD160 972aa738759b0fe924fb69096d25477829e604fd SHA1 4b9518cfe8efb54750e92cf9fb0458d15885072b SHA256 9054b6da6bba5659ac3c41a17cd7f50706af454083b6f3ed5ad602ee0fff9966
 DIST autofs-5.0.3-basedn-with-spaces-fix-3.patch 739 RMD160 2066a516afd9efe781b16b41c16dbd46677f4acc SHA1 53fd7c2aa390ca5ec0022b49f3865ff91a9beb24 SHA256 2483d04553a3a235f5a4695db12bbf2d1f3cc5dca3658804b4c3dc229b2bda9b
 DIST autofs-5.0.3-correct-ldap-lib.patch 2600 RMD160 851be5c9d26a05a09a067c46493daa13519dddcc SHA1 fb08814da414608e55e6b41f689eb304e3cdd443 SHA256 2f9ca7f1d35c9408b99a6839d3f5250d470b0c81291887698528cd5814878a25
 DIST autofs-5.0.3-dont-fail-on-empty-master-fix-2.patch 1481 RMD160 700c5b9826a364960ce122453b19985deb54393e SHA1 ff847ebe81e7ea01c782d1fc13762300f5e7e352 SHA256 f13ca5576b6e5dd76d4a22fa747ed55b31f27fa76010fc9d66b7ffe1deb542ec
+DIST autofs-5.0.3-expire-works-too-hard-update-2.patch 407 RMD160 ee13e72ec49287b8b4840e8f795940444321e98d SHA1 426e12de37a8a378c7067bd48773bb33479daded SHA256 a80a638d8eb8e26ff8aecacd59cf6be6d3ea7b5e10814121c23c5b837c79370b
+DIST autofs-5.0.3-expire-works-too-hard-update.patch 1503 RMD160 ac0e450db1a733c4eaad1fc412b56fd87df10faf SHA1 0f1790bb69ea6f4cd26a2025db9b3033c34007f9 SHA256 a427bac82b8213afa8a93c5ba960fbcf231a0d8d3c56f3ab2fe893c56e543ba4
 DIST autofs-5.0.3-expire-works-too-hard.patch 1630 RMD160 f17fa04bc0cb68063a29af00f49721dfa4987eba SHA1 31e9d823d8b8ef43ef5ed832f09eed3615fd0b6c SHA256 8843838d12503e72cbfdafc372f4f07709d8851fe43e942042eba79b69a1986f
+DIST autofs-5.0.3-handle-zero-length-nis-key.patch 1114 RMD160 bc31560fa3ed8e37b779de5e4d15f4020359b8d5 SHA1 999f524d4bb9ea2b08a2f5e281530da7168eafab SHA256 76cf5b2748312e66f0ccc9cb528871cedaf9aad568c93405d8277acbc997026d
 DIST autofs-5.0.3-ldap-page-control-configure-fix.patch 11870 RMD160 bf76a1457569f5dad1b5088496090820ee92ad05 SHA1 b821d576dc0c084db27b8da127a00707e83cbc86 SHA256 badd953d702f716266b5819c2001f1e29f1d70775aad92e835f2a46ee6375c5f
+DIST autofs-5.0.3-map-type-in-map-name.patch 1664 RMD160 6b4599b47ee4da6870a217ef0e37c32a280ce157 SHA1 c1f253d98684855c0c9505166dfc7efb50720992 SHA256 a2616b70613e0b4922bb94ee474b377df10015ce5fd27e33a7c0d44b5ed03bd9
+DIST autofs-5.0.3-mount-thread-create-cond-handling.patch 9284 RMD160 78f2d0bc970cc8f958117e0b3f88216147d79257 SHA1 ea8b6fa4246b720a6f284986553c5695027c9b95 SHA256 9ce5a15157ebee4e68e03f04777bac5d436e4e6233690f6bcf8d76fb281cbb01
 DIST autofs-5.0.3-nfs4-tcp-only.patch 810 RMD160 93cc53b149ced66c3a18cf3baa118dacf00aa9fb SHA1 533ca97bbdbdb77c1a0a556f3a927ac16c9a8647 SHA256 2761141b683d29d17e2924149b22238b718d769231bb86029a0d16025fd25bf7
 DIST autofs-5.0.3-unlink-mount-return-fix.patch 1570 RMD160 e397d2307c129180a50a03789d9fb7d4288c499b SHA1 9ffd8052a610fa8bdbe93db89cf9890aae7d6405 SHA256 599b1eafec53ed2a3fc10870fc729475d5630415b1c5d7df5ec78fbe2d314288
 DIST autofs-5.0.3-update-linux-auto_fs4-h.patch 2312 RMD160 db5ff55c717ebf1a3db96a00285c18c5755c78cf SHA1 0283fc4d05874e0a5a890825103f4353fa041c59 SHA256 806788242051370c4603aefc2ce70568fb49fe19376ac4a32a3b9524c9d6fb4e
@@ -54,6 +60,7 @@ EBUILD autofs-4.1.3-r9.ebuild 3116 RMD160 17db10c7bfb0b148416703824ce944aa2901f7
 EBUILD autofs-4.1.3.ebuild 1923 RMD160 eaab58530b774637b8b3ae8600a99e17eb31c0ca SHA1 cace6b8fae4c228c99b278a84e0889ce51c23a13 SHA256 655ab0f95d4d71fb37788ef6bd35c1cca0abd8b2714d67cbb26837c8477d95f7
 EBUILD autofs-5.0.3-r1.ebuild 2252 RMD160 769805c5ff06c8acc6dde7e60d9c365058271a82 SHA1 da7f063ee957643b8e0d91a7432d64160c6cbddd SHA256 727d68be090f5eb1646798e45b897f0e951ea2699118838e7d4140a24d00821e
 EBUILD autofs-5.0.3-r2.ebuild 2616 RMD160 a0d4f7d661f393f2bf1c92118ab3dad7c0ff8ed3 SHA1 2c6f89546d43b004719441bc208ab95ab0e67ee0 SHA256 c99bd677715659372729c48fd9115728db65dabe79b55bab6727ea88346a4423
+EBUILD autofs-5.0.3-r3.ebuild 3368 RMD160 0beacb037ca1dd774b9235819a100c85a01fecf6 SHA1 f4b6aaff6c3d2cdb43c4bcb3cf9457683460e10a SHA256 b8620a8a1346629ea2b82a455130d48f17aba32e1bf0d81941f5244cfda38ad2
 EBUILD autofs-5.0.3.ebuild 1635 RMD160 3b0d5e7c5100f60e7d6da903000142e676dce338 SHA1 e4d85cdbbbc89daec1e536fda5f9b6faf4ddf95f SHA256 a5839d8964101cec67d5ec3e70870122acab999906db3d65c40a0ea9ab77604c
-MISC ChangeLog 10205 RMD160 c0cce12ab65bbefe3244df9d59d91bdf9f760dd4 SHA1 0ccb4c8a85ff738cb318c4d599b04c7b4b38b89d SHA256 b527a310cf42be426e93bff9d5f4ed474612a55f4904751d14599c71001f4df8
+MISC ChangeLog 10405 RMD160 d0b64af5ecbaa065e3d8e01fa67568a7a9cf414b SHA1 2183bce3307960d0c7bc4dc3aa8f5827a4e2dc81 SHA256 f5e7ce9ac46355aff056c2690cb22decd9bed666cf424ff41833a96a12ff0932
 MISC metadata.xml 258 RMD160 3e5f58364805d3e42d35bb18afabc84771edc6e3 SHA1 f889879c2dfdef80624ebebd791c1b944ff859ae SHA256 3a3251d51801f0288687f235aed354e0f68cb6f90775941ba03b83bfd71e5dae
diff --git a/net-fs/autofs/autofs-5.0.3-r3.ebuild b/net-fs/autofs/autofs-5.0.3-r3.ebuild
new file mode 100644
index 000000000000..b28dc53e2977
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.3-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.3-r3.ebuild,v 1.1 2008/04/28 13:32:32 stefaan Exp $
+
+inherit eutils multilib autotools
+
+IUSE="ldap sasl"
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI_BASE="mirror://kernel/linux/daemons/${PN}/v5"
+SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2
+		${SRC_URI_BASE}/${P}-ldap-page-control-configure-fix.patch
+		${SRC_URI_BASE}/${P}-xfn-not-supported.patch
+		${SRC_URI_BASE}/${P}-basedn-with-spaces-fix-3.patch
+		${SRC_URI_BASE}/${P}-nfs4-tcp-only.patch
+		${SRC_URI_BASE}/${P}-correct-ldap-lib.patch
+		${SRC_URI_BASE}/${P}-dont-fail-on-empty-master-fix-2.patch
+		${SRC_URI_BASE}/${P}-expire-works-too-hard.patch
+		${SRC_URI_BASE}/${P}-unlink-mount-return-fix.patch
+		${SRC_URI_BASE}/${P}-update-linux-auto_fs4-h.patch
+		${SRC_URI_BASE}/${P}-expire-works-too-hard-update.patch
+		${SRC_URI_BASE}/${P}-expire-works-too-hard-update-2.patch
+		${SRC_URI_BASE}/${P}-handle-zero-length-nis-key.patch
+		${SRC_URI_BASE}/${PN}-5.0.2-init-cb-on-load.patch
+		${SRC_URI_BASE}/${P}-map-type-in-map-name.patch
+		${SRC_URI_BASE}/${P}-mount-thread-create-cond-handling.patch"
+DEPEND="virtual/libc
+		ldap? ( >=net-nds/openldap-2.0 )
+		sasl? ( virtual/krb5 )"
+			# currently, sasl code assumes the presence of kerberosV
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	PATCH_LIST="
+		${P}-ldap-page-control-configure-fix.patch
+		${P}-xfn-not-supported.patch
+		${P}-basedn-with-spaces-fix-3.patch
+		${P}-nfs4-tcp-only.patch
+		${P}-correct-ldap-lib.patch
+		${P}-dont-fail-on-empty-master-fix-2.patch
+		${P}-expire-works-too-hard.patch
+		${P}-unlink-mount-return-fix.patch
+		${P}-update-linux-auto_fs4-h.patch
+		${P}-expire-works-too-hard-update.patch
+		${P}-expire-works-too-hard-update-2.patch
+		${P}-handle-zero-length-nis-key.patch
+		${PN}-5.0.2-init-cb-on-load.patch
+		${P}-map-type-in-map-name.patch
+		${P}-mount-thread-create-cond-handling.patch"
+	for i in ${PATCH_LIST}; do
+		EPATCH_OPTS="-p1 -d ${S}" epatch ${DISTDIR}/${i}
+	done
+
+	cd "${S}"
+
+	# # use CC and CFLAGS from environment (bug #154797)
+	# write these values in Makefile.conf
+	(echo "# Use the compiler and cflags determined by configure";
+	echo "CC := @CC@"; echo "CFLAGS := @CFLAGS@") >> Makefile.conf.in
+	# make sure Makefile.conf is parsed after Makefile.rules
+	sed -ni '/include Makefile.conf/{x; n; G}; p' Makefile
+	sed -i 's/^\(CC\|CXX\).*//' Makefile.rules
+	sed -i 's/^CFLAGS=-fPIE.*//' configure.in
+
+	# do not include <nfs/nfs.h>, rather <linux/nfs.h>,
+	# as the former is a lame header for the latter (bug #157968)
+	sed -i 's@nfs/nfs.h@linux/nfs.h@' include/rpc_subs.h
+
+	eautoreconf || die "Autoconf failed"
+}
+
+src_compile() {
+	CFLAGS="${CFLAGS}" \
+	econf \
+		$(use_with ldap openldap) \
+		$(use_with sasl) \
+		--enable-ignore-busy \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newinitd "${FILESDIR}"/autofs5.rc1 autofs
+}
+
+pkg_postinst() {
+	elog "Note: If you plan on using autofs for automounting"
+	elog "remote NFS mounts without having the NFS daemon running"
+	elog "please add portmap to your default run-level."
+}