Revision bump - include latest upstream patches, probably fixes #269004

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 154 insertions, 2 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 1de028a6b27d..b3ccac98c616 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.88 2009/06/11 20:40:10 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.89 2009/06/14 10:46:26 stefaan Exp $
+
+*autofs-5.0.4-r5 (14 Jun 2009)
+
+  14 Jun 2009; Stefaan De Roeck <stefaan@gentoo.org>
+  +autofs-5.0.4-r5.ebuild:
+  Revision bump - include latest upstream patches, probably fixes #269004
 
   11 Jun 2009; Stefaan De Roeck <stefaan@gentoo.org>
   -autofs-3.1.7-r3.ebuild, -autofs-3.1.7-r4.ebuild, -autofs-4.0.0.ebuild,
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 3e6665c772ac..06f604d5e58e 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -98,14 +98,18 @@ DIST autofs-5.0.4-easy-alloca-replacements-fix.patch 6310 RMD160 737318d7ceb9ddc
 DIST autofs-5.0.4-easy-alloca-replacements.patch 34981 RMD160 25c8d563daa402a4fb9a7bdea448f2ade3bc3f54 SHA1 b001a37a2cf67ffb827633ac600212b478b252b5 SHA256 c2f580ca8b06514f948a568b534d9e9441bd0f7d4b1fc5e2f08d1744c3af3618
 DIST autofs-5.0.4-expire-specific-submount-only.patch 2461 RMD160 003862536a66c75579a8e1de99473fcaf177bcc2 SHA1 68316db81acb7d6ccceb16a77a700b439db91898 SHA256 03751bbeb7eac53151124a83dac9970b747a7d38b00d4471d2a5d1f9aab0a157
 DIST autofs-5.0.4-fix-bad-token-declare.patch 1085 RMD160 f32aa420dd15fdcb9c3401b8cda4a8efbc1231b8 SHA1 1e6f3d1b1ee6d609e22b3ad3983dbf8201f9e077 SHA256 2ee71883581ce6c28c381dbe633fd310bc3d763f7e4db92db18d0e05cca7e2b8
+DIST autofs-5.0.4-fix-double-free-in-do_sasl_bind.patch 1196 RMD160 c9715d288f1977fa792b0f413424ad4543ce2a2d SHA1 975ee0ba07eefb5484ad1328e527408e66fcea9e SHA256 80dbd7e532d727ab032e46faccc339b8ea6351715dc2d1edf551355654f7e3d0
 DIST autofs-5.0.4-fix-double-free-in-expire_proc.patch 1078 RMD160 89c61467d2f48ee39e9964b2172c8f3e0c3db19c SHA1 f00605d825aba19925c242c315392e63d6553b9c SHA256 5316540f9944ae563f3db9563f7f2cd7a09fe692f10ad4163bd4ca8c06ac7e84
 DIST autofs-5.0.4-fix-dumb-libxml2-check.patch 2462 RMD160 3a7ece1593cff78d253ae79bfd5bf87ca372063b SHA1 4d97b3fe0c1b0097e182be01bb61308b3538193f SHA256 4dc61fc8d05d5ce268447b1f3ff92aafad3956a24ae80d44a4be64b666efcd99
 DIST autofs-5.0.4-fix-hosts-map-use-after-free.patch 1357 RMD160 64cbd8cc207a79ad61f591bd09146db7c9ff7f83 SHA1 291e42618ef04cebefc15d236135e9468ee3c88c SHA256 81742146f6d31ade103acace3e410675342490d2608833523249a3c81016ee65
