Comment # 39
on bug 10476
from Pascal Quantin
The patch for master branch is available here:
https://code.wireshark.org/review/4401
I have not uploaded the patch for master-1.12 branch yet but it is pretty
simple:
diff --git a/Makefile.nmake b/Makefile.nmake
index a881331..808b422 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1073,6 +1073,7 @@ clean_setup:
rm -r -f gnutls-2.10.3-*-win??ws
rm -r -f gnutls-2.12.18-*-win??ws
rm -r -f gnutls-3.1.22-*-win??ws
+ rm -r -f gnutls-3.2.15-*-win??ws
!IF "$(GTK_NAME)" == "gtk2"
rm -r -f gtk2
!ELSE
diff --git a/config.nmake b/config.nmake
index d860692..e2bb9d0 100644
--- a/config.nmake
+++ b/config.nmake
@@ -433,7 +433,7 @@ C_ARES_PKG=1.9.1-1
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=3.1.22-2.3
+GNUTLS_PKG=3.2.15-2.7
GPGERROR_DLL=libgpg-error-0.dll
GCC_DLL=libgcc_s_sjlj-1.dll
@@ -688,7 +688,7 @@ C_ARES_PKG=1.9.1-1
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_PKG=3.1.22-2.3
+GNUTLS_PKG=3.2.15-2.9
GPGERROR_DLL=libgpg-error6-0.dll
GCC_DLL=libgcc_s_seh-1.dll
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index 5dcacf5..8b12b8b 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -22,7 +22,7 @@
# 32-bit wrapper for win-setup.sh.
-export DOWNLOAD_TAG="2014-06-19"
+export DOWNLOAD_TAG="2014-10-01"
export WIRESHARK_TARGET_PLATFORM="win32"
WIN_SETUP=`echo $0 | sed -e s/win32/win/`
diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh
index a814a75..d37d305 100755
--- a/tools/win64-setup.sh
+++ b/tools/win64-setup.sh
@@ -22,7 +22,7 @@
# 64-bit wrapper for win-setup.sh.
-export DOWNLOAD_TAG="2014-06-19"
+export DOWNLOAD_TAG="2014-10-01"
export WIRESHARK_TARGET_PLATFORM="win64"
WIN_SETUP=`echo $0 | sed -e s/win64/win/`
You are receiving this mail because:
- You are watching all bug changes.