aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--packaging/nsis/CMakeLists.txt2
-rw-r--r--packaging/wix/README2
-rw-r--r--tools/win-setup.ps18
3 files changed, 6 insertions, 6 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index aaee4c595e..71b79a5c50 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -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")
diff --git a/packaging/wix/README b/packaging/wix/README
index e800ed62fa..cfd5f187f4 100644
--- a/packaging/wix/README
+++ b/packaging/wix/README
@@ -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
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index ebd2518681..2552a741d8 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-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";
}