From b38d811673677dab387e15db58919e902299e993 Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Mon, 28 Aug 2017 16:41:46 +0100
Subject: gpg: be less strict on newer versions

---
 Library/Homebrew/gpg.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/gpg.rb b/Library/Homebrew/gpg.rb
index f56473df3..b9a6942ec 100644
--- a/Library/Homebrew/gpg.rb
+++ b/Library/Homebrew/gpg.rb
@@ -7,8 +7,7 @@ class Gpg
       next unless gpg_short_version
       gpg_version = Version.create(gpg_short_version.to_s)
       @version = gpg_version
-      gpg_version == Version.create("2.1") ||
-        gpg_version == Version.create("2.0")
+      gpg_version >= Version.create("2.0")
     end
   end
 
-- 
cgit v1.2.3


From 380afe2f2df9c4b341484571dc1b2d2d54f7400b Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Mon, 28 Aug 2017 16:51:58 +0100
Subject: gpg: test usability tweaks

---
 Library/Homebrew/gpg.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/gpg.rb b/Library/Homebrew/gpg.rb
index b9a6942ec..a63207e6c 100644
--- a/Library/Homebrew/gpg.rb
+++ b/Library/Homebrew/gpg.rb
@@ -37,12 +37,21 @@ class Gpg
       Key-Length: 2048
       Subkey-Type: RSA
       Subkey-Length: 2048
-      Passphrase: ''
       Name-Real: Testing
       Name-Email: testing@foo.bar
       Expire-Date: 1d
+      %no-protection
       %commit
     EOS
     system GPG_EXECUTABLE, "--batch", "--gen-key", "batch.gpg"
   end
+
+  def self.cleanup_test_processes!
+    odie "No GPG present to test against!" unless available?
+    gpgconf = Pathname.new(GPG_EXECUTABLE).parent/"gpgconf"
+
+    system gpgconf, "--kill", "gpg-agent"
+    system gpgconf, "--homedir", "keyrings/live", "--kill",
+                                 "gpg-agent"
+  end
 end
-- 
cgit v1.2.3


From c75a8221a5115dc45634ece380266a8a63c0458d Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Tue, 29 Aug 2017 05:20:10 +0100
Subject: gpg2_requirement: update code comments

---
 Library/Homebrew/requirements/gpg2_requirement.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Library')

diff --git a/Library/Homebrew/requirements/gpg2_requirement.rb b/Library/Homebrew/requirements/gpg2_requirement.rb
index d570983eb..ebdd71f6e 100644
--- a/Library/Homebrew/requirements/gpg2_requirement.rb
+++ b/Library/Homebrew/requirements/gpg2_requirement.rb
@@ -5,8 +5,8 @@ class GPG2Requirement < Requirement
   fatal true
   default_formula "gnupg"
 
-  # GPGTools installs GnuPG 2.0.x as a vanilla `gpg` symlink
-  # pointing to `gpg2`. Homebrew install 2.1.x as a non-symlink `gpg`.
-  # We support both the 2.0.x "stable" and 2.1.x "modern" series here.
+  # GPGTools installs GnuPG 2.0.x as a `gpg` symlink pointing
+  # to `gpg2`. Our `gnupg` installs only a non-symlink `gpg`.
+  # The aim is to retain support for any version above 2.0.
   satisfy(build_env: false) { Gpg.gpg || Gpg.gpg2 }
 end
-- 
cgit v1.2.3


From 6d726e1bd6676d97bf41bc800942881cf8c3e78f Mon Sep 17 00:00:00 2001
From: Dominyk Tiller
Date: Fri, 1 Sep 2017 01:50:26 +0100
Subject: gpg: create unified test helper

---
 Library/Homebrew/gpg.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'Library')

diff --git a/Library/Homebrew/gpg.rb b/Library/Homebrew/gpg.rb
index a63207e6c..de2089dda 100644
--- a/Library/Homebrew/gpg.rb
+++ b/Library/Homebrew/gpg.rb
@@ -54,4 +54,13 @@ class Gpg
     system gpgconf, "--homedir", "keyrings/live", "--kill",
                                  "gpg-agent"
   end
+
+  def self.test(path)
+    create_test_key(path)
+    begin
+      yield
+    ensure
+      cleanup_test_processes!
+    end
+  end
 end
-- 
cgit v1.2.3