Unverified Commit 6cab081e authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #221065 from fabaff/metasploit-bump 

metasploit: 6.3.5 -> 6.3.7
parents 23d59a4e ab94f417

pkgs/tools/security/metasploit/Gemfile

+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.3.5"
 
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.7"

pkgs/tools/security/metasploit/Gemfile.lock

+32 −30
Original line number Diff line number Diff line 
GIT

  remote: https://github.com/rapid7/metasploit-framework

  revision: a5332d9785cb7c8d0bbc3f0d8532287858b15aea

  ref: refs/tags/6.3.5

  revision: f6fdb097af15319fe1755e4e5fa5918edacbd5ca

  ref: refs/tags/6.3.7

  specs:

    metasploit-framework (6.3.5)

    metasploit-framework (6.3.7)

      actionpack (~> 7.0)

      activerecord (~> 7.0)

      activesupport (~> 7.0)
@@ -13,6 +13,7 @@ GIT 
      bcrypt

      bcrypt_pbkdf

      bson

      chunky_png

      dnsruby

      ed25519

      em-http-request
@@ -31,7 +32,7 @@ GIT 
      metasploit-concern

      metasploit-credential

      metasploit-model

      metasploit-payloads (= 2.0.113)

      metasploit-payloads (= 2.0.122)

      metasploit_data_models

      metasploit_payloads-mettle (= 1.0.20)

      mqtt
@@ -99,25 +100,25 @@ GEM 
  remote: https://rubygems.org/

  specs:

    Ascii85 (1.1.0)

    actionpack (7.0.4.2)

      actionview (= 7.0.4.2)

      activesupport (= 7.0.4.2)

    actionpack (7.0.4.3)

      actionview (= 7.0.4.3)

      activesupport (= 7.0.4.3)

      rack (~> 2.0, >= 2.2.0)

      rack-test (>= 0.6.3)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.0, >= 1.2.0)

    actionview (7.0.4.2)

      activesupport (= 7.0.4.2)

    actionview (7.0.4.3)

      activesupport (= 7.0.4.3)

      builder (~> 3.1)

      erubi (~> 1.4)

      rails-dom-testing (~> 2.0)

      rails-html-sanitizer (~> 1.1, >= 1.2.0)

    activemodel (7.0.4.2)

      activesupport (= 7.0.4.2)

    activerecord (7.0.4.2)

      activemodel (= 7.0.4.2)

      activesupport (= 7.0.4.2)

    activesupport (7.0.4.2)

    activemodel (7.0.4.3)

      activesupport (= 7.0.4.3)

    activerecord (7.0.4.3)

      activemodel (= 7.0.4.3)

      activesupport (= 7.0.4.3)

    activesupport (7.0.4.3)

      concurrent-ruby (~> 1.0, >= 1.0.2)

      i18n (>= 1.6, < 2)

      minitest (>= 5.1)
@@ -128,13 +129,13 @@ GEM 
    arel-helpers (2.14.0)

      activerecord (>= 3.1.0, < 8)

    aws-eventstream (1.2.0)

    aws-partitions (1.720.0)

    aws-partitions (1.726.0)

    aws-sdk-core (3.170.0)

      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.367.0)

    aws-sdk-ec2 (1.369.0)

      aws-sdk-core (~> 3, >= 3.165.0)

      aws-sigv4 (~> 1.1)

    aws-sdk-iam (1.75.0)
@@ -154,6 +155,7 @@ GEM 
    bindata (2.4.15)

    bson (4.15.0)

    builder (3.2.4)

    chunky_png (1.4.0)

    concurrent-ruby (1.2.2)

    cookiejar (0.3.3)

    crass (1.0.6)
@@ -179,7 +181,7 @@ GEM 
      faraday-net_http (>= 2.0, < 3.1)

      ruby2_keywords (>= 0.0.4)

    faraday-net_http (3.0.2)

    faraday-retry (2.0.0)

    faraday-retry (2.1.0)

      faraday (~> 2.0)

    faye-websocket (0.11.1)

      eventmachine (>= 0.12.0)
