Fix ldap linkage yet again, bug #362551, thank Joshua Rich for report.

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

4 files changed, 41 insertions, 17 deletions

diff --git a/net-fs/autofs/ChangeLog b/net-fs/autofs/ChangeLog
index a1b4afbb34eb..9b1cb44afb67 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.103 2011/04/06 15:03:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/ChangeLog,v 1.104 2011/04/30 18:20:50 pva Exp $
+
+*autofs-5.0.5-r3 (30 Apr 2011)
+
+  30 Apr 2011; Peter Volkov <pva@gentoo.org> -autofs-5.0.5-r2.ebuild,
+  +autofs-5.0.5-r3.ebuild, files/autofs-5.0.5-fix-building-without-ldap.patch:
+  Fix ldap linkage yet again, bug #362551, thank Joshua Rich for report.
 
   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
diff --git a/net-fs/autofs/Manifest b/net-fs/autofs/Manifest
index ca782250d015..438ed32015a9 100644
--- a/net-fs/autofs/Manifest
+++ b/net-fs/autofs/Manifest
@@ -12,7 +12,7 @@ AUX autofs-5.0.3-map-patch-fix.patch 2543 RMD160 3be39a53ddc5125b9ca09f636f3099c
 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-ldap.patch 1225 RMD160 21aaef32628eca6422be971fec86fe7d3f767fe1 SHA1 5af0896768db39fdb697b98403c2587e765a7b1f SHA256 dd1f1e3fece874a9180b7d94fc2d1a2aed626223ccc3a87da410410309603279
 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
 AUX autofs-5.0.5-respect-user-flags-and-fix-asneeded-v1.patch 4400 RMD160 441f8c5488267036da65f69234f11fd82015f809 SHA1 94016e5fde7286e54f8ca0c465dc3f1fe3bbd3ba SHA256 ab5cbc585fb3f6f753d08345beffbb4a188d8f957fad3ee9c81487baca6e69ec
@@ -151,7 +151,7 @@ EBUILD autofs-4.1.3-r9.ebuild 3101 RMD160 29c754ba5407258028cc372ee0d88193224f2f
 EBUILD autofs-4.1.4.ebuild 2604 RMD160 e1e4f6b32ca5060d27dd05a6611535bda9ab23d5 SHA1 72e6f936ab4830606139d44c879bb7210b8f76c8 SHA256 68cd3ca31d5bdae910cbc8afe2affd031f3a856fcea63f9ad28cb1a482397187
 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 3438 RMD160 1dbe647694670780099b4af731b914b0e9414c4f SHA1 b6973f858fb3af165203af3348ce3773ecd1842e SHA256 571b5d8042de20fb32475c30c610a249865f61f9fa62228573ab9f6c47703bcd
+EBUILD autofs-5.0.5-r3.ebuild 3438 RMD160 666a8f707a7047b6b72031cbdf590ef5b6259784 SHA1 4e067f5d5a0bba2d919335e507e137d3db58d191 SHA256 e0bf26d27c3a968e928cfffe8a0d889d9cbe6832dc078896234366bc2db04c5b
 EBUILD autofs-5.0.5.ebuild 2835 RMD160 5c5ca0c11ae8205f85bc8fbec7e2b95f206bbb91 SHA1 0d342ceed013e86f9c7f3a97706bde018843b301 SHA256 5107794cdebe88a072bb8ea82e42b0e17de242da17e032d515fb19a650dab8fe
-MISC ChangeLog 17795 RMD160 b242aac604bc48d92e107671247ac4a88e7b3cf9 SHA1 5ce7781103b4af1d24f2b17b2e4616d10ce10398 SHA256 4ac0d9e819cb4fe5f245b203127631cbf333994cba61d61950ac4f0fb8debdb2
+MISC ChangeLog 18050 RMD160 b908d65637b9aab68fccb027f9d97ee5681ff530 SHA1 50c0bfd2608616ba8a1102145c6d59a794f28ed9 SHA256 021bae9c0d930460c6147217f19465a0856e9e0ff28e73583ae559d6c3e834f2
 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-r3.ebuild
index 96f4ce112b3a..983bf1be3d42 100644
--- a/net-fs/autofs/autofs-5.0.5-r2.ebuild
+++ b/net-fs/autofs/autofs-5.0.5-r3.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.2 2011/04/06 15:03:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/autofs/autofs-5.0.5-r3.ebuild,v 1.1 2011/04/30 18:20:50 pva Exp $
 
 EAPI="4"
 inherit eutils multilib autotools linux-info
diff --git a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch
index d90ef94fcc55..3429b6f05893 100644
--- a/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch
+++ b/net-fs/autofs/files/autofs-5.0.5-fix-building-without-ldap.patch
@@ -1,24 +1,41 @@
---- lib/defaults.c.orig
-+++ lib/defaults.c
-@@ -19,7 +19,9 @@
+=== modified file 'Makefile.rules'
+--- Makefile.rules	2011-04-30 18:13:36 +0000
++++ Makefile.rules	2011-04-30 18:12:37 +0000
+@@ -42,6 +42,10 @@
+ AUTOFS_LDFLAGS += $(DMALLOCLIB)
+ endif
+ 
++ifdef SASL
++CFLAGS +=  $(XML_FLAGS)
++endif
++
+ # Standard rules
+ 
+ .SUFFIXES: .c .o .s .so
+
+=== modified file 'lib/defaults.c'
+--- lib/defaults.c	2011-04-30 18:13:36 +0000
++++ lib/defaults.c	2011-04-30 18:12:37 +0000
+@@ -19,7 +19,10 @@
  
  #include "list.h"
  #include "defaults.h"
-+#ifdef HAVE_LDAP
++#include "config.h"
++#ifdef WITH_LDAP
  #include "lookup_ldap.h"
 +#endif
  #include "log.h"
  #include "automount.h"
  
-@@ -197,6 +199,7 @@ static int parse_line(char *line, char *
+@@ -197,6 +200,7 @@
  	return 1;
  }
  
-+#ifdef HAVE_LDAP
++#ifdef WITH_LDAP
  void defaults_free_uris(struct list_head *list)
  {
  	struct list_head *next;
-@@ -252,9 +255,11 @@ static unsigned int add_uris(char *value
+@@ -252,9 +256,11 @@
  
  	return 1;
  }
@@ -26,11 +43,11 @@
  
  struct list_head *defaults_get_uris(void)
  {
-+#ifdef HAVE_LDAP
++#ifdef WITH_LDAP
  	FILE *f;
  	char buf[MAX_LINE_LEN];
  	char *res;
-@@ -288,6 +292,9 @@ struct list_head *defaults_get_uris(void
+@@ -288,6 +294,9 @@
  
  	fclose(f);
  	return list;
@@ -40,15 +57,15 @@
  }
  
  /*
-@@ -450,6 +457,7 @@ unsigned int defaults_get_ldap_network_t
+@@ -450,6 +459,7 @@
  	return res;
  }
  
-+#ifdef HAVE_LDAP
++#ifdef WITH_LDAP
  struct ldap_schema *defaults_get_default_schema(void)
  {
  	struct ldap_schema *schema;
-@@ -645,6 +653,7 @@ struct ldap_schema *defaults_get_schema(
+@@ -645,6 +655,7 @@
  
  	return schema;
  }
@@ -56,3 +73,4 @@
  
  unsigned int defaults_get_mount_nfs_default_proto(void)
  {
+