Bump upstream patchset, bug #394865 thank Dustin Polke for this job.

Package-Manager: portage-2.1.10.39/cvs/Linux x86_64

4 files changed, 284 insertions, 7 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 30d266dbafea..6c43293c521e 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.139 2011/11/01 05:54:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.140 2011/12/17 03:45:15 pva Exp $
+
+*autofs-5.0.6-r5 (17 Dec 2011)
+
+  17 Dec 2011; Peter Volkov <pva@gentoo.org> +autofs-5.0.6-r5.ebuild,
+  +files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch:
+  Bump upstream patchset, bug #394865 thank Dustin Polke for this job.
 
   01 Nov 2011; Markus Meier <maekke@gentoo.org> autofs-5.0.6-r3.ebuild:
   arm stable, bug #379569
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index d86c8da753b4..8cfaa7280f76 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f5d82a1073471eed654c99ff1fc3c064f3 SHA256 47df928601dc31bc8c23781bd0475b7ecb5bd09525c92a8772d51e0dc660b414
 AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078
@@ -21,6 +21,7 @@ AUX autofs-5.0.5-fix-install-deadlink.patch 544 RMD160 1fc3e01015a0b18e90a417546
 AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch 4400 RMD160 441f8c5488267036da65f69234f11fd82015f809 SHA1 94016e5fde7286e54f8ca0c465dc3f1fe3bbd3ba SHA256 ab5cbc585fb3f6f753d08345beffbb4a188d8f957fad3ee9c81487baca6e69ec
 AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch 3851 RMD160 df4fec7045a4dea512745f91fbbb3c7d00d2cf9f SHA1 b9e175dffcb65cb83fc34a15dce3c91f279278f3 SHA256 f69b3fcc717e96826fa6f6b2766423bc6d12cee06b739b0f10b99ffa3e4589ad
 AUX autofs-5.0.6-ipv6_name_lookup_regression.patch 1278 RMD160 badddcaa5c852d21d9f6d63db513eb4374c4ea69 SHA1 42224c808a41c1597d6f3a0d04a48b81a72d9322 SHA256 fdc02dbb0896dbfc71d042c1837e7c93983762f5683791fb99f931e6f98dda05
+AUX autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch 4102 RMD160 d8d8781c08ab89eed3f37e551f4705f4b54afd69 SHA1 6ee083e8dac0bad13398ad3b163967a3c872c9ba SHA256 7ea48494b1df75500333148f5e763028f883fda23639c0d32cb5b9bdee3f109b
 AUX autofs-5.0.6-respect-user-flags-and-fix-asneeded.patch 3895 RMD160 a06e62c8f0f1de0c5eccfe8cf429b2ea13ccb8eb SHA1 f8eed2d5f17100dfe8269db4c38ea7bec953c2ed SHA256 4f063e952349c0a4dba6895b2271034dd2905a649cdc0b672343123490e4aaa8
 AUX autofs-5.0.6-revert-ldap.patch 512 RMD160 00c5e2daac4a8b2ef0a8797158e7b38d1fe6b7a1 SHA1 34044dfdc91ea16a323fe0641dba3d1999d052a4 SHA256 67e4f23d0c1ef771f861ec295a2780d9c09b37d26718c21e3f20d3b4936738e9
 AUX autofs.confd9 799 RMD160 ef61372f9f804dc5b9f662d3810b8a8c80b635de SHA1 80612d8fa46c2b9b7ffdd8d3e711e6d14f0af19f SHA256 c19db9095a5b21bcc0da40adad7141800ddb43db09548adf4c91fd813d9b5e1f
