git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #142845 from fabaff/bump-metasploit
commit16859a23038f15347c0c10bbfa0cee343be32a29 authorSandro <sandro.jaeckel@gmail.com> dateMon 25 Oct 2021, 14:10 (5 years ago) parent9783af037a5c59
5 files changed+51−51
compare with master
unifiedsplit
pkgs/tools/security/metasploit/Gemfile+1−1 pkgs/tools/security/metasploit/Gemfile.lock+20−20 pkgs/tools/security/metasploit/default.nix+2−2 pkgs/tools/security/metasploit/gemset.nix+27−27 pkgs/tools/security/metasploit/update.sh+1−1
pkgs/tools/security/metasploit/Gemfile+1−1
@@ -1,4 +1,4 @@
11# frozen_string_literal: true
22source "https://rubygems.org"
33
4−gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.10"
4+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.11"
pkgs/tools/security/metasploit/Gemfile.lock+20−20
@@ -1,9 +1,9 @@
11GIT
22 remote: https://github.com/rapid7/metasploit-framework
3− revision: 822dd1ef2b1a1171d62803add58ee2afce30ea06
4− ref: refs/tags/6.1.10
3+ revision: 341b0cd1cdf69fe22345aea6c84ae11ba45e0d98
4+ ref: refs/tags/6.1.11
55 specs:
6− metasploit-framework (6.1.10)
6+ metasploit-framework (6.1.11)
77 actionpack (~> 6.0)
88 activerecord (~> 6.0)
99 activesupport (~> 6.0)
@@ -33,7 +33,7 @@ GIT
3333 metasploit-model
3434 metasploit-payloads (= 2.0.58)
3535 metasploit_data_models
36− metasploit_payloads-mettle (= 1.0.13)
36+ metasploit_payloads-mettle (= 1.0.15)
3737 mqtt
3838 msgpack
3939 nessus_rest
@@ -128,23 +128,23 @@ GEM
128128 arel-helpers (2.12.1)
129129 activerecord (>= 3.1.0, < 7)
130130 aws-eventstream (1.2.0)
131− aws-partitions (1.516.0)
132− aws-sdk-core (3.121.1)
131+ aws-partitions (1.518.0)
132+ aws-sdk-core (3.121.3)
133133 aws-eventstream (~> 1, >= 1.0.2)
134134 aws-partitions (~> 1, >= 1.239.0)
135135 aws-sigv4 (~> 1.1)
136136 jmespath (~> 1.0)
137− aws-sdk-ec2 (1.270.0)
138− aws-sdk-core (~> 3, >= 3.120.0)
137+ aws-sdk-ec2 (1.271.0)
138+ aws-sdk-core (~> 3, >= 3.121.2)
139139 aws-sigv4 (~> 1.1)
140− aws-sdk-iam (1.61.0)
141− aws-sdk-core (~> 3, >= 3.120.0)
140+ aws-sdk-iam (1.62.0)
141+ aws-sdk-core (~> 3, >= 3.121.2)
142142 aws-sigv4 (~> 1.1)
143− aws-sdk-kms (1.49.0)
144− aws-sdk-core (~> 3, >= 3.120.0)
143+ aws-sdk-kms (1.50.0)
144+ aws-sdk-core (~> 3, >= 3.121.2)
145145 aws-sigv4 (~> 1.1)
146− aws-sdk-s3 (1.103.0)
147− aws-sdk-core (~> 3, >= 3.120.0)
146+ aws-sdk-s3 (1.104.0)
147+ aws-sdk-core (~> 3, >= 3.121.2)
148148 aws-sdk-kms (~> 1)
149149 aws-sigv4 (~> 1.4)
150150 aws-sigv4 (1.4.0)
@@ -220,7 +220,7 @@ GEM
220220 jmespath (1.4.0)
221221 jsobfu (0.4.2)
222222 rkelly-remix
223− json (2.6.0)
223+ json (2.6.1)
224224 little-plugger (1.1.4)
225225 logging (2.3.0)
226226 little-plugger (~> 1.1)
@@ -258,7 +258,7 @@ GEM
258258 railties (~> 6.0)
259259 recog (~> 2.0)
260260 webrick
261− metasploit_payloads-mettle (1.0.13)
261+ metasploit_payloads-mettle (1.0.15)
262262 method_source (1.0.0)
263263 mini_portile2 (2.6.1)
264264 minitest (5.14.4)
@@ -298,7 +298,7 @@ GEM
298298 public_suffix (4.0.6)
299299 puma (5.5.2)
300300 nio4r (~> 2.0)
301− racc (1.5.2)
301+ racc (1.6.0)
302302 rack (2.2.3)
303303 rack-protection (2.1.0)
304304 rack
@@ -349,7 +349,7 @@ GEM
349349 rex-arch
350350 rex-ole (0.1.7)
351351 rex-text
352− rex-powershell (0.1.93)
352+ rex-powershell (0.1.94)
353353 rex-random_identifier
354354 rex-text
355355 ruby-rc4
@@ -405,7 +405,7 @@ GEM
405405 ttfunk (1.7.0)
406406 tzinfo (2.0.4)
407407 concurrent-ruby (~> 1.0)
408− tzinfo-data (1.2021.3)
408+ tzinfo-data (1.2021.5)
409409 tzinfo (>= 1.0.0)
410410 unf (0.1.4)
411411 unf_ext
@@ -433,7 +433,7 @@ GEM
433433 activesupport (>= 4.2, < 7.0)
434434 xmlrpc (0.3.2)
435435 webrick
436− zeitwerk (2.4.2)
436+ zeitwerk (2.5.1)
437437
438438PLATFORMS
439439 ruby
pkgs/tools/security/metasploit/default.nix+2−2
@@ -14,13 +14,13 @@ let
1414 };
1515in stdenv.mkDerivation rec {
1616 pname = "metasploit-framework";
17− version = "6.1.10";
17+ version = "6.1.11";
1818
1919 src = fetchFromGitHub {
2020 owner = "rapid7";
2121 repo = "metasploit-framework";
2222 rev = version;
23− sha256 = "sha256-VdnczTauHKYexXZs6U5F5v4DP8lJb8wCDy6yiPdEavI=";
23+ sha256 = "sha256-0C93rxVWHHZha2oRKanTm4S0qig3qZreFV08PLwShSw=";
2424 };
2525
2626 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/security/metasploit/gemset.nix+27−27
@@ -104,60 +104,60 @@
104104 platforms = [];
105105 source = {
106106 remotes = ["https://rubygems.org"];
107− sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0";
107+ sha256 = "18jjc7sxpdip10iyg0sn89ywvi2iqnhi225df7j6gs0fm25azkfw";
108108 type = "gem";
109109 };
110− version = "1.516.0";
110+ version = "1.518.0";
111111 };
112112 aws-sdk-core = {
113113 groups = ["default"];
114114 platforms = [];
115115 source = {
116116 remotes = ["https://rubygems.org"];
117− sha256 = "0njlpd4w008whz7bd7rrqs3k1m6xbm33hblzwh67pnk1frabv4q6";
117+ sha256 = "15x3qcmh81hf92x0gcj0h0h7yhnlzdqs6wdml56i3cq0nz9kxhs4";
118118 type = "gem";
119119 };
120− version = "3.121.1";
120+ version = "3.121.3";
121121 };
122122 aws-sdk-ec2 = {
123123 groups = ["default"];
124124 platforms = [];
125125 source = {
126126 remotes = ["https://rubygems.org"];
127− sha256 = "1m46n4fn505l0qqwamc5gk88h6aqvjqc7j0pkrcngxcgh5r7hcvf";
127+ sha256 = "0k85khm2c53y2sq29c9rg5kmjm1fnw2glgpjsl6hbh8cq3ciaain";
128128 type = "gem";
129129 };
130− version = "1.270.0";
130+ version = "1.271.0";
131131 };
132132 aws-sdk-iam = {
133133 groups = ["default"];
134134 platforms = [];
135135 source = {
136136 remotes = ["https://rubygems.org"];
137− sha256 = "1m5cc26kkh83f6c05y2a07nfz3dsdvkdf7jfrjkrhlkmdq9hha0m";
137+ sha256 = "0vnhcgr5pjkkplh4z2lbwp4w13kbwp236p0y1b1qiia28ra2isxv";
138138 type = "gem";
139139 };
140− version = "1.61.0";
140+ version = "1.62.0";
141141 };
142142 aws-sdk-kms = {
143143 groups = ["default"];
144144 platforms = [];
145145 source = {
146146 remotes = ["https://rubygems.org"];
147− sha256 = "15iar7b74lnvw1cafacp8vc63xy3zxa8zxmranfssa37mhk53byi";
147+ sha256 = "0prj048lcbkmxc6k2p7vibn3vw7cy1104dljqjvmwz12h9ds1qlf";
148148 type = "gem";
149149 };
150− version = "1.49.0";
150+ version = "1.50.0";
151151 };
152152 aws-sdk-s3 = {
153153 groups = ["default"];
154154 platforms = [];
155155 source = {
156156 remotes = ["https://rubygems.org"];
157− sha256 = "1xsa6nsdflwkm2wzmsr6kiy4am44f9f9459lbkrwxlcl166g05jq";
157+ sha256 = "1h8yzrzinckrfs8ahzqg7fs356vs1ksi5bva1bpfp0i65fjh9mw0";
158158 type = "gem";
159159 };
160− version = "1.103.0";
160+ version = "1.104.0";
161161 };
162162 aws-sigv4 = {
163163 groups = ["default"];
@@ -594,10 +594,10 @@
594594 platforms = [];
595595 source = {
596596 remotes = ["https://rubygems.org"];
597− sha256 = "0a7p95md8j8lbgxx9dzygysxmrg1s80895f46f1y47k9kq9q56ry";
597+ sha256 = "1z9grvjyfz16ag55hg522d3q4dh07hf391sf9s96npc0vfi85xkz";
598598 type = "gem";
599599 };
600− version = "2.6.0";
600+ version = "2.6.1";
601601 };
602602 little-plugger = {
603603 groups = ["default"];
@@ -664,12 +664,12 @@
664664 platforms = [];
665665 source = {
666666 fetchSubmodules = false;
667− rev = "822dd1ef2b1a1171d62803add58ee2afce30ea06";
668− sha256 = "1wka8kvqicif1w1cqvs9r4zh7zp68m7fjv3nqlgac75f6v6xrnam";
667+ rev = "341b0cd1cdf69fe22345aea6c84ae11ba45e0d98";
668+ sha256 = "0b452ay3qg2x2pg9ma9p52mb914vsfljj4baddhpc72n2nppfbyh";
669669 type = "git";
670670 url = "https://github.com/rapid7/metasploit-framework";
671671 };
672− version = "6.1.10";
672+ version = "6.1.11";
673673 };
674674 metasploit-model = {
675675 groups = ["default"];
@@ -706,10 +706,10 @@
706706 platforms = [];
707707 source = {
708708 remotes = ["https://rubygems.org"];
709− sha256 = "108jm8nz4xs62k33w5frw15xadd17pbmwpczhvcpzh3bf54sihsr";
709+ sha256 = "1kl7plipccqgrjlm6aqdnp1xz44f6hnb2qmljhqay8ln2kg9f1aa";
710710 type = "gem";
711711 };
712− version = "1.0.13";
712+ version = "1.0.15";
713713 };
714714 method_source = {
715715 groups = ["default"];
@@ -987,10 +987,10 @@
987987 platforms = [];
988988 source = {
989989 remotes = ["https://rubygems.org"];
990− sha256 = "178k7r0xn689spviqzhvazzvxfq6fyjldxb3ywjbgipbfi4s8j1g";
990+ sha256 = "0la56m0z26j3mfn1a9lf2l03qx1xifanndf9p3vx1azf6sqy7v9d";
991991 type = "gem";
992992 };
993− version = "1.5.2";
993+ version = "1.6.0";
994994 };
995995 rack = {
996996 groups = ["default"];
@@ -1197,10 +1197,10 @@
11971197 platforms = [];
11981198 source = {
11991199 remotes = ["https://rubygems.org"];
1200− sha256 = "1qpf4na2c57bypyxna7pqll8ym643cydh347v5zvlxknripjhjyz";
1200+ sha256 = "0ib75d16j8z0chni7m9v74xpxf13164hh8kr7v7yg93zpsqxw6p5";
12011201 type = "gem";
12021202 };
1203− version = "0.1.93";
1203+ version = "0.1.94";
12041204 };
12051205 rex-random_identifier = {
12061206 groups = ["default"];
@@ -1477,10 +1477,10 @@
14771477 platforms = [];
14781478 source = {
14791479 remotes = ["https://rubygems.org"];
1480− sha256 = "1f9wlg8p1p1wa86hcskiy58abbdysdqwr4pv2dmkhkfbi94f1lmr";
1480+ sha256 = "0w1iyvw0m2xvdr4654jnn1g27jwj84y94dvaj1k2p3lcrvndm698";
14811481 type = "gem";
14821482 };
1483− version = "1.2021.3";
1483+ version = "1.2021.5";
14841484 };
14851485 unf = {
14861486 groups = ["default"];
@@ -1607,9 +1607,9 @@
16071607 platforms = [];
16081608 source = {
16091609 remotes = ["https://rubygems.org"];
1610− sha256 = "1746czsjarixq0x05f7p3hpzi38ldg6wxnxxw74kbjzh1sdjgmpl";
1610+ sha256 = "18l4r6layck0d80ydc692mv1lxak5xbf6w2paj1x7m2ggbggzxgj";
16111611 type = "gem";
16121612 };
1613− version = "2.4.2";
1613+ version = "2.5.1";
16141614 };
16151615}
pkgs/tools/security/metasploit/update.sh+1−1
@@ -4,7 +4,7 @@
44set -eu -o pipefail
55cd "$(dirname "$(readlink -f "$0")")"
66
7−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)
7+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)
88echo "Updating metasploit to $latest"
99
1010sed -i "s#refs/tags/.*#refs/tags/$latest\"#" Gemfile