reverted: --- freetds-0.91/configure.ac +++ freetds-0.91.orig/configure.ac @@ -694,11 +694,11 @@ if test "$with_gnutls" = "yes"; then AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if you have GNU tls.]) if test "$PKG_CONFIG" != "" && "$PKG_CONFIG" --libs gnutls > /dev/null 2>&1; then + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags gnutls`" + NETWORK_LIBS="$NETWORK_LIBS `$PKG_CONFIG --libs gnutls`" - CPPFLAGS="$CPPFLAGS `libgcrypt-config --cflags` `$PKG_CONFIG --cflags gnutls`" - NETWORK_LIBS="$NETWORK_LIBS `libgcrypt-config --libs` `$PKG_CONFIG --libs gnutls`" else + CPPFLAGS="$CPPFLAGS `libgnutls-config --cflags`" + NETWORK_LIBS="$NETWORK_LIBS `libgnutls-config --libs`" - CPPFLAGS="$CPPFLAGS `libgcrypt-config --cflags` `libgnutls-config --cflags`" - NETWORK_LIBS="$NETWORK_LIBS `libgcrypt-config --libs` `libgnutls-config --libs`" fi OLDLIBS="$LIBS" LIBS="$LIBS $NETWORK_LIBS" diff -u freetds-0.91/debian/changelog freetds-0.91/debian/changelog --- freetds-0.91/debian/changelog +++ freetds-0.91/debian/changelog @@ -1,3 +1,13 @@ +freetds (0.91-6) unstable; urgency=low + + * Build against libgnutls28, now that license compatibility issues + with GPLv2-only software have been resolved. This includes patching + the upstream source to not look for gcrypt, which is no longer needed. + Thanks to Dimitri Ledkov for the patch. + Closes: #747449. + + -- Steve Langasek Thu, 08 May 2014 15:25:40 -0700 + freetds (0.91-5) unstable; urgency=low * Add Kerberos support. LP: #1223567. diff -u freetds-0.91/debian/control freetds-0.91/debian/control --- freetds-0.91/debian/control +++ freetds-0.91/debian/control @@ -11,9 +11,8 @@ autotools-dev, unixodbc-dev (>= 2.2.11-10), libglib2.0-dev | libglib-dev, - libgnutls-dev, + libgnutls28-dev, libreadline-dev, - libgcrypt-dev, libkrb5-dev, dh-autoreconf only in patch2: unchanged: --- freetds-0.91.orig/src/tds/net.c +++ freetds-0.91/src/tds/net.c @@ -94,11 +94,13 @@ #include #ifdef HAVE_GNUTLS +#include #if defined(_THREAD_SAFE) && defined(TDS_HAVE_PTHREAD_MUTEX) #include "tdsthread.h" +#if GNUTLS_VERSION_NUMBER <= 0x020b00 #include #endif -#include +#endif #elif defined(HAVE_OPENSSL) #include #endif @@ -1268,7 +1270,7 @@ } #endif -#if defined(_THREAD_SAFE) && defined(TDS_HAVE_PTHREAD_MUTEX) +#if defined(_THREAD_SAFE) && defined(TDS_HAVE_PTHREAD_MUTEX) && GNUTLS_VERSION_NUMBER <= 0x020b00 GCRY_THREAD_OPTION_PTHREAD_IMPL; #define tds_gcry_init() gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread) #else