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

Windows: upgrade Npcap to 0.99-r9 

Change-Id: Ie2b90a448415d7b8637aac03cee07fa9e5ab217f
Reviewed-on: https://code.wireshark.org/review/31691
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2019-01-23 12:09:43 +01:00
parent 57fd0a3be2
commit 32c54ef846
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packaging/nsis/CMakeLists.txt
View File

@ -51,7 +51,7 @@ file(TO_NATIVE_PATH "${GLIB2_DLL_DIR}/../.." _wireshark_lib_dir)
set(WIRESHARK_LIB_DIR "${_wireshark_lib_dir}")
# Must match ${WIRESHARK_LIB_DIR}/Npcap-X.Y.Z.exe
set(NPCAP_PACKAGE_VERSION "0.99-r8")
set(NPCAP_PACKAGE_VERSION "0.99-r9")
set(USBPCAP_PACKAGE_VERSION "1.2.0.4")

2
packaging/wix/README
View File

@ -18,7 +18,7 @@ a file (custom_mibs.txt, etc) for inclusion
Known issues:
1. It does not include installing WinPcap or USBPcap (the NSIS installer does). These
1. It does not include installing Npcap or USBPcap (the NSIS installer does). These
currently come as NSIS installers and it seems it would make more sense to "bundle" them
with WiX rather than include them as part of the Wireshark.msi.
2. Needs more flexible handling of VC CRT Merge module (need build script to provide

8
tools/win-setup.ps1
View File

@ -69,8 +69,8 @@ Param(
# trouble instead of trying to catch exceptions everywhere.
$ErrorActionPreference = "Stop"
$Win64CurrentTag = "2019-01-18"
$Win32CurrentTag = "2019-01-18"
$Win64CurrentTag = "2019-01-23"
$Win32CurrentTag = "2019-01-23"
# Archive file / SHA256
$Win64Archives = @{
@ -127,12 +127,12 @@ $ArchivesSubDirectory = @{
# Plain file downloads
$Win32Files = @{
"npcap-0.99-r8.exe" = "c8f996c430d7d6395edf94c0a85c849d034c324bd234b74a0f6ac62e4f0f04e0";
"npcap-0.99-r9.exe" = "fa35408528c4254cec6104f25f59b01fb7d35cd153507fc54a7291edc8824f7f";
"USBPcapSetup-1.2.0.4.exe" = "0a5ac30b0264e058f262e9c28e5865af7b836620ca5d68bb4bb42c9a808f7a43";
}
$Win64Files = @{
"npcap-0.99-r8.exe" = "c8f996c430d7d6395edf94c0a85c849d034c324bd234b74a0f6ac62e4f0f04e0";
"npcap-0.99-r9.exe" = "fa35408528c4254cec6104f25f59b01fb7d35cd153507fc54a7291edc8824f7f";
"USBPcapSetup-1.2.0.4.exe" = "0a5ac30b0264e058f262e9c28e5865af7b836620ca5d68bb4bb42c9a808f7a43";
}