diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-03-29 20:18:10 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-03-29 20:18:10 +0000 |
| commit | 3ae3fcee5c181b54761cfcbefc59838630e47243 (patch) | |
| tree | a317294e298bf623b827917a9220754537b79dfa | |
| parent | a256cb0c9dd83bce8279359923c799923a3bb01e (diff) | |
Use the GnuTLS 2.12.18-1.2-1 bundle.
svn path=/trunk/; revision=41829
| -rw-r--r-- | config.nmake | 14 | ||||
| -rwxr-xr-x | tools/win64-setup.sh | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/config.nmake b/config.nmake index 301fe5c97d..18f5fa6a72 100644 --- a/config.nmake +++ b/config.nmake @@ -299,11 +299,11 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125 C_ARES_PKG=1.7.1 # -# Optional: the GNUTLS library enables ssl decryption. +# Optional: the GnuTLS library enables ssl decryption. # -# If you have the GNUTLS library, set this to the package version. +# If you have the GnuTLS library, set this to the package version. # -# If you don't have GNUTLS, comment this line out, so that GNUTLS_PKG +# If you don't have GnuTLS, comment this line out, so that GNUTLS_PKG # isn't defined. # # Platform SDK conflicts with openssl.h header @@ -489,15 +489,15 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib125 C_ARES_PKG=1.7.1 # -# Optional: the GNUTLS library enables ssl decryption. +# Optional: the GnuTLS library enables ssl decryption. # -# If you have the GNUTLS library, set this to the package version. +# If you have the GnuTLS library, set this to the package version. # -# If you don't have GNUTLS, comment this line out, so that GNUTLS_PKG +# If you don't have GnuTLS, comment this line out, so that GNUTLS_PKG # isn't defined. # # Platform SDK conflicts with openssl.h header -GNUTLS_PKG=2.12.18-1.2 +GNUTLS_PKG=2.12.18-1.2-1 # # Optional: the KFW library enables kerberos/sasl/dcerpc decryption. diff --git a/tools/win64-setup.sh b/tools/win64-setup.sh index 6514e4b0b2..82ac1176ba 100755 --- a/tools/win64-setup.sh +++ b/tools/win64-setup.sh @@ -4,7 +4,7 @@ # 64-bit wrapper for win-setup.sh. -export DOWNLOAD_TAG="2012-03-26" +export DOWNLOAD_TAG="2012-03-29" export WIRESHARK_TARGET_PLATFORM="win64" WIN_SETUP=`echo $0 | sed -e s/win64/win/` |