diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2019-01-23 12:09:43 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2019-01-23 14:46:38 +0000 |
| commit | 32c54ef846a9fa9c20c77f1cd705322c467a1cd6 (patch) | |
| tree | 28a0ff94b52784a28080bb8be67034e4d0430dba /packaging | |
| parent | 57fd0a3be207fee7bc1d1d0e725fb1fa2e440064 (diff) | |
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>
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/wix/README | 2 |
2 files changed, 2 insertions, 2 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 |