diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-06-28 09:33:55 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-06-28 10:57:55 +0000 |
| commit | a8ec8a3a6bcb1f0fc05b10355f1af7434d01fbf2 (patch) | |
| tree | b94dd89e62e024c29b757a23b3d0bca5e0d7c228 | |
| parent | 96c8c830869c9e7e896a67ad30360195cff0c4d8 (diff) | |
| download | wireshark-a8ec8a3a6bcb1f0fc05b10355f1af7434d01fbf2.tar.gz | |
Windows: update c-ares to v1.13.0 and zlib to v1.2.11
Change-Id: I17f92dd76dc53732d5d764c2a129acb7b69bbe08
Reviewed-on: https://code.wireshark.org/review/22440
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/win-setup.ps1 | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1283fa4c86..f9235bcbdb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -846,7 +846,7 @@ endif() if(ENABLE_ZLIB) if (WIN32) # On Windows we build our own version of zlib, so add the paths - set(ZLIB_SRC_DIR "${_PROJECT_LIB_DIR}/zlib-1.2.8-ws") + set(ZLIB_SRC_DIR "${_PROJECT_LIB_DIR}/zlib-1.2.11-ws") set(SKIP_INSTALL_ALL True) # We copy the DLL ourselves. add_subdirectory("${ZLIB_SRC_DIR}" "${CMAKE_BINARY_DIR}/zlib") unset(SKIP_INSTALL_ALL) diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index fec9c1bd47..0d1195f05e 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -99,13 +99,13 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2017-05-11" -$Win32CurrentTag = "2017-05-11" +$Win64CurrentTag = "2017-06-28" +$Win32CurrentTag = "2017-06-28" # Archive file / subdir. $Win64Archives = @{ "AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622"; - "c-ares-1.12.0-1-win64ws.zip" = ""; + "c-ares-1.13.0-win64ws.zip" = ""; "GeoIP-1.6.10-win64ws.zip" = ""; "gnutls-3.4.11-1.35-win64ws.zip" = ""; "gtk+-bundle_2.24.23-3.39-2_win64ws.zip" = "gtk2"; @@ -125,12 +125,12 @@ $Win64Archives = @{ "upx303w.zip" = ""; "WinSparkle-0.5.3.zip" = ""; "WpdPack_4_1_2.zip" = ""; - "zlib-1.2.8-ws.zip" = ""; + "zlib-1.2.11-ws.zip" = ""; } $Win32Archives = @{ "AirPcap_Devpack_4_1_0_1622.zip" = "AirPcap_Devpack_4_1_0_1622"; - "c-ares-1.12.0-1-win32ws.zip" = ""; + "c-ares-1.13.0-win32ws.zip" = ""; "GeoIP-1.6.10-win32ws.zip" = ""; "gnutls-3.4.11-1.36-win32ws.zip" = ""; "gtk+-bundle_2.24.23-1.1-1_win32ws.zip" = "gtk2"; @@ -150,7 +150,7 @@ $Win32Archives = @{ "upx303w.zip" = ""; "WinSparkle-0.5.3.zip" = ""; "WpdPack_4_1_2.zip" = ""; - "zlib-1.2.8-ws.zip" = ""; + "zlib-1.2.11-ws.zip" = ""; } # Plain file downloads @@ -177,7 +177,7 @@ if ($Platform -eq "win32") { $CleanupItems = @( "c-ares-1.9.1-1-win??ws" - "c-ares-1.1?.0-win??ws" + "c-ares-1.1*-win??ws" "gnutls-3.1.22-*-win??ws" "gnutls-3.2.15-*-win??ws" "gnutls-3.4.11-*-win??ws" @@ -206,7 +206,7 @@ $CleanupItems = @( "user-guide" "zlib-1.2.5" "zlib-1.2.8" - "zlib-1.2.8-ws" + "zlib-1.2.*-ws" "AirPcap_Devpack_4_1_0_1622" "GeoIP-1.*-win??ws" "WinSparkle-0.3-44-g2c8d9d3-win??ws" |