Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/
Date: Sun, 01 May 2022 21:26:26
Message-Id: 1651440373.5fa2de42bd4a2a9a6006e73610d8cf32dc6aaf36.sam@gentoo
1 commit: 5fa2de42bd4a2a9a6006e73610d8cf32dc6aaf36
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 1 21:03:47 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sun May 1 21:26:13 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fa2de42
7
8 app-crypt/gnupg: drop 2.3.5-r2
9
10 Bug: https://bugs.gentoo.org/840511
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-crypt/gnupg/Manifest | 2 -
14 app-crypt/gnupg/gnupg-2.3.5-r2.ebuild | 162 ----------------------------------
15 2 files changed, 164 deletions(-)
16
17 diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
18 index c8caa908e90f..c829957e900c 100644
19 --- a/app-crypt/gnupg/Manifest
20 +++ b/app-crypt/gnupg/Manifest
21 @@ -2,7 +2,5 @@ DIST gnupg-2.2.34.tar.bz2 7252882 BLAKE2B f42fd8c4019a051c9f087ae1806ce61c831e0a
22 DIST gnupg-2.2.34.tar.bz2.sig 119 BLAKE2B 38d384f215f02bb45ab7c77bb7ad434d9038d8ed19610210ebf84e43e1548c2e938f1f45a1047a9c161c3a88308b83c21fb2bc254a77e68fcf00c7f0cf72e5f9 SHA512 220436aa2387376d4af41ee84dbac9a9e4fda2904024d81da9af6f8c704700c5c6f9da98cfa7e4a9f188ad2739189b905473cfd88747978300829ec382771745
23 DIST gnupg-2.2.35.tar.bz2 7262687 BLAKE2B 18b5965151ded3b3f28d139824e14d7a6f1673c5192ec5f5a80366a6d5f2e04ed7fa035e2bff105e1752753584f992626ccc9ea8840c2bfa39ffe7ca39b81f7f SHA512 ad9f8d10890b7fafb15a7422e2cebaf0f85ce7cf5f880f4edd8d1dec46aa73c01f9096e601f6edd665f8684d1f5892634991a400e00b3185e6b201f549004d3e
24 DIST gnupg-2.2.35.tar.bz2.sig 119 BLAKE2B d95323703c12c9474b21fa91ddb70d4d4d464c794223e21f6ae5d4de955f07a5cabde50612e977168ea6071c4b12be3262cbafe9bcaa8e9a0b009318c0ff6718 SHA512 9043894730520e974e7bc17e0f95419c319fbcd514f102faf644e2f5580e238719cecb8b5e778ecf20f9212ee2554206eb0686e8b5fce7f8c556146657660fe2
25 -DIST gnupg-2.3.5.tar.bz2 7601772 BLAKE2B b1044d8a62636be1fe870fe73213ffdefefc4b4f99b4cb1abcbc85679fda8ec855c1ac11296e2a37c7aef9bf0eec401bd3aafe68154a22df780512deb5ed77f8 SHA512 dcaf6a72179cbc21263f27c994100fbd45687daaa63e3a9a9668e26c25f331516e8c7b656cdce6c646e5fe29f0ad2e20b72ac364f242524fb3ead4e96e89520d
26 -DIST gnupg-2.3.5.tar.bz2.sig 119 BLAKE2B 5377908e2ad968db06e870d17116827c9a332bd159aba2ff737131805b9f81d7ff44352ffb9af0006ec2d48934fcfc7af54965d948a8a043fe3a59b3600f8745 SHA512 f12e799274833a657317e997e85958cc450d57bb6a3a39a613d41de50953ab1363e0a38a4f4948f81f7da08dd00ccb2e141d6b2eb7f131ed2905d3c1666f7da2
27 DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85
28 DIST gnupg-2.3.6.tar.bz2.sig 119 BLAKE2B c7d4cdc81580b8b1e56c7bc83236d65c9d2c1bab2d210d14a0d3c58f635d656c9b449ef9596b9601027cb891bd437cc8f2a63eb3c17742c288531511984fba7f SHA512 85d155f9809c8d0f38723d8622c085e421531c016d19fcce2ae34dc9a4aeac0bc1895f7a094ee9cdf69a15b426fb0d72ee53319fe0a05665c92caa0e950c1797
29
30 diff --git a/app-crypt/gnupg/gnupg-2.3.5-r2.ebuild b/app-crypt/gnupg/gnupg-2.3.5-r2.ebuild
31 deleted file mode 100644
32 index d32419deb726..000000000000
33 --- a/app-crypt/gnupg/gnupg-2.3.5-r2.ebuild
34 +++ /dev/null
35 @@ -1,162 +0,0 @@
36 -# Copyright 1999-2022 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -
41 -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
42 -inherit flag-o-matic systemd toolchain-funcs verify-sig
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 -SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
50 -S="${WORKDIR}/${MY_P}"
51 -
52 -LICENSE="GPL-3"
53 -SLOT="0"
54 -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"
55 -IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
56 -RESTRICT="!test? ( test )"
57 -REQUIRED_USE="test? ( tofu )"
58 -
59 -# Existence of executables is checked during configuration.
60 -# Note: On each bump, update dep bounds on each version from configure.ac!
61 -DEPEND=">=dev-libs/libassuan-2.5.0
62 - >=dev-libs/libgcrypt-1.9.1:=
63 - >=dev-libs/libgpg-error-1.41
64 - >=dev-libs/libksba-1.3.4
65 - >=dev-libs/npth-1.2
66 - >=net-misc/curl-7.10
67 - bzip2? ( app-arch/bzip2 )
68 - ldap? ( net-nds/openldap:= )
69 - readline? ( sys-libs/readline:0= )
70 - smartcard? ( usb? ( virtual/libusb:1 ) )
71 - tofu? ( >=dev-db/sqlite-3.27 )
72 - tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
73 - ssl? ( >=net-libs/gnutls-3.0:0= )
74 - sys-libs/zlib
75 -"
76 -
77 -RDEPEND="${DEPEND}
78 - app-crypt/pinentry
79 - nls? ( virtual/libintl )
80 - selinux? ( sec-policy/selinux-gpg )
81 - wks-server? ( virtual/mta )"
82 -
83 -BDEPEND="virtual/pkgconfig
84 - doc? ( sys-apps/texinfo )
85 - nls? ( sys-devel/gettext )
86 - verify-sig? ( sec-keys/openpgp-keys-gnupg )"
87 -
88 -DOCS=(
89 - ChangeLog NEWS README THANKS TODO VERSION
90 - doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
91 -)
92 -
93 -PATCHES=(
94 - "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
95 - "${FILESDIR}"/${P}-fix-buffering-hang.patch
96 -)
97 -
98 -src_prepare() {
99 - default
100 -
101 - # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
102 - # idea borrowed from libdbus, see
103 - # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
104 - #
105 - # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
106 - # which in turn requires discovery in Autoconf, something that upstream deeply resents.
107 - sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
108 - -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
109 -}
110 -
111 -src_configure() {
112 - local myconf=(
113 - $(use_enable bzip2)
114 - $(use_enable nls)
115 - $(use_enable smartcard scdaemon)
116 - $(use_enable ssl gnutls)
117 - $(use_enable tofu)
118 - $(use_enable tofu keyboxd)
119 - $(use_enable tofu sqlite)
120 - $(usex tpm '--with-tss=intel' '--disable-tpm2d')
121 - $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
122 - $(use_enable wks-server wks-tools)
123 - $(use_with ldap)
124 - $(use_with readline)
125 - --with-mailprog=/usr/libexec/sendmail
126 - --disable-ntbtls
127 - --enable-all-tests
128 - --enable-gpgsm
129 - --enable-large-secmem
130 - CC_FOR_BUILD="$(tc-getBUILD_CC)"
131 - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
132 - KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
133 - LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
134 - LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
135 - NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
136 - $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
137 - )
138 -
139 - if use prefix && use usb; then
140 - # bug #649598
141 - append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
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 "${myconf[@]}"
163 -}
164 -
165 -src_compile() {
166 - default
167 -
168 - use doc && emake -C doc html
169 -}
170 -
171 -src_test() {
172 - #Bug: 638574
173 - use tofu && export TESTFLAGS=--parallel
174 - default
175 -}
176 -
177 -src_install() {
178 - default
179 -
180 - use tools &&
181 - dobin \
182 - tools/{convert-from-106,gpg-check-pattern} \
183 - tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
184 - tools/make-dns-cert
185 -
186 - dosym gpg /usr/bin/gpg2
187 - dosym gpgv /usr/bin/gpgv2
188 - echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
189 - echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
190 -
191 - dodir /etc/env.d
192 - echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
193 -
194 - use doc && dodoc doc/gnupg.html/* doc/*.png
195 -
196 - systemd_douserunit doc/examples/systemd-user/*.{service,socket}
197 -}