phpExtensions.gnupg: 1.5.3 -> 1.5.4 and fix build (#437418)

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 ];
@@ -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 = {

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";