summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.nmake4
-rw-r--r--config.nmake2
-rwxr-xr-xtools/win32-setup.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.nmake b/Makefile.nmake
index f1b17083b9..6e098a1d42 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -787,7 +787,7 @@ process_libs:
!IFDEF GNUTLS_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
- . gnutls-2.8.1-1.zip
+ . gnutls-2.8.5-1.zip
!ENDIF
!IFDEF PORTAUDIO_DIR
@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
@@ -875,7 +875,7 @@ clean_setup:
rm -r -f $(WIRESHARK_LIBS)/gettext-0.17-1 # win64
rm -r -f $(WIRESHARK_LIBS)/glib
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)/gnutls-2.8.5-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 796fbe6f3e..62670a6ade 100644
--- a/config.nmake
+++ b/config.nmake
@@ -277,7 +277,7 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0
# isn't defined.
#
# Platform SDK conflicts with openssl.h header
-GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.1-1
+GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.8.5-1
#
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh
index a64ecbd7c3..1db5981298 100755
--- a/tools/win32-setup.sh
+++ b/tools/win32-setup.sh
@@ -4,7 +4,7 @@
# 32-bit wrapper for win-setup.sh.
-export DOWNLOAD_TAG="2009-10-25"
+export DOWNLOAD_TAG="2009-11-11"
export WIRESHARK_TARGET_PLATFORM="win32"
WIN_SETUP=`echo $0 | sed -e s/win32/win/`