diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2018-12-17 23:17:04 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-12-18 05:18:02 +0000 |
| commit | 0289b315a323b24e5168786f5a964182d2585ad2 (patch) | |
| tree | addb790751047c03290bb832e2a6806912a6b94d /packaging/nsis | |
| parent | 495a6204a42b106b7031a7fc9cc7f0a395605d69 (diff) | |
Windows: upgrade Npcap to 0.99-r8
While we are at it, let's propose by default to upgrade to Npcap when WinPcap
is intalled.
Change-Id: Id9aeb3a507127b5956185fba2b74c60cf1dfdf96
Reviewed-on: https://code.wireshark.org/review/31079
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index a758451f10..7ad4180ec6 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-r7") +set(NPCAP_PACKAGE_VERSION "0.99-r8") set(USBPCAP_PACKAGE_VERSION "1.2.0.4") diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index a9d573caf0..c3dacb88c5 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -1280,8 +1280,8 @@ lbl_npcap_installed: lbl_winpcap_installed: WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 2" "Text" "$WINPCAP_NAME" - WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 4" "State" "0" - WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 5" "Text" "If selected, the currently installed $WINPCAP_NAME will be uninstalled first." + WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 4" "State" "1" + WriteINIStr "$PLUGINSDIR\NpcapPage.ini" "Field 5" "Text" "The currently installed $WINPCAP_NAME will be uninstalled first." Goto lbl_npcap_done lbl_npcap_do_install: |