Merge pull request #155819 from fabaff/bump-metasploit

metasploit: 6.1.24 -> 6.1.25
This commit is contained in:
Fabian Affolter 2022-01-20 15:13:30 +01:00 committed by GitHub
commit 4c6173f046
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 76 additions and 53 deletions

View file

@ -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.24"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.25"

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 0991344df7a2b343b99e83507bf217137f11801d
ref: refs/tags/6.1.24
revision: 4a1ba0f9095d5c6e954ba58bc71d02feefc411a5
ref: refs/tags/6.1.25
specs:
metasploit-framework (6.1.24)
metasploit-framework (6.1.25)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -19,12 +19,11 @@ GIT
em-http-request
eventmachine
faker
faraday (= 1.8.0)
faraday
faye-websocket
filesize
hrr_rb_ssh-ed25519
http-cookie
io-console (= 0.5.9)
irb
jsobfu
json
@ -129,13 +128,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.547.0)
aws-sdk-core (3.125.2)
aws-partitions (1.549.0)
aws-sdk-core (3.125.5)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.291.0)
aws-sdk-ec2 (1.294.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.65.0)
@ -153,17 +152,17 @@ GEM
bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0)
bindata (2.4.10)
bson (4.13.0)
bson (4.14.0)
builder (3.2.4)
concurrent-ruby (1.0.5)
cookiejar (0.3.3)
crass (1.0.6)
daemons (1.4.1)
dnsruby (1.61.7)
dnsruby (1.61.9)
simpleidn (~> 0.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
ed25519 (1.2.4)
ed25519 (1.3.0)
em-http-request (1.1.7)
addressable (>= 2.3.4)
cookiejar (!= 0.3.1)
@ -176,25 +175,29 @@ GEM
eventmachine (1.2.7)
faker (2.19.0)
i18n (>= 1.6, < 2)
faraday (1.8.0)
faraday (1.9.3)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-httpclient (~> 1.0)
faraday-multipart (~> 1.0)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-net_http_persistent (~> 1.0)
faraday-patron (~> 1.0)
faraday-rack (~> 1.0)
multipart-post (>= 1.2, < 3)
faraday-retry (~> 1.0)
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.3)
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)
@ -215,7 +218,7 @@ GEM
httpclient (2.8.3)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
io-console (0.5.9)
io-console (0.5.11)
irb (1.3.6)
reline (>= 0.2.5)
jmespath (1.5.0)
@ -264,7 +267,7 @@ GEM
mini_portile2 (2.7.1)
minitest (5.15.0)
mqtt (0.5.0)
msgpack (1.4.2)
msgpack (1.4.3)
multi_json (1.15.0)
multipart-post (2.1.1)
mustermann (1.1.1)
@ -275,11 +278,11 @@ GEM
network_interface (0.0.2)
nexpose (7.3.0)
nio4r (2.5.8)
nokogiri (1.13.0)
nokogiri (1.13.1)
mini_portile2 (~> 2.7.0)
racc (~> 1.4)
nori (2.6.0)
octokit (4.21.0)
octokit (4.22.0)
faraday (>= 0.9)
sawyer (~> 0.8.0, >= 0.5.3)
openssl-ccm (1.2.2)
@ -373,7 +376,7 @@ GEM
rex-text
rexml (3.2.5)
rkelly-remix (0.0.7)
ruby-macho (2.5.1)
ruby-macho (3.0.0)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
ruby_smb (3.0.0)
@ -419,7 +422,7 @@ GEM
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
win32api (0.1.0)
windows_error (0.1.2)
windows_error (0.1.3)
winrm (2.3.6)
builder (>= 2.1.2)
erubi (~> 1.8)

