Merge pull request #142845 from fabaff/bump-metasploit

This commit is contained in:
Sandro 2021-10-25 14:10:04 +02:00 committed by GitHub
commit 16859a2303
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 51 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.10"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.11"

View file

@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 822dd1ef2b1a1171d62803add58ee2afce30ea06
ref: refs/tags/6.1.10
revision: 341b0cd1cdf69fe22345aea6c84ae11ba45e0d98
ref: refs/tags/6.1.11
specs:
metasploit-framework (6.1.10)
metasploit-framework (6.1.11)
actionpack (~> 6.0)
activerecord (~> 6.0)
activesupport (~> 6.0)
@ -33,7 +33,7 @@ GIT
metasploit-model
metasploit-payloads (= 2.0.58)
metasploit_data_models
metasploit_payloads-mettle (= 1.0.13)
metasploit_payloads-mettle (= 1.0.15)
mqtt
msgpack
nessus_rest
@ -128,23 +128,23 @@ GEM
arel-helpers (2.12.1)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.2.0)
aws-partitions (1.516.0)
aws-sdk-core (3.121.1)
aws-partitions (1.518.0)
aws-sdk-core (3.121.3)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.270.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sdk-ec2 (1.271.0)
aws-sdk-core (~> 3, >= 3.121.2)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.61.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sdk-iam (1.62.0)
aws-sdk-core (~> 3, >= 3.121.2)
aws-sigv4 (~> 1.1)
aws-sdk-kms (1.49.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sdk-kms (1.50.0)
aws-sdk-core (~> 3, >= 3.121.2)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.103.0)
aws-sdk-core (~> 3, >= 3.120.0)
aws-sdk-s3 (1.104.0)
aws-sdk-core (~> 3, >= 3.121.2)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.4.0)
@ -220,7 +220,7 @@ GEM
jmespath (1.4.0)
jsobfu (0.4.2)
rkelly-remix
json (2.6.0)
json (2.6.1)
little-plugger (1.1.4)
logging (2.3.0)
little-plugger (~> 1.1)
@ -258,7 +258,7 @@ GEM
railties (~> 6.0)
recog (~> 2.0)
webrick
metasploit_payloads-mettle (1.0.13)
metasploit_payloads-mettle (1.0.15)
method_source (1.0.0)
mini_portile2 (2.6.1)
minitest (5.14.4)
@ -298,7 +298,7 @@ GEM
public_suffix (4.0.6)
puma (5.5.2)
nio4r (~> 2.0)
racc (1.5.2)
racc (1.6.0)
rack (2.2.3)
rack-protection (2.1.0)
rack
@ -349,7 +349,7 @@ GEM
rex-arch
rex-ole (0.1.7)
rex-text
rex-powershell (0.1.93)
rex-powershell (0.1.94)
rex-random_identifier
rex-text
ruby-rc4
@ -405,7 +405,7 @@ GEM
ttfunk (1.7.0)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2021.3)
tzinfo-data (1.2021.5)
tzinfo (>= 1.0.0)
unf (0.1.4)
unf_ext
@ -433,7 +433,7 @@ GEM
activesupport (>= 4.2, < 7.0)
xmlrpc (0.3.2)
webrick
zeitwerk (2.4.2)
zeitwerk (2.5.1)
PLATFORMS
ruby

View file

@ -14,13 +14,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.1.10";
version = "6.1.11";
src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-VdnczTauHKYexXZs6U5F5v4DP8lJb8wCDy6yiPdEavI=";
sha256 = "sha256-0C93rxVWHHZha2oRKanTm4S0qig3qZreFV08PLwShSw=";
};
nativeBuildInputs = [ makeWrapper ];

View file

