[Pkg-openldap-devel] r1344 - in openldap/trunk/debian: . patches

[matthijs at alioth.debian.org]

tags 555867 pending
thanks

Author: matthijs
Date: 2011-03-26 17:32:56 +0000 (Sat, 26 Mar 2011)
New Revision: 1344

Added:
   openldap/trunk/debian/patches/fix-ftbfs-binutils-gold
Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/patches/series
Log:
 * Add a fix for FTBFS with binutils-gold.


Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2011-03-26 16:45:03 UTC (rev 1343)
+++ openldap/trunk/debian/changelog	2011-03-26 17:32:56 UTC (rev 1344)
@@ -6,8 +6,9 @@
   * Add Slovak translation, thanks Slavko <linux at slavino.sk> (Closes: #608699)
   * Add debian specific patch for ldap.conf. Add TLS_CACERT option and set it
     by default to /etc/ssl/certs/ca-certificates.crt (Closes: #555409, #616703)
+  * Add patch to fix a FTBFS with binutils-gold (Closes: #555867)
 
- -- Matthijs Möhlmann <matthijs at cacholong.nl>  Sat, 26 Mar 2011 17:44:27 +0100
+ -- Matthijs Möhlmann <matthijs at cacholong.nl>  Sat, 26 Mar 2011 18:32:08 +0100
 
 openldap (2.4.23-7) unstable; urgency=low
 

Added: openldap/trunk/debian/patches/fix-ftbfs-binutils-gold
===================================================================
--- openldap/trunk/debian/patches/fix-ftbfs-binutils-gold	                        (rev 0)
+++ openldap/trunk/debian/patches/fix-ftbfs-binutils-gold	2011-03-26 17:32:56 UTC (rev 1344)
@@ -0,0 +1,64 @@
+--- a/configure.in
++++ b/configure.in
+@@ -1208,7 +1208,7 @@
+ 				ol_with_tls=gnutls
+ 				ol_link_tls=yes
+ 
+-				TLS_LIBS="-lgnutls"
++				TLS_LIBS="-lgnutls -lgcrypt"
+ 
+ 				AC_DEFINE(HAVE_GNUTLS, 1, 
+ 					[define if you have GNUtls])
+--- a/libraries/libldap/Makefile.in
++++ b/libraries/libldap/Makefile.in
+@@ -51,21 +51,21 @@
+ XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
+ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
++UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(TLS_LIBS)
+ ifneq (,$(VERSION_OPTION))
+   VERSION_FLAGS = $(VERSION_OPTION)$(srcdir)/libldap.map
+ endif
+ 
+ apitest:	$(XLIBS) apitest.o
+-	$(LTLINK) -o $@ apitest.o $(LIBS)
++	$(LTLINK) -o $@ apitest.o $(LIBS) $(TLS_LIBS)
+ dntest:	$(XLIBS) dntest.o
+-	$(LTLINK) -o $@ dntest.o $(LIBS)
++	$(LTLINK) -o $@ dntest.o $(LIBS) $(TLS_LIBS)
+ ftest:	$(XLIBS) ftest.o
+-	$(LTLINK) -o $@ ftest.o $(LIBS)
++	$(LTLINK) -o $@ ftest.o $(LIBS) $(TLS_LIBS)
+ ltest:	$(XLIBS) test.o
+-	$(LTLINK) -o $@ test.o $(LIBS)
++	$(LTLINK) -o $@ test.o $(LIBS) $(TLS_LIBS)
+ urltest: $(XLIBS) urltest.o
+-	$(LTLINK) -o $@ urltest.o $(LIBS)
++	$(LTLINK) -o $@ urltest.o $(LIBS) $(TLS_LIBS)
+ 
+ CFFILES=ldap.conf
+ 
+--- a/libraries/libldap_r/Makefile.in
++++ b/libraries/libldap_r/Makefile.in
+@@ -60,7 +60,7 @@
+ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
+ XXXLIBS = $(LTHREAD_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
++UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) $(TLS_LIBS)
+ ifneq (,$(VERSION_OPTION))
+   VERSION_FLAGS = "$(VERSION_OPTION)$(XXDIR)/libldap.map"
+ endif
+@@ -80,9 +80,9 @@
+ depend-common: .links
+ 
+ apitest:	$(XLIBS) apitest.o
+-	$(LTLINK) -o $@ apitest.o $(LIBS)
++	$(LTLINK) -o $@ apitest.o $(LIBS) $(TLS_LIBS)
+ ltest:	$(XLIBS) test.o
+-	$(LTLINK) -o $@ test.o $(LIBS)
++	$(LTLINK) -o $@ test.o $(LIBS) $(TLS_LIBS)
+ 
+ install-local: $(CFFILES) FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libdir)

Modified: openldap/trunk/debian/patches/series
===================================================================
--- openldap/trunk/debian/patches/series	2011-03-26 16:45:03 UTC (rev 1343)
+++ openldap/trunk/debian/patches/series	2011-03-26 17:32:56 UTC (rev 1344)
@@ -15,3 +15,4 @@
 ldap-conf-tls-cacertdir
 service-operational-before-detach
 add-tlscacert-option-to-ldap-conf
+fix-ftbfs-binutils-gold