diff options
| author | Tomas Kukosa <tomas.kukosa@siemens.com> | 2008-12-15 11:52:06 +0000 |
|---|---|---|
| committer | Tomas Kukosa <tomas.kukosa@siemens.com> | 2008-12-15 11:52:06 +0000 |
| commit | 408d562a5c8fa0bf0d879a1c9ef8510dbefceb3b (patch) | |
| tree | cdd089f36cdc3fefac49a500b9fe8310b2bb06b4 | |
| parent | bc79c1f13a69323aea4da5e6a985c24f5ad04e8b (diff) | |
| download | wireshark-408d562a5c8fa0bf0d879a1c9ef8510dbefceb3b.tar.gz | |
Update GnuTls to gnutls-2.6.3-1
svn path=/trunk/; revision=26998
| -rw-r--r-- | Makefile.nmake | 4 | ||||
| -rw-r--r-- | config.nmake | 4 | ||||
| -rwxr-xr-x | tools/win32-setup.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index a163aa0e54..13cc329bb7 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -772,7 +772,7 @@ process_libs: !IFDEF GNUTLS_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ - . gnutls-2.3.8-1.zip + . gnutls-2.6.3-1.zip !ENDIF !IFDEF PORTAUDIO_DIR @$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \ @@ -864,8 +864,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-1.6.1-1 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)/gtk2 rm -r -f $(WIRESHARK_LIBS)/gtk+ rm -r -f $(WIRESHARK_LIBS)/gtk-wimp diff --git a/config.nmake b/config.nmake index 058617b5ec..648d0e8246 100644 --- a/config.nmake +++ b/config.nmake @@ -229,8 +229,8 @@ PCRE_DIR=$(WIRESHARK_LIBS)\pcre-7.0 # 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.3.8-1 +GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.6.3-1 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. diff --git a/tools/win32-setup.sh b/tools/win32-setup.sh index 027838038b..acf6e4e0e9 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="2008-12-10" +DOWNLOAD_TAG="2008-12-15" DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/$DOWNLOAD_TAG/packages/" TAG_FILE="current_tag.txt" |