Control: tags 792851 + pending Control: tags 880393 + pending patch Dear cyrus-sasl2 maintainers,
I have prepared a NMU fixing the following bugs: * #792851: FTCBFS This one already had a patch since ages. * #880393: libsasl2-modules-gssapi-heimdal linked against mit krb5 Actually, libgssapiv2.so is built against heimdal correctly. It just happens that the dh_auto_install overwrites the heimdal version with the mit version. Putting the relevant dh_install between the two dh_auto_install fixes the issue. You can find a .debdiff attached. I'll be uploading it to delayed/10 later today. Please let me know if I should delay it any longer. Helmut
diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/changelog cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/changelog --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/changelog 2018-04-21 18:20:16.000000000 +0200 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/changelog 2018-09-29 12:08:59.000000000 +0200 @@ -1,3 +1,14 @@ +cyrus-sasl2 (2.1.27~101-g0780600+dfsg-3.2) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTCBFS: (Closes: #792851) + + 0033-cross.patch: Drop -ldb from make depends. + * Build libsasl2-modules-gssapi-heimdal against heimdal: (Closes: #880393) + + Run dh_install before overwriting libgssapiv2.so* with the MIT + implementation. + + -- Helmut Grohne <[email protected]> Sat, 29 Sep 2018 12:08:59 +0200 + cyrus-sasl2 (2.1.27~101-g0780600+dfsg-3.1) unstable; urgency=medium * Non-maintainer upload with maintainer permission. diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/0033-cross.patch cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/0033-cross.patch --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/0033-cross.patch 1970-01-01 01:00:00.000000000 +0100 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/0033-cross.patch 2018-09-29 10:09:32.000000000 +0200 @@ -0,0 +1,18 @@ +Description: fix cross compialtion +Author: Helmut Grohne <[email protected]> +Bug-Debian: https://bugs.debian.org/792851 +Last-Update: 2015-07-19 + + * Remove SASL_DB_LIB as it expands to -ldb and make fails to find a build arch + -ldb. + +--- a/sasldb/Makefile.am ++++ b/sasldb/Makefile.am +@@ -54,6 +54,6 @@ + + libsasldb_la_SOURCES = allockey.c sasldb.h + EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) +-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) ++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) + libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) + libsasldb_la_LDFLAGS = -no-undefined diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/series cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/series --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/series 2016-12-31 15:59:34.000000000 +0100 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/patches/series 2018-09-29 10:09:00.000000000 +0200 @@ -30,3 +30,4 @@ 0030-Change-linking-from-sasldb-.libs-libsasldb.al-to-sas.patch 0031-Cleanup-for-modern-autotools.patch 0032-Add-with_pgsql-include-postgresql-to-include-path.patch +0033-cross.patch diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/rules cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/rules --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/rules 2018-04-21 18:20:06.000000000 +0200 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/rules 2018-09-29 11:46:00.000000000 +0200 @@ -23,6 +23,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk +-include /usr/share/dpkg/buildtools.mk +export CC # see FEATURE AREAS in dpkg-buildflags(1) #export DEB_BUILD_MAINT_OPTIONS = hardening=+all @@ -174,6 +176,7 @@ override_dh_auto_install: dh_auto_install -B$(TMPBUILD_HEIMDAL) -- sasldir=/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2 + dh_install -plibsasl2-modules-gssapi-heimdal dh_auto_install -B$(TMPBUILD_MIT) -- sasldir=/usr/lib/$(DEB_HOST_MULTIARCH)/sasl2 # Remove static plugins - they are useless @@ -228,7 +231,7 @@ debian/tmp/etc/logcheck/ignore.d.server/libsasl2-modules override_dh_install: - dh_install --fail-missing + dh_install --fail-missing -Nlibsasl2-modules-gssapi-heimdal override_dh_installinit: dh_installinit $(DH_PACKAGE_EXCLUDES) --name=saslauthd start 20 2 3 4 5 . stop 20 0 1 6 . diff --minimal -Nru cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/sample/Makefile cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/sample/Makefile --- cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/sample/Makefile 2016-12-31 15:59:34.000000000 +0100 +++ cyrus-sasl2-2.1.27~101-g0780600+dfsg/debian/sample/Makefile 2018-09-29 10:06:18.000000000 +0200 @@ -11,7 +11,7 @@ all: sample-server sample-client sample-server: sample-server.c - gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -g -o sample-server sample-server.c -I. -I$(T) -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2 + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -g -o sample-server sample-server.c -I. -I$(T) -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2 sample-client: sample-client.c - gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -g -o sample-client sample-client.c -I. -I$(T) -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2 + $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -g -o sample-client sample-client.c -I. -I$(T) -I$(INCDIR1) -I$(INCDIR2) -L$(LIBDIR) -lsasl2
