Merge pull request #122172 from fabaff/bump-metasploit

metasploit: 6.0.42 -> 6.0.43
This commit is contained in:
Fabian Affolter 2021-05-08 13:36:11 +02:00 committed by GitHub
commit 6b328db916
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 76 additions and 51 deletions

View file

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
source "https://rubygems.org" source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.42" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.43"

View file

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 57fda58cdde0909e975394b34a8daa39c97f7e1c revision: 08fd394933eadca2b90e4de4ecce7f478af1f161
ref: refs/tags/6.0.42 ref: refs/tags/6.0.43
specs: specs:
metasploit-framework (6.0.42) metasploit-framework (6.0.43)
actionpack (~> 5.2.2) actionpack (~> 5.2.2)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
@ -23,6 +23,7 @@ GIT
faye-websocket faye-websocket
filesize filesize
hrr_rb_ssh (= 0.3.0.pre2) hrr_rb_ssh (= 0.3.0.pre2)
http-cookie
irb irb
jsobfu jsobfu
json json
@ -30,7 +31,7 @@ GIT
metasploit-concern (~> 3.0.0) metasploit-concern (~> 3.0.0)
metasploit-credential (~> 4.0.0) metasploit-credential (~> 4.0.0)
metasploit-model (~> 3.1.0) metasploit-model (~> 3.1.0)
metasploit-payloads (= 2.0.44) metasploit-payloads (= 2.0.45)
metasploit_data_models (~> 4.1.0) metasploit_data_models (~> 4.1.0)
metasploit_payloads-mettle (= 1.0.9) metasploit_payloads-mettle (= 1.0.9)
mqtt mqtt
@ -92,26 +93,26 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
Ascii85 (1.1.0) Ascii85 (1.1.0)
actionpack (5.2.5) actionpack (5.2.6)
actionview (= 5.2.5) actionview (= 5.2.6)
activesupport (= 5.2.5) activesupport (= 5.2.6)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.5) actionview (5.2.6)
activesupport (= 5.2.5) activesupport (= 5.2.6)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3) rails-html-sanitizer (~> 1.0, >= 1.0.3)
activemodel (5.2.5) activemodel (5.2.6)
activesupport (= 5.2.5) activesupport (= 5.2.6)
activerecord (5.2.5) activerecord (5.2.6)
activemodel (= 5.2.5) activemodel (= 5.2.6)
activesupport (= 5.2.5) activesupport (= 5.2.6)
arel (>= 9.0) arel (>= 9.0)
activesupport (5.2.5) activesupport (5.2.6)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
minitest (~> 5.1) minitest (~> 5.1)
@ -123,7 +124,7 @@ GEM
arel-helpers (2.12.0) arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7) activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1) aws-eventstream (1.1.1)
aws-partitions (1.449.0) aws-partitions (1.452.0)
aws-sdk-core (3.114.0) aws-sdk-core (3.114.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.239.0)
@ -138,7 +139,7 @@ GEM
aws-sdk-kms (1.43.0) aws-sdk-kms (1.43.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.94.0) aws-sdk-s3 (1.94.1)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1) aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
@ -152,9 +153,11 @@ GEM
concurrent-ruby (1.0.5) concurrent-ruby (1.0.5)
cookiejar (0.3.3) cookiejar (0.3.3)
crass (1.0.6) crass (1.0.6)
daemons (1.3.1) daemons (1.4.0)
dnsruby (1.61.5) dnsruby (1.61.5)
simpleidn (~> 0.1) simpleidn (~> 0.1)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
ed25519 (1.2.4) ed25519 (1.2.4)
em-http-request (1.1.7) em-http-request (1.1.7)
addressable (>= 2.3.4) addressable (>= 2.3.4)
@ -184,6 +187,8 @@ GEM
hashery (2.1.2) hashery (2.1.2)
hrr_rb_ssh (0.3.0.pre2) hrr_rb_ssh (0.3.0.pre2)
ed25519 (~> 1.2) ed25519 (~> 1.2)
http-cookie (1.0.3)
domain_name (~> 0.5)
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (1.8.10) i18n (1.8.10)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
@ -216,7 +221,7 @@ GEM
activemodel (~> 5.2.2) activemodel (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
railties (~> 5.2.2) railties (~> 5.2.2)
metasploit-payloads (2.0.44) metasploit-payloads (2.0.45)
metasploit_data_models (4.1.4) metasploit_data_models (4.1.4)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
@ -263,7 +268,7 @@ GEM
ttfunk ttfunk
pg (1.2.3) pg (1.2.3)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.2.2) puma (5.3.0)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.5.2) racc (1.5.2)
rack (2.2.3) rack (2.2.3)
@ -276,9 +281,9 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0) rails-html-sanitizer (1.3.0)
loofah (~> 2.3) loofah (~> 2.3)
railties (5.2.5) railties (5.2.6)
actionpack (= 5.2.5) actionpack (= 5.2.6)
activesupport (= 5.2.5) activesupport (= 5.2.6)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0) thor (>= 0.19.0, < 2.0)

