From b6877b6051d8107899d74d34fc57adc196e12ff3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Nov 2023 15:46:51 +0100 Subject: [PATCH] metasploit: 6.3.43 -> 6.3.44 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 8 ++++---- pkgs/tools/security/metasploit/default.nix | 15 ++++++++++----- pkgs/tools/security/metasploit/gemset.nix | 6 +++--- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 539e6b8bc8d9..e7de6a9a982e 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/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.3.43" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.44" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index adc032baf213..9a129de0728c 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 58dcabe21524d8b2c4d05618ca8509dc42cc6515 - ref: refs/tags/6.3.43 + revision: 54a9eee7f85d369feef55d6a340340ad965f80a0 + ref: refs/tags/6.3.44 specs: - metasploit-framework (6.3.43) + metasploit-framework (6.3.44) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -462,4 +462,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.20 + 2.4.22 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 6f88b96cd6ad..6f9af0634e97 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,17 +15,22 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.43"; + version = "6.3.44"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; - rev = version; - sha256 = "sha256-IWdSxXhJFGbNTo9xqEjBJNEWB6imzdwzgnXoUbfao/g="; + rev = "refs/tags/${version}"; + hash = "sha256-LBmyFE617G2ryEAp5fig3G2T/goa9NXUggu0XH4X1xs="; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ (python3.withPackages (ps: [ ps.requests ])) ]; + nativeBuildInputs = [ + makeWrapper + ]; + + buildInputs = [ + (python3.withPackages (ps: [ ps.requests ])) + ]; dontPatchELF = true; # stay away from exploit executables diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index cf24944c4030..5f3386d4f2eb 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -654,12 +654,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "58dcabe21524d8b2c4d05618ca8509dc42cc6515"; - sha256 = "1y53vavm3s3mh8rxrkd6m03idl94q54ahwcg9v6nc529g32m4rr1"; + rev = "54a9eee7f85d369feef55d6a340340ad965f80a0"; + sha256 = "06yp2xz5rd0bhbadbx0s1bz96vfwl3wfaaa0r2mnvv5m9qab469c"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.43"; + version = "6.3.44"; }; metasploit-model = { groups = ["default"];