forked from osmocom/wireshark
Update GnuTls to gnutls-2.3.8-1
svn path=/trunk/; revision=25309
This commit is contained in:
parent
b42aec2948
commit
b202c984e3
|
@ -699,7 +699,7 @@ process_libs:
|
|||
|
||||
!IFDEF GNUTLS_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
. gnutls-1.6.1-1.zip
|
||||
. gnutls-2.3.8-1.zip
|
||||
!ENDIF
|
||||
!IFDEF PORTAUDIO_DIR
|
||||
@$(SH) tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIBS)" \
|
||||
|
@ -792,6 +792,7 @@ clean_setup:
|
|||
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)/gtk2
|
||||
rm -r -f $(WIRESHARK_LIBS)/gtk+
|
||||
rm -r -f $(WIRESHARK_LIBS)/gtk-wimp
|
||||
|
@ -1001,9 +1002,9 @@ install-all: install-generated-files
|
|||
!ENDIF
|
||||
!IFDEF GNUTLS_DIR
|
||||
xcopy $(GNUTLS_DIR)\bin\libgcrypt-11.dll $(INSTALL_DIR) /d
|
||||
xcopy $(GNUTLS_DIR)\bin\libgnutls-13.dll $(INSTALL_DIR) /d
|
||||
xcopy $(GNUTLS_DIR)\bin\libgnutls-extra-13.dll $(INSTALL_DIR) /d
|
||||
xcopy $(GNUTLS_DIR)\bin\libgnutls-openssl-13.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
|
||||
|
|
|
@ -206,7 +206,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-1.6.1-1
|
||||
GNUTLS_DIR=$(WIRESHARK_LIBS)\gnutls-2.3.8-1
|
||||
|
||||
#
|
||||
# Optional: the KFW library enables kerberos/sasl/dcerpc decryption.
|
||||
|
@ -753,7 +754,7 @@ GNUTLS_LIBS=\
|
|||
$(GNUTLS_DIR)\bin\libtasn1-3.lib \
|
||||
$(GNUTLS_DIR)\bin\libgpg-error-0.lib \
|
||||
$(GNUTLS_DIR)\bin\libgcrypt-11.lib \
|
||||
$(GNUTLS_DIR)\bin\libgnutls-13.lib
|
||||
$(GNUTLS_DIR)\bin\libgnutls-26.lib
|
||||
# Nmake uses carets to escape special characters
|
||||
GNUTLS_CONFIG=^#define HAVE_LIBGNUTLS 1
|
||||
LIBGCRYPT_CONFIG=^#define HAVE_LIBGCRYPT 1
|
||||
|
|
|
@ -317,9 +317,9 @@ File "${KFW_DIR}\bin\krb5_32.dll"
|
|||
!endif
|
||||
!ifdef GNUTLS_DIR
|
||||
File "${GNUTLS_DIR}\bin\libgcrypt-11.dll"
|
||||
File "${GNUTLS_DIR}\bin\libgnutls-13.dll"
|
||||
File "${GNUTLS_DIR}\bin\libgnutls-extra-13.dll"
|
||||
File "${GNUTLS_DIR}\bin\libgnutls-openssl-13.dll"
|
||||
File "${GNUTLS_DIR}\bin\libgnutls-26.dll"
|
||||
File "${GNUTLS_DIR}\bin\libgnutls-extra-26.dll"
|
||||
File "${GNUTLS_DIR}\bin\libgnutls-openssl-26.dll"
|
||||
File "${GNUTLS_DIR}\bin\libgpg-error-0.dll"
|
||||
File "${GNUTLS_DIR}\bin\libtasn1-3.dll"
|
||||
!endif
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
# in order to provide backward compatibility with older trees (e.g. a
|
||||
# previous release or an older SVN checkout).
|
||||
# Save previous tag.
|
||||
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-12/packages/"
|
||||
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-13/packages/"
|
||||
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-13/packages/"
|
||||
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2008-05-16/packages/"
|
||||
|
||||
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
|
||||
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"
|
||||
|
|
Loading…
Reference in New Issue