Control: tags 638654 + pending Dear maintainer,
I've prepared an NMU for postal (versioned as 0.73+nmu1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. 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 postal-0.73/bhm.cpp postal-0.73+nmu1/bhm.cpp --- postal-0.73/bhm.cpp 2012-01-14 13:09:31.000000000 +0100 +++ postal-0.73+nmu1/bhm.cpp 2014-08-18 19:24:20.000000000 +0200 @@ -21,8 +21,10 @@ #include "basictcp.h" #ifdef USE_GNUTLS #include <errno.h> +#if GNUTLS_VERSION_NUMBER <= 0x020b00 #include <gcrypt.h> GCRY_THREAD_OPTION_PTHREAD_IMPL; +#endif /* GNUTLS_VERSION_NUMBER */ #endif int processes = 0; diff -Nru postal-0.73/changes.txt postal-0.73+nmu1/changes.txt --- postal-0.73/changes.txt 2012-01-16 21:48:27.000000000 +0100 +++ postal-0.73+nmu1/changes.txt 2014-08-18 19:25:56.000000000 +0200 @@ -1,3 +1,13 @@ +postal (0.73+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Do not #include <gcrypt.h> when unnecessary. + * Stop linking against libgcrypt. + * Build against GnuTLS v3. + Closes: #638654 + + -- Andreas Metzler <[email protected]> Mon, 18 Aug 2014 19:25:50 +0200 + postal (0.73) unstable; urgency=low * Make postal correctly issue the quit command after delivery failure. diff -Nru postal-0.73/configure postal-0.73+nmu1/configure --- postal-0.73/configure 2012-01-14 12:33:01.000000000 +0100 +++ postal-0.73+nmu1/configure 2014-08-18 19:24:20.000000000 +0200 @@ -4057,7 +4057,7 @@ gnutls="" else gnutls="#define USE_GNUTLS" - crypt_ldflags="$extra_ldflags -lgnutls -lgcrypt" + crypt_ldflags="$extra_ldflags -lgnutls" fi if [ "$OPENSSL" = "no" ]; then openssl="" diff -Nru postal-0.73/configure.in postal-0.73+nmu1/configure.in --- postal-0.73/configure.in 2012-01-14 12:32:56.000000000 +0100 +++ postal-0.73+nmu1/configure.in 2014-08-18 19:24:20.000000000 +0200 @@ -120,7 +120,7 @@ gnutls="" else gnutls="#define USE_GNUTLS" - crypt_ldflags="$extra_ldflags -lgnutls -lgcrypt" + crypt_ldflags="$extra_ldflags -lgnutls" fi if [[ "$OPENSSL" = "no" ]]; then openssl="" diff -Nru postal-0.73/debian/changelog postal-0.73+nmu1/debian/changelog --- postal-0.73/debian/changelog 2012-01-16 21:48:27.000000000 +0100 +++ postal-0.73+nmu1/debian/changelog 2014-08-18 19:25:56.000000000 +0200 @@ -1,3 +1,13 @@ +postal (0.73+nmu1) unstable; urgency=medium + + * Non-maintainer upload. + * Do not #include <gcrypt.h> when unnecessary. + * Stop linking against libgcrypt. + * Build against GnuTLS v3. + Closes: #638654 + + -- Andreas Metzler <[email protected]> Mon, 18 Aug 2014 19:25:50 +0200 + postal (0.73) unstable; urgency=low * Make postal correctly issue the quit command after delivery failure. diff -Nru postal-0.73/debian/control postal-0.73+nmu1/debian/control --- postal-0.73/debian/control 2007-01-16 12:47:12.000000000 +0100 +++ postal-0.73+nmu1/debian/control 2014-08-18 19:25:40.000000000 +0200 @@ -1,5 +1,5 @@ Source: postal -Build-Depends: debhelper, libgnutls-dev +Build-Depends: debhelper, libgnutls28-dev Section: utils Priority: optional Maintainer: Russell Coker <[email protected]> diff -Nru postal-0.73/postal.cpp postal-0.73+nmu1/postal.cpp --- postal-0.73/postal.cpp 2012-01-14 13:08:12.000000000 +0100 +++ postal-0.73+nmu1/postal.cpp 2014-08-18 19:24:20.000000000 +0200 @@ -12,8 +12,10 @@ #include "logit.h" #ifdef USE_GNUTLS #include <errno.h> +#if GNUTLS_VERSION_NUMBER <= 0x020b00 #include <gcrypt.h> GCRY_THREAD_OPTION_PTHREAD_IMPL; +#endif /* GNUTLS_VERSION_NUMBER */ #endif void usage() diff -Nru postal-0.73/rabid.cpp postal-0.73+nmu1/rabid.cpp --- postal-0.73/rabid.cpp 2012-01-14 13:08:49.000000000 +0100 +++ postal-0.73+nmu1/rabid.cpp 2014-08-18 19:24:20.000000000 +0200 @@ -14,9 +14,12 @@ #include "logit.h" #ifdef USE_GNUTLS #include <errno.h> +#if GNUTLS_VERSION_NUMBER <= 0x020b00 #include <gcrypt.h> GCRY_THREAD_OPTION_PTHREAD_IMPL; +#endif /* GNUTLS_VERSION_NUMBER */ #endif +#include <cstring> void usage() {
signature.asc
Description: Digital signature
