From 39eb59e3dc5ab8889225e792a27a47ce8f1eff7a Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 14 Aug 2017 11:33:16 +0100 Subject: [PATCH] Require GnuTLS 3.2.10+ for GnuTLS builds It's not worth the effort to keep it building for <3.2 any more; nobody cares... or noticess when we accidentally break it. So kill it; we've been threatening to for ages. Use 3.2.10 as the base because 3.2.x before that was broken on Windows. Signed-off-by: David Woodhouse --- configure.ac | 15 +++------------ www/building.xml | 2 +- www/changelog.xml | 1 + 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 5c50cf62..bb92df7e 100644 --- a/configure.ac +++ b/configure.ac @@ -279,18 +279,9 @@ fi # First, check if GnuTLS exists and is usable if test "$with_gnutls" = "yes" || test "$with_gnutls" = ""; then - PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.12.16, - [if ! $PKG_CONFIG --atleast-version=2.12.16 gnutls; then - AC_MSG_WARN([Your GnuTLS is too old. At least v2.12.16 is required]) - elif test "$have_win" = "yes"; then - AC_MSG_CHECKING([for broken GnuTLS Windows versions]) - if $PKG_CONFIG --atleast-version=3.2.0 gnutls && - ! $PKG_CONFIG --atleast-version=3.2.10 gnutls; then - AC_MSG_RESULT([broken]) - else - AC_MSG_RESULT([OK]) - ssl_library=GnuTLS - fi + PKG_CHECK_MODULES(GNUTLS, gnutls, + [if ! $PKG_CONFIG --atleast-version=3.2.10 gnutls; then + AC_MSG_WARN([Your GnuTLS is too old. At least v3.2.10 is required]) else ssl_library=GnuTLS fi], [:]) diff --git a/www/building.xml b/www/building.xml index bcee63b9..d15f48bc 100644 --- a/www/building.xml +++ b/www/building.xml @@ -23,7 +23,7 @@ libraries and tools installed:

And optionally also: diff --git a/www/changelog.xml b/www/changelog.xml index ed2d08b1..300ea2c8 100644 --- a/www/changelog.xml +++ b/www/changelog.xml @@ -15,6 +15,7 @@