Unverified Commit 42600bc7 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #206504 from fabaff/metasploit-bump

metasploit: 6.2.30 -> 6.2.31
parents ea699573 019f0e90
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
# frozen_string_literal: true
source "https://rubygems.org"

gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.30"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.31"
+21 −22
Original line number Diff line number Diff line
GIT
  remote: https://github.com/rapid7/metasploit-framework
  revision: 21ca4473d2486d30618f99eaee7f3067e136c608
  ref: refs/tags/6.2.30
  revision: 2654f6f02a0ce6150e623804b9fab9576fe008f6
  ref: refs/tags/6.2.31
  specs:
    metasploit-framework (6.2.30)
    metasploit-framework (6.2.31)
      actionpack (~> 6.0)
      activerecord (~> 6.0)
      activesupport (~> 6.0)
@@ -13,7 +13,6 @@ GIT
      bcrypt
      bcrypt_pbkdf
      bson
      concurrent-ruby (= 1.0.5)
      dnsruby
      ed25519
      em-http-request
@@ -32,7 +31,7 @@ GIT
      metasploit-concern
      metasploit-credential
      metasploit-model
      metasploit-payloads (= 2.0.101)
      metasploit-payloads (= 2.0.105)
      metasploit_data_models
      metasploit_payloads-mettle (= 1.0.20)
      mqtt
