[sup-devel] [PATCH v2] prefer gpg2 (GnuPG 2.x) over gpg (GnuPG 1.x)

From: Sascha Silbe <sascha-pgp@silbe.org>
To: sup-devel <sup-devel@rubyforge.org>
Subject: [sup-devel] [PATCH v2] prefer gpg2 (GnuPG 2.x) over gpg (GnuPG 1.x)
Date: Tue, 18 Jan 2011 19:20:21 +0100	[thread overview]
Message-ID: <1295374821-1403-1-git-send-email-sascha-pgp@silbe.org> (raw)
In-Reply-To: <1294776647-sup-7357@meteor.durcheinandertal.local>

Since 1.9.14 GnuPG can automatically start gpg-agent if it's not already
running (using a well-known socket location). When using GnuPG 1.x gpg-agent
needs to already be running at the time sup is started because the socket
location is random and passed via environment variables.

Autostarting gpg-agent is particularly convenient when using sup via ssh
as gpg-agent would need to be started manually (for local X sessions OTOH
it's often started automatically by distro scripts).

Signed-off-by: Sascha Silbe <sascha-pgp@silbe.org>
---
v1->v2: rebase on next

 lib/sup/crypto.rb |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb
index 02f14d0..f44efb3 100644
--- a/lib/sup/crypto.rb
+++ b/lib/sup/crypto.rb
@@ -48,6 +48,11 @@ EOS
     GPGME.check_version({:protocol => GPGME::PROTOCOL_OpenPGP})
     rescue NameError, GPGME::Error
       @gpgme_present = false
+      return
+    end
+
+    if (bin = `which gpg2`.chomp) =~ /\S/
+      GPGME.set_engine_info GPGME::PROTOCOL_OpenPGP, bin, nil
     end
   end
 
-- 
1.7.2.3

_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel

