Fix ldap problem with -sasl, bug #381315 thank Martin Stockinger for report and Dustin Polke for this job.

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

4 files changed, 144 insertions, 12 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index ef50efd431c0..3d18a50b415e 100644
--- a/net-fs/autofs/ChangeLog
+++ b/net-fs/autofs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.122 2011/09/13 17:53:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.123 2011/09/15 03:52:42 pva Exp $
+
+*autofs-5.0.6-r2 (14 Sep 2011)
+
+  14 Sep 2011; Peter Volkov <pva@gentoo.org> +autofs-5.0.6-r2.ebuild,
+  +files/autofs-5.0.6-revert-ldap.patch:
+  Fix ldap problem with -sasl, bug #381315 thank Martin Stockinger for report
+  and Dustin Polke for this job.
 
   13 Sep 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #99651
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 846eb5434a5c..36cd4fecd0f1 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX auto.master 267 RMD160 4e8e79ef65122f4a1c6227298c8c4e39f3dd5846 SHA1 88da29f5d82a1073471eed654c99ff1fc3c064f3 SHA256 47df928601dc31bc8c23781bd0475b7ecb5bd09525c92a8772d51e0dc660b414
 AUX auto.misc 319 RMD160 363c7b0be2d0d79c93b3b74968ae197df49962b4 SHA1 17a5e54accde91da5130599c4375ff3beda99f52 SHA256 7fa3f3cee3d8b0e859316b89fa3fcbad9da03f757de2d3d1a317af94b700e078
 AUX auto.net 1134 RMD160 6396a1d4faac5e9a2bf0f83d53fa7e3c578840f9 SHA1 7a6c88657d22630f688ca80cc5ca782a93eb33f0 SHA256 5ff54fb5e8588b7e7503fca90cad179acec1dbe85a4b81f9c2320151f6b34602
@@ -22,6 +19,7 @@ AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch 4400 RMD160 441f8c
 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.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
 AUX autofs.rc11 7469 RMD160 e8472a75e3804a83cdb31fb1a9e293a87492ba0b SHA1 be29dc822d5216bd40edf1067df04eb5b56455a1 SHA256 a050aff19d249598d789859fbfd01ac72d73a68f83d9edb96661aae76a5f5481
 AUX autofs.rc12 7807 RMD160 bdd91c47ee5c223ca6eb7b395a4f82f36abd26f6 SHA1 a5efe6948c9674c4d2019db5e81de9d0a64ffaca SHA256 dc08949c2d47614be7fcea8be9988de52715b8072753ee3df77a87c19962975c
@@ -165,13 +163,7 @@ EBUILD autofs-5.0.5-r4.ebuild 3505 RMD160 f4657832f24d5f427859868f41f8b9c581d9cd
 EBUILD autofs-5.0.5-r5.ebuild 3374 RMD160 41f3d38a90d35e9c3d718260cc997208d0ea1858 SHA1 965ab1e86ea9368a42752b64e6e8d8b6fc1d12a7 SHA256 4468f9b6170af3199f49f8437afa8d956254c1838698a7666275319ff0f0dbc6
 EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91 SHA1 0d342ceed013e86f9c7f3a97706bde018843b301 SHA256 5107794cdebe88a072bb8ea82e42b0e17de242da17e032d515fb19a650dab8fe
 EBUILD autofs-5.0.6-r1.ebuild 3702 RMD160 589d540d027f97a674a4723db36d997118d17172 SHA1 bf120380ceb21c7d6a72c8e09b50c64c0ceb8d89 SHA256 f2f8f94c1f6c1e75bd7acfdfc83d1a5ba1bce3368c0fa230989edb466a652107
+EBUILD autofs-5.0.6-r2.ebuild 3796 RMD160 03a4051b37e8609993c90acc0c1c9c28b2f7c51a SHA1 0e4ceb734911f3834c5595fcfcaeb5cc77603579 SHA256 814c5e7af7441cd5629b5dd266f3b2d750d1fe259249f48af84050415064e973
 EBUILD autofs-5.0.6.ebuild 3485 RMD160 7c7accf22b56f49a3fa89fd0356a12ef17f39399 SHA1 24ebb4e411afb5721b1acd634ab2e516aae237f0 SHA256 faa6b414e896e49b3b8bac1507f3a43baa0399cd84b29c4ad517ac3ff59ba1e0
-MISC ChangeLog 20244 RMD160 a74019b4c976888d7c106ccddcb30aae2aba50b6 SHA1 80ba365c7761baeecd966b16241fa5b4ea738a4f SHA256 66f32a0081f953ca6a81d8d2d82810df74ce0177af39ce332685e0c705e5281b
+MISC ChangeLog 20497 RMD160 9521638ed4796b7651a7174874ec46543641e5a7 SHA1 6a2ab94d7b5c9251ddbaf20c4238d1b9e234a740 SHA256 b0f01343a444225b68d0e45aba0a4b0ccb929761595937fe212c005cf9f24a41
 MISC metadata.xml 530 RMD160 417c66e2ec6e8627d23373d76d8c187a4dced885 SHA1 7629fc63948229c175548cc8ca24774316fe41b1 SHA256 454c11f4af437af306f09746ed10abe0d565c2b9b4b232b3d892dca494e0d768
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5vmJIACgkQCaWpQKGI+9QWtgCfc/ycSUjn8x2076MWgdgfhXh0
-F3QAnRCeKhm1ihAws0aWnoovrrsBPtEQ
-=ER2Q
------END PGP SIGNATURE-----
diff --git a/net-fs/autofs/autofs-5.0.6-r2.ebuild b/net-fs/autofs/autofs-5.0.6-r2.ebuild
new file mode 100644
index 000000000000..a5e1c2712e4d
--- /dev/null
+++ b/net-fs/autofs/autofs-5.0.6-r2.ebuild
@@ -0,0 +1,115 @@
+# 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-r2.ebuild,v 1.1 2011/09/15 03:52:42 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=""
+[[ -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}"
+
+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.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 || die
+
+	# 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
+
+	# Fix for bug #373577
+	# Upstream reference: http://article.gmane.org/gmane.linux.kernel.autofs/6187
+	# Fix regression in IPv6 name lookup regression
+	epatch "${FILESDIR}"/${P}-ipv6_name_lookup_regression.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
+	econf \
+		--with-confdir=/etc/conf.d \
+		$(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-revert-ldap.patch b/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch
new file mode 100644
index 000000000000..49901ddfc69b
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.6-revert-ldap.patch
@@ -0,0 +1,18 @@
+--- modules/lookup_ldap.c
++++ modules/lookup_ldap.c	
+@@ -1488,6 +1488,7 @@ int lookup_init(const char *mapfmt, int
+ 		}
+ 	}
+ 
++#ifdef WITH_SASL
+ 	/*
+ 	 *  First, check to see if a preferred authentication method was
+ 	 *  specified by the user.  parse_ldap_config will return error
+@@ -1500,7 +1501,6 @@ int lookup_init(const char *mapfmt, int
+ 		return 1;
+ 	}
+ 
+-#ifdef WITH_SASL
+ 	/* Init the sasl callbacks */
+ 	if (!autofs_sasl_client_init(LOGOPT_NONE)) {
+ 		error(LOGOPT_ANY, "failed to init sasl client");