Package: nzbget
Version: 12.0+dfsg-1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for nzbget (versioned as 12.0+dfsg-1.1) and
uploaded it to DELAYED/12. Please feel free to tell me if I
should delay it longer.
* Rebuild against GnuTLS v3. Closes: #753137
* 0010_unnecessary_gcryptdep.diff: Only link against gcrypt if
gnutls << 2.12. Closes: #745958
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 nzbget-12.0+dfsg/debian/changelog nzbget-12.0+dfsg/debian/changelog
--- nzbget-12.0+dfsg/debian/changelog 2014-01-12 15:55:29.0 +0100
+++ nzbget-12.0+dfsg/debian/changelog 2014-08-16 11:53:34.0 +0200
@@ -1,3 +1,12 @@
+nzbget (12.0+dfsg-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild against GnuTLS v3. Closes: #753137
+ * 0010_unnecessary_gcryptdep.diff: Only link against gcrypt if
+gnutls << 2.12. Closes: #745958
+
+ -- Andreas Metzler Sat, 16 Aug 2014 11:53:28 +0200
+
nzbget (12.0+dfsg-1) unstable; urgency=low
* New upstream release
diff -Nru nzbget-12.0+dfsg/debian/control nzbget-12.0+dfsg/debian/control
--- nzbget-12.0+dfsg/debian/control 2014-01-12 15:19:06.0 +0100
+++ nzbget-12.0+dfsg/debian/control 2014-08-15 18:21:56.0 +0200
@@ -4,7 +4,7 @@
Maintainer: Andreas Moog
Build-Depends: debhelper (>= 9),
dh-autoreconf,
- libgnutls-dev,
+ libgnutls28-dev,
libncurses5-dev,
libpar2-dev (>= 0.3.1),
libsigc++-2.0-dev,
diff -Nru nzbget-12.0+dfsg/debian/patches/0010_unnecessary_gcryptdep.diff nzbget-12.0+dfsg/debian/patches/0010_unnecessary_gcryptdep.diff
--- nzbget-12.0+dfsg/debian/patches/0010_unnecessary_gcryptdep.diff 1970-01-01 01:00:00.0 +0100
+++ nzbget-12.0+dfsg/debian/patches/0010_unnecessary_gcryptdep.diff 2014-08-16 12:01:45.0 +0200
@@ -0,0 +1,71 @@
+Description: Use pkg-config to locate GnuTLS, and only search for
+ and link against libgcrypt if GnuTLS is older than 2.12.
+Author: Andreas Metzler
+Origin: vendor
+Forwarded: http://nzbget.net/forum/viewtopic.php?f=3&t=1229&p=8812#p8812
+Last-Update: 2014-08-16
+
+--- a/configure.ac
b/configure.ac
+@@ -383,37 +383,32 @@ if test "$USETLS" = "yes"; then
+ fi
+
+ if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
+- INCVAL="${LIBPREF}/include"
+- LIBVAL="${LIBPREF}/lib"
+- AC_ARG_WITH(libgnutls_includes,
+- [AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
+- [INCVAL="$withval"])
+- CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+- AC_ARG_WITH(libgnutls_libraries,
+- [AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
+- [LIBVAL="$withval"])
+- LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+-
+- AC_CHECK_HEADER(gnutls/gnutls.h,
+- FOUND=yes
+- TLSHEADERS=yes,
+- FOUND=no)
+- if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
+- AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h)])
++ PKG_CHECK_MODULES([GnuTLS], [gnutls >= 2.12],
++ [LIBS="${LIBS} ${GnuTLS_LIBS}"]
++ [CPPFLAGS="${CPPFLAGS} ${GnuTLS_CFLAGS}"]
++ [FOUND=yes],
++ [FOUND=maybe])
++ if test "x$FOUND" = "xmaybe" ; then
++ PKG_CHECK_MODULES([legacy_GnuTLS], [gnutls],
++[FOUND=legacy],
++[FOUND=no])
+ fi
+- if test "$FOUND" = "yes"; then
+- AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
+-AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
+- FOUND=yes,
+- FOUND=no),
+-FOUND=no)
+- if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
+-AC_MSG_ERROR([Couldn't find GnuTLS library])
+- fi
+- if test "$FOUND" = "yes"; then
+-TLSLIB="GnuTLS"
+-AC_DEFINE([HAVE_LIBGNUTLS],1,[Define to 1 to use GnuTLS library for TLS/SSL-support.])
++ AS_IF([test "x$FOUND" = "xlegacy"],
++ AC_MSG_NOTICE(["Found GnuTLS < 2.12. - we need libgcrypt."])
++ AC_SEARCH_LIBS([gcry_control], [gcrypt],
++[FOUND=yes]
++[LIBS="${LIBS} ${legacy_GnuTLS_LIBS}"]
++[CPPFLAGS="${CPPFLAGS} ${legacy_GnuTLS_CFLAGS}"],
++FOUND=no))
++
++ if test "x$FOUND" = "xno"; then
++ if test "x$TLSLIB" = "xGnuTLS"; then
++AC_MSG_ERROR([Could not find GnuTLS])
+ fi
++ else
++ TLSLIB="GnuTLS"
++ AC_DEFINE([HAVE_LIBGNUTLS],1,
++ [Define to 1 to use GnuTLS library for TLS/SSL-support.])
+ fi
+ fi
+
diff -Nru nzbget-12.0+dfsg/debian/patches/series nzbget-12.0+dfsg/debian/patches/series
--- nzbget-12.0+dfsg/debian/patches/series 2014-01-12 15:19:06.0 +0100
+++ nzbget-12.0+dfsg/debian/patches/series 2014-08-16 11:50:00.0 +0200
@@ -1 +1,2 @@
0001-dont-embed-libraries.patch
+0010_unnecessary_gcryptdep.diff
signature.asc
Description: Digital signature