@ -104,60 +104,60 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0";
sha256 = "18jjc7sxpdip10iyg0sn89ywvi2iqnhi225df7j6gs0fm25azkfw";
type = "gem";
};
version = "1.516.0";
version = "1.518.0";
};
aws-sdk-core = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0njlpd4w008whz7bd7rrqs3k1m6xbm33hblzwh67pnk1frabv4q6";
sha256 = "15x3qcmh81hf92x0gcj0h0h7yhnlzdqs6wdml56i3cq0nz9kxhs4";
type = "gem";
};
version = "3.121.1";
version = "3.121.3";
};
aws-sdk-ec2 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m46n4fn505l0qqwamc5gk88h6aqvjqc7j0pkrcngxcgh5r7hcvf";
sha256 = "0k85khm2c53y2sq29c9rg5kmjm1fnw2glgpjsl6hbh8cq3ciaain";
type = "gem";
};
version = "1.270.0";
version = "1.271.0";
};
aws-sdk-iam = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m5cc26kkh83f6c05y2a07nfz3dsdvkdf7jfrjkrhlkmdq9hha0m";
sha256 = "0vnhcgr5pjkkplh4z2lbwp4w13kbwp236p0y1b1qiia28ra2isxv";
type = "gem";
};
version = "1.61.0";
version = "1.62.0";
};
aws-sdk-kms = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15iar7b74lnvw1cafacp8vc63xy3zxa8zxmranfssa37mhk53byi";
sha256 = "0prj048lcbkmxc6k2p7vibn3vw7cy1104dljqjvmwz12h9ds1qlf";
type = "gem";
};
version = "1.49.0";
version = "1.50.0";
};
aws-sdk-s3 = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1xsa6nsdflwkm2wzmsr6kiy4am44f9f9459lbkrwxlcl166g05jq";
sha256 = "1h8yzrzinckrfs8ahzqg7fs356vs1ksi5bva1bpfp0i65fjh9mw0";
type = "gem";
};
version = "1.103.0";
version = "1.104.0";
};
aws-sigv4 = {
groups = ["default"];
@ -594,10 +594,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry";
sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
type = "gem";
};
version = "2.6.0";
version = "2.6.1";
};
little-plugger = {
groups = ["default"];
@ -664,12 +664,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "822dd1ef2b1a1171d62803add58ee2afce30ea06";
sha256 = "1wka8kvqicif1w1cqvs9r4zh7zp68m7fjv3nqlgac75f6v6xrnam";
rev = "341b0cd1cdf69fe22345aea6c84ae11ba45e0d98";
sha256 = "0b452ay3qg2x2pg9ma9p52mb914vsfljj4baddhpc72n2nppfbyh";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.1.10";
version = "6.1.11";
};
metasploit-model = {
groups = ["default"];
@ -706,10 +706,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "108jm8nz4xs62k33w5frw15xadd17pbmwpczhvcpzh3bf54sihsr";
sha256 = "1kl7plipccqgrjlm6aqdnp1xz44f6hnb2qmljhqay8ln2kg9f1aa";
type = "gem";
};
version = "1.0.13";
version = "1.0.15";
};
method_source = {
groups = ["default"];
@ -987,10 +987,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
type = "gem";
};
version = "1.5.2";
version = "1.6.0";
};
rack = {
groups = ["default"];
@ -1197,10 +1197,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qpf4na2c57bypyxna7pqll8ym643cydh347v5zvlxknripjhjyz";
sha256 = "0ib75d16j8z0chni7m9v74xpxf13164hh8kr7v7yg93zpsqxw6p5";
type = "gem";
};
version = "0.1.93";
version = "0.1.94";
};
rex-random_identifier = {
groups = ["default"];
@ -1477,10 +1477,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f9wlg8p1p1wa86hcskiy58abbdysdqwr4pv2dmkhkfbi94f1lmr";
sha256 = "0w1iyvw0m2xvdr4654jnn1g27jwj84y94dvaj1k2p3lcrvndm698";
type = "gem";
};
version = "1.2021.3";
version = "1.2021.5";
};
unf = {
groups = ["default"];
@ -1607,9 +1607,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";
type = "gem";
};
version = "2.4.2";
version = "2.5.1";
};
}

View file

@ -4,7 +4,7 @@
set -eu -o pipefail
cd "$(dirname "$(readlink -f "$0")")"
latest=$(curl https://github.com/rapid7/metasploit-framework/releases.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1)
latest=$(curl https://github.com/rapid7/metasploit-framework/tags.atom | xmlstarlet sel -N atom="http://www.w3.org/2005/Atom" -t -m /atom:feed/atom:entry -v atom:title -n | head -n1)
echo "Updating metasploit to $latest"
sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile