Package: snowdrop Version: 0.02b-12 Severity: normal Tags: patch Hello, please change the package's build-dependency from libgnutls-dev to libgnutls-openssl-dev. The latter is a virtual package provided by libgnutls-dev in sid and libgnutls28-dev in experimental. Having the reverse dependencies change should allow us to transition to the newer version if snowdrop also stops linking against gnutls-extra.
I have test-built the package against libgnutls28-dev/experimental with the attached patch which fixes both this report and 725723. Thanks, cu Andreas -- `What a good friend you are to him, Dr. Maturin. His other friends are so grateful to you.' `I sew his ears on from time to time, sure'
diff -Nru snowdrop-0.02b/debian/changelog snowdrop-0.02b/debian/changelog --- snowdrop-0.02b/debian/changelog 2013-08-30 13:45:57.000000000 +0200 +++ snowdrop-0.02b/debian/changelog 2013-12-05 19:51:10.000000000 +0100 @@ -1,3 +1,13 @@ +snowdrop (0.02b-12.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * Build-Depend on libgnutls-openssl-dev instead of libgnutls-dev to allow + transitioning to newer GnuTLS. + * Stop unnecessary linkage against gnutls-extra to allow building against + newer GnuTLS versions. Closes: #725723 + + -- Andreas Metzler <ametz...@debian.org> Thu, 05 Dec 2013 19:32:55 +0100 + snowdrop (0.02b-12) unstable; urgency=low * Fixed typos in snowdrop.c (fix-typos-in-source.patch). diff -Nru snowdrop-0.02b/debian/control snowdrop-0.02b/debian/control --- snowdrop-0.02b/debian/control 2013-08-30 12:08:02.000000000 +0200 +++ snowdrop-0.02b/debian/control 2013-12-05 19:33:39.000000000 +0100 @@ -2,7 +2,7 @@ Section: utils Priority: optional Maintainer: Simon Kainz <si...@familiekainz.at> -Build-Depends: libgnutls-dev (>> 2.7.12.1), debhelper (>= 8.0), pkg-config +Build-Depends: libgnutls-openssl-dev, debhelper (>= 8.0), pkg-config Standards-Version: 3.9.4 VCS-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/snowdrop.git;a=summary VCS-Git: git://anonscm.debian.org/collab-maint/snowdrop.git diff -Nru snowdrop-0.02b/debian/patches/link-as-needed.patch snowdrop-0.02b/debian/patches/link-as-needed.patch --- snowdrop-0.02b/debian/patches/link-as-needed.patch 2011-10-01 00:00:46.000000000 +0200 +++ snowdrop-0.02b/debian/patches/link-as-needed.patch 2013-12-05 19:44:09.000000000 +0100 @@ -1,12 +1,12 @@ Description: Link as needed Author: Arno Töll <deb...@toell.net> -Last-Update: 2011-06-30 +Last-Update: 2013-11-05 * Makefile: + Add -Wl,--as-needed to LDFLAGS ---- a/Makefile -+++ b/Makefile -@@ -30,6 +30,7 @@ +--- snowdrop-0.02b.orig/Makefile ++++ snowdrop-0.02b/Makefile +@@ -30,6 +30,7 @@ DESTDIR = / CFLAGS += -ggdb -O2 -fomit-frame-pointer -funroll-loops -fexpensive-optimizations \ -ffast-math -Wall -g @@ -14,10 +14,10 @@ all: modules snowdrop toinstall -@@ -56,7 +57,7 @@ +@@ -56,7 +57,7 @@ snowdrop: snowdrop.c language.h echo "[+] Building 'sd-$$i'..." ; \ ADDME="-lmd5"; \ - test "$$USEOPENSSL" = "" || ADDME="-DUSE_OPENSSL -DUSE_GNUTLS -lgnutls-extra -lgnutls-openssl $(shell pkg-config --libs --cflags gnutls)" ; \ + test "$$USEOPENSSL" = "" || ADDME="-DUSE_OPENSSL -DUSE_GNUTLS -lgnutls-openssl $(shell pkg-config --libs --cflags gnutls)" ; \ - $(CC) -DVER=\"$(VER)\" $(CFLAGS) -DTARGETLANG=\"$$i\" snowdrop.c lang-$$i.o -o sd-$$i $$ADDME || exit 1; \ + $(CC) $(LDFLAGS) -DVER=\"$(VER)\" $(CFLAGS) -DTARGETLANG=\"$$i\" snowdrop.c lang-$$i.o -o sd-$$i $$ADDME || exit 1; \ done; \ diff -Nru snowdrop-0.02b/debian/patches/use-tls.patch snowdrop-0.02b/debian/patches/use-tls.patch --- snowdrop-0.02b/debian/patches/use-tls.patch 2011-06-30 18:27:14.000000000 +0200 +++ snowdrop-0.02b/debian/patches/use-tls.patch 2013-12-05 19:39:59.000000000 +0100 @@ -1,6 +1,6 @@ Description: Use GnuTLS instead of OpenSSL Author: Joey Hess <jo...@debian.org>, patch creation: Arno Töll <deb...@toell.net> -Last-Update: 2011-06-30 +Last-Update: 2013-11-05 * snowdrop.c: Add GnuTLS header * lang-eng.c: Add GnuTLS header @@ -10,29 +10,9 @@ + Don't hide CFLAGS from dpkg-buildflags if used [Arno Töll] ---- a/snowdrop.c -+++ b/snowdrop.c -@@ -28,6 +28,9 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <time.h> -+#ifdef USE_GNUTLS -+#include <gnutls/openssl.h> -+#else - #ifdef USE_OPENSSL - #include <openssl/md5.h> - #else -@@ -37,6 +40,7 @@ - #define MD5_Final MD5Final - #define MD5_Update MD5Update - #endif /* USE_OPENSSL */ -+#endif /* USE_GNUTLS */ - - #include <string.h> - ---- a/Makefile -+++ b/Makefile -@@ -26,9 +26,10 @@ +--- snowdrop-0.02b.orig/Makefile ++++ snowdrop-0.02b/Makefile +@@ -26,9 +26,10 @@ VER = 0.02b LANG = eng engf c BINROOT = /usr/bin/ @@ -45,7 +25,7 @@ all: modules snowdrop toinstall -@@ -36,26 +37,26 @@ +@@ -36,26 +37,26 @@ all: modules snowdrop toinstall modules: language.h @echo ; \ echo "[*] Compiling language modules:" ; \ @@ -75,12 +55,12 @@ ADDME="-lmd5"; \ - test "$$USEOPENSSL" = "" || ADDME="-DUSE_OPENSSL -lcrypto" ; \ - $(CC) -DVER=\"$(VER)\" $(CFLAGS) -DTARGETLANG=\"$$i\" snowdrop.c lang-$$i.o -o sd-$$i $$ADDME || exit 1; \ -+ test "$$USEOPENSSL" = "" || ADDME="-DUSE_OPENSSL -DUSE_GNUTLS -lgnutls-extra -lgnutls-openssl $(shell pkg-config --libs --cflags gnutls)" ; \ ++ test "$$USEOPENSSL" = "" || ADDME="-DUSE_OPENSSL -DUSE_GNUTLS -lgnutls-openssl $(shell pkg-config --libs --cflags gnutls)" ; \ + $(CC) -DVER=\"$(VER)\" $(CFLAGS) -DTARGETLANG=\"$$i\" snowdrop.c lang-$$i.o -o sd-$$i $$ADDME || exit 1; \ done; \ echo "[*] Main code compiled." -@@ -67,12 +68,12 @@ +@@ -67,12 +68,12 @@ toinstall: clean: rm -f sd-* *.o core core.* a.out @@ -98,8 +78,8 @@ @echo "[*] Installation complete." publish: clean ---- a/lang-eng.c -+++ b/lang-eng.c +--- snowdrop-0.02b.orig/lang-eng.c ++++ snowdrop-0.02b/lang-eng.c @@ -24,6 +24,9 @@ #include <assert.h> #include <string.h> @@ -118,3 +98,23 @@ #include "language.h" +--- snowdrop-0.02b.orig/snowdrop.c ++++ snowdrop-0.02b/snowdrop.c +@@ -28,6 +28,9 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <time.h> ++#ifdef USE_GNUTLS ++#include <gnutls/openssl.h> ++#else + #ifdef USE_OPENSSL + #include <openssl/md5.h> + #else +@@ -37,6 +40,7 @@ + #define MD5_Final MD5Final + #define MD5_Update MD5Update + #endif /* USE_OPENSSL */ ++#endif /* USE_GNUTLS */ + + #include <string.h> +
