Unverified Commit 8016ec11 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #307038 from fabaff/metasploit-bump 

metasploit: 6.4.5 -> 6.4.5
parents 6a242fe3 bfbe2548

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

pkgs/tools/security/metasploit/Gemfile.lock

+12 −14
Original line number Diff line number Diff line 
GIT

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

  revision: 6dfd13e04c9e9763b485a5b7d6e85d97632a8edf

  ref: refs/tags/6.4.5

  revision: 55ea82f7d3f98652ea81ab1d29d3be3e55528345

  ref: refs/tags/6.4.6

  specs:

    metasploit-framework (6.4.5)

    metasploit-framework (6.4.6)

      actionpack (~> 7.0.0)

      activerecord (~> 7.0.0)

      activesupport (~> 7.0.0)
@@ -22,7 +22,7 @@ GIT 
      em-http-request

      eventmachine

      faker

      faraday

      faraday (= 2.7.11)

      faraday-retry

      faye-websocket

      filesize
@@ -87,7 +87,7 @@ GIT 
      rubyntlm

      rubyzip

      sinatra

      sqlite3

      sqlite3 (= 1.6.6)

      sshkey

      swagger-blocks

      thin
@@ -193,10 +193,11 @@ GEM 
    eventmachine (1.2.7)

    faker (3.3.1)

      i18n (>= 1.8.11, < 2)

    faraday (2.9.0)

      faraday-net_http (>= 2.0, < 3.2)

    faraday-net_http (3.1.0)

      net-http

    faraday (2.7.11)

      base64

      faraday-net_http (>= 2.0, < 3.1)

      ruby2_keywords (>= 0.0.4)

    faraday-net_http (3.0.2)

    faraday-retry (2.2.1)

      faraday (~> 2.0)

    faye-websocket (0.11.3)
@@ -275,8 +276,6 @@ GEM 
    mustermann (3.0.0)

      ruby2_keywords (~> 0.0.1)

    nessus_rest (0.1.6)

    net-http (0.4.1)

      uri

    net-imap (0.4.10)

      date

      net-protocol
@@ -416,7 +415,7 @@ GEM 
      rack (~> 2.2, >= 2.2.4)

      rack-protection (= 3.2.0)

      tilt (~> 2.0)

    sqlite3 (2.0.0)

    sqlite3 (1.6.6)

      mini_portile2 (~> 2.8.0)

    sshkey (3.0.0)

    strptime (0.2.5)
@@ -438,7 +437,6 @@ GEM 
      unf_ext

    unf_ext (0.0.9.1)

    unix-crypt (1.3.1)

    uri (0.13.0)

    warden (1.2.9)

      rack (>= 2.0.9)

    webrick (1.8.1)
@@ -470,4 +468,4 @@ DEPENDENCIES 
  metasploit-framework!



BUNDLED WITH

   2.4.13
 
   2.5.7

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.4.5";

  version = "6.4.6";



  src = fetchFromGitHub {

    owner = "rapid7";

    repo = "metasploit-framework";

    rev = "refs/tags/${version}";

    hash = "sha256-KmELKjbWjhHmyj8IlL5U2yNHwtpc8qX5ZAT1PcIJOd8=";

    hash = "sha256-2O/Hl95yd+4va6TGxd5zYdsjcgBwCGOcZ2jvtoOBhBE=";

  };



  nativeBuildInputs = [

pkgs/tools/security/metasploit/gemset.nix

+9 −29
Original line number Diff line number Diff line
@@ -414,20 +414,20 @@ 
    platforms = [];

    source = {

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

      sha256 = "1qqb1rmk0f9m82iijjlqadh5yby1bhnr6svjk9vxdvh6f181988s";

      sha256 = "0vn7jwss2v6jhnxvjsiwbs3irjwhbx9zxn4l6fhd4rkcfyxzdnw5";

      type = "gem";

    };

    version = "2.9.0";

    version = "2.7.11";

  };

  faraday-net_http = {

    groups = ["default"];

    platforms = [];

    source = {

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

      sha256 = "17w51yk4rrm9rpnbc3x509s619kba0jga3qrj4b17l30950vw9qn";

      sha256 = "13byv3mp1gsjyv8k0ih4612y6vw5kqva6i03wcg4w2fqpsd950k8";

      type = "gem";

    };

    version = "3.1.0";

    version = "3.0.2";

  };

  faraday-retry = {

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

    source = {

      fetchSubmodules = false;

      rev = "6dfd13e04c9e9763b485a5b7d6e85d97632a8edf";

      sha256 = "1prr1713vx84ckwsbwjwvb14f8yvajz9821zrbk133nn6qm0nq9a";

      rev = "55ea82f7d3f98652ea81ab1d29d3be3e55528345";

      sha256 = "04c4h61vdvv8cyf6623h01r27nv1fggcbim4dcpywxvjvsbwgvyq";

      type = "git";

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

    };

    version = "6.4.5";

    version = "6.4.6";

  };

  metasploit-model = {

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

    version = "0.1.6";

  };

  net-http = {

    groups = ["default"];

    platforms = [];

    source = {

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

      sha256 = "10n2n9aq00ih8v881af88l1zyrqgs5cl3njdw8argjwbl5ggqvm9";

      type = "gem";

    };

    version = "0.4.1";

  };

  net-imap = {

    groups = ["default"];

    platforms = [];
@@ -1457,10 +1447,10 @@ 
    platforms = [];

    source = {

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

      sha256 = "01sfiwn60czgpabfr7xq8dk3qkc17ai3z7d4yfwanq1zw6mf927n";

      sha256 = "15415lmz69jbzl6nch4q5l2jxv054676nk6y0vgy0g3iklmjrxvc";

      type = "gem";

    };

    version = "2.0.0";

    version = "1.6.6";

  };

  sshkey = {

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

    version = "1.3.1";

  };

  uri = {

    groups = ["default"];

    platforms = [];

    source = {

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

      sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96";

      type = "gem";

    };

    version = "0.13.0";

  };

  warden = {

    groups = ["default"];

    platforms = [];