@@ -155,6 +156,7 @@ DIST autofs-5.0.5-patches-3.tar.lzma 77343 RMD160 fc60a2605b65f9926dfd334c86c96f
 DIST autofs-5.0.5-patches-4.tar.lzma 85868 RMD160 87f6e0a4f7c2e68e9b45e0ae95fd0ab2b1917152 SHA1 003ea62f6fef6336cb5cc94bcb5f3688507cdf08 SHA256 669a97177fd67bf107bc9cdd188d8a01defe505b8668f83a5e907471e2ff08eb
 DIST autofs-5.0.5-patches-5.tar.lzma 87997 RMD160 3c01d5678ca5ef37e9a6579471f4a3077da166a8 SHA1 b0717dffc094b776a26e8ae59d4c1c657f31bb73 SHA256 8419de9e6ab4e840a118c277c70970e29d11c0b8e74538ebae2674d88bf6872a
 DIST autofs-5.0.5.tar.bz2 301327 RMD160 4d105cce439544193b4abcb0ca4763f8c1d3cf54 SHA1 7f8a320cc126cb233be23749669735320fe6933c SHA256 68c73e01bc3c14c7d3613a861bbde4ab601c13f3127fcb837d49e435e5986002
+DIST autofs-5.0.6-patches-1.tar.lzma 25424 RMD160 e83ba0d4eebe16e6b43d6b49356559fab7010e57 SHA1 d73b9e312326f50eb1e9be35697594703afff16a SHA256 7d92dd29b733a0e567d8a3a793a9559254e07abd23b1e2113d52a7e5cfb15e77
 DIST autofs-5.0.6.tar.bz2 311857 RMD160 1bbd94f887df4a90f379d98795fd009ef08840c3 SHA1 8c323e4327e98cbbcefc40883763e30814df9b44 SHA256 125b439a311939f247936ad697bc53b11a8e694aaff8ddf44a9fd7fa850e692c
 EBUILD autofs-4.1.3-r7.ebuild 2992 RMD160 7fc94cc967a7756eb9efb3da4a422fbb647c4d2c SHA1 056a5a4710b7275fb47a495985b51a64312412c4 SHA256 e8c538577a1a04659a0ff990b543efdb2dbb61d8b6bbb1cd2c7c1b159a842710
 EBUILD autofs-4.1.3-r9.ebuild 3101 RMD160 29c754ba5407258028cc372ee0d88193224f2ff9 SHA1 4fd3ec05fc46d05148c7ef32f97ee402bf2cb23f SHA256 a895a29abf8ee920cfa87764a30052f2d014d3003fc0421d430d0c2300e233bd
@@ -170,13 +172,14 @@ EBUILD autofs-5.0.6-r1.ebuild 3702 RMD160 589d540d027f97a674a4723db36d997118d171
 EBUILD autofs-5.0.6-r2.ebuild 3826 RMD160 79a773c7af48ff4bc18097c35f7453352e0860b2 SHA1 f23e8f39bb80d92e7530e1b5b9b38ddd58317e10 SHA256 9ed7b30e3fa651e7dc57971de42a046e6c5f29b36c90f311989894ad0a2ab5ab
 EBUILD autofs-5.0.6-r3.ebuild 3827 RMD160 7f26bf4eec2b05587b92ec9ec1d98c2900479b1a SHA1 f93b98219f81341e3b714f8dbc21e17cb2dbfaf6 SHA256 435ebd7e7837e575d5de1fecb8b4cd00a52c0877df4d62df543ecb70c2821e2f
 EBUILD autofs-5.0.6-r4.ebuild 3894 RMD160 ca2cb4f1da00ee5843bf06f1140ecf312d4f4d04 SHA1 6f4012b227ca9739c724d3432a325ea14b4a4d92 SHA256 e28b1ac232cf470e339906ac879aee000fa1d1b138754f1e612f7ffd53b4e909
+EBUILD autofs-5.0.6-r5.ebuild 3621 RMD160 7bb6bbf920a847469e682a61dc6d85119232ee55 SHA1 c09c037637e57acb9ae2adfc658ae4776986a9d8 SHA256 674564d087a7bd0199adf8eae6403a3f64df04a2b0540aab476ffde83f5d980c
 EBUILD autofs-5.0.6.ebuild 3485 RMD160 7c7accf22b56f49a3fa89fd0356a12ef17f39399 SHA1 24ebb4e411afb5721b1acd634ab2e516aae237f0 SHA256 faa6b414e896e49b3b8bac1507f3a43baa0399cd84b29c4ad517ac3ff59ba1e0
-MISC ChangeLog 22828 RMD160 4a68336b7f325eb7ff08d579da5d11a64ed09050 SHA1 ac8f8cc636066cd60242f886fd96f535547dbacb SHA256 9a7447dececdffffe63a84f7bc3c8945a49399b761a347588bd537d5740eea25
+MISC ChangeLog 23067 RMD160 638545b274a133305a443602e25c1a27efa8b0bf SHA1 48f9bb40676e45c456fb48b8b370fe0b481a6bdd SHA256 f8dc9e49b585f285d3d571fd9550670a482d0ec1330b7d997d3b55d806912de3
 MISC metadata.xml 530 RMD160 417c66e2ec6e8627d23373d76d8c187a4dced885 SHA1 7629fc63948229c175548cc8ca24774316fe41b1 SHA256 454c11f4af437af306f09746ed10abe0d565c2b9b4b232b3d892dca494e0d768
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6vijIACgkQkKaRLQcq0GIjoQCfUAPixjLY4OLjTd85Ybu9/bgs
-GAUAn33ZC2nosluzzgLxVpg45mnN7WC8
-=eK1r
+iF4EAREIAAYFAk7sEEkACgkQGrk+8vGYmweUKwD/VzQhUjzlejrBwt78fwJraxCu
+JxkVSYA8K3KUK6gCmL8BAMUi7kMDwIadqFdYE+pDD3RBsG/tpPz7T5xDCI6lGK2U
+=aoum
 -----END PGP SIGNATURE-----
