Skip to content

Commit

Permalink
Merge pull request #122908 from fabaff/bump-metasploit
Browse files Browse the repository at this point in the history
metasploit: 6.0.43 -> 6.0.44
  • Loading branch information
fabaff committed May 14, 2021
2 parents 8ead526 + a800bd2 commit ae17d70
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 21 deletions.
2 changes: 1 addition & 1 deletion pkgs/tools/security/metasploit/Gemfile
@@ -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.0.43"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.44"
16 changes: 9 additions & 7 deletions pkgs/tools/security/metasploit/Gemfile.lock
@@ -1,9 +1,9 @@
GIT
remote: https://github.com/rapid7/metasploit-framework
revision: 08fd394933eadca2b90e4de4ecce7f478af1f161
ref: refs/tags/6.0.43
revision: dbc17d32977b2e36ead8dafff4f41c607a8bec88
ref: refs/tags/6.0.44
specs:
metasploit-framework (6.0.43)
metasploit-framework (6.0.44)
actionpack (~> 5.2.2)
activerecord (~> 5.2.2)
activesupport (~> 5.2.2)
Expand Down Expand Up @@ -80,6 +80,7 @@ GIT
sinatra
sqlite3
sshkey
swagger-blocks
thin
tzinfo
tzinfo-data
Expand Down Expand Up @@ -124,13 +125,13 @@ GEM
arel-helpers (2.12.0)
activerecord (>= 3.1.0, < 7)
aws-eventstream (1.1.1)
aws-partitions (1.452.0)
aws-partitions (1.455.0)
aws-sdk-core (3.114.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-ec2 (1.235.0)
aws-sdk-ec2 (1.236.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-iam (1.52.0)
Expand Down Expand Up @@ -268,7 +269,7 @@ GEM
ttfunk
pg (1.2.3)
public_suffix (4.0.6)
puma (5.3.0)
puma (5.3.1)
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
Expand All @@ -289,7 +290,7 @@ GEM
thor (>= 0.19.0, < 2.0)
rake (13.0.3)
rb-readline (0.5.5)
recog (2.3.19)
recog (2.3.20)
nokogiri
redcarpet (3.5.1)
reline (0.2.5)
Expand Down Expand Up @@ -367,6 +368,7 @@ GEM
tilt (~> 2.0)
sqlite3 (1.4.2)
sshkey (2.0.0)
swagger-blocks (3.0.0)
thin (1.8.0)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
Expand Down
4 changes: 2 additions & 2 deletions pkgs/tools/security/metasploit/default.nix
Expand Up @@ -8,13 +8,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "metasploit-framework";
version = "6.0.43";
version = "6.0.44";

src = fetchFromGitHub {
owner = "rapid7";
repo = "metasploit-framework";
rev = version;
sha256 = "sha256-dj+8DodQnCJjwhxTD/TjccJvSA8KSjiwiX65V6CIpuQ=";
sha256 = "sha256-6uhqAJ7nlBROdhda9yU2IlAHZrnpKo0kpKoixXJeJYY=";
};

nativeBuildInputs = [ makeWrapper ];
Expand Down
32 changes: 21 additions & 11 deletions pkgs/tools/security/metasploit/gemset.nix
Expand Up @@ -114,10 +114,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55";
sha256 = "01i0qysphs0fl7gxg23bbsyn8iwgnaif6lvbfg6rdn6gp6qc8qgx";
type = "gem";
};
version = "1.452.0";
version = "1.455.0";
};
aws-sdk-core = {
groups = ["default"];
Expand All @@ -134,10 +134,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kcnfr5rw80d46hwp185jniqvbrxcdjy7srh24x7gjm2gpxmm234";
sha256 = "1x4gq4s5d9834n2p5gm1qchm8jvin1ipirc20z1j5lszjxxpy3c2";
type = "gem";
};
version = "1.235.0";
version = "1.236.0";
};
aws-sdk-iam = {
groups = ["default"];
Expand Down Expand Up @@ -554,12 +554,12 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "08fd394933eadca2b90e4de4ecce7f478af1f161";
sha256 = "1r56i2h5gfbyi6q3hjha1x46zhkiwgs0ylqwq9ij572hhw7bqgvn";
rev = "dbc17d32977b2e36ead8dafff4f41c607a8bec88";
sha256 = "11i5brrca8malhj8sap9p5k0fl126qjzfnhpfr719577kq06ms7a";
type = "git";
url = "https://github.com/rapid7/metasploit-framework";
};
version = "6.0.43";
version = "6.0.44";
};
metasploit-model = {
groups = ["default"];
Expand Down Expand Up @@ -846,10 +846,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1";
sha256 = "00839fhvcq73h9a4crbrk87y6bi2z4vp1zazxihn6w0mrwr51c3i";
type = "gem";
};
version = "5.3.0";
version = "5.3.1";
};
racc = {
groups = ["default"];
Expand Down Expand Up @@ -946,10 +946,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00czf392immsaff10snjxky2vpnfck1bgszpckx15y2kydag5k9i";
sha256 = "11hc55mdl2d4kb8vrbazydxdnzr5l7dd4v5spqrrgnmp2d7rq3az";
type = "gem";
};
version = "2.3.19";
version = "2.3.20";
};
redcarpet = {
groups = ["default"];
Expand Down Expand Up @@ -1281,6 +1281,16 @@
};
version = "2.0.0";
};
swagger-blocks = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bycg5si4pr69b0qqiqzhwcich90mvmn0v0gs39slvxg5nv3h28k";
type = "gem";
};
version = "3.0.0";
};
thin = {
groups = ["default"];
platforms = [];
Expand Down

0 comments on commit ae17d70

Please sign in to comment.