Version bump, bug #296357, thank Dustin Polke for this work.

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

6 files changed, 279 insertions, 3 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 3526193e5077..401202810efb 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-fs/autofs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.92 2010/06/01 09:19:58 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.93 2010/06/09 08:27:00 pva Exp $
+
+*autofs-5.0.5 (09 Jun 2010)
+
+  09 Jun 2010; Peter Volkov <pva@gentoo.org> +autofs-5.0.5.ebuild,
+  +files/autofs-5.0.5-fix-building-without-sasl.patch,
+  +files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch,
+  metadata.xml:
+  Version bump, bug #296357, thank Dustin Polke for this work.
 
   01 Jun 2010; Peter Volkov <pva@gentoo.org> autofs-5.0.4-r5.ebuild:
   Wrong patch was applied and that cause build issue, bug #292147#c15, thank
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index de78d2bc6de1..6b93e19b8ed4 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -6,6 +6,8 @@ AUX autofs-5.0.3-heimdal.patch 1380 RMD160 ed40e452a7648aec1b25e1002c99929be97b8
 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-v2.patch 1520 RMD160 ab22c45f92eca01abeaaba9546263340de8e5c9b SHA1 c91af03a8b61458127a9a37c8bab3941fff3942c SHA256 6a772377a5e37e1056ca337d22dcbdeb3fd5667947d5e728288eaa8fed86912f
 AUX autofs-5.0.4-user-ldflags-and-as-needed.patch 1692 RMD160 7309a7461484b9fb1fc9791d7fae75e415853964 SHA1 96ccf835dfb966180dd472b320bce5ecf72eb823 SHA256 dd2f8e449e99d3445c4c7ddb6b68938bbdc982dfbbcbcd6dfbd1ef1a680af6dd
+AUX autofs-5.0.5-fix-building-without-sasl.patch 469 RMD160 63727a0f759f57291fb05b534ddc797f597706db SHA1 4f37776eece0cc620d7e21cf8a901c29b2a292e0 SHA256 eba6fd9e03506833401096a744303b843960cd7e40bab2582daa29cd9c80efa0
+AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch 3851 RMD160 df4fec7045a4dea512745f91fbbb3c7d00d2cf9f SHA1 b9e175dffcb65cb83fc34a15dce3c91f279278f3 SHA256 f69b3fcc717e96826fa6f6b2766423bc6d12cee06b739b0f10b99ffa3e4589ad
 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
@@ -140,6 +142,8 @@ DIST autofs-5.0.4-use-percent-hack-for-master.patch 3850 RMD160 66f2437ae2c32e9b
 DIST autofs-5.0.4-use-srv-query-for-domain-dn.patch 27460 RMD160 0d83fd04659043126a174dec65ac4e5b0df9fb45 SHA1 d33be13150dfb49e28766c671e8a3faa0e7f9701 SHA256 3b9139f8654358156064d6338d4ded813b011f7aee20635e362b16602fd00aad
 DIST autofs-5.0.4-zero-s_magic-is-valid.patch 1320 RMD160 17b727128f589c744ece5cc6c8b3fccf0926fefb SHA1 4cc9d2213aa83b5e829c563c055cf6782782c4d1 SHA256 dc126f69203c6c486fecf42508b2c995ee4a8e0a26b01b97112dc5c2dfe9f547
 DIST autofs-5.0.4.tar.bz2 303863 RMD160 00708143c56b440fa0c7589c2d0d9170334e7c3e SHA1 0a50408ba2c1f6d27f3a448edc70f2395b6566b5 SHA256 631fe1a3cdc11c66aaf356fc6c0b8e41dff45897c43bb536a29b432e89d8da1b
+DIST autofs-5.0.5-patches-1.tar.lzma 59744 RMD160 4f253dfb04e5f09d16b6101e5121377c3399e399 SHA1 74364fdd40c1b96e788701c5816762e83eb8fb17 SHA256 e94e59fe9c88df727fd7d623be1002250141ea519467bf179dd74ffe797ce2a5
+DIST autofs-5.0.5.tar.bz2 301327 RMD160 4d105cce439544193b4abcb0ca4763f8c1d3cf54 SHA1 7f8a320cc126cb233be23749669735320fe6933c SHA256 68c73e01bc3c14c7d3613a861bbde4ab601c13f3127fcb837d49e435e5986002
 EBUILD autofs-3.1.7-r5.ebuild 1739 RMD160 2aba32bed55900477131d080beb301b1271be1aa SHA1 8a6b81324f6f893dac00324432b1bcfbb321856a SHA256 4e5c9f0981fb87311e452be843f6426a694c03a613f7eb05c7360c6e43f147ae
 EBUILD autofs-3.1.7-r6.ebuild 1774 RMD160 9054304132c27b09695f97457d257d0099b018a3 SHA1 394c17d7905c79dc37a6abc0cb9801854e82c067 SHA256 c3f954cba4d42f40b3a4d40dc81d3d74976c4bb5b16cf0be7da0c3e11e4cdccb
 EBUILD autofs-4.1.3-r7.ebuild 2989 RMD160 30122862e83e133f7ca817b4e708bb1c25308afb SHA1 2019f28e7b27d5ba1fee9174adad26217f88c952 SHA256 68c70c48c90956dd80442eee04f9339a97f21abfa92ea960e5fa115baf742983
