Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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 <dwmw2@infradead.org>
  • Loading branch information
dwmw2 committed Aug 14, 2017
1 parent d298a8b commit 39eb59e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 13 deletions.
15 changes: 3 additions & 12 deletions configure.ac
Expand Up @@ -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], [:])
Expand Down
2 changes: 1 addition & 1 deletion www/building.xml
Expand Up @@ -23,7 +23,7 @@ libraries and tools installed:</p>
<ul>
<li><b><tt>libxml2</tt></b></li>
<li><b><tt>zlib</tt></b></li>
<li>Either <b><tt>OpenSSL</tt></b> or <b><tt>GnuTLS</tt></b></li>
<li>Either <b><tt>OpenSSL</tt></b> or <b><tt>GnuTLS</tt></b> <i>(v3.2.10+)</i></li>
<li><b><tt>pkg-config</tt></b></li>
</ul>
And <em>optionally</em> also:
Expand Down
1 change: 1 addition & 0 deletions www/changelog.xml
Expand Up @@ -15,6 +15,7 @@
<ul>
<li><b>OpenConnect HEAD</b>
<ul>
<li>Drop support for GnuTLS older than 3.2.10.</li>
<li>Fix <tt>--passwd-on-stdin</tt> for Windows to not forcibly open console.</li>
<li>Fix portability of shell scripts in test suite.</li>
<li>Add Google Authenticator TOTP support for Juniper.</li>
Expand Down

0 comments on commit 39eb59e

Please sign in to comment.