Package: cyrus-sasl2 Version: 2.1.23.dfsg1-5 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu natty ubuntu-patch User: debian-...@lists.debian.org Usertags: ld-as-needed
Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use it.
diff -u cyrus-sasl2-2.1.23.dfsg1/debian/changelog cyrus-sasl2-2.1.23.dfsg1/debian/changelog --- cyrus-sasl2-2.1.23.dfsg1/debian/changelog +++ cyrus-sasl2-2.1.23.dfsg1/debian/changelog @@ -1,3 +1,9 @@ +cyrus-sasl2 (2.1.23.dfsg1-5ubuntu3) natty; urgency=low + + * Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use it. + + -- Matthias Klose <d...@ubuntu.com> Fri, 07 Jan 2011 17:27:50 +0100 + cyrus-sasl2 (2.1.23.dfsg1-5ubuntu2) maverick; urgency=low * Remove unhelpful debian/sample/config.h, stop copying it in, and arrange diff -u cyrus-sasl2-2.1.23.dfsg1/debian/patches/00list cyrus-sasl2-2.1.23.dfsg1/debian/patches/00list --- cyrus-sasl2-2.1.23.dfsg1/debian/patches/00list +++ cyrus-sasl2-2.1.23.dfsg1/debian/patches/00list @@ -22,0 +23 @@ +0024_ld only in patch2: unchanged: --- cyrus-sasl2-2.1.23.dfsg1.orig/debian/patches/0024_ld.dpatch +++ cyrus-sasl2-2.1.23.dfsg1/debian/patches/0024_ld.dpatch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add $(SASL_DB_LIB) as dependency to libsasldb, and use it. + +...@dpatch@ +--- ./sasldb/Makefile.am~ 2011-01-07 17:23:30.408228999 +0100 ++++ ./sasldb/Makefile.am 2011-01-07 17:24:41.598229000 +0100 +@@ -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 = +--- ./saslauthd/Makefile.am.orig 2006-04-24 18:02:04.000000000 +0000 ++++ ./saslauthd/Makefile.am 2011-01-07 16:36:46.178228998 +0000 +@@ -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@
