diff --git a/config/software/winpcap-devpack.rb b/config/software/npcap-sdk.rb similarity index 83% rename from config/software/winpcap-devpack.rb rename to config/software/npcap-sdk.rb index a47c4b06..512858bb 100644 --- a/config/software/winpcap-devpack.rb +++ b/config/software/npcap-sdk.rb @@ -14,19 +14,17 @@ # limitations under the License. # -name "winpcap-devpack" -default_version "4.1.2" +name "npcap-sdk" +default_version "1.13" -version "4.1.2" do - source md5: "bae2236af062b0900ad1416b2c4878b9" +version "1.13" do + source md5: "2067b3975763ddf61d4114d28d9d6c9b" end dependency "ruby-windows" dependency "ruby-windows-devkit" -relative_path "WpdPack" - -source url: "https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip" +source url: "https://npcap.com/dist/npcap-sdk-#{version}.zip" build do ruby_api_version = "3.1.0" diff --git a/config/software/pcaprub.rb b/config/software/pcaprub.rb index 5672b235..5ee98e6c 100644 --- a/config/software/pcaprub.rb +++ b/config/software/pcaprub.rb @@ -20,7 +20,7 @@ if windows? dependency "ruby-windows" dependency "ruby-windows-devkit" - dependency "winpcap-devpack" + dependency "npcap-sdk" else dependency "ruby" dependency "libpcap" @@ -33,8 +33,7 @@ env = with_standard_compiler_flags(with_embedded_path) env['SSL_CERT_FILE'] = "#{install_dir}/embedded/ssl/cert.pem" - # We need to create the pcaprub gem ourselves until 0.13.2 is released (https://github.com/pcaprub/pcaprub/issues/67) - # Use version of pcaprub relative to the current directory + # Support a custom build of pcaprub relative to the current directory local_pcaprub_checkout = File.expand_path(File.join(Dir.pwd, "..", "pcaprub")) command "echo checking for path: #{local_pcaprub_checkout}", env: env if File.exist?(local_pcaprub_checkout) diff --git a/local/cache b/local/cache index 0ad37117..d4228bcc 160000 --- a/local/cache +++ b/local/cache @@ -1 +1 @@ -Subproject commit 0ad37117f09e0fd78f109c36a17a48421b2ac7c6 +Subproject commit d4228bcc4ab85e60d10f05bab34e6daed28ba2f0