From 711ac47896d62a7fece706df1aeb29aa2a05ec1b Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Mon, 1 Apr 2019 21:55:03 +0200 Subject: [PATCH] Windows: upgrade USBPcap to 1.3.0.0 and Npcap to 0.992 Change-Id: Ie27c2cb36dc90a20851f1e2c53c1af2220465a39 Reviewed-on: https://code.wireshark.org/review/32678 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- packaging/nsis/CMakeLists.txt | 4 ++-- tools/win-setup.ps1 | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 08a2f01405..204448d353 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -46,9 +46,9 @@ endif() set (MMDBRESOLVE_EXE ${MAXMINDDB_FOUND}) # Must match ${EXTRA_INSTALLER_DIR}/Npcap-X.Y.Z.exe -set(NPCAP_PACKAGE_VERSION "0.991") +set(NPCAP_PACKAGE_VERSION "0.992") -set(USBPCAP_PACKAGE_VERSION "1.2.0.4") +set(USBPCAP_PACKAGE_VERSION "1.3.0.0") set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index 4040d63297..275c6b9ee7 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -69,8 +69,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2019-03-18" -$Win32CurrentTag = "2019-03-18" +$Win64CurrentTag = "2019-04-01" +$Win32CurrentTag = "2019-04-01" # Archive file / SHA256 $Win64Archives = @{ @@ -123,13 +123,13 @@ $ArchivesSubDirectory = @{ # Plain file downloads $Win32Files = @{ - "npcap-0.991.exe" = "01edecc5f9391051c512d8cd6bf1b0d106799c5b2a89454e3e98dd14b0819f59"; - "USBPcapSetup-1.2.0.4.exe" = "0a5ac30b0264e058f262e9c28e5865af7b836620ca5d68bb4bb42c9a808f7a43"; + "npcap-0.992.exe" = "a41d6e8296ef55c71fc04c5775e5d0e5d04689fc2aaf7f6f908664db9670a1f9"; + "USBPcapSetup-1.3.0.0.exe" = "859b525bc83cddce2c04513094c50d5b5b9e0b11da685104423303280822cf8b"; } $Win64Files = @{ - "npcap-0.991.exe" = "01edecc5f9391051c512d8cd6bf1b0d106799c5b2a89454e3e98dd14b0819f59"; - "USBPcapSetup-1.2.0.4.exe" = "0a5ac30b0264e058f262e9c28e5865af7b836620ca5d68bb4bb42c9a808f7a43"; + "npcap-0.992.exe" = "a41d6e8296ef55c71fc04c5775e5d0e5d04689fc2aaf7f6f908664db9670a1f9"; + "USBPcapSetup-1.3.0.0.exe" = "859b525bc83cddce2c04513094c50d5b5b9e0b11da685104423303280822cf8b"; } $Archives = $Win64Archives;