@@ -129,13 +128,13 @@ GEM
    arel-helpers (2.14.0)
      activerecord (>= 3.1.0, < 8)
    aws-eventstream (1.2.0)
    aws-partitions (1.674.0)
    aws-partitions (1.679.0)
    aws-sdk-core (3.168.4)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.651.0)
      aws-sigv4 (~> 1.5)
      jmespath (~> 1, >= 1.6.1)
    aws-sdk-ec2 (1.354.0)
    aws-sdk-ec2 (1.355.0)
      aws-sdk-core (~> 3, >= 3.165.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-iam (1.73.0)
@@ -155,7 +154,7 @@ GEM
    bindata (2.4.14)
    bson (4.15.0)
    builder (3.2.4)
    concurrent-ruby (1.0.5)
    concurrent-ruby (1.1.10)
    cookiejar (0.3.3)
    crass (1.0.6)
    daemons (1.4.1)
@@ -176,7 +175,7 @@ GEM
    eventmachine (1.2.7)
    faker (3.0.0)
      i18n (>= 1.8.11, < 2)
    faraday (2.7.1)
    faraday (2.7.2)
      faraday-net_http (>= 2.0, < 3.1)
      ruby2_keywords (>= 0.0.4)
    faraday-net_http (3.0.2)
@@ -203,8 +202,8 @@ GEM
    httpclient (2.8.3)
    i18n (1.12.0)
      concurrent-ruby (~> 1.0)
    io-console (0.5.11)
    irb (1.6.0)
    io-console (0.6.0)
    irb (1.6.1)
      reline (>= 0.3.0)
    jmespath (1.6.2)
    jsobfu (0.4.2)
@@ -214,7 +213,7 @@ GEM
    logging (2.3.1)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
    loofah (2.19.0)
    loofah (2.19.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
    metasm (1.0.5)
@@ -222,7 +221,7 @@ GEM
      activemodel (~> 6.0)
      activesupport (~> 6.0)
      railties (~> 6.0)
    metasploit-credential (6.0.0)
    metasploit-credential (6.0.1)
      metasploit-concern
      metasploit-model
      metasploit_data_models (>= 5.0.0)
@@ -236,7 +235,7 @@ GEM
      activemodel (~> 6.0)
      activesupport (~> 6.0)
      railties (~> 6.0)
    metasploit-payloads (2.0.101)
    metasploit-payloads (2.0.105)
    metasploit_data_models (5.0.6)
      activerecord (~> 6.0)
      activesupport (~> 6.0)
@@ -292,15 +291,15 @@ GEM
      nio4r (~> 2.0)
    racc (1.6.1)
    rack (2.2.4)
    rack-protection (3.0.4)
    rack-protection (3.0.5)
      rack
    rack-test (2.0.2)
      rack (>= 1.3)
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
    rails-html-sanitizer (1.4.3)
      loofah (~> 2.3)
    rails-html-sanitizer (1.4.4)
      loofah (~> 2.19, >= 2.19.1)
    railties (6.1.7)
      actionpack (= 6.1.7)
      activesupport (= 6.1.7)
@@ -312,7 +311,7 @@ GEM
    recog (3.0.3)
      nokogiri
    redcarpet (3.5.1)
    reline (0.3.1)
    reline (0.3.2)
      io-console (~> 0.5)
    rex-arch (0.1.14)
      rex-text
@@ -359,7 +358,7 @@ GEM
      rex-socket
      rex-text
    rex-struct2 (0.1.3)
    rex-text (0.2.46)
    rex-text (0.2.47)
    rex-zip (0.1.4)
      rex-text
    rexml (3.2.5)
@@ -380,10 +379,10 @@ GEM
      faraday (>= 0.17.3, < 3)
    simpleidn (0.2.1)
      unf (~> 0.1.4)
    sinatra (3.0.4)
    sinatra (3.0.5)
      mustermann (~> 3.0)
      rack (~> 2.2, >= 2.2.4)
      rack-protection (= 3.0.4)
      rack-protection (= 3.0.5)
      tilt (~> 2.0)
    sqlite3 (1.5.4)
      mini_portile2 (~> 2.8.0)
@@ -436,4 +435,4 @@ DEPENDENCIES
  metasploit-framework!

BUNDLED WITH
   2.3.25
   2.3.26
+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ let
  };
in stdenv.mkDerivation rec {
  pname = "metasploit-framework";
  version = "6.2.30";
  version = "6.2.31";

  src = fetchFromGitHub {
    owner = "rapid7";
    repo = "metasploit-framework";
    rev = version;
    sha256 = "sha256-2AEZJoGSWEBCCFabHjqzJyI3zx0PC8da2D3eRlfMKwY=";
    sha256 = "sha256-oifgAc1umrEOULuJzK9EboBdXIXSici8ndlhRbbHUaw=";
  };

  nativeBuildInputs = [ makeWrapper ];
+31 −31
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "0a4inr58vqzqb6g4j09pch55xyhj4kbbl4drsk1apfwhakc70vpr";
      sha256 = "0ijs16zjif7zkwi4wd1qffi7c5b1v5b6hnw76h8kh6vgiwj9hmmz";
      type = "gem";
    };
    version = "1.674.0";
    version = "1.679.0";
  };
  aws-sdk-core = {
    groups = ["default"];
@@ -124,10 +124,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "1fj3na0i1d50iw6cih2g3k3h9h2hq0n62czppxr0qsw65mwr5h8b";
      sha256 = "1x0fg5gp7qcvfhngplb9438jv074llfb9d52jclnik8ibrrmgx8w";
      type = "gem";
    };
    version = "1.354.0";
    version = "1.355.0";
  };
  aws-sdk-iam = {
    groups = ["default"];
@@ -224,10 +224,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
      sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14";
      type = "gem";
    };
    version = "1.0.5";
    version = "1.1.10";
  };
  cookiejar = {
    groups = ["default"];
@@ -344,10 +344,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "1wyz9ab0mzi84gpf81fs19vrixglmmxi25k6n1mn9h141qmsp590";
      sha256 = "17lacy6n0hsayafvgxgzmngfq2x62b2arbn32bj2yyzmgxwyxhqn";
      type = "gem";
    };
    version = "2.7.1";
    version = "2.7.2";
  };
  faraday-net_http = {
    groups = ["default"];
@@ -494,20 +494,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "0r9kxrf9jccrr329pa3s37rf16vy426cbqmfwxkav1fidwvih93y";
      sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff";
      type = "gem";
    };
    version = "0.5.11";
    version = "0.6.0";
  };
  irb = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "078jfdkjg8kl82hy3awq0r9vww4allw4zpncm8hl6ccjswppr4jk";
      sha256 = "09mbpnmfh5lwg6kcjlbyv9163pn50lfxphbra9rsws8cp04m1qj3";
      type = "gem";
    };
    version = "1.6.0";
    version = "1.6.1";
  };
  jmespath = {
    groups = ["default"];
@@ -564,10 +564,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "1fpyk1965py77al7iadkn5dibwgvybknkr7r8bii2dj73wvr29rh";
      sha256 = "08qhzck271anrx9y6qa6mh8hwwdzsgwld8q0000rcd7yvvpnjr3c";
      type = "gem";
    };
    version = "2.19.0";
    version = "2.19.1";
  };
  metasm = {
    groups = ["default"];
@@ -594,22 +594,22 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "045aap4wrslclbvm2rczdxlgivyx9ricdbg2z9xk5xamf6cxfrx1";
      sha256 = "061zkhiq7gpp0kjk1alaz0r266makzj3ahjzq6j9qxm4z9xiis4d";
      type = "gem";
    };
    version = "6.0.0";
    version = "6.0.1";
  };
  metasploit-framework = {
    groups = ["default"];
    platforms = [];
    source = {
      fetchSubmodules = false;
      rev = "21ca4473d2486d30618f99eaee7f3067e136c608";
      sha256 = "01ibribldpixv1dcf2qg3p7kf8i7ncx1x6sn11140n4jh4k1j0fq";
      rev = "2654f6f02a0ce6150e623804b9fab9576fe008f6";
      sha256 = "1b2iqyv4aqfrknyci2fjhmf5v03f8jpwr2dva07b36kfrl0y09x2";
      type = "git";
      url = "https://github.com/rapid7/metasploit-framework";
    };
    version = "6.2.30";
    version = "6.2.31";
  };
  metasploit-model = {
    groups = ["default"];
@@ -626,10 +626,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "0m9w4yy5iwpbbjycpxyhfql2b4dnm4wgcn039aw43igjgfdrkmkz";
      sha256 = "1zp4njsk9ybrhjr7pb06nmnm3shmxc69ra2hxvz0bwhq4syr1xsl";
      type = "gem";
    };
    version = "2.0.101";
    version = "2.0.105";
  };
  metasploit_data_models = {
    groups = ["default"];
@@ -957,10 +957,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "1kljmw1lhzqjcwnwadr5m2khii0h2lsah447zb9vgirrv5jszg9h";
      sha256 = "1a12m1mv8dc0g90fs1myvis8vsgr427k1arg1q4a9qlfw6fqyhis";
      type = "gem";
    };
    version = "3.0.4";
    version = "3.0.5";
  };
  rack-test = {
    groups = ["default"];
@@ -987,10 +987,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "1mj0b7ay10a2fgwj70kjw7mlyrp7a5la8lx8zmwhy40bkansdfrf";
      sha256 = "1mcb75qvldfz6zsr4inrfx7dmb0ngxy507awx28khqmnla3hqpc9";
      type = "gem";
    };
    version = "1.4.3";
    version = "1.4.4";
  };
  railties = {
    groups = ["default"];
@@ -1047,10 +1047,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "1izlsziflj70kgwfy2d72jfr7bhrzamnhbq8gxjn8xdz0wvdj0di";
      sha256 = "1vpsmij5mknpiqy4b835rzl87slshm5dkr08hm8wypfya3v4m6cp";
      type = "gem";
    };
    version = "0.3.1";
    version = "0.3.2";
  };
  rex-arch = {
    groups = ["default"];
@@ -1217,10 +1217,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "0arm3yakxs541qbm52rxjjd9b3p70sqim7syd83m3vqh366gr67d";
      sha256 = "06xihmiw7fqbjpxi1zh6hb8whbq45saxllvlk00mjp2l3dn0p7hb";
      type = "gem";
    };
    version = "0.2.46";
    version = "0.2.47";
  };
  rex-zip = {
    groups = ["default"];
@@ -1337,10 +1337,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
      sha256 = "1lgvrna3wvm21y350hrasdb4w8119cn1fd0prrrj76ws5w0pdzvc";
      sha256 = "1ryfja9yd3fq8n1p5yi3qnd0pjk7bkycmxxmbb1bj0axlr1pdv20";
      type = "gem";
    };
    version = "3.0.4";
    version = "3.0.5";
  };
  sqlite3 = {
    dependencies = ["mini_portile2"];