Skip to content

Instantly share code, notes, and snippets.

@Noctem
Last active August 29, 2015 14:03
Show Gist options
  • Save Noctem/65fb6b7432663f909158 to your computer and use it in GitHub Desktop.
Save Noctem/65fb6b7432663f909158 to your computer and use it in GitHub Desktop.
Patch for head version of gnupg2 on homebrew.
diff --git a/configure.ac b/configure.ac
index 02e02bb..2334e4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ min_automake_version="1.10"
# (git tag -s gnupg-2.n.m) and run "./autogen.sh --force". Please
# bump the version number immediately *after* the release and do
# another commit and push so that the git magic is able to work.
-m4_define([mym4_package],[gnupg])
+m4_define([mym4_package],[gnupg2])
m4_define([mym4_major], [2])
m4_define([mym4_minor], [1])
m4_define([mym4_micro], [0])
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index 4b1c219..47e7a60 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -20,8 +20,8 @@
# Programs required before we can run these tests.
-required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
- ../../tools/gpg-connect-agent ../../tools/mk-tdata
+required_pgms = ../../g10/gpg2 ../../tools/gpg-connect-agent \
+ ../../tools/mk-tdata
TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C
diff --git a/tests/pkits/inittests b/tests/pkits/inittests
index 5c29bdc..242c306 100755
--- a/tests/pkits/inittests
+++ b/tests/pkits/inittests
@@ -76,7 +76,7 @@ no-greeting
batch
disable-crl-checks
disable-dirmngr
-agent-program ../../agent/gpg-agent
+agent-program gpg-agent
no-common-certs-import
EOF
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment