From 7aff85339a41270e727a66c7d774fa73fe00dae0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 11 Jan 2022 18:32:08 +0100 Subject: [PATCH] metasploit: 6.1.23 -> 6.1.24 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 31 ++++++------- pkgs/tools/security/metasploit/default.nix | 4 +- pkgs/tools/security/metasploit/gemset.nix | 50 +++++++-------------- 4 files changed, 32 insertions(+), 55 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 66c28b5ab08..22b2cb70e0e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.23" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.24" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 77c92e9f4f6..38c9bda1434 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 7682d9ab9c404b55cfc4a221db22f74a740a6f7f - ref: refs/tags/6.1.23 + revision: 0991344df7a2b343b99e83507bf217137f11801d + ref: refs/tags/6.1.24 specs: - metasploit-framework (6.1.23) + metasploit-framework (6.1.24) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -19,11 +19,12 @@ GIT em-http-request eventmachine faker - faraday + faraday (= 1.8.0) faye-websocket filesize hrr_rb_ssh-ed25519 http-cookie + io-console (= 0.5.9) irb jsobfu json @@ -129,12 +130,12 @@ GEM activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) aws-partitions (1.547.0) - aws-sdk-core (3.125.1) + aws-sdk-core (3.125.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.290.0) + aws-sdk-ec2 (1.291.0) aws-sdk-core (~> 3, >= 3.125.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.65.0) @@ -175,33 +176,29 @@ GEM eventmachine (1.2.7) faker (2.19.0) i18n (>= 1.6, < 2) - faraday (1.9.3) + faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) + faraday-httpclient (~> 1.0.1) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) + faraday-net_http_persistent (~> 1.1) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + multipart-post (>= 1.2, < 3) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.2) - multipart-post (>= 1.2, < 3) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - faraday-retry (1.0.3) faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.15.4) + ffi (1.15.5) filesize (0.2.0) gssapi (1.3.1) ffi (>= 1.0.1) @@ -218,10 +215,10 @@ GEM httpclient (2.8.3) i18n (1.8.11) concurrent-ruby (~> 1.0) - io-console (0.5.11) + io-console (0.5.9) irb (1.3.6) reline (>= 0.2.5) - jmespath (1.4.0) + jmespath (1.5.0) jsobfu (0.4.2) rkelly-remix json (2.6.1) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index c1f6e7116ad..727518fe81d 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.23"; + version = "6.1.24"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-um2WDbc7SHhbPSTamOTB0tRWl0tkkNGnY0lm+dU7iIA="; + sha256 = "sha256-eCnudckLCiE6L2EC/IHqbXdOrGBkSmWZHyHFvvFUqQ4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index cbf772acdb6..a9bcf2c227f 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,20 +114,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17v517dkrazxs9n64c8qdkwhb5fj9flnc2lp99gph6307ciz47w1"; + sha256 = "1jp8nz18r9skri118haqy0slqmr5bwjw7xvrghcmj9lx409f0m6p"; type = "gem"; }; - version = "3.125.1"; + version = "3.125.2"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "147z6prv5cj5scnd3rpjqw0pvbj7yvp9b7lzl786c0jil1pvjm0p"; + sha256 = "1awg6wdq5nqlxq5zqj2h06898d9b24ci3jnczpss9pqgis4g0w0n"; type = "gem"; }; - version = "1.290.0"; + version = "1.291.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -344,10 +344,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6"; + sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi"; type = "gem"; }; - version = "1.9.3"; + version = "1.8.0"; }; faraday-em_http = { groups = ["default"]; @@ -389,16 +389,6 @@ }; version = "1.0.1"; }; - faraday-multipart = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ih6nkjx4ph00iybicn0ssjkjnhnjd2xsl9g83lkg64w8q5s0i87"; - type = "gem"; - }; - version = "1.0.2"; - }; faraday-net_http = { groups = ["default"]; platforms = []; @@ -439,16 +429,6 @@ }; version = "1.0.0"; }; - faraday-retry = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; - }; faye-websocket = { groups = ["default"]; platforms = []; @@ -464,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.4"; + version = "1.15.5"; }; filesize = { groups = ["default"]; @@ -574,10 +554,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r9kxrf9jccrr329pa3s37rf16vy426cbqmfwxkav1fidwvih93y"; + sha256 = "0pmafwxh8z1apnk7bb1ibnbhfrgb1jgilxm4j8d0fcqlc2ggmbja"; type = "gem"; }; - version = "0.5.11"; + version = "0.5.9"; }; irb = { groups = ["default"]; @@ -594,10 +574,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + sha256 = "1ylph158dc3ql6cvkik00ab6gf2k1rv2dii63m196xclhkzwfyan"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; jsobfu = { groups = ["default"]; @@ -684,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "7682d9ab9c404b55cfc4a221db22f74a740a6f7f"; - sha256 = "10487gazjrj9cfkx34349fbmdm6jq7j9ini47mdphj1vnw6rcvds"; + rev = "0991344df7a2b343b99e83507bf217137f11801d"; + sha256 = "03m9akqvxi913ycnajk4c2n4wxvdxa0zq0k15wx222hbr5sywabq"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.23"; + version = "6.1.24"; }; metasploit-model = { groups = ["default"];