osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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 <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2016-08-03 22:35:44 +02:00
parent 4be341b23a
commit a723a30ad4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/nsis/CMakeLists.txt
View File

@ -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})

2
packaging/nsis/config.nsh.in
View File

@ -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@

2
packaging/wix/CMakeLists.txt
View File

@ -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})

8
tools/win-setup.ps1
View File

@ -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;