osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Windows: upgrade USBPcap to 1.2.0.4 

Change-Id: I1ab4bbc410f2f896aea323c3d4884207150f9beb
Ping-Bug: 14657
Bug: 14982
Reviewed-on: https://code.wireshark.org/review/29154
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2018-08-15 22:31:15 +02:00
parent 92872ee7ec
commit 15ef9039a7
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

@ -54,7 +54,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.2.0.3")
set(USBPCAP_DISPLAY_VERSION "1.2.0.4")
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.2.0.3"
!define USBPCAP_DISPLAY_VERSION "1.2.0.4"
!define VERSION @VERSION@
!define VERSION_MAJOR @VERSION_MAJOR@
!define VERSION_MINOR @VERSION_MINOR@

2
packaging/wix/CMakeLists.txt
View File

@ -76,7 +76,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.2.0.3")
set(USBPCAP_DISPLAY_VERSION "1.2.0.4")
set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION}.${PROJECT_BUILD_VERSION})

8
tools/win-setup.ps1
View File

@ -69,8 +69,8 @@ Param(
# trouble instead of trying to catch exceptions everywhere.
$ErrorActionPreference = "Stop"
$Win64CurrentTag = "2018-08-04"
$Win32CurrentTag = "2018-08-04"
$Win64CurrentTag = "2018-08-15"
$Win32CurrentTag = "2018-08-15"
# Archive file / SHA256
$Win64Archives = @{
@ -132,12 +132,12 @@ $ArchivesSubDirectory = @{
$Win32Files = @{
"WinPcap_4_1_3.exe" = "fc4623b113a1f603c0d9ad5f83130bd6de1c62b973be9892305132389c8588de";
"USBPcapSetup-1.2.0.3.exe" = "77a05766f91518d58a30e4983472e3feb64a8479ed16a915646dcc25b28aee9a";
"USBPcapSetup-1.2.0.4.exe" = "0a5ac30b0264e058f262e9c28e5865af7b836620ca5d68bb4bb42c9a808f7a43";
}
$Win64Files = @{
"WinPcap_4_1_3.exe" = "fc4623b113a1f603c0d9ad5f83130bd6de1c62b973be9892305132389c8588de";
"USBPcapSetup-1.2.0.3.exe" = "77a05766f91518d58a30e4983472e3feb64a8479ed16a915646dcc25b28aee9a";
"USBPcapSetup-1.2.0.4.exe" = "0a5ac30b0264e058f262e9c28e5865af7b836620ca5d68bb4bb42c9a808f7a43";
}
$Archives = $Win64Archives;