From 001181d49e306a8a5aed7f22ee583c9136af95da Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 5 Oct 2024 07:19:54 +0200
Subject: [PATCH 1/2] oath-toolkit: migrate to `pkgs/by-name` overlay

---
 .../default.nix => by-name/oa/oath-toolkit/package.nix}         | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/security/oath-toolkit/default.nix => by-name/oa/oath-toolkit/package.nix} (100%)

diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/by-name/oa/oath-toolkit/package.nix
similarity index 100%
rename from pkgs/tools/security/oath-toolkit/default.nix
rename to pkgs/by-name/oa/oath-toolkit/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58ab2693467b..e3fb810aca96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10655,8 +10655,6 @@ with pkgs;
 
   oapi-codegen = callPackage ../tools/networking/oapi-codegen { };
 
-  oath-toolkit = callPackage ../tools/security/oath-toolkit { };
-
   oatpp = callPackage ../development/libraries/oatpp { };
 
   obex_data_server = callPackage ../tools/bluetooth/obex-data-server { };

From 18e9a97ff835d73ecf8d2e8ae3f4466b809750cd Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 5 Oct 2024 07:21:54 +0200
Subject: [PATCH 2/2] oath-toolkit: 2.6.11 -> 2.6.12

Note that this fixes CVE-2024-47191 (privilege escalation), see
https://security.opensuse.org/2024/10/04/oath-toolkit-vulnerability.html
---
 pkgs/by-name/oa/oath-toolkit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oa/oath-toolkit/package.nix b/pkgs/by-name/oa/oath-toolkit/package.nix
index aa4255860469..15fc4760bc37 100644
--- a/pkgs/by-name/oa/oath-toolkit/package.nix
+++ b/pkgs/by-name/oa/oath-toolkit/package.nix
@@ -8,11 +8,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "oath-toolkit";
-  version = "2.6.11";
+  version = "2.6.12";
 
   src = fetchurl {
     url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-/FEqSltG9MQ6sFhsMYn+zk1U9+ZJOX1voeI0KEMeLLQ=";
+    hash = "sha256-yv33ObHsSydkQcau2uZBFDS72HAHH2YVS5CcxuLZ6Lo=";
   };
 
   buildInputs = [ securityDependency ];