aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2025-02-02 15:09:23 -05:00
Code

Don't link with libgnutls-openssl, which is now GPLv3+.

Browse Source 
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.
(cherry picked from commit 9ca0182ec6ffa5f652a3d45529e82ee31329f301)
This commit is contained in:
Kalle Olavi Niemitalo 2008-08-17 17:36:43 +03:00 committed by Kalle Olavi Niemitalo
parent 018af50f1d
commit 64f0f6e7a8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -223,6 +223,8 @@ To be released as 0.11.5.
* bug 698: Attach controls to the intended form even if it is * bug 698: Attach controls to the intended form even if it is
incorrectly nested in a table. (Was broken in 0.11.4.) incorrectly nested in a table. (Was broken in 0.11.4.)
* build bug 1021: fixed uninitialized variable in http_got_header * 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: ELinks 0.11.4:
-------------- --------------

10
configure.in
View File

@ -1090,12 +1090,10 @@ else
CFLAGS="$CFLAGS_X" CFLAGS="$CFLAGS_X"
AC_SUBST(GNUTLS_CFLAGS) AC_SUBST(GNUTLS_CFLAGS)
# Verify if the MD5 compatibility layer is usable. # GnuTLS 2.2.0 changed libgnutls-openssl from GPLv2+
CONFIG_GNUTLS_OPENSSL_COMPAT=yes # to GPLv3+. Don't link that with the GPLv2 ELinks.
EL_CHECK_OPTIONAL_LIBRARY(CONFIG_GNUTLS_OPENSSL_COMPAT, # ELinks will use its internal MD5 code instead.
[GNU TLS OpenSSL compatibility], CONFIG_GNUTLS_OPENSSL_COMPAT=no
gnutls/openssl.h, gnutls-openssl,
MD5_Init)
else else
if test -n "$gnutls_withval" && test "x$gnutls_withval" != xno; then 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.]) AC_MSG_ERROR([GNUTLS (1.2 or later) not found. ELinks no longer supports GNUTLS 1.1.])