From a723a30ad4cde5aa8d30b4479fd4b3280b007ae0 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 3 Aug 2016 22:35:44 +0200 Subject: [PATCH] Update USBPcap installer packaged in our Windows installer This new version contains kernel drivers with an EV certificate that is cross-signed by Microsoft as it will become mandatory. See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/driver-signing-changes-in-windows-10-version-1607/ for details. Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625 Reviewed-on: https://code.wireshark.org/review/16862 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- packaging/nsis/CMakeLists.txt | 2 +- packaging/nsis/config.nsh.in | 2 +- packaging/wix/CMakeLists.txt | 2 +- tools/win-setup.ps1 | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 3452568999..4072771c5b 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -66,7 +66,7 @@ set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}") set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION}) string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}") -set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3") +set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5") set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION}) diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index 0c5e7dee25..c119d04fd4 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -13,7 +13,7 @@ !define WIRESHARK_LIB_DIR "@WIRESHARK_LIB_DIR@" !define WINPCAP_PACKAGE_VERSION @WINPCAP_PACKAGE_VERSION@ !define PCAP_DISPLAY_VERSION @PCAP_DISPLAY_VERSION@ -!define USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3" +!define USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5" !define VERSION @VERSION@ !define VERSION_MAJOR @VERSION_MAJOR@ !define VERSION_MINOR @VERSION_MINOR@ diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index 357152ab37..16489f0741 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -90,7 +90,7 @@ set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}") set(WINPCAP_PACKAGE_VERSION ${WINPCAP_VERSION}) string(REPLACE "_" "." PCAP_DISPLAY_VERSION "${WINPCAP_PACKAGE_VERSION}") -set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-3") +set(USBPCAP_DISPLAY_VERSION "1.1.0.0-g794bf26-5") 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 e28735ef2f..63fc5772de 100644 --- a/tools/win-setup.ps1 +++ b/tools/win-setup.ps1 @@ -101,8 +101,8 @@ Param( # trouble instead of trying to catch exceptions everywhere. $ErrorActionPreference = "Stop" -$Win64CurrentTag = "2016-06-15" -$Win32CurrentTag = "2016-06-15" +$Win64CurrentTag = "2016-08-03" +$Win32CurrentTag = "2016-08-03" # Archive file / subdir. $Win64Archives = @{ @@ -151,12 +151,12 @@ if ( @("14", "12", "11", "10") -contains $VSVersion ) { $Win32Files = @( "WinPcap_4_1_3.exe"; - "USBPcapSetup-1.1.0.0-g794bf26-3.exe"; + "USBPcapSetup-1.1.0.0-g794bf26-5.exe"; ) $Win64Files = @( "WinPcap_4_1_3.exe"; - "USBPcapSetup-1.1.0.0-g794bf26-3.exe"; + "USBPcapSetup-1.1.0.0-g794bf26-5.exe"; ) $Archives = $Win64Archives;