diff options
| -rw-r--r-- | Makefile.nmake | 6 | ||||
| -rw-r--r-- | config.nmake | 6 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 0d1e12ac6a..ea951c3341 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -814,7 +814,7 @@ process_libs: !IFDEF GNUTLS_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . gnutls-2.6.4-1.zip + . gnutls-2.8.1-1.zip !ENDIF !IFDEF PORTAUDIO_DIR @$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -892,7 +892,7 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17-1 rm -r -f $(WIRESHARK_LIBS)/gettext-0.17-1 # win64 rm -r -f $(WIRESHARK_LIBS)/glib - rm -r -f $(WIRESHARK_LIBS)/gnutls-2.6.3-1 + rm -r -f $(WIRESHARK_LIBS)/gnutls-2.8.1-1 rm -r -f $(WIRESHARK_LIBS)/gnutls-2.6.4-1 rm -r -f $(WIRESHARK_LIBS)/gtk2 rm -r -f $(WIRESHARK_LIBS)/gtk+ @@ -1088,8 +1088,6 @@ install-all: install-generated-files !IFDEF GNUTLS_DIR xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libgnutls-26.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libgnutls-extra-26.dll $(INSTALL_DIR) /d - xcopy $(GNUTLS_DIR)\bin\libgnutls-openssl-26.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libgpg-error-0.dll $(INSTALL_DIR) /d xcopy $(GNUTLS_DIR)\bin\libtasn1-3.dll $(INSTALL_DIR) /d !ENDIF diff --git a/config.nmake b/config.nmake index 020f5c307a..f4722ff94e 100644 --- a/config.nmake +++ b/config.nmake @@ -251,8 +251,7 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0 # isn't defined. # # Platform SDK conflicts with openssl.h header -#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.3-1 -GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.4-1 +GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.1-1 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. @@ -476,8 +475,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123 # isn't defined. # # Platform SDK conflicts with openssl.h header -#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-1.6.1-1 -#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.3.8-1 +#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.1-1 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 091724d42b..f35fb173b3 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -9,7 +9,7 @@ # in order to provide backward compatibility with older trees (e.g. a # previous release or an older SVN checkout). # Save previous tag. -DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-06-10"} +DOWNLOAD_TAG=${DOWNLOAD_TAG:-"2009-06-10-1.0"} WIRESHARK_TARGET_PLATFORM=${WIRESHARK_TARGET_PLATFORM:-"win32"} DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages/" |