View file

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.1.24";
version = "6.1.25";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-eCnudckLCiE6L2EC/IHqbXdOrGBkSmWZHyHFvvFUqQ4=";
sha256 = "sha256-lfTueN3s7wsyQRrulsx7TKVMhOu6//4Z6DDjR/Lm6Vw=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -104,30 +104,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1fi4irlxam3bmvafm6iiqj0vlzqg10vc4bzznl4c5w6zmg0lzp6b";
sha256 = "02d86hv5jfs27hszd9d92q31dz3wl3s1racimkhb7nx8xg0l9ldj";
type = "gem";
};
version = "1.547.0";
version = "1.549.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jp8nz18r9skri118haqy0slqmr5bwjw7xvrghcmj9lx409f0m6p";
sha256 = "1i6835n7d2ss3k3ljwbw8by0fagymk0122ill3i9ipghz21xpqld";
type = "gem";
};
version = "3.125.2";
version = "3.125.5";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1awg6wdq5nqlxq5zqj2h06898d9b24ci3jnczpss9pqgis4g0w0n";
sha256 = "0rzbd111n7pgzpgjabcxi2mpnkxf3fcxkvy4rqidyf80m4633gwy";
type = "gem";
};
version = "1.291.0";
version = "1.294.0";
};
aws-sdk-iam = {
groups = ["default"];
@ -204,10 +204,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ir2fml3d6gjzqhiqpxl8rqmgrp5lqrx8xdwz9cmcnxhfzmqgxbp";
sha256 = "0vfwqzd89542xm8sc1ni6jvjy6wgycnri67q7agxnc5jmwawmcgf";
type = "gem";
};
version = "4.13.0";
version = "4.14.0";
};
builder = {
groups = ["default"];
@ -264,10 +264,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pbhj4xmj4262in6c1nwl5ssw0qypg8ysjrrkwn2akkzbxzy9rfq";
sha256 = "0v8jfxamsdvs8rdl28ylcp5xphb03kmf5f1aqrnr2020ras618kc";
type = "gem";
};
version = "1.61.7";
version = "1.61.9";
};
domain_name = {
groups = ["default"];
@ -284,10 +284,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw";
sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
type = "gem";
};
version = "1.2.4";
version = "1.3.0";
};
em-http-request = {
groups = ["default"];
@ -344,10 +344,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0afhlqgby2cizcwgh7h2sq5f77q01axjbdl25bsvfwsry9n7gyyi";
sha256 = "0y32gj994ll3zlcqjmwp78r7s03iiwayij6fz2pjpkfywgvp71s6";
type = "gem";
};
version = "1.8.0";
version = "1.9.3";
};
faraday-em_http = {
groups = ["default"];
@ -389,6 +389,16 @@
};
version = "1.0.1";
};
faraday-multipart = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j";
type = "gem";
};
version = "1.0.3";
};
faraday-net_http = {
groups = ["default"];
platforms = [];
@ -429,6 +439,16 @@
};
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 = [];
@ -554,10 +574,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0pmafwxh8z1apnk7bb1ibnbhfrgb1jgilxm4j8d0fcqlc2ggmbja";
sha256 = "0r9kxrf9jccrr329pa3s37rf16vy426cbqmfwxkav1fidwvih93y";
type = "gem";
};
version = "0.5.9";
version = "0.5.11";
};
irb = {
groups = ["default"];
@ -664,12 +684,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "0991344df7a2b343b99e83507bf217137f11801d";
sha256 = "03m9akqvxi913ycnajk4c2n4wxvdxa0zq0k15wx222hbr5sywabq";
rev = "4a1ba0f9095d5c6e954ba58bc71d02feefc411a5";
sha256 = "0p79wvr4gqrhx0czxzxsxf24r9acgg69dvhs84r0pvzcvmwfxx4m";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.1.24";
version = "6.1.25";
};
metasploit-model = {
groups = ["default"];
@ -756,10 +776,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06iajjyhx0rvpn4yr3h1hc4w4w3k59bdmfhxnjzzh76wsrdxxrc6";
sha256 = "14kg9wdfls7s63lds9blrd77n8mx780bzyh05dj8kn0aimw3l9dx";
type = "gem";
};
version = "1.4.2";
version = "1.4.3";
};
multi_json = {
groups = ["default"];
@ -857,10 +877,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1cvx23d8z1nf5nsr5cv55m5dhr3f1bnvgdfqqfnjvhcd8cfnkgcd";
sha256 = "1zqzawia52cdcmi55lp7v8jmiqyw7pcpwsksqlnirwfm3f7bnf11";
type = "gem";
};
version = "1.13.0";
version = "1.13.1";
};
nori = {
groups = ["default"];
@ -877,10 +897,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ak64rb48d8z98nw6q70r6i0i3ivv61iqla40ss5l79491qfnn27";
sha256 = "1nmdd7klyinvrrv2mggwwmc99ykaq7i379j00i37hvvaqx4giifj";
type = "gem";
};
version = "4.21.0";
version = "4.22.0";
};
openssl-ccm = {
groups = ["default"];
@ -1307,10 +1327,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jgmhj4srl7cck1ipbjys6q4klcs473gq90bm59baw4j1wpfaxch";
sha256 = "0sg0kzqrldx9mlpvymif3dcgz8j8q1nc8jaszrd03nfh5bvp3fd5";
type = "gem";
};
version = "2.5.1";
version = "3.0.0";
};
ruby-rc4 = {
groups = ["default"];
@ -1567,10 +1587,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kbcv9j5sc7pvjzf1dkp6h69i6lmj205zyy2arxcfgqg11bsz2kp";
sha256 = "1dy35rfdmj6pfhdicix1kcgpj5y7844a43i6bnklngn7b1wmy3av";
type = "gem";
};
version = "0.1.2";
version = "0.1.3";
};
winrm = {
groups = ["default"];