+DIST autofs-5.0.4-fix-incorrect-dclist-free.patch 874 RMD160 c0268396963a678004ee23bfe5b9b62b2110fc5c SHA1 4f79965fcfb5b4d012bf7a27bc5eb77b197a117a SHA256 6384fc2ef250978127c953db821dd7dd98d7c12ac8de5d91cf6b1de4c1d32454
 DIST autofs-5.0.4-fix-kernel-includes.patch 2689 RMD160 202ad11af683b7fbab7cd29e708fb753d6d31c36 SHA1 e7ba25235a42442c4c60e74061164b4a67cd5a6c SHA256 ca8198fab9dc597f19c431d7c66ff25a1c88a5ef3b503697f0eb2721a21796d3
 DIST autofs-5.0.4-fix-ldap-detection.patch 3546 RMD160 f20b055dbcb267a105a76a49d5bd24ac18ffc063 SHA1 915e6db1d43de4ad1c246d8b63c6fbb1adfa1a30 SHA256 046a8fc50a0033efe50d165544b9a9e16f8b726c34ae267992f17c0307e54cfb
 DIST autofs-5.0.4-fix-lsb-init-script-header.patch 1623 RMD160 e5ad71c91bd68a679034a3d67e6acc0cad7cd6e1 SHA1 d09cdc5a7547af4812946029fca7106d61eedc98 SHA256 1c5ce9740e77d6ae3ab8fe92b8270a78e91d7a3ffd9aec73fde79477bfd22194
+DIST autofs-5.0.4-fix-map-type-info-parse-error.patch 1265 RMD160 2f6df4f3aee67658efbc01d086ffc7c3a98f5742 SHA1 024f3cefed7e09c7c50cb18b10662acd67baae0b SHA256 44baed37dc36442d881f2f990ae7a5ecdfe190a645587ec6dd997962b7d79f9b
 DIST autofs-5.0.4-fix-memory-leak-reading-ldap-master.patch 1062 RMD160 11702551c7873ce0cf5be0b900a9ce7a6dbb26e5 SHA1 a7751bdf373fce33089f170e8edd406f69964ca1 SHA256 a38bb91a716c73010b8b310222877c94f0fbf85a6f3fca2264020047801a8180
 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-notify-mount-message-path.patch 1974 RMD160 dc03c84d448d4a5c4f67871809b15fa5351ee5b1 SHA1 6743c78698409fa70c614ad9b8da4a796e7e3eef SHA256 e816084f9b61d04caa335c53dc4dd105b6a227f3cb6fb5d1540bffcd03d5e44f
 DIST autofs-5.0.4-fix-quoted-mess.patch 1049 RMD160 7091cb2dff02845d3a5f3ded056a760f06adb07b SHA1 59e9ba917cb5cd370f3d37e9390cc40b94b05bd0 SHA256 e8fec6ecd6fc3e7867aa5c3e2eeed40d6c8068008a83cac6e1ad4dc7251a0e95
 DIST autofs-5.0.4-fix-restorecon.patch 1437 RMD160 a8c839781eede4ea999aa85479e1d6c6154817c8 SHA1 34365e6b7b3337ffdae717dc6742bca277986b57 SHA256 0d09fe5b22cf6c915addf30664221dc0ea95a6da9194ee890da2a83b555f6b6a
 DIST autofs-5.0.4-fix-return-start-status-on-fail.patch 5080 RMD160 dc38afb301e1931cd03824753449ce6896ece995 SHA1 aa34994a80e606bb9f826b6ab9c79e26cb6f2793 SHA256 3af14f7d48a80bbe52d252b6053ea1adc5cef0a9668c81e76aff028802b53f2a
@@ -115,13 +119,17 @@ DIST autofs-5.0.4-force-unlink-umount.patch 7167 RMD160 707f9f60804ce89d0afbd04f
 DIST autofs-5.0.4-improve-manual-umount-recovery.patch 4902 RMD160 5fa902624d95f7d554611ce44683ff33c2b7d8b7 SHA1 298d3b1e27356cf42c0c111d4fbe62b6eb72ff49 SHA256 9d9944c9cb073ee8f0858785597d732b340041afee4317d323dc83f8a3fcdf03
 DIST autofs-5.0.4-ipv6-name-and-address-support.patch 25149 RMD160 f765d186657b35f572aa401ab016bef1e8c9681f SHA1 fd860b4e8ab43a8e7f34c3b32240036b5ba0c7d9 SHA256 f6de85f29a56afb1116065c2db81097a0b42eb5fd25449c6e0ace6ce01417e2f
 DIST autofs-5.0.4-ipv6-parse.patch 12264 RMD160 58aa234c25d32896e6884e4060bc2b5a9eb70037 SHA1 4667a992f82941c36c734cbc07a47c0a71329660 SHA256 94f562284bfcb060e3908b2caf34b5370b27e12af3fb8df28b796b09f4821ce7
