Merge pull request #153899 from fabaff/bump-metasploit

metasploit: 6.1.22 -> 6.1.23
This commit is contained in:
Fabian Affolter 2022-01-08 09:27:12 +01:00 committed by GitHub
commit d3895a8051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 65 additions and 41 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.22"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.23"

View File

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 3bfd2d8eeab3f8ab7efd7a46f8125a7a3bb5f2f0
ref: refs/tags/6.1.22
revision: 7682d9ab9c404b55cfc4a221db22f74a740a6f7f
ref: refs/tags/6.1.23
specs:
metasploit-framework (6.1.22)
metasploit-framework (6.1.23)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -75,7 +75,7 @@ GIT
rex-text
rex-zip
ruby-macho
ruby_smb (~> 2.0)
ruby_smb (~> 3.0)
rubyntlm
rubyzip
sinatra
@ -128,13 +128,13 @@ GEM
arel-helpers (2.14.0)
activerecord (>= 3.1.0, < 8)
aws-eventstream (1.2.0)
aws-partitions (1.543.0)
aws-sdk-core (3.125.0)
aws-partitions (1.547.0)
aws-sdk-core (3.125.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.288.0)
aws-sdk-ec2 (1.290.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.65.0)
@ -143,7 +143,7 @@ GEM
aws-sdk-kms (1.53.0)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.110.0)
aws-sdk-s3 (1.111.1)
aws-sdk-core (~> 3, >= 3.125.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@ -175,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.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)
@ -260,7 +264,7 @@ GEM
webrick
metasploit_payloads-mettle (1.0.17)
method_source (1.0.0)
mini_portile2 (2.6.1)
mini_portile2 (2.7.1)
minitest (5.15.0)
mqtt (0.5.0)
msgpack (1.4.2)
@ -274,8 +278,8 @@ GEM
network_interface (0.0.2)
nexpose (7.3.0)
nio4r (2.5.8)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
nokogiri (1.13.0)
mini_portile2 (~> 2.7.0)
racc (~> 1.4)
nori (2.6.0)
octokit (4.21.0)
@ -375,7 +379,7 @@ GEM
ruby-macho (2.5.1)
ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5)
ruby_smb (2.0.13)
ruby_smb (3.0.0)
bindata
openssl-ccm
openssl-cmac
@ -400,7 +404,7 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.1.0)
thor (1.2.1)
tilt (2.0.10)
ttfunk (1.7.0)
tzinfo (2.0.4)

View File

@ -15,13 +15,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.1.22";
version = "6.1.23";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-D3OmkXEqOgDOf1fvMtWiFT4bLw38SNHp2A25xAkq7Ew=";
sha256 = "sha256-um2WDbc7SHhbPSTamOTB0tRWl0tkkNGnY0lm+dU7iIA=";
};
nativeBuildInputs = [ makeWrapper ];

View File

@ -104,30 +104,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07ydbhiyncl0l1dwy09z8inf72x1k961qlcwwg62l4yacv0a74wq";
sha256 = "1fi4irlxam3bmvafm6iiqj0vlzqg10vc4bzznl4c5w6zmg0lzp6b";
type = "gem";
};
version = "1.543.0";
version = "1.547.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "06mkw688mrhz4j2d2ajzigr87041hxczy2w45j0iv1mnvs5yrhan";
sha256 = "17v517dkrazxs9n64c8qdkwhb5fj9flnc2lp99gph6307ciz47w1";
type = "gem";
};
version = "3.125.0";
version = "3.125.1";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0s67sgpv7b6asg3am157brsclq15p8r3fm2gc741zz546xfbfpm3";
sha256 = "147z6prv5cj5scnd3rpjqw0pvbj7yvp9b7lzl786c0jil1pvjm0p";
type = "gem";
};
version = "1.288.0";
version = "1.290.0";
};
aws-sdk-iam = {
groups = ["default"];
@ -154,10 +154,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1587v0xh0hcrxn0ki0ahx70kkpny4pm32fj4bh7500wzvjki6d6v";
sha256 = "1pgh6zd07r9sfzkdz4bf6piq4n8gzl0f76h68l2zxchc1g9z4lqw";
type = "gem";
};
version = "1.110.0";
version = "1.111.1";
};
aws-sigv4 = {
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 = "0ih6nkjx4ph00iybicn0ssjkjnhnjd2xsl9g83lkg64w8q5s0i87";
type = "gem";
};
version = "1.0.2";
};
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 = [];
@ -664,12 +684,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "3bfd2d8eeab3f8ab7efd7a46f8125a7a3bb5f2f0";
sha256 = "0k7c584w9f8dv3lx2j7w1lpinghmlbak5vspgz700fiaf68scwqg";
rev = "7682d9ab9c404b55cfc4a221db22f74a740a6f7f";
sha256 = "10487gazjrj9cfkx34349fbmdm6jq7j9ini47mdphj1vnw6rcvds";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.1.22";
version = "6.1.23";
};
metasploit-model = {
groups = ["default"];
@ -726,10 +746,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq";
sha256 = "0d3ga166pahsxavzwj19yjj4lr13rw1vsb36s2qs8blcxigrdp6z";
type = "gem";
};
version = "2.6.1";
version = "2.7.1";
};
minitest = {
groups = ["default"];
@ -857,10 +877,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b";
sha256 = "1cvx23d8z1nf5nsr5cv55m5dhr3f1bnvgdfqqfnjvhcd8cfnkgcd";
type = "gem";
};
version = "1.12.5";
version = "1.13.0";
};
nori = {
groups = ["default"];
@ -1337,10 +1357,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1bjsh4qi6ii4zl0g0na004ylk991ar9rg5kz9rq1q7r5crxy2rw7";
sha256 = "1klfrp56qid5fr1kzsi62bkhpp2yn6pbv0yg4ikf0lgzg5nq781w";
type = "gem";
};
version = "2.0.13";
version = "3.0.0";
};
rubyntlm = {
groups = ["default"];
@ -1437,10 +1457,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna";
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi";
type = "gem";
};
version = "1.1.0";
version = "1.2.1";
};
tilt = {
groups = ["default"];