Merge pull request #115384 from fabaff/bump-metasploit

metasploit: 6.0.31 -> 6.0.33
This commit is contained in:
Sandro 2021-03-08 09:41:52 +01:00 committed by GitHub
commit 806f057eff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 49 additions and 49 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.31" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.33"

View File

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 56ef940a085620b127d61a516bc10241a795f92b revision: 76926232b9c92df4832d986513fe89b8c1d53f1f
ref: refs/tags/6.0.31 ref: refs/tags/6.0.33
specs: specs:
metasploit-framework (6.0.31) metasploit-framework (6.0.33)
actionpack (~> 5.2.2) actionpack (~> 5.2.2)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
@ -31,7 +31,7 @@ GIT
metasploit-concern metasploit-concern
metasploit-credential metasploit-credential
metasploit-model metasploit-model
metasploit-payloads (= 2.0.28) metasploit-payloads (= 2.0.34)
metasploit_data_models metasploit_data_models
metasploit_payloads-mettle (= 1.0.6) metasploit_payloads-mettle (= 1.0.6)
mqtt mqtt
@ -123,14 +123,14 @@ GEM
arel (9.0.0) arel (9.0.0)
arel-helpers (2.12.0) arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7) activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.0) aws-eventstream (1.1.1)
aws-partitions (1.428.0) aws-partitions (1.431.1)
aws-sdk-core (3.112.0) aws-sdk-core (3.112.1)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-ec2 (1.225.0) aws-sdk-ec2 (1.226.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-iam (1.48.0) aws-sdk-iam (1.48.0)
@ -139,11 +139,11 @@ GEM
aws-sdk-kms (1.42.0) aws-sdk-kms (1.42.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.88.1) aws-sdk-s3 (1.89.0)
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)
aws-sigv4 (1.2.2) aws-sigv4 (1.2.3)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16) bcrypt (3.1.16)
bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0)
@ -186,7 +186,7 @@ GEM
i18n (1.8.9) i18n (1.8.9)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
io-console (0.5.8) io-console (0.5.8)
irb (1.3.3) irb (1.3.4)
reline (>= 0.1.5) reline (>= 0.1.5)
jmespath (1.4.0) jmespath (1.4.0)
jsobfu (0.4.2) jsobfu (0.4.2)
@ -214,7 +214,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.28) metasploit-payloads (2.0.34)
metasploit_data_models (4.1.2) metasploit_data_models (4.1.2)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
@ -228,7 +228,7 @@ GEM
metasploit_payloads-mettle (1.0.6) metasploit_payloads-mettle (1.0.6)
method_source (1.0.0) method_source (1.0.0)
mini_portile2 (2.5.0) mini_portile2 (2.5.0)
minitest (5.14.3) minitest (5.14.4)
mqtt (0.5.0) mqtt (0.5.0)
msgpack (1.4.2) msgpack (1.4.2)
multipart-post (2.1.1) multipart-post (2.1.1)
@ -239,7 +239,7 @@ GEM
net-ssh (6.1.0) net-ssh (6.1.0)
network_interface (0.0.2) network_interface (0.0.2)
nexpose (7.2.1) nexpose (7.2.1)
nio4r (2.5.5) nio4r (2.5.7)
nokogiri (1.11.1) nokogiri (1.11.1)
mini_portile2 (~> 2.5.0) mini_portile2 (~> 2.5.0)
racc (~> 1.4) racc (~> 1.4)
@ -261,7 +261,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.1) puma (5.2.2)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.5.2) racc (1.5.2)
rack (2.2.3) rack (2.2.3)
@ -285,7 +285,7 @@ GEM
recog (2.3.19) recog (2.3.19)
nokogiri nokogiri
redcarpet (3.5.1) redcarpet (3.5.1)
reline (0.2.3) reline (0.2.4)
io-console (~> 0.5) io-console (~> 0.5)
rex-arch (0.1.14) rex-arch (0.1.14)
rex-text rex-text
@ -332,7 +332,7 @@ GEM
rex-socket rex-socket
rex-text rex-text
rex-struct2 (0.1.3) rex-struct2 (0.1.3)
rex-text (0.2.31) rex-text (0.2.33)
rex-zip (0.1.4) rex-zip (0.1.4)
rex-text rex-text
rexml (3.2.4) rexml (3.2.4)

View File

@ -8,13 +8,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.0.31"; version = "6.0.33";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "sha256-wt7VeS8NnmJHMhry/68W1S1f9jUnsSHnhUSrCQN1qNM="; sha256 = "sha256-hIAXqohZyBJfVj4BxxYVpERZDU6sd6EnVgVax7MXQ7Q=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

View File