View file

@ -8,13 +8,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.0.42"; version = "6.0.43";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-L4P6QUERoH0JnaTpzrA0UWUYqRepBS97fSexKa8JZQU="; sha256 = "sha256-dj+8DodQnCJjwhxTD/TjccJvSA8KSjiwiX65V6CIpuQ=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View file

@ -4,50 +4,50 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m"; sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y";
type = "gem"; type = "gem";
}; };
version = "5.2.5"; version = "5.2.6";
}; };
actionview = { actionview = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i"; sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg";
type = "gem"; type = "gem";
}; };
version = "5.2.5"; version = "5.2.6";
}; };
activemodel = { activemodel = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b"; sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6";
type = "gem"; type = "gem";
}; };
version = "5.2.5"; version = "5.2.6";
}; };
activerecord = { activerecord = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj"; sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc";
type = "gem"; type = "gem";
}; };
version = "5.2.5"; version = "5.2.6";
}; };
activesupport = { activesupport = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj"; sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj";
type = "gem"; type = "gem";
}; };
version = "5.2.5"; version = "5.2.6";
}; };
addressable = { addressable = {
groups = ["default"]; groups = ["default"];
@ -114,10 +114,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18d990l9mraf8j1akfn1f4l3y6n7shhnr9x5naj6pzv5z3y3dzf4"; sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55";
type = "gem"; type = "gem";
}; };
version = "1.449.0"; version = "1.452.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
@ -164,10 +164,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "119f1nf2q1k7xg7h2agm7g8i87abfdkad0l78hhk6y4f3v02niv9"; sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9";
type = "gem"; type = "gem";
}; };
version = "1.94.0"; version = "1.94.1";
}; };
aws-sigv4 = { aws-sigv4 = {
groups = ["default"]; groups = ["default"];
@ -264,10 +264,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; sha256 = "1fki1aipqafqlg8xy25ykk0ql1dciy9kk6lcp5gzgkh9ccmaxzf3";
type = "gem"; type = "gem";
}; };
version = "1.3.1"; version = "1.4.0";
}; };
dnsruby = { dnsruby = {
groups = ["default"]; groups = ["default"];
@ -279,6 +279,16 @@
}; };
version = "1.61.5"; version = "1.61.5";
}; };
domain_name = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0";
type = "gem";
};
version = "0.5.20190701";
};
ed25519 = { ed25519 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -419,6 +429,16 @@
}; };
version = "0.3.0.pre2"; version = "0.3.0.pre2";
}; };
http-cookie = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g";
type = "gem";
};
version = "1.0.3";
};
"http_parser.rb" = { "http_parser.rb" = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
@ -534,12 +554,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "57fda58cdde0909e975394b34a8daa39c97f7e1c"; rev = "08fd394933eadca2b90e4de4ecce7f478af1f161";
sha256 = "01b516pjkc97gmxjy1d92ylihrai6jqcxsd4kl4pv80i850zm0rg"; sha256 = "1r56i2h5gfbyi6q3hjha1x46zhkiwgs0ylqwq9ij572hhw7bqgvn";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.0.42"; version = "6.0.43";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -556,10 +576,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0z0cgg4fghcpj3pvjyqnnzll5zvhwpv68dvpz2y0zgij14cvfg7y"; sha256 = "09w5r7g19n845h9ii66h8cx9ikgv69d59ry67183h7c76mhzvm9c";
type = "gem"; type = "gem";
}; };
version = "2.0.44"; version = "2.0.45";
}; };
metasploit_data_models = { metasploit_data_models = {
groups = ["default"]; groups = ["default"];
@ -826,10 +846,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k"; sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1";
type = "gem"; type = "gem";
}; };
version = "5.2.2"; version = "5.3.0";
}; };
racc = { racc = {
groups = ["default"]; groups = ["default"];
@ -896,10 +916,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9"; sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k";
type = "gem"; type = "gem";
}; };
version = "5.2.5"; version = "5.2.6";
}; };
rake = { rake = {
groups = ["default"]; groups = ["default"];