@@ -203,7 +205,7 @@ GEM 
    i18n (1.12.0)

      concurrent-ruby (~> 1.0)

    io-console (0.6.0)

    irb (1.6.2)

    irb (1.6.3)

      reline (>= 0.3.0)

    jmespath (1.6.2)

    jsobfu (0.4.2)
@@ -236,7 +238,7 @@ GEM 
      activemodel (~> 7.0)

      activesupport (~> 7.0)

      railties (~> 7.0)

    metasploit-payloads (2.0.113)

    metasploit-payloads (2.0.122)

    metasploit_data_models (6.0.2)

      activerecord (~> 7.0)

      activesupport (~> 7.0)
@@ -250,9 +252,9 @@ GEM 
    metasploit_payloads-mettle (1.0.20)

    method_source (1.0.0)

    mini_portile2 (2.8.1)

    minitest (5.17.0)

    minitest (5.18.0)

    mqtt (0.6.0)

    msgpack (1.6.0)

    msgpack (1.6.1)

    multi_json (1.15.0)

    mustermann (3.0.0)

      ruby2_keywords (~> 0.0.1)
@@ -262,7 +264,7 @@ GEM 
      timeout

    net-smtp (0.3.3)

      net-protocol

    net-ssh (7.0.1)

    net-ssh (7.1.0)

    network_interface (0.0.2)

    nexpose (7.3.0)

    nio4r (2.5.8)
@@ -291,7 +293,7 @@ GEM 
    puma (6.1.1)

      nio4r (~> 2.0)

    racc (1.6.2)

    rack (2.2.6.3)

    rack (2.2.6.4)

    rack-protection (3.0.5)

      rack

    rack-test (2.0.2)
@@ -301,9 +303,9 @@ GEM 
      nokogiri (>= 1.6)

    rails-html-sanitizer (1.5.0)

      loofah (~> 2.19, >= 2.19.1)

    railties (7.0.4.2)

      actionpack (= 7.0.4.2)

      activesupport (= 7.0.4.2)

    railties (7.0.4.3)

      actionpack (= 7.0.4.3)

      activesupport (= 7.0.4.3)

      method_source

      rake (>= 12.2)

      thor (~> 1.0)
@@ -330,7 +332,7 @@ GEM 
      metasm

      rex-arch

      rex-text

    rex-exploitation (0.1.37)

    rex-exploitation (0.1.38)

      jsobfu

      metasm

      rex-arch
@@ -362,7 +364,7 @@ GEM 
      rex-socket

      rex-text

    rex-struct2 (0.1.3)

    rex-text (0.2.49)

    rex-text (0.2.50)

    rex-zip (0.1.4)

      rex-text

    rexml (3.2.5)
@@ -370,7 +372,7 @@ GEM 
    ruby-macho (3.0.0)

    ruby-rc4 (0.1.5)

    ruby2_keywords (0.0.5)

    ruby_smb (3.2.4)

    ruby_smb (3.2.5)

      bindata

      openssl-ccm

      openssl-cmac

pkgs/tools/security/metasploit/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ let 
  };