diff --git a/net-fs/autofs/autofs-5.0.6-r5.ebuild b/net-fs/autofs/autofs-5.0.6-r5.ebuild
new file mode 100644
index 000000000000..c645f99b06da
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.6-r5.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.6-r5.ebuild,v 1.1 2011/12/17 03:45:15 pva Exp $
+
+EAPI="4"
+inherit eutils multilib autotools linux-info
+
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+PATCH_VER="1"
+[[ -n ${PATCH_VER} ]] && \
+	PATCHSET_URI="mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
+SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2
+	${PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="hesiod ldap sasl"
+
+# USE="sasl" adds SASL support to the LDAP module which will not be build. If
+# SASL support should be available, please add "ldap" to the USE flags.
+REQUIRED_USE="sasl? ( ldap )"
+
+# currently, sasl code assumes the presence of kerberosV
+RDEPEND="
+	hesiod? ( net-dns/hesiod )
+	ldap? ( >=net-nds/openldap-2.0
+		sasl? ( dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5 ) )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/yacc"
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${PATCH_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+			epatch "${WORKDIR}"/patches
+	fi
+
+	# Fix for bug #210762
+	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/4203
+	epatch "${FILESDIR}"/${PN}-5.0.3-heimdal.patch
+
+	# Accumulated fixes for bugs
+	#    #154797: Respect CC and CFLAGS
+	#    #253412: Respect LDFLAGS
+	#    #247969: Link order for --as-needed
+	epatch "${FILESDIR}"/${P}-respect-user-flags-and-fix-asneeded-r2.patch
+
+	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/5371
+	epatch "${FILESDIR}"/${PN}-5.0.5-fix-install-deadlink.patch
+
+	# Upstream reference: http://thread.gmane.org/gmane.linux.kernel.autofs/6039
+	# Disable LDAP specific code if USE="-ldap", let's see what upstream says...
+	epatch "${FILESDIR}"/${PN}-5.0.5-fix-building-without-ldap.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=361899
+	epatch "${FILESDIR}"/${PN}-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=381315
+	epatch "${FILESDIR}"/${P}-revert-ldap.patch
+	eautoreconf
+}
+
+src_configure() {
+	# work around bug #355975 (mount modifies timestamp of /etc/mtab)
+	# with >=sys-apps/util-linux-2.19,
+	addpredict "/etc/mtab"
+
+	# --with-confdir is for bug #361481
+	# --with-mapdir is for bug #385113
+	# for systemd support (not enabled yet):
+	#   --with-systemd
+	#   --disable-move-mount: requires kernel >=2.6.39
+	econf \
+		--with-confdir=/etc/conf.d \
+		--with-mapdir=/etc/autofs \
+		$(use_with ldap openldap) \
+		$(use_with sasl) \
+		$(use_with hesiod) \
+		--enable-ignore-busy
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL
+
+	# kernel patches
+	docinto patches
+	dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch
+
+	newinitd "${FILESDIR}"/autofs5.initd autofs
+	insinto etc/autofs
+	newins "${FILESDIR}"/autofs5-auto.master auto.master
+}
+
+pkg_postinst() {
+	if kernel_is -lt 2 6 30; then
+		elog "This version of ${PN} requires a kernel with autofs4 supporting"
+		elog "protocol version 5.00. Patches for kernels older than 2.6.30 have"
+		elog "been installed into"
+		elog "${EROOT}usr/share/doc/${P}/patches."
+		elog "For further instructions how to patch the kernel, please refer to"
+		elog "${EROOT}usr/share/doc/${P}/INSTALL."
+		elog
+	fi
+	elog "If you plan on using autofs for automounting remote NFS mounts,"
+	elog "please check that both portmap (or rpcbind) and rpc.statd/lockd"
+	elog "are running."
+}
diff --git a/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch b/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch
new file mode 100644
index 000000000000..a61696b6fb16
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.6-respect-user-flags-and-fix-asneeded-r2.patch
@@ -0,0 +1,154 @@
+--- a/Makefile.conf.in
++++ b/Makefile.conf.in
+@@ -100,3 +100,6 @@ initdir = @initdir@
+ 
+ # Location of systemd unit files
+ systemddir = @systemddir@
++
++# Use the compiler determined by configure
++CC := @CC@
+--- a/Makefile.rules
++++ b/Makefile.rules
+@@ -16,44 +16,30 @@ INSTALLROOT = $(DESTDIR)
+ AUTOFS_LIB = ../lib/autofs.a
+ 
+ # Compilers, linkers and flags
+-# The STRIP defined here *must not* remove any dynamic-loading symbols
+-
+ ifdef DMALLOCLIB
+ DEBUG=1
+ endif
+ 
+ ifdef DEBUG
+ CFLAGS    ?= -g -Wall -DDEBUG
+-LDFLAGS   = -g
+-STRIP     = :
+ else
+-ifdef DONTSTRIP
+ CFLAGS    ?= -O2 -g
+-LDFLAGS   = -g
+-STRIP     = :
+-else
+-CFLAGS    ?= -O2 -Wall
+-LDFLAGS   = -s
+-STRIP     = strip --strip-debug
+-endif
+ endif
++AUTOFS_LDFLAGS = -g
+ 
+-CC        = gcc
+-CXX       = g++
+ CXXFLAGS  = $(CFLAGS)
+ LD        = ld
+ SOLDFLAGS = -shared
+ 
+ CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
+-LDFLAGS += -lpthread
+ 
+ ifdef TIRPCLIB
+ CFLAGS += -I/usr/include/tirpc
+-LDFLAGS += $(TIRPCLIB)
++AUTOFS_LDFLAGS += $(TIRPCLIB)
+ endif
+ 
+ ifdef DMALLOCLIB
+-LDFLAGS += $(DMALLOCLIB)
++AUTOFS_LDFLAGS += $(DMALLOCLIB)
+ endif
+ 
+ ifdef SASL
+@@ -71,5 +57,4 @@ endif
+ 	$(CC) $(CFLAGS) -S $<
+ 
+ .c.so:
+-	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
+-	$(STRIP) $*.so
++	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
+--- a/configure.in
++++ b/configure.in
+@@ -183,7 +183,7 @@ AC_ARG_WITH(hesiod,
+ 		: Search for Hesiod in normal directory path
+ 	else
+ 		: Search for Hesiod in specific directory
+-		LDFLAGS="$LDFLAGS -L${withval}/lib"
++		LDFLAGS="$LDFLAGS -Wl,--no-as-needed -L${withval}/lib"
+ 		LIBHESIOD="-L${withval}/lib"
+ 		HESIOD_FLAGS="-I${withval}/include"
+ 	fi
+--- a/daemon/Makefile
++++ b/daemon/Makefile
+@@ -2,8 +2,8 @@
+ # Makefile for autofs
+ #
+ 
+--include ../Makefile.conf
+ include ../Makefile.rules
++-include ../Makefile.conf
+ 
+ SRCS = automount.c indirect.c direct.c spawn.c module.c mount.c \
+ 	lookup.c state.c flag.c
+@@ -20,7 +20,7 @@ CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfi
+ CFLAGS += -DAUTOFS_FLAG_DIR=\"$(autofsflagdir)\"
+ CFLAGS += -DVERSION_STRING=\"$(version)\"
+ LDFLAGS += -rdynamic
+-LIBS = -ldl
++LIBS = -ldl -lpthread
+ 
+ ifeq ($(LDAP), 1)
+     CFLAGS += $(XML_FLAGS)
+@@ -30,8 +30,7 @@ endif
+ all: automount
+ 
+ automount: $(OBJS) $(AUTOFS_LIB)
+-	$(CC) $(LDFLAGS) $(DAEMON_LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
+-	$(STRIP) automount
++	$(CC) $(AUTOFS_LDFLAGS) $(DAEMON_LDFLAGS) $(LDFLAGS) -o automount $(OBJS) $(AUTOFS_LIB) $(LIBS)
+ 
+ clean:
+ 	rm -f *.o *.s *~ automount
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -41,14 +41,12 @@ mount_clnt.c: mount.h
+ 
+ mount_clnt.o: mount_clnt.c
+ 	$(CC) $(CFLAGS) -o mount_clnt.o -c mount_clnt.c
+-	$(STRIP) mount_clnt.o
+ 
+ mount_xdr.c: mount.h
+ 	$(RPCGEN) -c -o mount_xdr.c mount.x
+ 
+ mount_xdr.o: mount_xdr.c
+ 	$(CC) $(CFLAGS) -Wno-unused-variable -o mount_xdr.o -c mount_xdr.c
+-	$(STRIP) mount_xdr.o
+ 
+ master_tok.c: master_tok.l
+ 	$(LEX) -o$@ -Pmaster_ $?
+--- a/modules/Makefile
++++ b/modules/Makefile
+@@ -87,9 +87,8 @@ endif
+ # Ad hoc compilation rules for modules which need auxilliary libraries
+ #
+ lookup_hesiod.so: lookup_hesiod.c
+-	$(CC) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
++	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(HESIOD_FLAGS) -o lookup_hesiod.so \
+ 		lookup_hesiod.c $(AUTOFS_LIB) $(LIBHESIOD) $(LIBRESOLV)
+-	$(STRIP) lookup_hesiod.so
+ 
+ cyrus-sasl.o: cyrus-sasl.c
+ 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
+@@ -98,13 +97,10 @@ cyrus-sasl-extern.o: cyrus-sasl-extern.c
+ 	$(CC) $(CFLAGS) $(LDAP_FLAGS) -c $<
+ 
+ lookup_ldap.so: lookup_ldap.c dclist.o base64.o $(SASL_OBJ)
+-	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
++	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
+ 		lookup_ldap.c dclist.o base64.o $(SASL_OBJ) \
+ 		$(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV)
+-	$(STRIP) lookup_ldap.so
+ 
+ mount_nfs.so: mount_nfs.c replicated.o
+-	$(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
++	$(CC) $(LDFLAGS) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \
+ 		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
+-	$(STRIP) mount_nfs.so
+-