From 9ca0182ec6ffa5f652a3d45529e82ee31329f301 Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sun, 17 Aug 2008 17:36:43 +0300 Subject: [PATCH] Don't link with libgnutls-openssl, which is now GPLv3+. ELinks used to call the MD5 code in libgnutls-openssl, part of GNUTLS-EXTRA, which was licensed under GNU GPL version 2 or later. In GnuTLS 2.2.0 however, the license of GNUTLS-EXTRA has been changed to GNU GPL version 3 or later. This is no longer compatible with GNU GPL version 2 as used in the current ELinks, because GPLv2 clause 2. b) requires the whole work to be licensed under GPLv2, and GPLv3 does not allow that. If anyone is still using a pre-2.2 GnuTLS, he or she can tweak configure.in to check the version or just assume it's old enough. There is not much reason to do so though, as including the MD5 code in ELinks seems to cost only about 4 kilobytes on i686. --- NEWS | 2 ++ configure.in | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index b4aa450d..5d003ec7 100644 --- a/NEWS +++ b/NEWS @@ -18,6 +18,8 @@ To be released as 0.11.5. * bug 698: Attach controls to the intended form even if it is incorrectly nested in a table. (Was broken in 0.11.4.) * build bug 1021: fixed uninitialized variable in http_got_header +* build: don't use libgnutls-openssl, which is no longer GPLv2 + compatible in GnuTLS 2.2.0 ELinks 0.11.4: -------------- diff --git a/configure.in b/configure.in index c7e7081e..47d505b5 100644 --- a/configure.in +++ b/configure.in @@ -955,12 +955,10 @@ else CFLAGS="$CFLAGS_X" AC_SUBST(GNUTLS_CFLAGS) - # Verify if the MD5 compatibility layer is usable. - CONFIG_GNUTLS_OPENSSL_COMPAT=yes - EL_CHECK_OPTIONAL_LIBRARY(CONFIG_GNUTLS_OPENSSL_COMPAT, - [GNU TLS OpenSSL compatibility], - gnutls/openssl.h, gnutls-openssl, - MD5_Init) + # GnuTLS 2.2.0 changed libgnutls-openssl from GPLv2+ + # to GPLv3+. Don't link that with the GPLv2 ELinks. + # ELinks will use its internal MD5 code instead. + CONFIG_GNUTLS_OPENSSL_COMPAT=no else if test -n "$gnutls_withval" && test "x$gnutls_withval" != xno; then AC_MSG_ERROR([GNUTLS (1.2 or later) not found. ELinks no longer supports GNUTLS 1.1.])