+DIST autofs-5.0.4-library-reload-fix-update-fix-2.patch 1446 RMD160 eb0a9e89d8eccd6f5b91455147979c1797424681 SHA1 d71d4a06ed090d247b389b058a9bb2d287cdd0eb SHA256 0cc2994a1c1b7a4ff704b8eebf1808a24158c4616531a82ca8707e16228c2d56
 DIST autofs-5.0.4-library-reload-fix-update-fix.patch 2292 RMD160 695f2ade1ad219ee651079a1e05c0c6b07c7ace8 SHA1 24e61ac07828d9245813c1ba243404c2b6f9e1a0 SHA256 c9696ea233424490e2a34c14804be861f1a20b970e9f47352f56fc6f11c22d6b
 DIST autofs-5.0.4-library-reload-fix-update.patch 11309 RMD160 cd9b096518a611c8d03edd963d1715ae148dbd89 SHA1 75b7acf167f23e07391babea786dd8001a9558ee SHA256 c5198bab85aab40694e4018b5e1bbc096c656d2e9a6ebb16ce81da59252a7f64
 DIST autofs-5.0.4-libxml2-workaround-fix.patch 1062 RMD160 4fa0f5c12fd3ba327a7c323297eb393c06df574c SHA1 b0933205f2c6c8c0c9dc785717b5e3d87b77530b SHA256 879b1868d6f386a3c1f62e8e90f89524c9595cd7d70918b21d97e7d04f3fd021
 DIST autofs-5.0.4-make-MAX_ERR_BUF-and-PARSE_MAX_BUF-use-easier-to-audit.patch 7876 RMD160 524d5309c5afd2879779004b58d6d0d985bfc1f9 SHA1 06c094765f759a9b0df52e122c7854e2c33ee21d SHA256 0e34aaa4e6cf2be0188aebabb0c4c796ecd7b33b06b21dda1773b696b15a7978
 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-manual-umount-recovery-fixes.patch 2992 RMD160 42cd85191ca2c31582370893d7ea9f9a2907a081 SHA1 a40f2c8c360ff5cf156321d3b545dee0aaf18023 SHA256 d6716f842bcb17e2c6df017f76835dc29a8c40bc001e3dcce098761b48b18d2e
+DIST autofs-5.0.4-remount-we-created-mount-point-fix.patch 1644 RMD160 1234da36147f153eeb9366d3209349d22e7ad4e3 SHA1 010323d1a4e9c9b863f823cb30c99a0cb4a85efa SHA256 0c52953447ff9ef063d5256f46b3fd8bf3854f6e1a64960d54a594dc7edce51f
 DIST autofs-5.0.4-renew-sasl-creds-upon-reconnect-fail.patch 1785 RMD160 d2bf66403147403644320af74b0f3d61cf90bf23 SHA1 38bb5c5c8b3c31911e1c38066119cc24b962d6f3 SHA256 6cca5a02838d4875ac593e0a54905ff884e820ef3270269ece6d42355dcc4fb0
 DIST autofs-5.0.4-reset-flex-scanner-when-setting-buffer.patch 1471 RMD160 982c558e344a0684e9e2859932fedf6ee7229994 SHA1 47ff5772e09489c13ebef4ca0cdcd9a84e1b8013 SHA256 83d57377f2cb23024c59bb3517fde6553ccf658d12cd20a7f38691f8451cb1d9
