1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
require "formula"
class Gnupg2 < Formula
homepage "https://www.gnupg.org/"
url "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-2.0.23.tar.bz2"
sha1 "c90e47ab95a40dd070fd75faef0a05c7b679553b"
option "8192", "Build with support for private keys of up to 8192 bits"
depends_on "libgpg-error"
depends_on "libgcrypt"
depends_on "libksba"
depends_on "libassuan"
depends_on "pinentry"
depends_on "pth"
depends_on "gpg-agent"
depends_on "dirmngr" => :recommended
depends_on "libusb-compat" => :recommended
depends_on "readline" => :optional
# Fix hardcoded runtime data location
# upstream: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;h=c3f08dc
# Adjust package name to fit our scheme of packaging both gnupg 1.x and
# 2.x, and gpg-agent separately, and adjust tests to fit this scheme
patch :DATA
def install
inreplace "g10/keygen.c", "max=4096", "max=8192" if build.include? "8192"
(var/"run").mkpath
ENV.append "LDFLAGS", "-lresolv"
ENV["gl_cv_absolute_stdint_h"] = "#{MacOS.sdk_path}/usr/include/stdint.h"
agent = Formula["gpg-agent"].opt_prefix
args = %W[
--disable-dependency-tracking
--prefix=#{prefix}
--sbindir=#{bin}
--enable-symcryptrun
--disable-agent
--with-agent-pgm=#{agent}/bin/gpg-agent
--with-protect-tool-pgm=#{agent}/libexec/gpg-protect-tool
]
if build.with? "readline"
args << "--with-readline=#{Formula["readline"].opt_prefix}"
end
system "./configure", *args
system "make"
system "make check"
system "make install"
# Conflicts with a manpage from the 1.x formula, and
# gpg-zip isn't installed by this formula anyway
rm man1/"gpg-zip.1"
end
end
__END__
diff --git a/common/homedir.c b/common/homedir.c
index 4b03cfe..c84f26f 100644
--- a/common/homedir.c
+++ b/common/homedir.c
@@ -472,7 +472,7 @@ dirmngr_socket_name (void)
}
return name;
#else /*!HAVE_W32_SYSTEM*/
- return "/var/run/dirmngr/socket";
+ return "HOMEBREW_PREFIX/var/run/dirmngr/socket";
#endif /*!HAVE_W32_SYSTEM*/
}
diff --git a/configure b/configure
index 5959b37..2bea995 100755
--- a/configure
+++ b/configure
@@ -578,8 +578,8 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='gnupg'
-PACKAGE_TARNAME='gnupg'
+PACKAGE_NAME='gnupg2'
+PACKAGE_TARNAME='gnupg2'
PACKAGE_VERSION='2.0.23'
PACKAGE_STRING='gnupg 2.0.23'
PACKAGE_BUGREPORT='http://bugs.gnupg.org'
diff --git a/tests/openpgp/Makefile.in b/tests/openpgp/Makefile.in
index c9ceb2d..7044900 100644
--- a/tests/openpgp/Makefile.in
+++ b/tests/openpgp/Makefile.in
@@ -312,11 +312,11 @@ GPG_IMPORT = ../../g10/gpg2 --homedir . \
# Programs required before we can run these tests.
-required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
+required_pgms = ../../g10/gpg2 \
../../tools/gpg-connect-agent
TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C \
- ../../agent/gpg-agent --quiet --daemon sh
+ gpg-agent --quiet --daemon sh
TESTS = version.test mds.test \
decrypt.test decrypt-dsa.test \
|
