Wireshark-commits: [Wireshark-commits] master-1.12 afa09b0: Upgrade Windows builds to GnuTLS 3.1.22
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=afa09b0f20b6198a07871fb5e8b2ec0c315bc3f9
Submitter: Evan Huus (eapache@xxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark
Commits:
afa09b0 by Pascal Quantin (pascal.quantin@xxxxxxxxx):
Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4
Reviewed-on: https://code.wireshark.org/review/1978
Reviewed-by: Pascal Quantin <pascal.quantin@xxxxxxxxx>
(cherry picked from ad7b5381ac54567217f12ee729c7be6cd2848d0f)
Change-Id: I3f67b80e984e187ed65c0997fcd02ae3d715995b
Reviewed-on: https://code.wireshark.org/review/2021
Reviewed-by: Evan Huus <eapache@xxxxxxxxx>
Actions performed:
from d801c7f [Automatic manuf, services and enterprise-numbers update for 2014-06-08]
adds afa09b0 Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0
Summary of changes:
Makefile.nmake | 15 +++++++++++----
cmake/modules/FindGCRYPT.cmake | 4 ++--
cmake/modules/FindGNUTLS.cmake | 4 ++--
config.nmake | 18 +++++++++++++-----
epan/dissectors/packet-pdcp-lte.c | 2 +-
packaging/nsis/Makefile.nmake | 2 ++
packaging/nsis/wireshark.nsi | 14 ++++++++++----
tools/win32-setup.sh | 2 +-
tools/win64-setup.sh | 2 +-
ui/qt/QtShark.pro | 7 +++++--
10 files changed, 48 insertions(+), 22 deletions(-)