+DIST autofs-5.0.4-srv-lookup-handle-endian.patch 907 RMD160 2a07e8c79bfd2af22b764333a9c3f1fb1dfa8f3c SHA1 4e24dcf836eb87026f2aff7dae92ab4eeaf23017 SHA256 e0a0b7b1fd1306b55af041212c709b3fbba0bde52454a7b7132d0ecf1ca65951
 DIST autofs-5.0.4-uris-list-locking-fix.patch 6981 RMD160 b5bdbfd87a711347084875d7470887a42776cae0 SHA1 a623b73f2fb89b778b20d21f1ef8a69e3cdec5c8 SHA256 d3d0c6529428fc1fe37bcd880c5075f51d4e8eb06b89a133aa584e9a177bf043
 DIST autofs-5.0.4-use-CLOEXEC-flag-setmntent-include-fix.patch 1137 RMD160 d78fe68805a9036b44daab5bc6552b962a44266b SHA1 1e02590c61baa12e9efec02543dac805e38c5226 SHA256 0e156f3505e7ef2b69c29c8af00a6c69799d740f154963dd047a2cd310490085
 DIST autofs-5.0.4-use-CLOEXEC-flag-setmntent.patch 2636 RMD160 6c3f2d300930e2a67ebf4d031ed79a6bf04e8a3d SHA1 e4651099faf2453dee1bda393cc84930e87d1073 SHA256 b5fdbaa54bd95a93e83c773522f64c0bd4c7eea735f97dc89472f2fbefe0846f
@@ -140,6 +148,7 @@ EBUILD autofs-5.0.3-r6.ebuild 4277 RMD160 8568f2a33e6f9514f76d2a3c2e683fcde0dfc7
 EBUILD autofs-5.0.4-r2.ebuild 2708 RMD160 2f04b946efd04385d5c37373f247f27c1e30ccad SHA1 de1ac1785e6f81edc3b14071353d0321f21aef36 SHA256 a11fb8da0340a3072057aba75167b31fb7e2cf829ebfa83f7c01aae663149d15
 EBUILD autofs-5.0.4-r3.ebuild 4211 RMD160 0a1dc6427d22e97a6814b9f3bef480ef8ed48458 SHA1 f949b4ee0dcdf487a50b2df0f4df8641344772ee SHA256 e50f9c00c2fc1528757bb279cc32865fc4ae3ec2aa87b78d007b6793e7953fbd
 EBUILD autofs-5.0.4-r4.ebuild 4485 RMD160 7695a00476de0aa18275c3f2b6ceed6831e1b7b6 SHA1 9ab780067eb448ff45a82ede61e5a1af0d8a016b SHA256 94fe8cd4bda57d3629f6e680178f456fd5dd45adcda153db57b94074085f9eaf
+EBUILD autofs-5.0.4-r5.ebuild 4820 RMD160 296dec3cae812f7fae2366031e0c53d7bf5e8daa SHA1 da65509e15b3acc79ee3dae292a6289bbddccd80 SHA256 4b9341be676de94e0d36f9742614dc8955b4fbd56607dc1285a12928293caa31
 EBUILD autofs-5.0.4.ebuild 2538 RMD160 07754d4304cb7bcdac718f24dfb4d7720cd83e2d SHA1 836870ac883c18e5138c995621188a08ef1f0db2 SHA256 eea28b3082acda4215343f0100d1f896d4364961b74db0ce518746b94ef32c76
-MISC ChangeLog 13725 RMD160 5cc1e7e64afd3043ed954b7ece286963d915ee4a SHA1 933b4de4a3c27b2c1cc023acb98af3802a96d6eb SHA256 9b47e3f24b6dad437cf5c6472289f5269e85d9d828129e04ef92ded3ac125f43
+MISC ChangeLog 13912 RMD160 f707afdae1d12866d41a446712b8862359c188e0 SHA1 5cbde752c61e66c7d3acf884b4b0a00695e91991 SHA256 0ad48ba85bb69d4f4c752237410583fba741e5e04ccea7693480e20c138a9ae8
 MISC metadata.xml 258 RMD160 3e5f58364805d3e42d35bb18afabc84771edc6e3 SHA1 f889879c2dfdef80624ebebd791c1b944ff859ae SHA256 3a3251d51801f0288687f235aed354e0f68cb6f90775941ba03b83bfd71e5dae
diff --git a/net-fs/autofs/autofs-5.0.4-r5.ebuild b/net-fs/autofs/autofs-5.0.4-r5.ebuild
new file mode 100644
index 000000000000..65b7db6bd504
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.4-r5.ebuild
@@ -0,0 +1,137 @@
+# 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-r5.ebuild,v 1.1 2009/06/14 10:46:26 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-${PV}
+# 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
+	${P}-fix-quoted-mess.patch
+	${P}-use-CLOEXEC-flag-setmntent.patch
+	${P}-fix-hosts-map-use-after-free.patch
+	${P}-uris-list-locking-fix.patch
+	${P}-renew-sasl-creds-upon-reconnect-fail.patch
+	${P}-library-reload-fix-update.patch
+	${P}-force-unlink-umount.patch
+	${P}-always-read-file-maps.patch
+	${P}-code-analysis-corrections.patch
+	${P}-make-MAX_ERR_BUF-and-PARSE_MAX_BUF-use-easier-to-audit.patch
+	${P}-easy-alloca-replacements.patch
+	${P}-configure-libtirpc.patch
+	${P}-ipv6-name-and-address-support.patch
+	${P}-ipv6-parse.patch
+	${P}-add-missing-changelog-entries.patch
+	${P}-use-CLOEXEC-flag-setmntent-include-fix.patch
+	${P}-easy-alloca-replacements-fix.patch
+	${P}-libxml2-workaround-fix.patch
+	${P}-configure-libtirpc-fix.patch
+	${P}-add-nfs-mount-proto-default-conf-option.patch
+	${P}-fix-bad-token-declare.patch
+	${P}-fix-return-start-status-on-fail.patch
+	${P}-fix-double-free-in-expire_proc.patch
+	${P}-another-easy-alloca-replacements-fix.patch
+	${P}-add-lsb-init-script-parameter-block.patch
+	${P}-always-read-file-maps-fix.patch
+	${P}-use-misc-device.patch
+	${P}-fix-restorecon.patch
+	${P}-clear-rpc-client-on-lookup-fail.patch
+	${P}-fix-lsb-init-script-header.patch
+	${P}-fix-memory-leak-reading-ldap-master.patch
+	${P}-fix-st_remove_tasks-locking.patch
+	${P}-reset-flex-scanner-when-setting-buffer.patch
+	${P}-zero-s_magic-is-valid.patch
+	${P}-use-percent-hack-for-master.patch
+	${P}-use-intr-as-hosts-mount-default.patch
+	${P}-fix-kernel-includes.patch
+	${P}-dont-umount-existing-direct-mount-on-reread.patch
+	${P}-library-reload-fix-update-fix.patch
+	${P}-improve-manual-umount-recovery.patch
+	${P}-dont-fail-on-ipv6-address-adding-host.patch
+	${P}-always-read-file-maps-multi-map-fix.patch
+	${P}-always-read-file-maps-key-lookup-fixes.patch
+	${P}-use-srv-query-for-domain-dn.patch
+	${P}-fix-incorrect-dclist-free.patch
+	${P}-srv-lookup-handle-endian.patch
+	${P}-library-reload-fix-update-fix-2.patch
+	${P}-fix-notify-mount-message-path.patch
+	${P}-remount-we-created-mount-point-fix.patch
+	${P}-fix-double-free-in-do_sasl_bind.patch
+	${P}-manual-umount-recovery-fixes.patch
+	${P}-fix-map-type-info-parse-error.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
+RDEPEND="${DEPEND}"
+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-v2.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."
+}