Fix build issue with USE='ldap -sasl', bug #361899, thank Justin Lecher for report and Dustin Polke for this fix.

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

4 files changed, 42 insertions, 4 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index 00603ceec3b0..a1b4afbb34eb 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.102 2011/04/06 14:10:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.103 2011/04/06 15:03:01 pva Exp $
+
+  06 Apr 2011; Peter Volkov <pva@gentoo.org> autofs-5.0.5-r2.ebuild,
+  +files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patc
+  h:
+  Fix build issue with USE='ldap -sasl', bug #361899, thank Justin Lecher for
+  report and Dustin Polke for this fix.
 
 *autofs-4.1.4 (06 Apr 2011)
 
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index 0db52153275b..78ad7c895332 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -11,6 +11,7 @@ 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-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch 756 RMD160 d63b92f33cc9d1725211c3450de603ba6b55c63b SHA1 1a8c07f429734378d0d55bc180ec014363d8a5a9 SHA256 0917780bf6f9be61d523535e42bcdcc460810d6f06b5b505230801f7a549efb4
 AUX autofs-5.0.5-fix-building-without-ldap.patch 1047 RMD160 c0e01afebea8dbc6e6672db4ac442a2620de5284 SHA1 e197ddccc2da488a7a3a65696ad7f1e4c4912bcf SHA256 039a77646a753d29572d2c63b54c2ac0f49b34ce73fc70297144d670cc6e802e
 AUX autofs-5.0.5-fix-building-without-sasl.patch 469 RMD160 63727a0f759f57291fb05b534ddc797f597706db SHA1 4f37776eece0cc620d7e21cf8a901c29b2a292e0 SHA256 eba6fd9e03506833401096a744303b843960cd7e40bab2582daa29cd9c80efa0
 AUX autofs-5.0.5-fix-install-deadlink.patch 544 RMD160 1fc3e01015a0b18e90a41754654ca6b7b1f3f30c SHA1 6170d1f7cd2ba88063967154b92d2ef67d760160 SHA256 48393e00ddb51c5b0588ea45711abb16bf256c487c584062bc3de59b30bae053
@@ -150,7 +151,7 @@ EBUILD autofs-4.1.3-r9.ebuild 3101 RMD160 29c754ba5407258028cc372ee0d88193224f2f
 EBUILD autofs-4.1.4.ebuild 2599 RMD160 bed4f4be0a9e35fcf18dcc7a8172294fa6695244 SHA1 0144ff43516bdba0d5ed1e113f741143620a703f SHA256 f42ff48952c009e83e5ff4c93cb444bf0267b8b71ca56a166b63291593043275
 EBUILD autofs-5.0.3-r6.ebuild 4266 RMD160 f1fedf489dceea7366f0d334d499fcc1db57d824 SHA1 b8dc48046353e6ea3e4bdd7c228d0ed565077634 SHA256 7db072e58681b59a7e04970134ea8c5d37ffc1388e7e64a27280a013886d335a
 EBUILD autofs-5.0.4-r5.ebuild 4856 RMD160 f976f8a74c6c4d3aeb9d70066409c53de99baee8 SHA1 14829c8353c82928d902247891cbbae0b3b6e099 SHA256 3e175bde315b472c7f83c94a847f0c40666b345c9486bf143c7a39db0cb71ccc
-EBUILD autofs-5.0.5-r2.ebuild 3301 RMD160 7e43be08e6464b8e0a9ba167faa27d5ca8db0c31 SHA1 0e97b3800a702ca5249f808fdfb8c1bec8a1ca9d SHA256 2d52de140cebbfcb1b97ff8d5ed61dacd58a4321f9a570084ae1ad1f845bc6ac
+EBUILD autofs-5.0.5-r2.ebuild 3438 RMD160 1dbe647694670780099b4af731b914b0e9414c4f SHA1 b6973f858fb3af165203af3348ce3773ecd1842e SHA256 571b5d8042de20fb32475c30c610a249865f61f9fa62228573ab9f6c47703bcd
 EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91 SHA1 0d342ceed013e86f9c7f3a97706bde018843b301 SHA256 5107794cdebe88a072bb8ea82e42b0e17de242da17e032d515fb19a650dab8fe
-MISC ChangeLog 17522 RMD160 fdeb86e4d6e7f2165905a0599f50c21cd19edd97 SHA1 6ddbf84c9035c6c29150176d7e32daea916d5285 SHA256 00ed93f621f751feb50fff79270f1bdd2be2f669d27c7b2c008457b774472e6f
+MISC ChangeLog 17795 RMD160 b242aac604bc48d92e107671247ac4a88e7b3cf9 SHA1 5ce7781103b4af1d24f2b17b2e4616d10ce10398 SHA256 4ac0d9e819cb4fe5f245b203127631cbf333994cba61d61950ac4f0fb8debdb2
 MISC metadata.xml 629 RMD160 e54d3bf18dc419c0e900d81ed9aca1432e555d65 SHA1 64893b5cd342d35c9278df1b63fa106629b5ccf4 SHA256 2f9dffb787ccf5f094c9f839c60f32cc78f12546b56da94fec2c1fbb23e07e2b
diff --git a/net-fs/autofs/autofs-5.0.5-r2.ebuild b/net-fs/autofs/autofs-5.0.5-r2.ebuild
index 4c00474db3e2..96f4ce112b3a 100644
--- a/net-fs/autofs/autofs-5.0.5-r2.ebuild
+++ b/net-fs/autofs/autofs-5.0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.5-r2.ebuild,v 1.1 2011/04/03 17:55:17 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.5-r2.ebuild,v 1.2 2011/04/06 15:03:01 pva Exp $
 
 EAPI="4"
 inherit eutils multilib autotools linux-info
@@ -57,6 +57,9 @@ src_prepare() {
 	# Disable LDAP specific code if USE="-ldap", let's see what upstream says...
 	epatch "${FILESDIR}"/${P}-fix-building-without-ldap.patch
 
+	# https://bugs.gentoo.org/show_bug.cgi?id=361899
+	epatch "${FILESDIR}"/${P}-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
+
 	eautoreconf
 }
 
diff --git a/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch b/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
new file mode 100644
index 000000000000..4d70d2a2f766
--- /dev/null
+++ b/net-fs/autofs/files/autofs-5.0.5-add-missing-endif-HAVE_SASL-in-modules-lookup_ldap.c.patch
@@ -0,0 +1,28 @@
+--- ./modules/lookup_ldap.c
++++ ./modules/lookup_ldap.c
+@@ -591,10 +591,12 @@ static LDAP *do_connect(unsigned logopt, const char *uri, struct lookup_context
+ {
+ 	LDAP *ldap;
+ 
++#ifdef HAVE_SASL
+ 	if (ctxt->extern_cert && ctxt->extern_key) {
+ 		set_env(logopt, ENV_LDAPTLS_CERT, ctxt->extern_cert);
+ 		set_env(logopt, ENV_LDAPTLS_KEY, ctxt->extern_key);
+ 	}
++#endif
+ 
+ 	ldap = init_ldap_connection(logopt, uri, ctxt);
+ 	if (ldap) {
+@@ -1372,10 +1374,12 @@ static void free_context(struct lookup_context *ctxt)
+ 		defaults_free_searchdns(ctxt->sdns);
+ 	if (ctxt->dclist)
+ 		free_dclist(ctxt->dclist);
++#ifdef HAVE_SASL
+ 	if (ctxt->extern_cert)
+ 		free(ctxt->extern_cert);
+ 	if (ctxt->extern_key)
+ 		free(ctxt->extern_key);
++#endif
+ 	free(ctxt);
+ 
+ 	return;