From: Amos Jeffries <yadij@users.noreply.github.com>
Date: Mon, 26 Feb 2018 04:00:22 +0000 (+1300)
Subject: Bump minimum GnuTLS version required by Squid. (#156)
X-Git-Tag: M-staged-PR151~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=516ec633e8a608bb9aaaad22f4c06b8bee7297b5;p=thirdparty%2Fsquid.git

Bump minimum GnuTLS version required by Squid. (#156)

PR#81 added functions only provided by GnuTLS 3.4.0 and later, but did not bump the
configure.ac check for GnuTLS to enforce that version as minimum.
---

diff --git a/configure.ac b/configure.ac
index b45f33c763..f9e744f65d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1245,13 +1245,13 @@ if test "x$with_gnutls" != "xno"; then
   LIBS="$LIBS $LIBGNUTLS_PATH"
 
   # auto-detect using pkg-config
-  PKG_CHECK_MODULES([LIBGNUTLS],[gnutls >= 3.1.5],[
+  PKG_CHECK_MODULES([LIBGNUTLS],[gnutls >= 3.4.0],[
     CPPFLAGS="$CPPFLAGS $LIBGNUTLS_CFLAGS"
     ],[
     ## find the package without pkg-config
     ## check that the library is actually new enough.
-    ## by testing for a 3.1.5+ function which we use
-    AC_CHECK_LIB(gnutls,gnutls_certificate_verify_peers3,[LIBGNUTLS_LIBS="-lgnutls"])
+    ## by testing for a 3.4.0+ function which we use
+    AC_CHECK_LIB(gnutls,gnutls_pcert_export_x509,[LIBGNUTLS_LIBS="-lgnutls"])
   ])
   AC_CHECK_HEADERS(gnutls/gnutls.h gnutls/x509.h gnutls/abstract.h)