Introducing new patches from upstream, in an attempt to fix bugs #253806 and #255369

Package-Manager: portage-2.2_rc21/cvs/Linux 2.6.27-gentoo-r4 x86_64

3 files changed, 97 insertions, 2 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 9cb4c7c59e22..6e873e720d56 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-fs/autofs
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.77 2009/01/04 12:31:28 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.78 2009/01/20 09:09:43 stefaan Exp $
+
+*autofs-5.0.4-r1 (20 Jan 2009)
+
+  20 Jan 2009; Stefaan De Roeck <stefaan@gentoo.org>
+  +autofs-5.0.4-r1.ebuild:
+  Introducing new patches from upstream, in an attempt to fix bugs #253806
+  and #255369
 
 *autofs-5.0.4 (04 Jan 2009)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 8daf8f0e8920..e9334b616307 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -85,6 +85,9 @@ DIST autofs-5.0.4-expire-specific-submount-only.patch 2461 RMD160 003862536a66c7
 DIST autofs-5.0.4-fix-dumb-libxml2-check.patch 2462 RMD160 3a7ece1593cff78d253ae79bfd5bf87ca372063b SHA1 4d97b3fe0c1b0097e182be01bb61308b3538193f SHA256 4dc61fc8d05d5ce268447b1f3ff92aafad3956a24ae80d44a4be64b666efcd99
 DIST autofs-5.0.4-fix-ldap-detection.patch 3546 RMD160 f20b055dbcb267a105a76a49d5bd24ac18ffc063 SHA1 915e6db1d43de4ad1c246d8b63c6fbb1adfa1a30 SHA256 046a8fc50a0033efe50d165544b9a9e16f8b726c34ae267992f17c0307e54cfb
 DIST autofs-5.0.4-fix-negative-cache-non-existent-key.patch 9852 RMD160 3e9cf52fc6bdca447d5164eac0c93819fa1303f5 SHA1 cab61d77fb8729765fbb81e76e4e6f99f5c61eb5 SHA256 7a9a438899c422b74283399587fa2037a67425aaebe4e952fb485088e3ae9f4c
+DIST autofs-5.0.4-fix-select-fd-limit.patch 6912 RMD160 5571c1a0bffa74d7d2be7479aa48a8250f012b73 SHA1 530fe6e3d3ce177640ebed482b5d60993c9ce680 SHA256 2678fd5b1d4c184f2d30b06b8854a1d6ea5f1b4dfc3933a5588ed75e845cec5e
+DIST autofs-5.0.4-make-hash-table-scale-to-thousands-of-entries.patch 9173 RMD160 62b26be1d1d0b5900ed7b7bf8926e9653e835603 SHA1 b501c112bbfa9f2bf666673ba9b1864769abbbef SHA256 24a288f5928812315821c70f7e98d760b1fcdb8e4d85478eae1197cfdb239ad3
+DIST autofs-5.0.4-use-CLOEXEC-flag.patch 30508 RMD160 eb01b3ef5fb3473381471fc653ca829c5fc960a1 SHA1 0b835638924098b6305c38aa6372064e5b72d2e2 SHA256 741ed2bf9b7a0b40c974c71a7e26d14dc9aac2273c78a8df258eb3edad7da07c
 DIST autofs-5.0.4.tar.bz2 303863 RMD160 00708143c56b440fa0c7589c2d0d9170334e7c3e SHA1 0a50408ba2c1f6d27f3a448edc70f2395b6566b5 SHA256 631fe1a3cdc11c66aaf356fc6c0b8e41dff45897c43bb536a29b432e89d8da1b
 EBUILD autofs-3.1.7-r3.ebuild 1285 RMD160 ba36b6a4dcf4164e79e75fca03bd9a13b53beb49 SHA1 dc51bd1d3f3db641c6087001bbf45f22704055d8 SHA256 66d8b470cf2f10b08a71a4a588a67371a92323de0f91d7c12637d3b6cd925bab
 EBUILD autofs-3.1.7-r4.ebuild 1725 RMD160 8d3a806b959f2700c43364acc9b49d174e3c092f SHA1 c82743878f9c3424fa91a684dfb200b87fc35ad4 SHA256 c45d1025c201329e2fc0d72cbf39807ef07536446b893583bc693b2422232560
