From 50f538175ee5c99753ec6d46ff09a80c8cfb5fcc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 3 May 2017 14:21:51 +0200
Subject: v2.7.7

---
 php-horde-Horde-Crypt-pr220.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 php-horde-Horde-Crypt-pr220.patch

(limited to 'php-horde-Horde-Crypt-pr220.patch')

diff --git a/php-horde-Horde-Crypt-pr220.patch b/php-horde-Horde-Crypt-pr220.patch
new file mode 100644
index 0000000..dbe6e5e
--- /dev/null
+++ b/php-horde-Horde-Crypt-pr220.patch
@@ -0,0 +1,24 @@
+From 6f16c25d4e3780469e86ca1b6c6f2d8ca47ee786 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 3 May 2017 14:14:19 +0200
+Subject: [PATCH] '--pinentry-mode loopback' was introduce in gnupg 2.1.12
+
+---
+ framework/Crypt/lib/Horde/Crypt/Pgp/Backend/Binary.php | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp/Backend/Binary.php b/framework/Crypt/lib/Horde/Crypt/Pgp/Backend/Binary.php
+index 73d6d40..71e765d 100644
+--- a/framework/Crypt/lib/Horde/Crypt/Pgp/Backend/Binary.php
++++ b/framework/Crypt/lib/Horde/Crypt/Pgp/Backend/Binary.php
+@@ -80,8 +80,8 @@ public function __construct($gnupg, $temp = null)
+ 
+         /* GnuPG 2 requires specifying the pinentry-mode. */
+         $result = $this->_callGpg(array('--version'), 'r');
+-        if (preg_match('/gpg \(GnuPG\) (\d+)\.(\d+)\.(\d+)/', $result->stdout, $version) &&
+-            $version[1] >= 2) {
++        if (preg_match('/gpg \(GnuPG\) (\d+\.\d+\.\d+)/', $result->stdout, $version) &&
++            version_compare($version[1], '2.1.12', 'ge') ) {
+             $this->_gnupg[] = '--pinentry-mode loopback';
+             file_put_contents(
+                 $this->_tempdir . '/gpg-agent.conf',
-- 
cgit