@ -104,40 +104,40 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; sha256 = "0jfki5ikfr8ln5cdgv4iv1643kax0bjpp29jh78chzy713274jh3";
type = "gem"; type = "gem";
}; };
version = "1.1.0"; version = "1.1.1";
}; };
aws-partitions = { aws-partitions = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "13rvpllihvpksf1jqwa2i5vbv2hhb34viaidw4rkxr3dyygkdpj8"; sha256 = "08574xgyq39z07xhbgc12882v38lgkmj0jpznpcivjca1v7dk53l";
type = "gem"; type = "gem";
}; };
version = "1.428.0"; version = "1.431.1";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "15lynby6r91p9hh5h92pg4jr8xgnjr52px5ax0p0wncdw4vz0skp"; sha256 = "0r5f7pb9dh95f7cb4rdj1z766c88735y6y6msbgzak0v8g8j3dw9";
type = "gem"; type = "gem";
}; };
version = "3.112.0"; version = "3.112.1";
}; };
aws-sdk-ec2 = { aws-sdk-ec2 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1x2f3jp8p7ag9kw7glkiq60ypqq26ra79qnhms4apqz5www86d4d"; sha256 = "0xa39m2lsdq4i0n9r2bz19nv43pjkrs54dnas7q78gl3c467wqj9";
type = "gem"; type = "gem";
}; };
version = "1.225.0"; version = "1.226.0";
}; };
aws-sdk-iam = { aws-sdk-iam = {
groups = ["default"]; groups = ["default"];
@ -164,20 +164,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "01zlv2icx3m0pq94z9fcsp1r9ivdqhfpnpbrv63fpr6m7yqww24y"; sha256 = "0mznxmpsjqf3gmb6nxkmj2niswy4vvs4ykabf5z9cvamhbvvjhbv";
type = "gem"; type = "gem";
}; };
version = "1.88.1"; version = "1.89.0";
}; };
aws-sigv4 = { aws-sigv4 = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1ll9382c1x2hp750cilh01h1cycgyhdr4cmmgx23k94hyyb8chv5"; sha256 = "1d9zhmi3mpfzkkpg7yw7s9r1dwk157kh9875j3c7gh6cy95lmmaw";
type = "gem"; type = "gem";
}; };
version = "1.2.2"; version = "1.2.3";
}; };
bcrypt = { bcrypt = {
groups = ["default"]; groups = ["default"];
@ -444,10 +444,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "00c95xk8c9wzcs5imsrm85jk06y8l4dbnzhvqap98nprr9mxxnvl"; sha256 = "1zf8n7s823rs5byzxpin626hd532ql0w5hdj1i3bds3h8h5gvxwb";
type = "gem"; type = "gem";
}; };
version = "1.3.3"; version = "1.3.4";
}; };
jmespath = { jmespath = {
groups = ["default"]; groups = ["default"];
@ -524,12 +524,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "56ef940a085620b127d61a516bc10241a795f92b"; rev = "76926232b9c92df4832d986513fe89b8c1d53f1f";
sha256 = "1lx8fl1hkas4hpkj3c976pv5ybfm2spzzwhs693n57hd5xwxbpn2"; sha256 = "1d232yrwfnh5aqks2xxc9q6mji542lbcf09yargi5j2ri2m1g044";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.0.31"; version = "6.0.33";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -546,10 +546,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1xln6zgdiimrbwjbdhi9008bjhmwqm13zky4310pvr7g8riffwqx"; sha256 = "1n0npcd6im6h225pd3abcydsxg9n3hmarmdssy66x4g8wpiifbrp";
type = "gem"; type = "gem";
}; };
version = "2.0.28"; version = "2.0.34";
}; };
metasploit_data_models = { metasploit_data_models = {
groups = ["default"]; groups = ["default"];
@ -596,10 +596,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ipjhdw8ds6q9h7bs3iw28bjrwkwp215hr4l3xf6215fsl80ky5j"; sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl";
type = "gem"; type = "gem";
}; };
version = "5.14.3"; version = "5.14.4";
}; };
mqtt = { mqtt = {
groups = ["default"]; groups = ["default"];
@ -696,10 +696,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0xbrmq1pvmszrwf40lzwmf8krs2b56720i7wsz9gh274qljkzklf"; sha256 = "00fwz0qq7agd2xkdz02i8li236qvwhma3p0jdn5bdvc21b7ydzd5";
type = "gem"; type = "gem";
}; };
version = "2.5.5"; version = "2.5.7";
}; };
nokogiri = { nokogiri = {
groups = ["default"]; groups = ["default"];
@ -816,10 +816,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "10kj484ppkjdg1j8jac4bxdv1082bd6g6xhrj70chlp7lkgl8ggh"; sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k";
type = "gem"; type = "gem";
}; };
version = "5.2.1"; version = "5.2.2";
}; };
racc = { racc = {
groups = ["default"]; groups = ["default"];
@ -936,10 +936,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "18xpix2hn4x4hihn0fjsv6i7jr7zjfbwzs94hwn48klyq3yrym2h"; sha256 = "15gcafrzp9qzfv65cjapifpqg7cckyr14m9xw86fi56d2b6jms8b";
type = "gem"; type = "gem";
}; };
version = "0.2.3"; version = "0.2.4";
}; };
rex-arch = { rex-arch = {
groups = ["default"]; groups = ["default"];
@ -1106,10 +1106,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "078bdybz7cw3zd0mr59qgr1x6pifnn352636s74i1ncqzrzni46b"; sha256 = "1933p6fri27d2gscws43k1v8jw1821l5j4yfi9z97ch5l80mv1zr";
type = "gem"; type = "gem";
}; };
version = "0.2.31"; version = "0.2.33";
}; };
rex-zip = { rex-zip = {
groups = ["default"]; groups = ["default"];