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

Merge pull request #297982 from fabaff/metasploit-bump 

metasploit: 6.3.60 -> 6.4.0
parents a3ed7406 31752f3b

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

pkgs/tools/security/metasploit/Gemfile.lock

+7 −7
Original line number Diff line number Diff line 
GIT

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

  revision: 5df84967c30bc92484c217aa70754596ff358ad0

  ref: refs/tags/6.3.60

  revision: c82de1374a222da3ca6db840432a971cfd4e865e

  ref: refs/tags/6.4.0

  specs:

    metasploit-framework (6.3.60)

    metasploit-framework (6.4.0)

      actionpack (~> 7.0.0)

      activerecord (~> 7.0.0)

      activesupport (~> 7.0.0)
@@ -83,7 +83,7 @@ GIT 
      rex-zip

      ruby-macho

      ruby-mysql

      ruby_smb (~> 3.3.0)

      ruby_smb (~> 3.3.3)

      rubyntlm

      rubyzip

      sinatra
@@ -166,7 +166,7 @@ GEM 
    bcrypt (3.1.20)

    bcrypt_pbkdf (1.1.0)

    bigdecimal (3.1.6)

    bindata (2.5.0)

    bindata (2.4.15)

    bootsnap (1.18.3)

      msgpack (~> 1.2)

    bson (5.0.0)
@@ -398,8 +398,8 @@ GEM 
    ruby-mysql (4.1.0)

    ruby-rc4 (0.1.5)

    ruby2_keywords (0.0.5)

    ruby_smb (3.3.2)

      bindata

    ruby_smb (3.3.4)

      bindata (= 2.4.15)

      openssl-ccm

      openssl-cmac

      rubyntlm

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

  version = "6.4.0";



  src = fetchFromGitHub {

    owner = "rapid7";

    repo = "metasploit-framework";

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

    hash = "sha256-K4NBMaoWpxbyKCtkHYzPJSIM27yY8MZZDXAuJM9T1ZE=";

    hash = "sha256-1OWgQgnmsKxGHzX2ly/7xIJH4BcWUV6SjScxB5bMhu0=";

  };



  nativeBuildInputs = [

pkgs/tools/security/metasploit/gemset.nix

+7 −7
Original line number Diff line number Diff line
@@ -234,10 +234,10 @@ 
    platforms = [];

    source = {

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

      sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19";

      sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5";

      type = "gem";

    };

    version = "2.5.0";

    version = "2.4.15";

  };

  bootsnap = {

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

    source = {

      fetchSubmodules = false;

      rev = "5df84967c30bc92484c217aa70754596ff358ad0";

      sha256 = "14fmag7j8bkh1mcwdw4qpkdhq8i5ry61sr1b53r1d9qnm8ql30rb";

      rev = "c82de1374a222da3ca6db840432a971cfd4e865e";

      sha256 = "1vc6rjb0fc97in95wl8n2zh4g0n4zcprgxim3x3arc76151a1rfl";

      type = "git";

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

    };

    version = "6.3.60";

    version = "6.4.0";

  };

  metasploit-model = {

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

    source = {

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

      sha256 = "1yy5z53mp2l3d8k8dhf8s8hbscmgd829j50nfcgmqrli0vvz0s1a";

      sha256 = "0wcbglknz86qf7sbsns84a35a0vvfn9cn1cbhf9ycjwh6nqxhcim";

      type = "gem";

    };

    version = "3.3.2";

    version = "3.3.4";

  };

  rubyntlm = {

    groups = ["default"];