@@ -150,5 +154,6 @@ EBUILD autofs-5.0.4-r3.ebuild 4193 RMD160 820198e5016743bc58993274a8eb6216391391
 EBUILD autofs-5.0.4-r4.ebuild 4467 RMD160 fd8b8bf519bd585154c0216e387e2ffdef5c6e58 SHA1 de127e4e8946b9636ff0a51fab4c71a2fc940b92 SHA256 a3ebf1697a3bd3271f4c3186748d35b12389a94519418fdd310ae225c82e29b7
 EBUILD autofs-5.0.4-r5.ebuild 4864 RMD160 639a34420c55e8f7f6be3b5f3bef4c3ce107fedb SHA1 b704d2e3effb4b98141715a184c9da30e99d46d3 SHA256 c149a52ebd7c8768c26c9815e7ade0b95f3f8b47fdd438444698fa84de66d26a
 EBUILD autofs-5.0.4.ebuild 2520 RMD160 101142f25740c5c9c07178615834abdb9c0d36db SHA1 d965e8186c3d6d4075afab86cfb5500ca5295a0c SHA256 ae46e201d50517bbbbe3cf45dd6555a09d3c18a94ff041a89b5bd5d75a749826
-MISC ChangeLog 14630 RMD160 c48cf90ec2cc8bf6d070e95d4ab37580a0e32855 SHA1 22b98d3b315817f84c41941f50e26b6a0abc40b4 SHA256 a6164b398f3d5a18bd6c732e499ca939f98b73292b5e9f7cbc3912fd118416c5
-MISC metadata.xml 455 RMD160 a663d0671c98ec7e1edfe840a112852c7c9fd2c6 SHA1 bcfb190671f9f5d537a3a1e5155b1a7c09eb8516 SHA256 d6cf2e64ea33230abc1b1aabe35d8a94232c801dc47f60c74f5d912e2ec91cfb
+EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91 SHA1 0d342ceed013e86f9c7f3a97706bde018843b301 SHA256 5107794cdebe88a072bb8ea82e42b0e17de242da17e032d515fb19a650dab8fe
+MISC ChangeLog 14926 RMD160 fff9217a28a88c89b4b9c6ef5e63c2fb717b5016 SHA1 0202054b206537cb5a8904cdbfe6c0755c3eaa94 SHA256 2dd335b30c1b1f653b767093a27caeabb41499dbfcb81ea4c8dcecc1379bbae9
+MISC metadata.xml 629 RMD160 e54d3bf18dc419c0e900d81ed9aca1432e555d65 SHA1 64893b5cd342d35c9278df1b63fa106629b5ccf4 SHA256 2f9dffb787ccf5f094c9f839c60f32cc78f12546b56da94fec2c1fbb23e07e2b
diff --git a/net-fs/autofs/autofs-5.0.5.ebuild b/net-fs/autofs/autofs-5.0.5.ebuild
new file mode 100644
index 000000000000..c1a4e4beb4a9
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.5.ebuild,v 1.1 2010/06/09 08:27:00 pva Exp $
+
+EAPI="2"
+
+inherit eutils multilib autotools
+
+PATCH_VER="1"
+DESCRIPTION="Kernel based automounter"
+HOMEPAGE="http://www.linux-consulting.com/Amd_AutoFS/autofs.html"
+SRC_URI="mirror://kernel/linux/daemons/${PN}/v5/${P}.tar.bz2
+	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.lzma"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="hesiod ldap sasl"
+
+# currently, sasl code assumes the presence of kerberosV
+DEPEND="hesiod? ( net-dns/hesiod )
+	ldap? (
+		>=net-nds/openldap-2.0
+		sasl? (
+			dev-libs/cyrus-sasl
+			dev-libs/libxml2
+			virtual/krb5
+		)
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/patches
+
+	# fixes bug #210762
+	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.patch
+
+	# do not include <nfs/nfs.h>, rather <linux/nfs.h>,
+	# as the former is a lame header for the latter (bug #157968)
+	sed 's@nfs/nfs.h@linux/nfs.h@' -i include/rpc_subs.h
+
+	epatch "${FILESDIR}"/${P}-fix-building-without-sasl.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if use sasl && ! use ldap; then
+		ewarn "USE=\"sasl\" adds SASL support to the LDAP module"
+		ewarn "which will not be build. If SASL support should be"
+		ewarn "available, please add \"ldap\" to the USE flags."
+		myconf="--with-openldap=no --with-sasl=no"
+		epause 5
+	else
+		myconf="$(use_with ldap openldap) $(use_with sasl)"
+	fi
+
+	econf \
+		${myconf} \
+		$(use_with hesiod) \
+		--enable-ignore-busy
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+#	make DESTDIR="${D}" install_kernel || die "make install failed"
+#	make DESTDIR="${D}" install_samples || die "make install failed"
+
+	dodoc README* CHANGELOG CREDITS COPYRIGHT INSTALL || die "dodoc failed"
+
+	# kernel patches
+	docinto patches
+	dodoc patches/${PN}4-2.6.??{,.?{,?}}-v5-update-????????.patch \
+		|| die "Installing patches failed"
+
+	newinitd "${FILESDIR}"/autofs5.rc1 autofs || die
+}
+
+pkg_postinst() {
+	elog "Note: You might need to patch your kernel to use this"
+	elog "version of ${PN}. Upstream kernel patches have been"
+	elog "installed into \"/usr/share/doc/${P}/patches\"."
+	elog "For further instructions, please refer to"
+	elog "\"/usr/share/doc/${P}/README\"."
+	elog ""
+	elog "Note: If you plan on using autofs for automounting"
+	elog "remote NFS mounts without having the NFS daemon running"
+	elog "please add portmap or rpcbind to your default run-level."
+}
diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-sasl.patch b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-sasl.patch
new file mode 100644
index 000000000000..ae93e2e028b0
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-sasl.patch
@@ -0,0 +1,16 @@
+--- modules/lookup_ldap.c.old	2010-05-28 13:47:33.888723271 +0200
++++ modules/lookup_ldap.c	2010-05-28 13:58:32.048972838 +0200
+@@ -141,9 +141,13 @@
+ {
+ 	int rv;
+ 
++#ifdef WITH_SASL
+ 	if (ctxt->auth_required == LDAP_AUTH_USESIMPLE)
+ 		rv = ldap_simple_bind_s(ldap, ctxt->user, ctxt->secret);
+ 	else if (ctxt->version == 2)
++#else
++	if (ctxt->version == 2)
++#endif
+ 		rv = ldap_simple_bind_s(ldap, ctxt->base, NULL);
+ 	else
+ 		rv = ldap_simple_bind_s(ldap, NULL, NULL);
diff --git a/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch
new file mode 100644
index 000000000000..029dcc58c166
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.5-respect-user-flags-and-fix-asneeded.patch
@@ -0,0 +1,144 @@
+--- configure.in.old	2010-05-29 17:17:06.242996467 +0200
++++ configure.in	2010-05-29 17:19:23.453749422 +0200
+@@ -173,7 +173,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
+--- Makefile.conf.in.old	2010-05-27 16:25:30.136149753 +0200
++++ Makefile.conf.in	2010-05-27 16:27:29.736148646 +0200
+@@ -90,3 +90,5 @@
+ # Location for init.d files
+ initdir = @initdir@
+ 
++# Use the compiler determined by configure
++CC := @CC@
+--- Makefile.rules.old	2010-05-27 16:25:26.722150726 +0200
++++ Makefile.rules	2010-05-27 16:35:52.030400349 +0200
+@@ -16,8 +16,6 @@
+ 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
+@@ -24,36 +24,24 @@
+ 
+ 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
+ 
+ # Standard rules
+@@ -56,4 +54,3 @@
+ 
+ .c.so:
+ 	$(CC) $(SOLDFLAGS) $(CFLAGS) -o $*.so $< $(AUTOFS_LIB) $(DMALLOCLIB) $(LIBNSL)
+-	$(STRIP) $*.so
+--- daemon/Makefile.old	2010-05-27 16:37:18.755178257 +0200
++++ daemon/Makefile	2010-05-27 16:39:24.433440867 +0200
+@@ -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_FLAG_DIR=\"$(autofsflagdir)\"
+ CFLAGS += -DVERSION_STRING=\"$(version)\"
+ LDFLAGS += -rdynamic
+-LIBS = -ldl
++LIBS = -ldl -lpthread
+ 
+ ifeq ($(LDAP), 1)
+   ifeq ($(SASL), 1)
+@@ -30,8 +30,7 @@
+ 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
+--- lib/Makefile.old	2010-05-27 17:42:14.424151727 +0200
++++ lib/Makefile	2010-05-27 17:42:43.629174396 +0200
+@@ -41,14 +41,12 @@
+ 
+ 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_ $?
+--- modules/Makefile.old	2010-05-27 17:42:18.726149315 +0200
++++ modules/Makefile	2010-05-27 17:43:01.581400805 +0200
+@@ -87,7 +87,6 @@
+ lookup_hesiod.so: lookup_hesiod.c
+ 	$(CC) $(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 $<
+@@ -96,10 +95,7 @@
+ 	$(CC) $(SOLDFLAGS) $(CFLAGS) $(LDAP_FLAGS) -o lookup_ldap.so \
+ 		lookup_ldap.c dclist.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 \
+ 		mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL)
+-	$(STRIP) mount_nfs.so
+-
diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index 9cf0428e990d..3b1e12ba2ad0 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/metadata.xml
@@ -14,4 +14,9 @@
 	<email>gentoobugsie.20.dsurawicz@spamgourmet.com</email>
 	<name>Dustin Polke</name>
 </maintainer>
+<use>
+	<flag name="hesiod">Install hesiod module</flag>
+	<flag name="ldap">Install LDAP module</flag>
+	<flag name="sasl">Enable SASL support in the LDAP module</flag>
+</use>
 </pkgmetadata>