From 7058c089a6c38681d1d84cfec9f40f499a3cf885 Mon Sep 17 00:00:00 2001 From: JCount Date: Tue, 14 Mar 2017 17:08:36 -0400 Subject: [PATCH 1/3] gpg: add the 2.1.x series as a recognized GnuPG version --- Library/Homebrew/gpg.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/gpg.rb b/Library/Homebrew/gpg.rb index 066f67864e..7775420558 100644 --- a/Library/Homebrew/gpg.rb +++ b/Library/Homebrew/gpg.rb @@ -5,7 +5,9 @@ class Gpg which_all(executable).detect do |gpg| gpg_short_version = Utils.popen_read(gpg, "--version")[/\d\.\d/, 0] next unless gpg_short_version - Version.create(gpg_short_version.to_s) == Version.create("2.0") + gpg_version = Version.create(gpg_short_version.to_s) + gpg_version == Version.create("2.0") || + gpg_version == Version.create("2.1") end end From de6650683b9ef4280a51e2c66553e376bb9e18d2 Mon Sep 17 00:00:00 2001 From: JCount Date: Tue, 14 Mar 2017 17:11:39 -0400 Subject: [PATCH 2/3] gpg2_requirement: indicate 2.1.x "modern" series is supported as well --- Library/Homebrew/requirements/gpg2_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/gpg2_requirement.rb b/Library/Homebrew/requirements/gpg2_requirement.rb index 00bf4183a7..1784b4c9da 100644 --- a/Library/Homebrew/requirements/gpg2_requirement.rb +++ b/Library/Homebrew/requirements/gpg2_requirement.rb @@ -7,6 +7,6 @@ class GPG2Requirement < Requirement # MacGPG2/GPGTools installs GnuPG 2.0.x as a vanilla `gpg` symlink # pointing to `gpg2`, as do we. Ensure we're actually using a 2.0 `gpg`. - # Temporarily, only support 2.0.x rather than the 2.1.x "modern" series. + # Support both the 2.0.x "stable" and 2.1.x "modern" series. satisfy(build_env: false) { Gpg.gpg2 || Gpg.gpg } end From ca303f6195bbe0a8cc47e87a6fa530a35d3b6b5e Mon Sep 17 00:00:00 2001 From: JCount Date: Wed, 15 Mar 2017 14:53:18 -0400 Subject: [PATCH 3/3] gpg2_requirement: set default_formula to gnupg (2.1.x) --- Library/Homebrew/requirements/gpg2_requirement.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/requirements/gpg2_requirement.rb b/Library/Homebrew/requirements/gpg2_requirement.rb index 1784b4c9da..97fabcca0d 100644 --- a/Library/Homebrew/requirements/gpg2_requirement.rb +++ b/Library/Homebrew/requirements/gpg2_requirement.rb @@ -3,7 +3,7 @@ require "gpg" class GPG2Requirement < Requirement fatal true - default_formula "gnupg2" + default_formula "gnupg" # MacGPG2/GPGTools installs GnuPG 2.0.x as a vanilla `gpg` symlink # pointing to `gpg2`, as do we. Ensure we're actually using a 2.0 `gpg`.