[Pkg-cyrus-sasl2-commits] r623 - in /cyrus-sasl-2.1/trunk/debian: changelog patches/0025_ld_as_needed.diff patches/series

[roberto at users.alioth.debian.org]

Author: roberto
Date: Sun Mar 13 02:50:36 2011
New Revision: 623

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=623
Log:
Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use it.
Thanks to Matthias Klose for the patch (Closes: #609237)

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0025_ld_as_needed.diff
Modified:
    cyrus-sasl-2.1/trunk/debian/changelog
    cyrus-sasl-2.1/trunk/debian/patches/series

Modified: cyrus-sasl-2.1/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/changelog?rev=623&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/changelog (original)
+++ cyrus-sasl-2.1/trunk/debian/changelog Sun Mar 13 02:50:36 2011
@@ -9,8 +9,10 @@
   * cyrus-sasl2-dbg: Demote dependency on cyrus-sasl2-{mit,heimdal}-dbg to
     a recommendation (Closes: #607558)
   * Enable hardening features (Closes: #542725)
-
- -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 12 Mar 2011 21:24:24 -0500
+  * Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use it.
+    Thanks to Matthias Klose for the patch (Closes: #609237)
+
+ -- Roberto C. Sanchez <roberto at connexer.com>  Sat, 12 Mar 2011 21:48:35 -0500
 
 cyrus-sasl2 (2.1.23.dfsg1-7) unstable; urgency=low
 

Added: cyrus-sasl-2.1/trunk/debian/patches/0025_ld_as_needed.diff
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0025_ld_as_needed.diff?rev=623&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0025_ld_as_needed.diff (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0025_ld_as_needed.diff Sun Mar 13 02:50:36 2011
@@ -1,0 +1,27 @@
+Author: Matthias Klose <doko at ubuntu.com>
+Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
+it.
+--- trunk.orig/saslauthd/Makefile.am
++++ trunk/saslauthd/Makefile.am
+@@ -16,7 +16,7 @@
+ saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@
+ saslauthd_LDADD	= @SASL_KRB_LIB@ \
+ 		  @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
+-		  @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
++		  @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@
+ 
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c
+ testsaslauthd_LDADD = @LIB_SOCKET@
+--- trunk.orig/sasldb/Makefile.am
++++ trunk/sasldb/Makefile.am
+@@ -55,8 +55,8 @@
+ 
+ libsasldb_la_SOURCES = allockey.c sasldb.h
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
+-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) 
++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
+ 
+ # Prevent make dist stupidity
+ libsasldb_a_SOURCES =

Modified: cyrus-sasl-2.1/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/series?rev=623&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/series (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/series Sun Mar 13 02:50:36 2011
@@ -19,3 +19,4 @@
 0021_no_mutex_changes_after_init.diff
 0022_gcc4.4_preprocessor_syntax.diff
 0024_allow_detection_of_heimdal.diff
+0025_ld_as_needed.diff