diff options
| author | Bertrand Marc <beberking@gmail.com> | 2012-09-29 15:16:17 +0200 |
|---|---|---|
| committer | Bertrand Marc <beberking@gmail.com> | 2012-09-29 15:16:17 +0200 |
| commit | c1ca2887668538d7c0c9cd63c3d69428219ef4b2 (patch) | |
| tree | c8df12a672f1316a62a01cbfc9f924b302bffb39 | |
| parent | ec2ff8efb5ff9fb195dc2575487b0f30c09316ed (diff) | |
Update libgcrypt version check to a less strict check, patch picked from upstream, following Werner Koch's advice (Closes: #684997).
| -rw-r--r-- | debian/patches/libgcrypt_version_check.diff | 47 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
2 files changed, 50 insertions, 0 deletions
diff --git a/debian/patches/libgcrypt_version_check.diff b/debian/patches/libgcrypt_version_check.diff new file mode 100644 index 0000000..71c4b84 --- /dev/null +++ b/debian/patches/libgcrypt_version_check.diff @@ -0,0 +1,47 @@ +--- 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 diff --git a/debian/patches/series b/debian/patches/series index 8c90987..ffffb2f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,6 @@ +libgcrypt_version_check.diff +unix_match_uid.diff +fix_nss_libdir.diff fix_kfreebsd_build.diff support_GNU_hurd.patch sparc_alignment.patch |