1 |
commit: 47d9576076ddd37b4fe05550969b8b9e029dc9da |
2 |
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 3 20:10:50 2020 +0000 |
4 |
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 3 20:10:50 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d95760 |
7 |
|
8 |
app-crypt/gnupg: Drop old |
9 |
|
10 |
Package-Manager: Portage-3.0.4, Repoman-2.3.23 |
11 |
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org> |
12 |
|
13 |
app-crypt/gnupg/Manifest | 2 - |
14 |
.../gnupg/files/gnupg-2.2.22-card-status.patch | 20 --- |
15 |
app-crypt/gnupg/gnupg-2.2.21.ebuild | 165 --------------------- |
16 |
app-crypt/gnupg/gnupg-2.2.22-r1.ebuild | 165 --------------------- |
17 |
4 files changed, 352 deletions(-) |
18 |
|
19 |
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest |
20 |
index 57c6cc33249..a1bd0368bda 100644 |
21 |
--- a/app-crypt/gnupg/Manifest |
22 |
+++ b/app-crypt/gnupg/Manifest |
23 |
@@ -1,4 +1,2 @@ |
24 |
DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc |
25 |
-DIST gnupg-2.2.21.tar.bz2 6813160 BLAKE2B b4708fd34c23dec8ec5be0740a502d155b649b4c88a89e5cc6f3cb99a15f7c6e31c50247ccacfedad55600dac3e7f91a8567424d335ab5e537082261dc98aceb SHA512 b4eac75253d4a1cac341c8a1ba7bb275e849a88d5377035497777c7bcd49b5a4c91b77000311695eb7d4083856975b2b2d14518f24ab94846027280bd8c301f9 |
26 |
-DIST gnupg-2.2.22.tar.bz2 7098444 BLAKE2B b5f306485032acadc852f4f71f2e968795843faacd5dda24ed2b20df78a3d38a364c2feade7ef8389a203e8b037fbb92129207cbc6d60b89cfb0945dded56a97 SHA512 3e5a8bb91c122f97acee2a93e3233db89bff9b96c6ec052c95bd2fe7e46c79a8afaac536c05675a7129e332272d62c677722a12cb05386b54a8d12ef82b6c5fa |
27 |
DIST gnupg-2.2.23.tar.bz2 7099806 BLAKE2B 0b9c1f5c8931399cfd9d95f107f91869733c4a986476ea43631b4265b1a5c26cfb8c9bb24ef6a295af7aa803749caaedde26365f6f50a7c946c1f86c867d855d SHA512 736b39628f7e4adc650b3f9937c81f27e9ad41e77f5345dc54262c91c1cf7004243fa7f932313bcde955e0e9b3f1afc639bac18023ae878b1d26e3c5a3cabb90 |
28 |
|
29 |
diff --git a/app-crypt/gnupg/files/gnupg-2.2.22-card-status.patch b/app-crypt/gnupg/files/gnupg-2.2.22-card-status.patch |
30 |
deleted file mode 100644 |
31 |
index 1a01e5ddbc5..00000000000 |
32 |
--- a/app-crypt/gnupg/files/gnupg-2.2.22-card-status.patch |
33 |
+++ /dev/null |
34 |
@@ -1,20 +0,0 @@ |
35 |
-diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c |
36 |
-index 8a1d30d5b..ccc360fc8 100644 |
37 |
---- a/scd/app-openpgp.c |
38 |
-+++ b/scd/app-openpgp.c |
39 |
-@@ -2357,10 +2357,15 @@ verify_chv2 (app_t app, |
40 |
- int rc; |
41 |
- char *pinvalue; |
42 |
- int pinlen; |
43 |
-+ int i; |
44 |
- |
45 |
- if (app->did_chv2) |
46 |
- return 0; /* We already verified CHV2. */ |
47 |
- |
48 |
-+ /* Make sure we have load the public keys. */ |
49 |
-+ for (i = 0; i < 3; i++) |
50 |
-+ get_public_key (app, i); |
51 |
-+ |
52 |
- if (app->app_local->pk[1].key || app->app_local->pk[2].key) |
53 |
- { |
54 |
- rc = verify_a_chv (app, pincb, pincb_arg, 2, 0, &pinvalue, &pinlen); |
55 |
|
56 |
diff --git a/app-crypt/gnupg/gnupg-2.2.21.ebuild b/app-crypt/gnupg/gnupg-2.2.21.ebuild |
57 |
deleted file mode 100644 |
58 |
index e41bbd94151..00000000000 |
59 |
--- a/app-crypt/gnupg/gnupg-2.2.21.ebuild |
60 |
+++ /dev/null |
61 |
@@ -1,165 +0,0 @@ |
62 |
-# Copyright 1999-2020 Gentoo Authors |
63 |
-# Distributed under the terms of the GNU General Public License v2 |
64 |
- |
65 |
-EAPI=7 |
66 |
- |
67 |
-inherit flag-o-matic systemd toolchain-funcs |
68 |
- |
69 |
-MY_P="${P/_/-}" |
70 |
- |
71 |
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" |
72 |
-HOMEPAGE="https://gnupg.org/" |
73 |
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
74 |
- |
75 |
-LICENSE="GPL-3" |
76 |
-SLOT="0" |
77 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
78 |
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server" |
79 |
- |
80 |
-# Existence of executables is checked during configuration. |
81 |
-DEPEND=">=dev-libs/libassuan-2.5.0 |
82 |
- >=dev-libs/libgcrypt-1.7.3 |
83 |
- >=dev-libs/libgpg-error-1.28 |
84 |
- >=dev-libs/libksba-1.3.4 |
85 |
- >=dev-libs/npth-1.2 |
86 |
- >=net-misc/curl-7.10 |
87 |
- bzip2? ( app-arch/bzip2 ) |
88 |
- ldap? ( net-nds/openldap ) |
89 |
- readline? ( sys-libs/readline:0= ) |
90 |
- smartcard? ( usb? ( virtual/libusb:1 ) ) |
91 |
- ssl? ( >=net-libs/gnutls-3.0:0= ) |
92 |
- sys-libs/zlib |
93 |
- tofu? ( >=dev-db/sqlite-3.7 )" |
94 |
- |
95 |
-RDEPEND="${DEPEND} |
96 |
- app-crypt/pinentry |
97 |
- nls? ( virtual/libintl ) |
98 |
- selinux? ( sec-policy/selinux-gpg ) |
99 |
- wks-server? ( virtual/mta )" |
100 |
- |
101 |
-BDEPEND="virtual/pkgconfig |
102 |
- doc? ( sys-apps/texinfo ) |
103 |
- nls? ( sys-devel/gettext )" |
104 |
- |
105 |
-S="${WORKDIR}/${MY_P}" |
106 |
- |
107 |
-DOCS=( |
108 |
- ChangeLog NEWS README THANKS TODO VERSION |
109 |
- doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER |
110 |
-) |
111 |
- |
112 |
-PATCHES=( |
113 |
- "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
114 |
- "${FILESDIR}/${PN}-2.2.20-fix-dirmngr-for-non-ipv6-enabled-hosts.patch" |
115 |
-) |
116 |
- |
117 |
-src_prepare() { |
118 |
- default |
119 |
- |
120 |
- # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode, |
121 |
- # idea borrowed from libdbus, see |
122 |
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6 |
123 |
- # |
124 |
- # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl', |
125 |
- # which in turn requires discovery in Autoconf, something that upstream deeply resents. |
126 |
- sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ |
127 |
- -i doc/examples/systemd-user/gpg-agent-ssh.socket || die |
128 |
-} |
129 |
- |
130 |
-src_configure() { |
131 |
- local myconf=() |
132 |
- |
133 |
- if use prefix && use usb; then |
134 |
- # bug #649598 |
135 |
- append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" |
136 |
- fi |
137 |
- |
138 |
- if use elibc_SunOS || use elibc_AIX; then |
139 |
- myconf+=( --disable-symcryptrun ) |
140 |
- else |
141 |
- myconf+=( --enable-symcryptrun ) |
142 |
- fi |
143 |
- |
144 |
- #bug 663142 |
145 |
- if use user-socket; then |
146 |
- myconf+=( --enable-run-gnupg-user-socket ) |
147 |
- fi |
148 |
- |
149 |
- # glib fails and picks up clang's internal stdint.h causing weird errors |
150 |
- [[ ${CC} == *clang ]] && \ |
151 |
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h |
152 |
- |
153 |
- # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist. |
154 |
- # As of GnuPG 2.3, the mailprog substitution is used for the binary called |
155 |
- # by wks-client & wks-server; and if it's autodetected but not not exist at |
156 |
- # build time, then then 'gpg-wks-client --send' functionality will not |
157 |
- # work. This has an unwanted side-effect in stage3 builds: there was a |
158 |
- # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating |
159 |
- # the build where the install guide previously make the user chose the |
160 |
- # logger & mta early in the install. |
161 |
- |
162 |
- econf \ |
163 |
- "${myconf[@]}" \ |
164 |
- $(use_enable bzip2) \ |
165 |
- $(use_enable nls) \ |
166 |
- $(use_enable smartcard scdaemon) \ |
167 |
- $(use_enable ssl gnutls) \ |
168 |
- $(use_enable tofu) \ |
169 |
- $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \ |
170 |
- $(use_enable wks-server wks-tools) \ |
171 |
- $(use_with ldap) \ |
172 |
- $(use_with readline) \ |
173 |
- --with-mailprog=/usr/libexec/sendmail \ |
174 |
- --disable-ntbtls \ |
175 |
- --enable-all-tests \ |
176 |
- --enable-gpg \ |
177 |
- --enable-gpgsm \ |
178 |
- --enable-large-secmem \ |
179 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" \ |
180 |
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \ |
181 |
- KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \ |
182 |
- LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \ |
183 |
- LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \ |
184 |
- NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \ |
185 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
186 |
-} |
187 |
- |
188 |
-src_compile() { |
189 |
- default |
190 |
- |
191 |
- use doc && emake -C doc html |
192 |
-} |
193 |
- |
194 |
-src_test() { |
195 |
- #Bug: 638574 |
196 |
- use tofu && export TESTFLAGS=--parallel |
197 |
- default |
198 |
-} |
199 |
- |
200 |
-src_install() { |
201 |
- default |
202 |
- |
203 |
- use tools && |
204 |
- dobin \ |
205 |
- tools/{convert-from-106,gpg-check-pattern} \ |
206 |
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ |
207 |
- tools/make-dns-cert |
208 |
- |
209 |
- dosym gpg /usr/bin/gpg2 |
210 |
- dosym gpgv /usr/bin/gpgv2 |
211 |
- echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die |
212 |
- echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die |
213 |
- |
214 |
- dodir /etc/env.d |
215 |
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die |
216 |
- |
217 |
- use doc && dodoc doc/gnupg.html/* doc/*.png |
218 |
- |
219 |
- systemd_douserunit doc/examples/systemd-user/*.{service,socket} |
220 |
-} |
221 |
- |
222 |
-pkg_postinst() { |
223 |
- elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg" |
224 |
- elog |
225 |
- elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!" |
226 |
-} |
227 |
|
228 |
diff --git a/app-crypt/gnupg/gnupg-2.2.22-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.22-r1.ebuild |
229 |
deleted file mode 100644 |
230 |
index 3cd4a08ed40..00000000000 |
231 |
--- a/app-crypt/gnupg/gnupg-2.2.22-r1.ebuild |
232 |
+++ /dev/null |
233 |
@@ -1,165 +0,0 @@ |
234 |
-# Copyright 1999-2020 Gentoo Authors |
235 |
-# Distributed under the terms of the GNU General Public License v2 |
236 |
- |
237 |
-EAPI=7 |
238 |
- |
239 |
-inherit flag-o-matic systemd toolchain-funcs |
240 |
- |
241 |
-MY_P="${P/_/-}" |
242 |
- |
243 |
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" |
244 |
-HOMEPAGE="https://gnupg.org/" |
245 |
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
246 |
- |
247 |
-LICENSE="GPL-3" |
248 |
-SLOT="0" |
249 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
250 |
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server" |
251 |
- |
252 |
-# Existence of executables is checked during configuration. |
253 |
-DEPEND=">=dev-libs/libassuan-2.5.0 |
254 |
- >=dev-libs/libgcrypt-1.7.3 |
255 |
- >=dev-libs/libgpg-error-1.29 |
256 |
- >=dev-libs/libksba-1.3.4 |
257 |
- >=dev-libs/npth-1.2 |
258 |
- >=net-misc/curl-7.10 |
259 |
- bzip2? ( app-arch/bzip2 ) |
260 |
- ldap? ( net-nds/openldap ) |
261 |
- readline? ( sys-libs/readline:0= ) |
262 |
- smartcard? ( usb? ( virtual/libusb:1 ) ) |
263 |
- ssl? ( >=net-libs/gnutls-3.0:0= ) |
264 |
- sys-libs/zlib |
265 |
- tofu? ( >=dev-db/sqlite-3.7 )" |
266 |
- |
267 |
-RDEPEND="${DEPEND} |
268 |
- app-crypt/pinentry |
269 |
- nls? ( virtual/libintl ) |
270 |
- selinux? ( sec-policy/selinux-gpg ) |
271 |
- wks-server? ( virtual/mta )" |
272 |
- |
273 |
-BDEPEND="virtual/pkgconfig |
274 |
- doc? ( sys-apps/texinfo ) |
275 |
- nls? ( sys-devel/gettext )" |
276 |
- |
277 |
-S="${WORKDIR}/${MY_P}" |
278 |
- |
279 |
-DOCS=( |
280 |
- ChangeLog NEWS README THANKS TODO VERSION |
281 |
- doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER |
282 |
-) |
283 |
- |
284 |
-PATCHES=( |
285 |
- "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
286 |
- "${FILESDIR}/${P}-card-status.patch" |
287 |
-) |
288 |
- |
289 |
-src_prepare() { |
290 |
- default |
291 |
- |
292 |
- # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode, |
293 |
- # idea borrowed from libdbus, see |
294 |
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6 |
295 |
- # |
296 |
- # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl', |
297 |
- # which in turn requires discovery in Autoconf, something that upstream deeply resents. |
298 |
- sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ |
299 |
- -i doc/examples/systemd-user/gpg-agent-ssh.socket || die |
300 |
-} |
301 |
- |
302 |
-src_configure() { |
303 |
- local myconf=() |
304 |
- |
305 |
- if use prefix && use usb; then |
306 |
- # bug #649598 |
307 |
- append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" |
308 |
- fi |
309 |
- |
310 |
- if use elibc_SunOS || use elibc_AIX; then |
311 |
- myconf+=( --disable-symcryptrun ) |
312 |
- else |
313 |
- myconf+=( --enable-symcryptrun ) |
314 |
- fi |
315 |
- |
316 |
- #bug 663142 |
317 |
- if use user-socket; then |
318 |
- myconf+=( --enable-run-gnupg-user-socket ) |
319 |
- fi |
320 |
- |
321 |
- # glib fails and picks up clang's internal stdint.h causing weird errors |
322 |
- [[ ${CC} == *clang ]] && \ |
323 |
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h |
324 |
- |
325 |
- # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist. |
326 |
- # As of GnuPG 2.3, the mailprog substitution is used for the binary called |
327 |
- # by wks-client & wks-server; and if it's autodetected but not not exist at |
328 |
- # build time, then then 'gpg-wks-client --send' functionality will not |
329 |
- # work. This has an unwanted side-effect in stage3 builds: there was a |
330 |
- # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating |
331 |
- # the build where the install guide previously make the user chose the |
332 |
- # logger & mta early in the install. |
333 |
- |
334 |
- econf \ |
335 |
- "${myconf[@]}" \ |
336 |
- $(use_enable bzip2) \ |
337 |
- $(use_enable nls) \ |
338 |
- $(use_enable smartcard scdaemon) \ |
339 |
- $(use_enable ssl gnutls) \ |
340 |
- $(use_enable tofu) \ |
341 |
- $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') \ |
342 |
- $(use_enable wks-server wks-tools) \ |
343 |
- $(use_with ldap) \ |
344 |
- $(use_with readline) \ |
345 |
- --with-mailprog=/usr/libexec/sendmail \ |
346 |
- --disable-ntbtls \ |
347 |
- --enable-all-tests \ |
348 |
- --enable-gpg \ |
349 |
- --enable-gpgsm \ |
350 |
- --enable-large-secmem \ |
351 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" \ |
352 |
- GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \ |
353 |
- KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \ |
354 |
- LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \ |
355 |
- LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \ |
356 |
- NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \ |
357 |
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') |
358 |
-} |
359 |
- |
360 |
-src_compile() { |
361 |
- default |
362 |
- |
363 |
- use doc && emake -C doc html |
364 |
-} |
365 |
- |
366 |
-src_test() { |
367 |
- #Bug: 638574 |
368 |
- use tofu && export TESTFLAGS=--parallel |
369 |
- default |
370 |
-} |
371 |
- |
372 |
-src_install() { |
373 |
- default |
374 |
- |
375 |
- use tools && |
376 |
- dobin \ |
377 |
- tools/{convert-from-106,gpg-check-pattern} \ |
378 |
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ |
379 |
- tools/make-dns-cert |
380 |
- |
381 |
- dosym gpg /usr/bin/gpg2 |
382 |
- dosym gpgv /usr/bin/gpgv2 |
383 |
- echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die |
384 |
- echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die |
385 |
- |
386 |
- dodir /etc/env.d |
387 |
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die |
388 |
- |
389 |
- use doc && dodoc doc/gnupg.html/* doc/*.png |
390 |
- |
391 |
- systemd_douserunit doc/examples/systemd-user/*.{service,socket} |
392 |
-} |
393 |
- |
394 |
-pkg_postinst() { |
395 |
- elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg" |
396 |
- elog |
397 |
- elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!" |
398 |
-} |