From fba3e1ae0c0f4c1d73f55b9f97674c3ed7e695e0 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 25 Sep 2016 08:35:18 +0200
Subject: [PATCH] GnuPG 2.1: Add option to configure gpgconf binary location

---
 plugins/enigma/config.inc.php.dist         | 4 ++++
 plugins/enigma/lib/enigma_driver_gnupg.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist
index 581ac8534..aa4280f41 100644
--- a/plugins/enigma/config.inc.php.dist
+++ b/plugins/enigma/config.inc.php.dist
@@ -24,6 +24,10 @@ $config['enigma_pgp_binary'] = '';
 // It's used with GnuPG 2.x.
 $config['enigma_pgp_agent'] = '';
 
+// Location of gpgconf binary. By default it will be auto-detected.
+// It's used with GnuPG >= 2.1.
+$config['enigma_pgp_gpgconf'] = '';
+
 // Enables signatures verification feature.
 $config['enigma_signatures'] = true;
 
diff --git a/plugins/enigma/lib/enigma_driver_gnupg.php b/plugins/enigma/lib/enigma_driver_gnupg.php
index 3c02f9f43..267af4fd1 100644
--- a/plugins/enigma/lib/enigma_driver_gnupg.php
+++ b/plugins/enigma/lib/enigma_driver_gnupg.php
@@ -43,6 +43,7 @@ class enigma_driver_gnupg extends enigma_driver
         $debug   = $this->rc->config->get('enigma_debug');
         $binary  = $this->rc->config->get('enigma_pgp_binary');
         $agent   = $this->rc->config->get('enigma_pgp_agent');
+        $gpgconf = $this->rc->config->get('enigma_pgp_gpgconf');
 
         if (!$homedir) {
             return new enigma_error(enigma_error::INTERNAL,
@@ -88,6 +89,9 @@ class enigma_driver_gnupg extends enigma_driver
         if ($agent) {
             $options['agent'] = $agent;
         }
+        if ($gpgconf) {
+            $options['gpgconf'] = $gpgconf;
+        }
 
         // Create Crypt_GPG object
         try {