Version bump to 5.0.4 + fix bugs #247969 and #253412 concerning LDFLAGS and --as-needed

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

4 files changed, 165 insertions, 3 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 9159568d4125..9cb4c7c59e22 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,14 @@
 # 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.76 2008/08/29 13:51:00 robbat2 Exp $
+# 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 $
+
+*autofs-5.0.4 (04 Jan 2009)
+
+  04 Jan 2009; Stefaan De Roeck <stefaan@gentoo.org>
+  +files/autofs-5.0.4-user-ldflags-and-as-needed.patch,
+  +autofs-5.0.4.ebuild:
+  Version bump to 5.0.4 + fix bugs #247969 and #253412 concerning LDFLAGS
+  and --as-needed
 
   29 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> Manifest:
   Bug #236051, I had a download failure during digesting, with a zero-byte
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 2a54b005139e..8daf8f0e8920 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -4,6 +4,7 @@ AUX auto.net 1134 RMD160 6396a1d4faac5e9a2bf0f83d53fa7e3c578840f9 SHA1 7a6c88657
 AUX autofs-4.1.3-signal-race-fix.patch 426 RMD160 1cd4bdc099d29e75d5b6833ffbd2c93f22bf4a3d SHA1 31d20235bd414e8a74de19d951e3f7cf3b61c035 SHA256 1f7f25ce97546c038b71cb9a4ba7dd1fe88e9cd66f0fc34c8411fd76bd7b60de
 AUX autofs-5.0.3-heimdal.patch 1380 RMD160 ed40e452a7648aec1b25e1002c99929be97b8bf9 SHA1 3f7d05c14e52a9a8160a43a38a7b736bb81bb68b SHA256 ca62546abf6b6ae2ed95f53d439d25770f20e70651fdaf5a0edf9d69920b108a
 AUX autofs-5.0.3-map-patch-fix.patch 2543 RMD160 3be39a53ddc5125b9ca09f636f3099c02b15de20 SHA1 4d0613ba4c9f51b1bdfdc2f854f02b0acc2681fa SHA256 7a905f5784b9ecddb757cc998033827b58c2c3f4ea514fd746d1d99d8f0f1d5b
+AUX autofs-5.0.4-user-ldflags-and-as-needed.patch 1692 RMD160 7309a7461484b9fb1fc9791d7fae75e415853964 SHA1 96ccf835dfb966180dd472b320bce5ecf72eb823 SHA256 dd2f8e449e99d3445c4c7ddb6b68938bbdc982dfbbcbcd6dfbd1ef1a680af6dd
 AUX autofs.confd 186 RMD160 812709be1af1cfc35fa313907496bfb4e9490386 SHA1 51cfe6ffa36ee5bc02f61a3d500469d73e3aa266 SHA256 d32c102ae6bab4958d230366cd42c1a67fab4f38e0d6abdf0c4a94cd71dffa45
 AUX autofs.confd9 799 RMD160 ef61372f9f804dc5b9f662d3810b8a8c80b635de SHA1 80612d8fa46c2b9b7ffdd8d3e711e6d14f0af19f SHA256 c19db9095a5b21bcc0da40adad7141800ddb43db09548adf4c91fd813d9b5e1f
 AUX autofs.rc10 6373 RMD160 bbff8d48111f33a36afd4bf1628d7366a87478fd SHA1 957f37f6e61c89ab0cb452f7a1e7e55e4d0f9070 SHA256 e8ddf8aac8ae593be10ad9640f739f2ddc4d23566bdaeb9b1ac70a3d5c4f31ec
@@ -80,6 +81,11 @@ DIST autofs-5.0.3-update-replicated-doco.patch 3630 RMD160 f4030e46757359678b5d6
 DIST autofs-5.0.3-use-dev-urandom.patch 1087 RMD160 99b7b351fb450f156ae6b7e412107166641c1d9c SHA1 c2ccfb95da23187b0896b23935af8fa210d8b485 SHA256 b43f53b95d4dc4a9473a97288633e3616879d512240bde0e24deb9bdbdad2ba8
 DIST autofs-5.0.3-xfn-not-supported.patch 1753 RMD160 25729dd9fc17f8fbd143ee4670fa9d498473d015 SHA1 8d0e17e1ab721758f932f37efb49541101bfe27a SHA256 fa674ca5e63b01d6a6eee21ef8b1c81c432b7fe353390c60edae7fa0f4c5b67f
 DIST autofs-5.0.3.tar.bz2 225298 RMD160 b25fd5f2da4592ec3827de1cd7227d66469fe853 SHA1 3e6c275d8c8752132ffd881ac3ec962dd2926498 SHA256 1598f6849c1bf0ec596e7dad7c7c8176a958e973d55370da1236d8b9bdd4acc9
