osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Drop support for GnuTLS 2.12.x, require GnuTLS 3.2 or newer 

Upcoming changes need GnuTLS >= 3.0.2. Require GnuTLS 3.2 (or newer) for
licensing reasons. The Debian control file still mentions 3.2.14 because
older packages linked with a GMP library that was not GPLv2+ compatible.

RHEL6 only has 2.12.23, but is already unsupported anyway.

Change-Id: I024b2a734ebb16b73a624bb2435c254e963d8b7d
Reviewed-on: https://code.wireshark.org/review/30832
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Peter Wu 2018-11-29 14:46:21 +01:00 committed by Anders Broman
parent 7cc07bf748
commit bcd32b07e7
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -979,7 +979,9 @@ endif()
if(ENABLE_GNUTLS)
set(PACKAGELIST ${PACKAGELIST} GNUTLS)
# Minimum version needed.
set(GNUTLS_OPTIONS "2.12.0")
# 3.0.2 due to GNUTLS_PRIVKEY_IMPORT_COPY
# 3.2.0 to remain GPLv2-compatible.
set(GNUTLS_OPTIONS "3.2.0")
endif()
# Kerberos

5
debian/control vendored
View File

@ -11,9 +11,8 @@ Build-Depends: lsb-release,
docbook-xsl (>= 1.64.1.0-0), docbook-xml, libxml2-utils, libpcre3-dev,
libcap2-dev [linux-any] | libcap-dev (>= 2.17) [linux-any],
bison, quilt, libparse-yapp-perl,
# libgnutls28-dev >= 3.2.14-1 is GPLv2+ compatible. libgnutls-dev is
# backports-compatible.
libgnutls28-dev (>= 3.2.14-1~) | libgnutls-dev,
# libgnutls28-dev >= 3.2.14-1 is GPLv2+ compatible.
libgnutls28-dev (>= 3.2.14-1~),
libgcrypt-dev, libkrb5-dev, liblua5.2-dev, libsmi2-dev,
libmaxminddb-dev, dpkg-dev (>= 1.16.1~), libsystemd-dev | libsystemd-journal-dev,
libnl-genl-3-dev [linux-any], libnl-route-3-dev [linux-any], asciidoctor,

6
docbook/wsdg_src/WSDG_chapter_libraries.asciidoc
View File

@ -229,8 +229,8 @@ https://www.winpcap.org/install/[]
=== GnuTLS (optional)
The GNU Transport Layer Security Library is used to dissect TLS and SSL
protocols (aka: HTTPS).
The GNU Transport Layer Security Library is used to enable TLS decryption
using a RSA private key.
[[ChLibsUnixGNUTLS]]
@ -238,7 +238,7 @@ protocols (aka: HTTPS).
If this library isn't already installed or available as a
package for your platform, you can get it at
https://www.gnu.org/software/gnutls/download.html[].
https://gnutls.org/[].
[[ChLibsWin32GNUTLS]]

4
tools/debian-setup.sh
View File

@ -118,11 +118,9 @@ add_package ADDITIONAL_LIST libssh-gcrypt-dev ||
add_package ADDITIONAL_LIST libssh-dev ||
echo "libssh-gcrypt-dev and libssh-dev are unavailable" >&2
# libgnutls-dev: Debian <= jessie, Ubuntu <= 16.04
# libgnutls28-dev: Debian >= wheezy-backports, Ubuntu >= 12.04
add_package ADDITIONAL_LIST libgnutls28-dev ">= 3.2.14-1" ||
add_package ADDITIONAL_LIST libgnutls-dev ||
echo "libgnutls28-dev and libgnutls-dev are unavailable" >&2
echo "libgnutls28-dev is unavailable" >&2
# mmdbresolve
add_package ADDITIONAL_LIST libmaxminddb-dev ||