diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-21 12:01:10 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-21 12:01:10 +0000 |
commit | e98fe116d8678612e73968b5e944e8523caa5983 (patch) | |
tree | c6af4316f98bd045e6eea0a4dfc68aa4d4524e09 /pkgs/tools/security | |
parent | 709a4a0ae1acd1accc8975d1bb6ea231f8d66d23 (diff) | |
parent | ba884b665a34bb5983ec3dc077e1044506fec1ad (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/metasploit/Gemfile | 2 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/Gemfile.lock | 6 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/metasploit/gemset.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/proxmark3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/trueseeing/default.nix | 8 |
6 files changed, 17 insertions, 13 deletions
diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 7475d019a7be0..557d26ab38c55 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.54" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.55" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index d25c247fad96d..a0f10b1a203ac 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: 038a5b20f97601ac1f73edcc4642f1add35ef08f - ref: refs/tags/6.3.54 + revision: 59122f9afd18c1e41a2a66870f1d986896f05216 + ref: refs/tags/6.3.55 specs: - metasploit-framework (6.3.54) + metasploit-framework (6.3.55) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index d86b14b46d25b..f828b47891f01 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.54"; + version = "6.3.55"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-LGAvqtmtrEuhC61LohEgFBSSLR52orHVSnJqcl60yjs="; + hash = "sha256-443sNaqGizvrJh7aEtarK+jix9+KYzkEZJg8k0QGskM="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index c614fa81f15c4..4f2478a12fc3e 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -664,12 +664,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "038a5b20f97601ac1f73edcc4642f1add35ef08f"; - sha256 = "0fyanig74skj9bav38kn3qnr450l408s4jxd1fhlpb5dv6m2yq1c"; + rev = "59122f9afd18c1e41a2a66870f1d986896f05216"; + sha256 = "0hxj0r296g4qch23jqwavz3y5s1bmgb15nhy4vmkp2w6m8syr3g3"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.54"; + version = "6.3.55"; }; metasploit-model = { groups = ["default"]; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index de586e7e9004b..609d2f7818ee9 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -25,13 +25,13 @@ assert withBlueshark -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "proxmark3"; - version = "4.17768"; + version = "4.18218"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "proxmark3"; rev = "v${version}"; - hash = "sha256-4x8GN4Jsk9xqk4MbGu8SpE4Zh0Opb3akCH5NlASzLQo="; + hash = "sha256-LltTTmYEF1JsqkVaj7Z19qGR+dEUj6Hwr6T5Z1eDzZc="; }; patches = [ diff --git a/pkgs/tools/security/trueseeing/default.nix b/pkgs/tools/security/trueseeing/default.nix index 5feccbb2d8beb..ef0026f870f0f 100644 --- a/pkgs/tools/security/trueseeing/default.nix +++ b/pkgs/tools/security/trueseeing/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trueseeing"; - version = "2.1.10"; + version = "2.2.1"; pyproject = true; src = fetchFromGitHub { owner = "alterakey"; repo = "trueseeing"; rev = "refs/tags/v${version}"; - hash = "sha256-q7hUsBmTRPizmNWueFtFDc5t7rd1evMrBj3oX1Q2VfM="; + hash = "sha256-bgvnzCcxRiJnjcHVbcIA6YfpCOIDTLD5tQae/0Tqk4E="; }; nativeBuildInputs = with python3.pkgs; [ @@ -23,12 +23,16 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; propagatedBuildInputs = with python3.pkgs; [ + asn1crypto attrs + importlib-metadata jinja2 lxml + progressbar2 pypubsub pyyaml termcolor + zstandard ]; # Project has no tests |