From 7eb51a716e4d1f29287db5e49d6fb79da28f5847 Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Wed, 4 Sep 2024 22:37:27 +0200
Subject: [PATCH] ibm-sw-tpm2: 1682 -> 1682-unstable-2024-08-02

In order to fix build with more recent OpenSSL versions (3.2.x+)
use new Github upstream URL, which is more recent than the sourceforge
release.

Only a tag and no release is made, so use the unstable versioning
scheme.

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/tools/security/ibm-sw-tpm2/default.nix | 27 ++++++---------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix
index 76123a7c893f..8030b5ba1565 100644
--- a/pkgs/tools/security/ibm-sw-tpm2/default.nix
+++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
-, fetchurl
-, fetchpatch
+, fetchFromGitHub
 , openssl
 }:
 let
@@ -12,28 +11,18 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ibm-sw-tpm2";
-  version = "1682";
+  version = "1682-unstable-2024-08-02";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz";
-    hash = "sha256-PLZC+HGheyPVCwRuX5X0ScIodBX8HnrrS9u4kg28s48=";
+  src = fetchFromGitHub {
+    owner = "kgoldman";
+    repo = "ibmswtpm2";
+    rev = "rev183-2024-08-02";
+    hash = "sha256-D2GAkiePBow2iixYMOOeJrnh5hk2lO07dV++lK4X8qE=";
   };
 
-  patches = [
-    # Backport openssl-3.1 from development branch.
-    # Can be removed with next release.
-    (fetchpatch {
-      name = "openssl-3.1.patch";
-      url = "https://github.com/kgoldman/ibmswtpm2/commit/15501bf4973d334ca9420fa2fb0f0fe1800871e0.patch";
-      includes = [ "TpmToOsslMath.h" ];
-      stripLen = 1;
-      hash = "sha256-8TwyZVy8pQwq5Fl8cy9xJWtdckwL+QK0+DL5EHDLYUY=";
-    })
-  ];
-
   buildInputs = [ openssl ];
 
-  sourceRoot = "src";
+  sourceRoot = "${src.name}/src";
 
   inherit makefile;