Merge pull request #110099 from fabaff/bump-msf

metasploit: 6.0.25 -> 6.0.26
This commit is contained in:
Sandro 2021-01-20 13:13:19 +01:00 committed by GitHub
commit 3b48d6fabb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 53 additions and 53 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.25" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.26"

View File

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c revision: 0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48
ref: refs/tags/6.0.25 ref: refs/tags/6.0.26
specs: specs:
metasploit-framework (6.0.25) metasploit-framework (6.0.26)
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,9 +31,9 @@ GIT
metasploit-concern metasploit-concern
metasploit-credential metasploit-credential
metasploit-model metasploit-model
metasploit-payloads (= 2.0.26) metasploit-payloads (= 2.0.27)
metasploit_data_models metasploit_data_models
metasploit_payloads-mettle (= 1.0.2) metasploit_payloads-mettle (= 1.0.5)
mqtt mqtt
msgpack msgpack
nessus_rest nessus_rest
@ -124,8 +124,8 @@ 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.0) aws-eventstream (1.1.0)
aws-partitions (1.415.0) aws-partitions (1.417.0)
aws-sdk-core (3.110.0) aws-sdk-core (3.111.2)
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)
@ -136,7 +136,7 @@ GEM
aws-sdk-iam (1.46.0) aws-sdk-iam (1.46.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-kms (1.40.0) aws-sdk-kms (1.41.0)
aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-core (~> 3, >= 3.109.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.87.0) aws-sdk-s3 (1.87.0)
@ -174,7 +174,7 @@ GEM
faraday-net_http (~> 1.0) faraday-net_http (~> 1.0)
multipart-post (>= 1.2, < 3) multipart-post (>= 1.2, < 3)
ruby2_keywords ruby2_keywords
faraday-net_http (1.0.0) faraday-net_http (1.0.1)
faye-websocket (0.11.0) faye-websocket (0.11.0)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1) websocket-driver (>= 0.5.1)
@ -185,14 +185,14 @@ GEM
http_parser.rb (0.6.0) http_parser.rb (0.6.0)
i18n (1.8.7) i18n (1.8.7)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
io-console (0.5.6) io-console (0.5.7)
irb (1.3.0) irb (1.3.2)
reline (>= 0.1.5) reline (>= 0.1.5)
jmespath (1.4.0) jmespath (1.4.0)
jsobfu (0.4.2) jsobfu (0.4.2)
rkelly-remix rkelly-remix
json (2.5.1) json (2.5.1)
loofah (2.8.0) loofah (2.9.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
metasm (1.0.4) metasm (1.0.4)
@ -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.26) metasploit-payloads (2.0.27)
metasploit_data_models (4.1.1) metasploit_data_models (4.1.1)
activerecord (~> 5.2.2) activerecord (~> 5.2.2)
activesupport (~> 5.2.2) activesupport (~> 5.2.2)
@ -224,7 +224,7 @@ GEM
pg pg
railties (~> 5.2.2) railties (~> 5.2.2)
recog (~> 2.0) recog (~> 2.0)
metasploit_payloads-mettle (1.0.2) metasploit_payloads-mettle (1.0.5)
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.3)
@ -284,7 +284,7 @@ GEM
recog (2.3.18) recog (2.3.18)
nokogiri nokogiri
redcarpet (3.5.1) redcarpet (3.5.1)
reline (0.2.0) reline (0.2.2)
io-console (~> 0.5) io-console (~> 0.5)
rex-arch (0.1.14) rex-arch (0.1.14)
rex-text rex-text
@ -312,7 +312,7 @@ GEM
rex-arch rex-arch
rex-ole (0.1.7) rex-ole (0.1.7)
rex-text rex-text
rex-powershell (0.1.88) rex-powershell (0.1.89)
rex-random_identifier rex-random_identifier
rex-text rex-text
ruby-rc4 ruby-rc4
@ -330,13 +330,13 @@ GEM
rex-socket rex-socket
rex-text rex-text
rex-struct2 (0.1.3) rex-struct2 (0.1.3)
rex-text (0.2.29) rex-text (0.2.31)
rex-zip (0.1.4) rex-zip (0.1.4)
rex-text rex-text
rkelly-remix (0.0.7) rkelly-remix (0.0.7)
ruby-macho (2.5.0) ruby-macho (2.5.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
ruby2_keywords (0.0.2) ruby2_keywords (0.0.4)
ruby_smb (2.0.7) ruby_smb (2.0.7)
bindata bindata
openssl-ccm openssl-ccm
@ -348,7 +348,7 @@ GEM
sawyer (0.8.2) sawyer (0.8.2)
addressable (>= 2.3.5) addressable (>= 2.3.5)
faraday (> 0.8, < 2.0) faraday (> 0.8, < 2.0)
simpleidn (0.1.1) simpleidn (0.2.1)
unf (~> 0.1.4) unf (~> 0.1.4)
sinatra (2.1.0) sinatra (2.1.0)
mustermann (~> 1.0) mustermann (~> 1.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.25"; version = "6.0.26";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = version; rev = version;
sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l"; sha256 = "sha256-ayW0MsV3TQnta+bP9kNL6m3hFPrn6lbsiAbXw7WOmBA=";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];

View File

@ -114,20 +114,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1348hdy6wf1av75nvlwp4b0pp4vshc9vrzic5vzrwnx9fg6cib08"; sha256 = "1difs2ynpizrq0jdww075camiagkkxncyfb1qi4s19hfsn8xp3j0";
type = "gem"; type = "gem";
}; };
version = "1.415.0"; version = "1.417.0";
}; };
aws-sdk-core = { aws-sdk-core = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1lrxwi9im4bpdcga6w7bmam7hywy5c2yss09377lyqm89whb4kl4"; sha256 = "0bfj1cnpp0ljr9jc44kljdwl5399cbqlvlqkz6fxq5i4r6ckggi4";
type = "gem"; type = "gem";
}; };
version = "3.110.0"; version = "3.111.2";
}; };
aws-sdk-ec2 = { aws-sdk-ec2 = {
groups = ["default"]; groups = ["default"];
@ -154,10 +154,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1pk76w1w9z4dh1sic08jp1j2rbbmnrfci53a6pkxq0g3y4kkx2g4"; sha256 = "02f70a4rr5h2na7navjhaf3n15ifq95zdl1avsryyxdvqzm5gzwm";
type = "gem"; type = "gem";
}; };
version = "1.40.0"; version = "1.41.0";
}; };
aws-sdk-s3 = { aws-sdk-s3 = {
groups = ["default"]; groups = ["default"];
@ -364,10 +364,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1kk5d1c5nxbmwawl5gcznwiscjz24nz3vdhxrlzvj7748c1qqr6d"; sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
type = "gem"; type = "gem";
}; };
version = "1.0.0"; version = "1.0.1";
}; };
faye-websocket = { faye-websocket = {
groups = ["default"]; groups = ["default"];
@ -434,20 +434,20 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0vbn4nvnr1pcmjsn0gghc3bz2md89njxq4801zi5dv5niypdxlsp"; sha256 = "1gp1xx2g1x81wsh929x7rzsm0c8qgkhr2mkjn79fbdwyfnk4s04l";
type = "gem"; type = "gem";
}; };
version = "0.5.6"; version = "0.5.7";
}; };
irb = { irb = {
groups = ["default"]; groups = ["default"];
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0a7gkibv9485dbh64k3r5j20bf553dg0kmxy3hhgl2jsgqyvrl1y"; sha256 = "166xravh6r82w46d8hcjrg55gnyjdf0501g16lb48i2h06k363l2";
type = "gem"; type = "gem";
}; };
version = "1.3.0"; version = "1.3.2";
}; };
jmespath = { jmespath = {
groups = ["default"]; groups = ["default"];
@ -484,10 +484,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0ndimir6k3kfrh8qrb7ir1j836l4r3qlwyclwjh88b86clblhszh"; sha256 = "0bzwvxvilx7w1p3pg028ks38925y9i0xm870lm7s12w7598hiyck";
type = "gem"; type = "gem";
}; };
version = "2.8.0"; version = "2.9.0";
}; };
metasm = { metasm = {
groups = ["default"]; groups = ["default"];
@ -524,12 +524,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "7bcfc6e6a97e994c8a67f7c0bad8012f009dc13c"; rev = "0cdd01a0c4432348b45e1a0f5b5b9983b6ce6c48";
sha256 = "1g48v2p6bmfqb6xs0773spx9din5dckvy8j997q9qhpmb4ff8i7l"; sha256 = "044qissw7mq6i3n5dsp7z8af2vga9d1zdkz6dgnhjkbpqlrb89bb";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.0.25"; version = "6.0.26";
}; };
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 = "1gpv327750b7g243w0dmynji1gabwk81kb424y5hlbq9vqpgamnb"; sha256 = "1c3jn9gjy1bknyd7wrwwfbcjwlmijd6nnsjzyqc7yszjjy0yqca2";
type = "gem"; type = "gem";
}; };
version = "2.0.26"; version = "2.0.27";
}; };
metasploit_data_models = { metasploit_data_models = {
groups = ["default"]; groups = ["default"];
@ -566,10 +566,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "147s4jd2hckls76binsskb6rvnh1crd2agmf1lk7fsj1n55dhkvk"; sha256 = "0z6gnidpcpdm80vvl0yw1h10kchkaw9whcsv2kwy7ih6247l7nbq";
type = "gem"; type = "gem";
}; };
version = "1.0.2"; version = "1.0.5";
}; };
method_source = { method_source = {
groups = ["default"]; groups = ["default"];
@ -936,10 +936,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "109gpk4c9712cc3ilvidgks9i42y8gwnjpw6j4w4hci09pasz7i1"; sha256 = "0zinl7l63gzy6y477j8w1azfm5655h2026hxl49w4c73qcfdjj3x";
type = "gem"; type = "gem";
}; };
version = "0.2.0"; version = "0.2.2";
}; };
rex-arch = { rex-arch = {
groups = ["default"]; groups = ["default"];
@ -1036,10 +1036,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "02bzkraz4722zkjkm5cn9kvhx2mbkrhd5g123bkqgfkd19kbfjif"; sha256 = "1wza4g3kkscc17kaw44hnq8qs2nmvppb9awaf27lp4v1c1kdxixs";
type = "gem"; type = "gem";
}; };
version = "0.1.88"; version = "0.1.89";
}; };
rex-random_identifier = { rex-random_identifier = {
groups = ["default"]; groups = ["default"];
@ -1106,10 +1106,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "05s0izxlb4rrhr42d6dz6idxdj4hrb7bdkk22qfwnaqdppb4w536"; sha256 = "078bdybz7cw3zd0mr59qgr1x6pifnn352636s74i1ncqzrzni46b";
type = "gem"; type = "gem";
}; };
version = "0.2.29"; version = "0.2.31";
}; };
rex-zip = { rex-zip = {
groups = ["default"]; groups = ["default"];
@ -1156,10 +1156,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; sha256 = "15wfcqxyfgka05v2a7kpg64x57gl1y4xzvnc9lh60bqx5sf1iqrs";
type = "gem"; type = "gem";
}; };
version = "0.0.2"; version = "0.0.4";
}; };
ruby_smb = { ruby_smb = {
groups = ["default"]; groups = ["default"];
@ -1206,10 +1206,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0b9v0xs4ksd68zckamv6rbrrqllpa9am0p29bycq9fxvlkqd7w2w"; sha256 = "06f7w6ph3bzzqk212yylfp4jfx275shgp9zg3xszbpv1ny2skp9m";
type = "gem"; type = "gem";
}; };
version = "0.1.1"; version = "0.2.1";
}; };
sinatra = { sinatra = {
groups = ["default"]; groups = ["default"];