diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2016-05-10 22:18:34 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2016-05-11 05:46:02 +0000 |
| commit | 6d0e5bbf02e9d0a97205041d35ee1ca1eb6fcdbb (patch) | |
| tree | e5bf11699b8c28124345946f41325cef80eefd41 | |
| parent | 2275e0273091314b38ed411a8cae39ed877f5bec (diff) | |
Upgrade c-ares Windows library from 1.9.1 to 1.11.0
Bug: 12412
Change-Id: I5e5f8f86293e391ec425a6e3e314573711947bce
Reviewed-on: https://code.wireshark.org/review/15345
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | config.nmake | 8 | ||||
| -rw-r--r-- | tools/win-setup.ps1 | 9 |
3 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 84f944c4be..a55c9d1be1 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1126,6 +1126,7 @@ clean_setup: rm -r -f c-ares-1.7.0-win??ws rm -r -f c-ares-1.7.1-win??ws rm -r -f c-ares-1.9.1-1-win??ws + rm -r -f c-ares-1.11.0-win??ws rm -r -f gettext-0.14.5 rm -r -f gettext-runtime-0.17 rm -r -f gettext-runtime-0.17-1 diff --git a/config.nmake b/config.nmake index 8856e0a4ef..a13d5ec72d 100644 --- a/config.nmake +++ b/config.nmake @@ -266,7 +266,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1 WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32" -DOWNLOAD_TAG=2016-04-07 +DOWNLOAD_TAG=2016-05-10 ##### Win32 Libraries ##### # # Mandatory: GLib settings @@ -414,7 +414,7 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws # If you don't have c-ares, comment this line out, so that C_ARES_DIR # isn't defined. # -C_ARES_PKG=1.9.1-1 +C_ARES_PKG=1.11.0 # # Optional: the GnuTLS library enables ssl decryption. @@ -520,7 +520,7 @@ GEOIP_PKG=1.6.6 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws !else -DOWNLOAD_TAG=2016-04-07 +DOWNLOAD_TAG=2016-05-10 ##### Win64 Libraries ##### # # Mandatory: GLib settings @@ -659,7 +659,7 @@ ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws # If you don't have c-ares, comment this line out, so that C_ARES_DIR # isn't defined. # -C_ARES_PKG=1.9.1-1 +C_ARES_PKG=1.11.0 # # Optional: the GnuTLS library enables ssl decryption. diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index b9e159d70b..48fa6a52de 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -101,13 +101,13 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2016-04-07" -$Win32CurrentTag = "2016-04-07" +$Win64CurrentTag = "2016-05-10" +$Win32CurrentTag = "2016-05-10" # Archive file / subdir. $Win64Archives = @{ "AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622"; - "c-ares-1.9.1-1-win64ws.zip" = ""; + "c-ares-1.11.0-win64ws.zip" = ""; "GeoIP-1.6.6-win64ws.zip" = "GeoIP-1.6.6-win64ws"; "gnutls-3.2.15-2.9-win64ws.zip" = ""; "gtk+-bundle_2.24.23-3.39_win64ws.zip" = "gtk2"; @@ -125,7 +125,7 @@ $Win64Archives = @{ $Win32Archives = @{ "AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622"; - "c-ares-1.9.1-1-win32ws.zip" = ""; + "c-ares-1.11.0-win32ws.zip" = ""; "GeoIP-1.6.6-win32ws.zip" = "GeoIP-1.6.6-win32ws"; "gnutls-3.2.15-2.7-win32ws.zip" = ""; "gtk+-bundle_2.24.23-1.1_win32ws.zip" = "gtk2"; @@ -173,6 +173,7 @@ if ($Platform -eq "win32") { $CleanupItems = @( "c-ares-1.9.1-1-win??ws" + "c-ares-1.11.0-win??ws" "gnutls-3.1.22-*-win??ws" "gnutls-3.2.15-*-win??ws" "gtk2" |