osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Update to the GnuTLS 2.8.5 

svn path=/trunk/; revision=30930
This commit is contained in:
Tomas Kukosa 2009-11-11 09:58:29 +00:00
parent 7b7d48d2a7
commit 7f38b7b889
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.nmake
View File

@ -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

2
config.nmake
View File

@ -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.

2
tools/win32-setup.sh
View File

@ -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/`