in stdenv.mkDerivation rec {

  pname = "metasploit-framework";

  version = "6.3.5";

  version = "6.3.7";



  src = fetchFromGitHub {

    owner = "rapid7";

    repo = "metasploit-framework";

    rev = version;

    sha256 = "sha256-T6MrvTnaTE+Pvx3UwzBZmw9jWcL4qr4TDbyCCqI6O0g=";

    sha256 = "sha256-UT6KPiNz3f+peLt1mGEgk2OHBZJMBrxIz6Te8qfdiik=";

  };



  nativeBuildInputs = [ makeWrapper ];

pkgs/tools/security/metasploit/gemset.nix

+50 −40
Original line number Diff line number Diff line
@@ -4,50 +4,50 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "02q8mjgw70szmhx3hc5pdcf0yhk5hfhhvfng24xghiqkx7dkgf21";

      sha256 = "1cb0hqkfkc0b9s7swvi4nf64c24i3ma1gv09anr8a81k56s0rwxd";

      type = "gem";

    };

    version = "7.0.4.2";

    version = "7.0.4.3";

  };

  actionview = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "07fn4brsrz308b01rqql0n582zqva5q8ws2gnx2jdm9ab2ph1l4i";

      sha256 = "1h9027sqzfcbc84dnzw8nxjyg15zrk1y2fc0468wg1xi9nmyw96z";

      type = "gem";

    };

    version = "7.0.4.2";

    version = "7.0.4.3";

  };

  activemodel = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1a961ak8n53d783k5p0n4clgvlbp9vkwxk32ysfww28nl00jlr0r";

      sha256 = "0ymhsxgdb68zgf4zp07g2bymmpgn0b9r38avn9pagz1p5zy1ql9v";

      type = "gem";

    };

    version = "7.0.4.2";

    version = "7.0.4.3";

  };

  activerecord = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "159z1m6294f2v1mjzbjbfajahiks4x2mg0s01hw407a9y23q07ln";

      sha256 = "01wb98i2zsbb4jcb4i6z72vb05wiks4hv9chc66h1rsxrv0zi4dv";

      type = "gem";

    };

    version = "7.0.4.2";

    version = "7.0.4.3";

  };

  activesupport = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0dmywys50074vj5rivpx188b00qimlc4jn84xzqlialrgp3ckq5f";

      sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp";

      type = "gem";

    };

    version = "7.0.4.2";

    version = "7.0.4.3";

  };

  addressable = {

    groups = ["default"];
@@ -104,10 +104,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0f9dc7igx4wxza0vim2fg15hj1bgi6js2a2w2fkr2h8mi019nrgs";

      sha256 = "0pn77j932x8p5z992arfjwdjpp5m6zl8llma6pk61hm8dh9wxfw5";

      type = "gem";

    };

    version = "1.720.0";

    version = "1.726.0";

  };

  aws-sdk-core = {

    groups = ["default"];
@@ -124,10 +124,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1xxfa17xv9rl2xd0wp4vh9ddjj9zzb93nbb8y2n34phz7l2yxd0w";

      sha256 = "0kzlkvidm3hzh0168m0jz9w2c2r47dy8n97l2qyys77hl1cxa6kf";

      type = "gem";

    };

    version = "1.367.0";

    version = "1.369.0";

  };

  aws-sdk-iam = {

    groups = ["default"];
@@ -219,6 +219,16 @@ 
    };

    version = "3.2.4";

  };

  chunky_png = {

    groups = ["default"];

    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1znw5x86hmm9vfhidwdsijz8m38pqgmv98l9ryilvky0aldv7mc9";

      type = "gem";

    };

    version = "1.4.0";

  };

  concurrent-ruby = {

    groups = ["default"];

    platforms = [];
@@ -364,10 +374,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "07bn75d784ndj9ljqk19ff6217hkqqmxjlnjx5b9v36k2nnj9kys";

      sha256 = "1zz0w4jpfa6h1wlirfcs9hzvlpijnd1nnmjq94w5yv50585p279n";

      type = "gem";

    };

    version = "2.0.0";

    version = "2.1.0";

  };

  faye-websocket = {

    groups = ["default"];
@@ -504,10 +514,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "10qvm0s8784lhmz98blqnxh36i7d7rzkk17znx17d46666z7czrf";

      sha256 = "1h9s07n5v3z029v18924ws9vdkdc80n6llp9ccx77yg1krv2g0f3";

      type = "gem";

    };

    version = "1.6.2";

    version = "1.6.3";

  };

  jmespath = {

    groups = ["default"];
@@ -604,12 +614,12 @@ 
    platforms = [];

    source = {

      fetchSubmodules = false;

      rev = "a5332d9785cb7c8d0bbc3f0d8532287858b15aea";

      sha256 = "0j1v7ai0m0mw1l9vxapqq9cn63wvb4qc7m0xpy7lyk6s76yjp8sg";

      rev = "f6fdb097af15319fe1755e4e5fa5918edacbd5ca";

      sha256 = "0acavnkz5pm4rx4bq1jcj82qfqwk41hrhxdvg2lzzpbk4cz8lgji";

      type = "git";

      url = "https://github.com/rapid7/metasploit-framework";

    };

    version = "6.3.5";

    version = "6.3.7";

  };

  metasploit-model = {

    groups = ["default"];
@@ -626,10 +636,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0wmck8jldfdhfvax8dqa3dbxq76sn10xsvs02gf9wbs9zcp0nypi";

      sha256 = "054h5bvcyxfqpvczbmssxvjpginxxg9q9qsjm8n9wssaxjq8vvd6";

      type = "gem";

    };

    version = "2.0.113";

    version = "2.0.122";

  };

  metasploit_data_models = {

    groups = ["default"];
@@ -676,10 +686,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1kjy67qajw4rnkbjs5jyk7kc3lyhz5613fwj1i8f6ppdk4zampy0";

      sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06";

      type = "gem";

    };

    version = "5.17.0";

    version = "5.18.0";

  };

  mqtt = {

    groups = ["default"];
@@ -696,10 +706,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1q03pb0vq8388s431nbxabsfxnch6p304c8vnjlk0zzpcv713yr3";

      sha256 = "1jr9grsdnlb8wgd9by7mhsc9c1wixijh9an4m4yq1ph0jg26x9rk";

      type = "gem";

    };

    version = "1.6.0";

    version = "1.6.1";

  };

  multi_json = {

    groups = ["default"];
@@ -766,10 +776,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1qp3i8bi7ji1np0530bp2p9zrrn6galvmbsivxwpkjdpjdyn19sr";

      sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";

      type = "gem";

    };

    version = "7.0.1";

    version = "7.1.0";

  };

  network_interface = {

    groups = ["default"];
@@ -947,10 +957,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "17wg99w29hpiq9p4cmm8c6kdg4lcw0ll2c36qw7y50gy1cs4h5j2";

      sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";

      type = "gem";

    };

    version = "2.2.6.3";

    version = "2.2.6.4";

  };

  rack-protection = {

    groups = ["default"];
@@ -997,10 +1007,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0056s3hh67mjqwb2gjsarx6v3ay2cb8dqiwj1zf84krlbj83l9kz";

      sha256 = "0w6pib1s0kmfnhjvxwh48flz7w4gy8y961n821w8by7d1g83vjwq";

      type = "gem";

    };

    version = "7.0.4.2";

    version = "7.0.4.3";

  };

  rake = {

    groups = ["default"];
@@ -1107,10 +1117,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "15fcisxsxcs6kvg84cv4xdxpd0bhajbmdssrbbvacblvwxn0yydb";

      sha256 = "1afz3qvdmaav542klxz2jwwgrayhw1lyrivmpfv5jk2c613cky3n";

      type = "gem";

    };

    version = "0.1.37";

    version = "0.1.38";

  };

  rex-java = {

    groups = ["default"];
@@ -1227,10 +1237,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "0s25qqgjqz98240mfx9a39449v2f89yga3qm718zkdzks4f99c0x";

      sha256 = "1558dqyd9w290bxyq44kdwzsl7s7hq79gsjrrpfqzr6h8cri2slw";

      type = "gem";

    };

    version = "0.2.49";

    version = "0.2.50";

  };

  rex-zip = {

    groups = ["default"];
@@ -1297,10 +1307,10 @@ 
    platforms = [];

    source = {

      remotes = ["https://rubygems.org"];

      sha256 = "1vzwh4r2056cyagx0kggrl82yi9ldhj5slp0rdy8fdchh6ac95rg";

      sha256 = "075ib787qp2g0ghx0pww76ff843l09y5d5h1x63zbnxzm3q3v4dz";

      type = "gem";

    };

    version = "3.2.4";

    version = "3.2.5";

  };

  rubyntlm = {

    groups = ["default"];