diff options
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | config.nmake | 6 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 979a21963d..0c611be0a7 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -770,7 +770,7 @@ process_libs: !IFDEF GNUTLS_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . gnutls-2.6.3-1.zip + . gnutls-2.6.4-1.zip !ENDIF !IFDEF PORTAUDIO_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -866,8 +866,8 @@ clean_setup: rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17 rm -r -f $(WIRESHARK_LIBS)/gettext-runtime-0.17-1 rm -r -f $(WIRESHARK_LIBS)/glib - rm -r -f $(WIRESHARK_LIBS)/gnutls-2.3.8-1 rm -r -f $(WIRESHARK_LIBS)/gnutls-2.6.3-1 + rm -r -f $(WIRESHARK_LIBS)/gnutls-2.6.4-1 rm -r -f $(WIRESHARK_LIBS)/gtk2 rm -r -f $(WIRESHARK_LIBS)/gtk+ rm -r -f $(WIRESHARK_LIBS)/gtk-wimp diff --git a/config.nmake b/config.nmake index 0f7c28e1a8..bda2183f0f 100644 --- a/config.nmake +++ b/config.nmake @@ -236,8 +236,8 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0 # isn't defined. # # Platform SDK conflicts with openssl.h header -#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.3.8-1 -GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.3-1 +#GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.3-1 +GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.4-1 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. @@ -820,7 +820,7 @@ NETTLE_CONFIG= !IFDEF GNUTLS_DIR GNUTLS_PATH=$(GNUTLS_DIR) # /DNOCRYPT avoids inclusion of Wincrypt.h, avoiding a X509_NAME define clash -GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT +GNUTLS_CFLAGS=/I$(GNUTLS_DIR)\include /DNOCRYPT /DIMPORT_LIGNUTLSDLL GNUTLS_LIBS=\ $(GNUTLS_DIR)\bin\libtasn1-3.lib \ $(GNUTLS_DIR)\bin\libgpg-error-0.lib \ diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 792300d4fd..2b2af6f1f3 100755 --- a/tools/win32-setup.sh +++ b/tools/win32-setup.sh @@ -7,7 +7,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="2009-01-13" +DOWNLOAD_TAG="2009-02-09" DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/" TAG_FILE="current_tag.txt" |