From 2227358346a84dda52c6776dd358c1bb0f579d9b Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Wed, 27 Aug 2025 08:48:41 +0200
Subject: [PATCH 1/2] phpExtensions.gnupg: 1.5.3 -> 1.5.4

---
 pkgs/development/php-packages/gnupg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix
index ab3e4f28caf3..07e62f03d76a 100644
--- a/pkgs/development/php-packages/gnupg/default.nix
+++ b/pkgs/development/php-packages/gnupg/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "1.5.3";
+  version = "1.5.4";
 in
 buildPecl {
   inherit version;
@@ -20,7 +20,7 @@ buildPecl {
     repo = "php-gnupg";
     rev = "gnupg-${version}";
     fetchSubmodules = true;
-    hash = "sha256-F9Rq+mmUhvXfIuoifqRM/ZIMYszCF93cvv13Vt/A5Mo=";
+    hash = "sha256-g9w0v9qc/Q5qjB9/ekZyheQ1ClIEqMEoBc32nGWhXYA=";
   };
 
   buildInputs = [ gpgme ];

From e0b493ef387a8ac6923571860ff03b399c61fd83 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Wed, 27 Aug 2025 08:49:17 +0200
Subject: [PATCH 2/2] phpExtensions.gnupg fix build

---
 .../php-packages/gnupg/default.nix            |  5 ++++
 .../gnupg/missing-new-line-test.patch         | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/php-packages/gnupg/missing-new-line-test.patch

diff --git a/pkgs/development/php-packages/gnupg/default.nix b/pkgs/development/php-packages/gnupg/default.nix
index 07e62f03d76a..9cfa7e0eaafb 100644
--- a/pkgs/development/php-packages/gnupg/default.nix
+++ b/pkgs/development/php-packages/gnupg/default.nix
@@ -43,6 +43,11 @@ buildPecl {
       --replace-fail 'string(12)' 'string(${toString (lib.stringLength "${gnupg}/bin/gpg")})'
   '';
 
+  patches = [
+    # https://github.com/php-gnupg/php-gnupg/issues/62
+    ./missing-new-line-test.patch
+  ];
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/php-packages/gnupg/missing-new-line-test.patch b/pkgs/development/php-packages/gnupg/missing-new-line-test.patch
new file mode 100644
index 000000000000..5a31f7c931d5
--- /dev/null
+++ b/pkgs/development/php-packages/gnupg/missing-new-line-test.patch
@@ -0,0 +1,28 @@
+diff --git a/tests/gnupg_oo_sign_clear.phpt b/tests/gnupg_oo_sign_clear.phpt
+index 4f9b79c..05fda25 100644
+--- a/tests/gnupg_oo_sign_clear.phpt
++++ b/tests/gnupg_oo_sign_clear.phpt
+@@ -38,8 +38,7 @@ array(1) {
+     int(0)
+   }
+ }
+-string(8) "foo bar
+-"
++string(7) "foo bar"
+ --CLEAN--
+ <?php
+ require_once "gnupgt.inc";
+diff --git a/tests/gnupg_res_sign_clear.phpt b/tests/gnupg_res_sign_clear.phpt
+index 71dd6c2..74fd26d 100644
+--- a/tests/gnupg_res_sign_clear.phpt
++++ b/tests/gnupg_res_sign_clear.phpt
+@@ -36,8 +36,7 @@ array(1) {
+     int(0)
+   }
+ }
+-string(8) "foo bar
+-"
++string(7) "foo bar"
+ --CLEAN--
+ <?php
+ require_once "gnupgt.inc";
\ No newline at end of file