From cd752deeac9851b0d547445ca5ff73945225697c Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Thu, 9 Dec 2021 22:41:07 +0100 Subject: [PATCH] Windows: upgrade Npcap to 1.60 --- docbook/release-notes.adoc | 4 ++-- packaging/nsis/CMakeLists.txt | 2 +- tools/win-setup.ps1 | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docbook/release-notes.adoc b/docbook/release-notes.adoc index d35a324809..395546e0c0 100644 --- a/docbook/release-notes.adoc +++ b/docbook/release-notes.adoc @@ -34,8 +34,8 @@ See the “New and Updated Features” section below for more details. The following features are new (or have been significantly updated) since version 3.6.0: -// * The Windows installers now ship with Npcap 1.55. -// They previously shipped with Npcap 1.31. +* The Windows installers now ship with Npcap 1.60. +They previously shipped with Npcap 1.55. * Display filter syntax: ** Set elements must be separated using a comma, e.g: {1, 2, "foo"}. Using only whitespace as separator was deprecated in 3.6 and is now a syntax error. diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 6d88f3e06a..5c112329b9 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -46,7 +46,7 @@ endif() set (MMDBRESOLVE_EXE ${MAXMINDDB_FOUND}) # Must match ${EXTRA_INSTALLER_DIR}/Npcap-X.Y.Z.exe -set(NPCAP_PACKAGE_VERSION "1.55") +set(NPCAP_PACKAGE_VERSION "1.60") set(USBPCAP_PACKAGE_VERSION "1.5.4.0") diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1 index b3b63e9ff2..c98cd5690a 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 = "2021-11-11" -$Win32CurrentTag = "2021-11-11" +$Win64CurrentTag = "2021-12-09" +$Win32CurrentTag = "2021-12-09" # Archive file / SHA256 $Win64Archives = @{ @@ -135,12 +135,12 @@ $ArchivesSubDirectory = @{ # Plain file downloads $Win32Files = @{ - "npcap-1.55.exe" = "0bcc56aef29b24985d7f658cd34013b08cb53ad5bf6b6ac2a982a5f6d4d95800"; + "npcap-1.60.exe" = "87d3624772b8272767a3a4ffcceecc3052489cd09e494a6c352dce5e5efa4070"; "USBPcapSetup-1.5.4.0.exe" = "87a7edf9bbbcf07b5f4373d9a192a6770d2ff3add7aa1e276e82e38582ccb622"; } $Win64Files = @{ - "npcap-1.55.exe" = "0bcc56aef29b24985d7f658cd34013b08cb53ad5bf6b6ac2a982a5f6d4d95800"; + "npcap-1.60.exe" = "87d3624772b8272767a3a4ffcceecc3052489cd09e494a6c352dce5e5efa4070"; "USBPcapSetup-1.5.4.0.exe" = "87a7edf9bbbcf07b5f4373d9a192a6770d2ff3add7aa1e276e82e38582ccb622"; }