1 |
commit: 1fa3c6009b4f72fbb63ae44dd1360c74f0b2f6b6 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 17 07:41:31 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 17 07:41:31 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fa3c600 |
7 |
|
8 |
app-crypt/gnupg: [QA] drop 2.2.30 |
9 |
|
10 |
* 2.2.30 breaks symmetric encryption |
11 |
|
12 |
Bug: https://bugs.gentoo.org/812668 |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
app-crypt/gnupg/Manifest | 1 - |
16 |
app-crypt/gnupg/gnupg-2.2.30.ebuild | 152 ------------------------------------ |
17 |
2 files changed, 153 deletions(-) |
18 |
|
19 |
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest |
20 |
index 5a890d00833..e2a729dfe89 100644 |
21 |
--- a/app-crypt/gnupg/Manifest |
22 |
+++ b/app-crypt/gnupg/Manifest |
23 |
@@ -1,6 +1,5 @@ |
24 |
DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84 |
25 |
DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab |
26 |
DIST gnupg-2.2.29.tar.bz2 7215986 BLAKE2B 04b777730b8fcbe8d93dfc8985aadd6bc7385ac2ac9684e6248cb3ae6d008daae5aa976ffa3bae27fe9e89bc2c4c1d4ae81dcaa259fb08d13f894f00f12072e9 SHA512 12645e230fc6aa4811420ef33def6baa590e847ecdf7e5f8b96eb49122e6406cbdba4595d0b52fa26700d5d5def67acb4ed7dfe7f778e496d4d21ccbef3c476b |
27 |
-DIST gnupg-2.2.30.tar.bz2 7215171 BLAKE2B 3754bdab2bfe56bb111079cf606b71664ae7fbbffd840b03f1e7a52d483248686ec8ba42b79ecf14a2da5a07f4f356df62b91ebe7af550254d7e2ec018b20a32 SHA512 942adac2e0eff654d54c2fe03501bfa20fa5e58575253ca57e9ad585ec2b96e14cc108e0191f3f586234a3b1675fe17dc2cf9e7790280a57166f84ddeb5d5d4f |
28 |
DIST gnupg-2.2.31.tar.bz2 7212188 BLAKE2B 57a2b6c6ea491137a708e18a0119502621b7bdf0591818d19beb8b08a521a7dbf60472243e1723f53acbfb9a5de612b8e5040c45dc847bdda26012244edb11be SHA512 2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea |
29 |
DIST gnupg-2.3.2.tar.bz2 7589445 BLAKE2B f7e35ed553ea89cdb073abb1432f67fa00bb625f6e686e534f96bca11d88f09ea272b3cb0d6706e4bce2c023f8c5b8d628742aa2f60752a2e605132cd32f62ed SHA512 2747cbe38546f500d165f024ebb2dc5be70fa68d20702af3f61e97db685eba94caf65307293137c76ea6cfcc189ed24aaee025c80cd33f26609e5fe512bdda73 |
30 |
|
31 |
diff --git a/app-crypt/gnupg/gnupg-2.2.30.ebuild b/app-crypt/gnupg/gnupg-2.2.30.ebuild |
32 |
deleted file mode 100644 |
33 |
index 81662988beb..00000000000 |
34 |
--- a/app-crypt/gnupg/gnupg-2.2.30.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,152 +0,0 @@ |
37 |
-# Copyright 1999-2021 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=8 |
41 |
- |
42 |
-inherit flag-o-matic systemd toolchain-funcs |
43 |
- |
44 |
-MY_P="${P/_/-}" |
45 |
- |
46 |
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" |
47 |
-HOMEPAGE="https://gnupg.org/" |
48 |
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
49 |
- |
50 |
-LICENSE="GPL-3" |
51 |
-SLOT="0" |
52 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
53 |
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server" |
54 |
- |
55 |
-# Existence of executables is checked during configuration. |
56 |
-DEPEND=">=dev-libs/libassuan-2.5.0 |
57 |
- >=dev-libs/libgcrypt-1.8.0 |
58 |
- >=dev-libs/libgpg-error-1.29 |
59 |
- >=dev-libs/libksba-1.3.4 |
60 |
- >=dev-libs/npth-1.2 |
61 |
- >=net-misc/curl-7.10 |
62 |
- bzip2? ( app-arch/bzip2 ) |
63 |
- ldap? ( net-nds/openldap ) |
64 |
- readline? ( sys-libs/readline:0= ) |
65 |
- smartcard? ( usb? ( virtual/libusb:1 ) ) |
66 |
- ssl? ( >=net-libs/gnutls-3.0:0= ) |
67 |
- sys-libs/zlib |
68 |
- tofu? ( >=dev-db/sqlite-3.7 )" |
69 |
- |
70 |
-RDEPEND="${DEPEND} |
71 |
- app-crypt/pinentry |
72 |
- nls? ( virtual/libintl ) |
73 |
- selinux? ( sec-policy/selinux-gpg ) |
74 |
- wks-server? ( virtual/mta )" |
75 |
- |
76 |
-BDEPEND="virtual/pkgconfig |
77 |
- doc? ( sys-apps/texinfo ) |
78 |
- nls? ( sys-devel/gettext )" |
79 |
- |
80 |
-S="${WORKDIR}/${MY_P}" |
81 |
- |
82 |
-DOCS=( |
83 |
- ChangeLog NEWS README THANKS TODO VERSION |
84 |
- doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER |
85 |
-) |
86 |
- |
87 |
-PATCHES=( |
88 |
- "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
89 |
-) |
90 |
- |
91 |
-src_prepare() { |
92 |
- default |
93 |
- |
94 |
- # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode, |
95 |
- # idea borrowed from libdbus, see |
96 |
- # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6 |
97 |
- # |
98 |
- # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl', |
99 |
- # which in turn requires discovery in Autoconf, something that upstream deeply resents. |
100 |
- sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ |
101 |
- -i doc/examples/systemd-user/gpg-agent-ssh.socket || die |
102 |
-} |
103 |
- |
104 |
-src_configure() { |
105 |
- local myconf=( |
106 |
- $(use_enable bzip2) |
107 |
- $(use_enable nls) |
108 |
- $(use_enable smartcard scdaemon) |
109 |
- $(use_enable ssl gnutls) |
110 |
- $(use_enable tofu) |
111 |
- $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver') |
112 |
- $(use_enable wks-server wks-tools) |
113 |
- $(use_with ldap) |
114 |
- $(use_with readline) |
115 |
- --with-mailprog=/usr/libexec/sendmail |
116 |
- --disable-ntbtls |
117 |
- --enable-all-tests |
118 |
- --enable-gpg |
119 |
- --enable-gpgsm |
120 |
- --enable-large-secmem |
121 |
- CC_FOR_BUILD="$(tc-getBUILD_CC)" |
122 |
- GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" |
123 |
- KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config" |
124 |
- LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" |
125 |
- LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" |
126 |
- NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config" |
127 |
- $("${S}/configure" --help | grep -o -- '--without-.*-prefix') |
128 |
- ) |
129 |
- |
130 |
- if use prefix && use usb; then |
131 |
- # bug #649598 |
132 |
- append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" |
133 |
- fi |
134 |
- |
135 |
- #bug 663142 |
136 |
- if use user-socket; then |
137 |
- myconf+=( --enable-run-gnupg-user-socket ) |
138 |
- fi |
139 |
- |
140 |
- # glib fails and picks up clang's internal stdint.h causing weird errors |
141 |
- [[ ${CC} == *clang ]] && \ |
142 |
- export gl_cv_absolute_stdint_h=/usr/include/stdint.h |
143 |
- |
144 |
- # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist. |
145 |
- # As of GnuPG 2.3, the mailprog substitution is used for the binary called |
146 |
- # by wks-client & wks-server; and if it's autodetected but not not exist at |
147 |
- # build time, then then 'gpg-wks-client --send' functionality will not |
148 |
- # work. This has an unwanted side-effect in stage3 builds: there was a |
149 |
- # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating |
150 |
- # the build where the install guide previously make the user chose the |
151 |
- # logger & mta early in the install. |
152 |
- |
153 |
- econf "${myconf[@]}" |
154 |
-} |
155 |
- |
156 |
-src_compile() { |
157 |
- default |
158 |
- |
159 |
- use doc && emake -C doc html |
160 |
-} |
161 |
- |
162 |
-src_test() { |
163 |
- #Bug: 638574 |
164 |
- use tofu && export TESTFLAGS=--parallel |
165 |
- default |
166 |
-} |
167 |
- |
168 |
-src_install() { |
169 |
- default |
170 |
- |
171 |
- use tools && |
172 |
- dobin \ |
173 |
- tools/{convert-from-106,gpg-check-pattern} \ |
174 |
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ |
175 |
- tools/make-dns-cert |
176 |
- |
177 |
- dosym gpg /usr/bin/gpg2 |
178 |
- dosym gpgv /usr/bin/gpgv2 |
179 |
- echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die |
180 |
- echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die |
181 |
- |
182 |
- dodir /etc/env.d |
183 |
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die |
184 |
- |
185 |
- use doc && dodoc doc/gnupg.html/* doc/*.png |
186 |
- |
187 |
- systemd_douserunit doc/examples/systemd-user/*.{service,socket} |
188 |
-} |