diff options
| author | Bertrand Marc <beberking@gmail.com> | 2013-01-12 14:55:33 +0100 |
|---|---|---|
| committer | Bertrand Marc <beberking@gmail.com> | 2013-01-27 12:42:04 +0100 |
| commit | c881d55786a72d310d47083973b91490651775aa (patch) | |
| tree | 2375897eed87866b9b1a76fdf272faf6055805ad /debian/patches/libgcrypt_version_check.diff | |
| parent | 663df7b8d5d2c40736944abf07f04bfdeba74d49 (diff) | |
Revert some of the previous changes to target wheezy.debian/0.9.3-5
Diffstat (limited to 'debian/patches/libgcrypt_version_check.diff')
| -rw-r--r-- | debian/patches/libgcrypt_version_check.diff | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/debian/patches/libgcrypt_version_check.diff b/debian/patches/libgcrypt_version_check.diff deleted file mode 100644 index 71c4b84..0000000 --- a/debian/patches/libgcrypt_version_check.diff +++ /dev/null @@ -1,47 +0,0 @@ ---- a/src/util/crypto_random.c -+++ b/src/util/crypto_random.c -@@ -302,12 +302,12 @@ - void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init () - { - gcry_control (GCRYCTL_DISABLE_SECMEM, 0); -- if (!gcry_check_version (GCRYPT_VERSION)) -+ if (!gcry_check_version (NEED_LIBGCRYPT_VERSION)) - { - FPRINTF (stderr, - _ - ("libgcrypt has not the expected version (version %s is required).\n"), -- GCRYPT_VERSION); -+ NEED_LIBGCRYPT_VERSION); - GNUNET_abort (); - } - #ifdef GCRYCTL_INITIALIZATION_FINISHED ---- a/configure.ac -+++ b/configure.ac -@@ -211,13 +211,25 @@ - - # libgcrypt - gcrypt=0 --AM_PATH_LIBGCRYPT(1.2.0, gcrypt=1) -+NEED_LIBGCRYPT_API=1 -+NEED_LIBGCRYPT_VERSION=1.4.2 -+ -+ -+AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_API:$NEED_LIBGCRYPT_VERSION", gcrypt=1) - AC_CHECK_DECLS([gcry_mpi_lshift], [], [], [[#include <gcrypt.h>]]) - - if test $gcrypt = 0 - then -- AC_MSG_ERROR([GNUnet needs libgcrypt]) -+ AC_MSG_ERROR([[ -+*** -+*** You need libgcrypt to build this program. -+** This library is for example available at -+*** ftp://ftp.gnupg.org/gcrypt/libgcrypt/ -+*** (at least version $NEED_LIBGCRYPT_VERSION (API $NEED_LIBGCRYPT_API) -+*** is required.) -+***]]) - fi -+AC_DEFINE_UNQUOTED([NEED_LIBGCRYPT_VERSION], "$NEED_LIBGCRYPT_VERSION", [required libgcrypt version]) - - # Adam shostack suggests the following for Windows: - # -D_FORTIFY_SOURCE=2 -fstack-protector-all |