1 |
commit: 4b084d956b9bc167ec1887cb7717573b5a4f077d |
2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Apr 9 17:49:17 2019 +0000 |
4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 9 17:50:20 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b084d95 |
7 |
|
8 |
app-crypt/gnupg: bump |
9 |
|
10 |
Also adds one-line delta patch for --quiet in --send-key, submitted to |
11 |
upstream for inclusion. |
12 |
|
13 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
14 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
15 |
|
16 |
app-crypt/gnupg/Manifest | 1 + |
17 |
.../gnupg/files/gnupg-2.2.14-quiet-sending.patch | 34 +++++ |
18 |
app-crypt/gnupg/gnupg-2.2.15.ebuild | 137 +++++++++++++++++++++ |
19 |
3 files changed, 172 insertions(+) |
20 |
|
21 |
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest |
22 |
index d9d42130a4f..ffc0c9cfd34 100644 |
23 |
--- a/app-crypt/gnupg/Manifest |
24 |
+++ b/app-crypt/gnupg/Manifest |
25 |
@@ -2,3 +2,4 @@ DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bc |
26 |
DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370beec77ffba0abb7862defdab2d5a82b1508284961e30e7d0aab82bffdf09fe796741603e843a062073f179f0bfc2 SHA512 a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd |
27 |
DIST gnupg-2.2.12.tar.bz2 6682303 BLAKE2B 8470ab8bf386d3524ce57ef1a1f6ac74d8cf2d7c35062b95c668b37586603c8e0817e410f4a0a807256e42896c11116897b7118b29e471184b2fa871ad4ba048 SHA512 30de9757bb60a5cb6bf0dc2c8da5f4742c54affec3fcd0bcbf66f28f2812149afec5db70dcb6ba592101de4bdc479d1ba0b47c53c8b8d4765ddff32fa51c26c8 |
28 |
DIST gnupg-2.2.14.tar.bz2 6707735 BLAKE2B feedb1c776e8d43e43905e8a8c1487bd88e8effc59e94baf308cb29a5feea5d9c666c78b50147d65a259dc89af241c2a2bf07a72c417617e5238e0fdbbc2b17f SHA512 9d5216dee085efe6de300579d8fb773a5a55df639d5a435708611a974df522dd60dc995fbfcaad98065475dbeb731bbba19ecc3273e78b9b45fccff640dde69b |
29 |
+DIST gnupg-2.2.15.tar.bz2 6705912 BLAKE2B 145bd174cb74c6a1180de76a6d46b40d2434ced61bb9aa3eaddeb0079cd05634529c9b062e475d3ca9d35b3af3b62b39a79ef0efbb476cb9ebb9e2099ad13ae0 SHA512 7c6f0092d384fd71fc7a1c905ce23ae98df42ce131ee09fc190c275f9c8d0912be344b0782244cccb5b3938322ef3cfff8ed1ec7e949e761478b8c5110dde36a |
30 |
|
31 |
diff --git a/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch b/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch |
32 |
new file mode 100644 |
33 |
index 00000000000..1f7a561d3f7 |
34 |
--- /dev/null |
35 |
+++ b/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch |
36 |
@@ -0,0 +1,34 @@ |
37 |
+From d8db73615e68d1c549b3ed50057a49d84a31b334 Mon Sep 17 00:00:00 2001 |
38 |
+From: "Robin H. Johnson" <robbat2@g.o> |
39 |
+Date: Tue, 9 Apr 2019 10:27:11 -0700 |
40 |
+Subject: [PATCH] g10: support --quiet for --send-key |
41 |
+ |
42 |
+The --recv-key command supports --quiet, but --send-key does not. |
43 |
+Add support for it for parity and better scripting. |
44 |
+ |
45 |
+Signed-off-by: Robin H. Johnson <robbat2@g.o> |
46 |
+--- |
47 |
+ g10/keyserver.c | 7 ++++--- |
48 |
+ 1 file changed, 4 insertions(+), 3 deletions(-) |
49 |
+ |
50 |
+diff --git a/g10/keyserver.c b/g10/keyserver.c |
51 |
+index 66900f7a9..e5fc011c0 100644 |
52 |
+--- a/g10/keyserver.c |
53 |
++++ b/g10/keyserver.c |
54 |
+@@ -1814,9 +1814,10 @@ keyserver_put (ctrl_t ctrl, strlist_t keyspecs) |
55 |
+ log_error (_("skipped \"%s\": %s\n"), kspec->d, gpg_strerror (err)); |
56 |
+ else |
57 |
+ { |
58 |
+- log_info (_("sending key %s to %s\n"), |
59 |
+- keystr (keyblock->pkt->pkt.public_key->keyid), |
60 |
+- ksurl?ksurl:"[?]"); |
61 |
++ if (!opt.quiet) |
62 |
++ log_info (_("sending key %s to %s\n"), |
63 |
++ keystr (keyblock->pkt->pkt.public_key->keyid), |
64 |
++ ksurl?ksurl:"[?]"); |
65 |
+ |
66 |
+ err = gpg_dirmngr_ks_put (ctrl, data, datalen, keyblock); |
67 |
+ release_kbnode (keyblock); |
68 |
+-- |
69 |
+2.21.0 |
70 |
+ |
71 |
|
72 |
diff --git a/app-crypt/gnupg/gnupg-2.2.15.ebuild b/app-crypt/gnupg/gnupg-2.2.15.ebuild |
73 |
new file mode 100644 |
74 |
index 00000000000..1c68f3982ce |
75 |
--- /dev/null |
76 |
+++ b/app-crypt/gnupg/gnupg-2.2.15.ebuild |
77 |
@@ -0,0 +1,137 @@ |
78 |
+# Copyright 1999-2019 Gentoo Authors |
79 |
+# Distributed under the terms of the GNU General Public License v2 |
80 |
+ |
81 |
+EAPI=7 |
82 |
+ |
83 |
+inherit flag-o-matic systemd toolchain-funcs |
84 |
+ |
85 |
+MY_P="${P/_/-}" |
86 |
+ |
87 |
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" |
88 |
+HOMEPAGE="http://www.gnupg.org/" |
89 |
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
90 |
+ |
91 |
+LICENSE="GPL-3" |
92 |
+SLOT="0" |
93 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
94 |
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server" |
95 |
+ |
96 |
+# Existence of executables is checked during configuration. |
97 |
+DEPEND="!app-crypt/dirmngr |
98 |
+ >=dev-libs/libassuan-2.5.0 |
99 |
+ >=dev-libs/libgcrypt-1.7.3 |
100 |
+ >=dev-libs/libgpg-error-1.28 |
101 |
+ >=dev-libs/libksba-1.3.4 |
102 |
+ >=dev-libs/npth-1.2 |
103 |
+ >=net-misc/curl-7.10 |
104 |
+ bzip2? ( app-arch/bzip2 ) |
105 |
+ ldap? ( net-nds/openldap ) |
106 |
+ readline? ( sys-libs/readline:0= ) |
107 |
+ smartcard? ( usb? ( virtual/libusb:1 ) ) |
108 |
+ ssl? ( >=net-libs/gnutls-3.0:0= ) |
109 |
+ sys-libs/zlib |
110 |
+ tofu? ( >=dev-db/sqlite-3.7 ) |
111 |
+ virtual/mta" |
112 |
+ |
113 |
+RDEPEND="${DEPEND} |
114 |
+ app-crypt/pinentry |
115 |
+ nls? ( virtual/libintl ) |
116 |
+ selinux? ( sec-policy/selinux-gpg )" |
117 |
+ |
118 |
+BDEPEND="virtual/pkgconfig |
119 |
+ doc? ( sys-apps/texinfo ) |
120 |
+ nls? ( sys-devel/gettext )" |
121 |
+ |
122 |
+S="${WORKDIR}/${MY_P}" |
123 |
+ |
124 |
+DOCS=( |
125 |
+ ChangeLog NEWS README THANKS TODO VERSION |
126 |
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER |
127 |
+) |
128 |
+ |
129 |
+PATCHES=( |
130 |
+ "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
131 |
+ "${FILESDIR}/${PN}-2.2.14-quiet-sending.patch" |
132 |
+) |
133 |
+ |
134 |
+src_configure() { |
135 |
+ local myconf=() |
136 |
+ |
137 |
+ if use prefix && use usb; then |
138 |
+ # bug #649598 |
139 |
+ append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" |
140 |
+ fi |
141 |
+ |
142 |
+ if use elibc_SunOS || use elibc_AIX; then |
143 |
+ myconf+=( --disable-symcryptrun ) |
144 |
+ else |
145 |
+ myconf+=( --enable-symcryptrun ) |
146 |
+ fi |
147 |
+ |
148 |
+ #bug 663142 |
149 |
+ if use user-socket; then |
150 |
+ myconf+=( --enable-run-gnupg-user-socket ) |
151 |
+ fi |
152 |
+ |
153 |
+ # glib fails and picks up clang's internal stdint.h causing weird errors |
154 |
+ [[ ${CC} == *clang ]] && \ |
155 |
+ export gl_cv_absolute_stdint_h=/usr/include/stdint.h |
156 |
+ |
157 |
+ econf \ |
158 |
+ "${myconf[@]}" \ |
159 |
+ $(use_enable bzip2) \ |
160 |
+ $(use_enable nls) \ |
161 |
+ $(use_enable smartcard scdaemon) \ |
162 |
+ $(use_enable ssl gnutls) \ |
163 |
+ $(use_enable tofu) \ |
164 |
+ $(use_enable usb ccid-driver) \ |
165 |
+ $(use_enable wks-server wks-tools) \ |
166 |
+ $(use_with ldap) \ |
167 |
+ $(use_with readline) \ |
168 |
+ --disable-ntbtls \ |
169 |
+ --enable-all-tests \ |
170 |
+ --enable-gpg \ |
171 |
+ --enable-gpgsm \ |
172 |
+ --enable-large-secmem \ |
173 |
+ CC_FOR_BUILD="$(tc-getBUILD_CC)" \ |
174 |
+ GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \ |
175 |
+ KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \ |
176 |
+ LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \ |
177 |
+ LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \ |
178 |
+ NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \ |
179 |
+ $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
180 |
+} |
181 |
+ |
182 |
+src_compile() { |
183 |
+ default |
184 |
+ |
185 |
+ use doc && emake -C doc html |
186 |
+} |
187 |
+ |
188 |
+src_test() { |
189 |
+ #Bug: 638574 |
190 |
+ use tofu && export TESTFLAGS=--parallel |
191 |
+ default |
192 |
+} |
193 |
+ |
194 |
+src_install() { |
195 |
+ default |
196 |
+ |
197 |
+ use tools && |
198 |
+ dobin \ |
199 |
+ tools/{convert-from-106,gpg-check-pattern} \ |
200 |
+ tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ |
201 |
+ tools/make-dns-cert |
202 |
+ |
203 |
+ dosym gpg /usr/bin/gpg2 |
204 |
+ dosym gpgv /usr/bin/gpgv2 |
205 |
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die |
206 |
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die |
207 |
+ |
208 |
+ dodir /etc/env.d |
209 |
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die |
210 |
+ |
211 |
+ use doc && dodoc doc/gnupg.html/* doc/*.png |
212 |
+ |
213 |
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket} |
214 |
+} |