+DIST autofs-5.0.4-expire-specific-submount-only.patch 2461 RMD160 003862536a66c75579a8e1de99473fcaf177bcc2 SHA1 68316db81acb7d6ccceb16a77a700b439db91898 SHA256 03751bbeb7eac53151124a83dac9970b747a7d38b00d4471d2a5d1f9aab0a157
+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.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
 EBUILD autofs-3.1.7-r5.ebuild 1739 RMD160 2aba32bed55900477131d080beb301b1271be1aa SHA1 8a6b81324f6f893dac00324432b1bcfbb321856a SHA256 4e5c9f0981fb87311e452be843f6426a694c03a613f7eb05c7360c6e43f147ae
@@ -99,5 +105,6 @@ 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
-MISC ChangeLog 11635 RMD160 7074e48245dc926b1044f96cded2df0f0ebfd077 SHA1 9f510337cdb8ec785009486876516850f0b3a9ba SHA256 46b0730ff3e9c6eb2f604a631b75327bef68e3738573c955f921ca8d80a0e709
+EBUILD autofs-5.0.4.ebuild 2538 RMD160 07754d4304cb7bcdac718f24dfb4d7720cd83e2d SHA1 836870ac883c18e5138c995621188a08ef1f0db2 SHA256 eea28b3082acda4215343f0100d1f896d4364961b74db0ce518746b94ef32c76
+MISC ChangeLog 11890 RMD160 17c1d02d0a312478401c5f78b3b3fe896bae4777 SHA1 5bc4c70cf5642d01ca9c93e38809c4218e6cdf97 SHA256 16a66d9849bd4a6d72f560f953041436d64c313ff1ea12af10dfd829b06120d7
 MISC metadata.xml 258 RMD160 3e5f58364805d3e42d35bb18afabc84771edc6e3 SHA1 f889879c2dfdef80624ebebd791c1b944ff859ae SHA256 3a3251d51801f0288687f235aed354e0f68cb6f90775941ba03b83bfd71e5dae
diff --git a/net-fs/autofs/autofs-5.0.4.ebuild b/net-fs/autofs/autofs-5.0.4.ebuild
new file mode 100644
index 000000000000..9fe4b4e42c07
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.4.ebuild
@@ -0,0 +1,81 @@
+# 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.ebuild,v 1.1 2009/01/04 12:31:28 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"
+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."
+}
diff --git a/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch b/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch
new file mode 100644
index 000000000000..ba650593b92d
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.4-user-ldflags-and-as-needed.patch
@@ -0,0 +1,66 @@
+1/2) Patch 177057 to bug #253412: use user ldflags, don't add pthreads through ldflags
+
+diff -ru a/Makefile.rules b/Makefile.rules
+--- a/Makefile.rules	2009-01-01 21:54:02.000000000 -0600
++++ b/Makefile.rules	2009-01-01 22:17:41.000000000 -0600
+@@ -24,16 +24,16 @@
+ 
+ ifdef DEBUG
+ CFLAGS    ?= -g -Wall -DDEBUG
+-LDFLAGS   = -g
++AUTOFS_LDFLAGS   = -g
+ STRIP     = :
+ else
+ ifdef DONTSTRIP
+ CFLAGS    ?= -O2 -g
+-LDFLAGS   = -g
++AUTOFS_LDFLAGS   = -g
+ STRIP     = :
+ else
+ CFLAGS    ?= -O2 -Wall
+-LDFLAGS   = -s
++AUTOFS_LDFLAGS   = -s
+ STRIP     = strip --strip-debug
+ endif
+ endif
+@@ -45,10 +45,9 @@
+ SOLDFLAGS = -shared
+ 
+ CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
+-LDFLAGS += -lpthread
+ 
+ ifdef DMALLOCLIB
+-LDFLAGS += $(DMALLOCLIB)
++AUTOFS_LDFLAGS += $(DMALLOCLIB)
+ endif
+ 
+ # Standard rules
+diff -ru a/daemon/Makefile b/daemon/Makefile
+--- a/daemon/Makefile	2009-01-01 22:14:10.000000000 -0600
++++ b/daemon/Makefile	2009-01-01 22:24:03.000000000 -0600
+@@ -25,7 +25,7 @@
+ all: automount
+ 
+ automount: $(OBJS) $(AUTOFS_LIB)
+-	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
++	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
+ 	$(STRIP) automount
+ 
+ clean:
+
+
+
+2/2) Patch 177056 to bug #247969: add -lpthread the correct way (removed from LDFLAGS in above patch)
+
+diff -ru a/daemon/Makefile b/daemon/Makefile
+--- a/daemon/Makefile	2009-01-01 22:14:10.000000000 -0600
++++ b/daemon/Makefile	2009-01-01 22:21:16.000000000 -0600
+@@ -20,7 +20,7 @@
+ CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
+ CFLAGS += -DVERSION_STRING=\"$(version)\"
+ LDFLAGS += -rdynamic
+-LIBS = -ldl
++LIBS = -ldl -lpthread
+ 
+ all: automount
+