@@ -105,6 +108,7 @@ EBUILD autofs-5.0.3-r4.ebuild 3502 RMD160 3c23739fd994bd642c6703b2e94978eff453be
 EBUILD autofs-5.0.3-r5.ebuild 3634 RMD160 2b144b12dc0ef3c58f5133113b2202c26a2824ff SHA1 a48726d670d6bd8ef576fe346548c61347743f80 SHA256 f0a7b15550485cff040816cfac73821a39a1c980bcf4266df05b989c68ad95c1
 EBUILD autofs-5.0.3-r6.ebuild 4290 RMD160 f4ed49897064f6e7461a033f6dcbdb1b4834372c SHA1 e761f33488e3ac91ebf7cdb5df8a0142033a992d SHA256 ae276187e14b82aca89a729d72e990741749518f47414c6e0f9579bfa7e7c684
 EBUILD autofs-5.0.3.ebuild 1635 RMD160 3b0d5e7c5100f60e7d6da903000142e676dce338 SHA1 e4d85cdbbbc89daec1e536fda5f9b6faf4ddf95f SHA256 a5839d8964101cec67d5ec3e70870122acab999906db3d65c40a0ea9ab77604c
+EBUILD autofs-5.0.4-r1.ebuild 2660 RMD160 03dfd6f28375a62c0783041b3615c05f8159749c SHA1 ce40153ca8d65c4f365bacbd1a720f4f72c582f6 SHA256 441e33c561437dbeeed477c159f2109ab15bd2521983610132058afc0cadea87
 EBUILD autofs-5.0.4.ebuild 2538 RMD160 07754d4304cb7bcdac718f24dfb4d7720cd83e2d SHA1 836870ac883c18e5138c995621188a08ef1f0db2 SHA256 eea28b3082acda4215343f0100d1f896d4364961b74db0ce518746b94ef32c76
-MISC ChangeLog 11890 RMD160 17c1d02d0a312478401c5f78b3b3fe896bae4777 SHA1 5bc4c70cf5642d01ca9c93e38809c4218e6cdf97 SHA256 16a66d9849bd4a6d72f560f953041436d64c313ff1ea12af10dfd829b06120d7
+MISC ChangeLog 12092 RMD160 3b98958fa4b9e35f326f4916d7f4db76b4788c6b SHA1 b60cd6f62593a3548fc4fecd8cf61b4ce58894fc SHA256 640b942d98a64cd36bb4c0505b83fa785f585c163760852aaa6e21cde9c62bbe
 MISC metadata.xml 258 RMD160 3e5f58364805d3e42d35bb18afabc84771edc6e3 SHA1 f889879c2dfdef80624ebebd791c1b944ff859ae SHA256 3a3251d51801f0288687f235aed354e0f68cb6f90775941ba03b83bfd71e5dae
diff --git a/net-fs/autofs/autofs-5.0.4-r1.ebuild b/net-fs/autofs/autofs-5.0.4-r1.ebuild
new file mode 100644
index 000000000000..2c6f3c971fbf
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.4-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.4-r1.ebuild,v 1.1 2009/01/20 09:09:43 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"
+# This list is taken directly from http://kernel.org/pub/linux/daemons/autofs/v5/patch_order-5.0.3
+# Please do not modify the order
+PATCH_LIST="
+	${P}-fix-dumb-libxml2-check.patch
+	${P}-expire-specific-submount-only.patch
+	${P}-fix-negative-cache-non-existent-key.patch
+	${P}-fix-ldap-detection.patch
+	${P}-use-CLOEXEC-flag.patch
+	${P}-fix-select-fd-limit.patch
+	${P}-make-hash-table-scale-to-thousands-of-entries.patch"
+SRC_URI="${SRC_URI_BASE}/${P}.tar.bz2"
+for i in ${PATCH_LIST} ; do
+	SRC_URI="${SRC_URI} ${SRC_URI_BASE}/${i}"
+done ;
+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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	for i in ${PATCH_LIST}; do
+		EPATCH_OPTS="-p1 -d ${S}" epatch "${DISTDIR}"/${i}
+	done
+
+	cd "${S}"
+
+	# fixes bug #210762
+	epatch "${FILESDIR}"/${PN}-5.0.3-heimdal.patch
+
+	# fixes bugs #253412 and #247969
+	epatch "${FILESDIR}"/${P}-user-ldflags-and-as-needed.patch
+
+	# # 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 DONTSTRIP=1 || 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."
+}