Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/files/, app-crypt/gnupg/
Date: Thu, 08 Apr 2021 09:21:34
Message-Id: 1617873683.efddb1f00fcee1b6d957755d6e76f71cb6d0c27c.polynomial-c@gentoo
1 commit: efddb1f00fcee1b6d957755d6e76f71cb6d0c27c
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 8 09:15:45 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 8 09:21:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efddb1f0
7
8 app-crypt/gnupg: Bump to version 2.3.0
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 app-crypt/gnupg/Manifest | 1 +
13 .../gnupg/files/gnupg-2.3.0-sqlite_check.patch | 62 ++++++++
14 app-crypt/gnupg/gnupg-2.3.0.ebuild | 158 +++++++++++++++++++++
15 3 files changed, 221 insertions(+)
16
17 diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
18 index 4f8d716e719..f4c3e9db0ff 100644
19 --- a/app-crypt/gnupg/Manifest
20 +++ b/app-crypt/gnupg/Manifest
21 @@ -1,3 +1,4 @@
22 DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
23 DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B c930edf9259a0e1c508af8d76a86f979860adfe2c525020b37d3741679200f96483f0ad8bc1f72e2dbf7fe77696cd04d4272a2ee23e4c4abe1ed6ba88b95f365 SHA512 ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
24 DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
25 +DIST gnupg-2.3.0.tar.bz2 7557228 BLAKE2B 10a1e37a7f6aa3d429905b3e048e69b8e321dd616e3a26b0f778c3bd9e8298562ade439f7e27b8605ed155e55a0939c35a7b8554f8a89eb33cdb724506126fdf SHA512 f8d2b31e9ae750b132ecb7b478be52cdb7628a5806967a2ee3be19d3e955c3f64214997b168b1ec00caa6830c26711f2ea8430cc6269d6b980b21239186ba29f
26
27 diff --git a/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch b/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch
28 new file mode 100644
29 index 00000000000..dd529da7a7c
30 --- /dev/null
31 +++ b/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch
32 @@ -0,0 +1,62 @@
33 +From 58aa0e8547a29e147f3d9d1792117d96bc00ffda Mon Sep 17 00:00:00 2001
34 +From: Lars Wendler <polynomial-c@g.o>
35 +Date: Thu, 8 Apr 2021 11:05:36 +0200
36 +Subject: [PATCH] gnupg: configure.ac: Fix sqlite3 detection
37 +
38 +or else --disable-sqlite has no effect and linking later fails with:
39 +
40 + keyboxd-backend-sqlite.o: in function `show_sqlstmt.part.0':
41 + backend-sqlite.c:(.text+0x42): undefined reference to `sqlite3_expanded_sql'
42 +
43 +Signed-off-by: Lars Wendler <polynomial-c@g.o>
44 +---
45 + configure.ac | 23 ++++++++++++-----------
46 + 1 file changed, 12 insertions(+), 11 deletions(-)
47 +
48 +diff --git a/configure.ac b/configure.ac
49 +index 9cf0c6a7f..d46469cbb 100644
50 +--- a/configure.ac
51 ++++ b/configure.ac
52 +@@ -969,18 +969,20 @@ AC_ARG_ENABLE(sqlite,
53 + [disable the use of SQLITE]),
54 + try_sqlite=$enableval, try_sqlite=yes)
55 +
56 +-if test x"$use_tofu" = xyes ; then
57 +- if test x"$try_sqlite" = xyes ; then
58 ++AS_IF([test x"$try_sqlite" = xyes], [
59 + PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $NEED_SQLITE_VERSION],
60 + [have_sqlite=yes],
61 + [have_sqlite=no])
62 +- fi
63 +- if test "$have_sqlite" = "yes"; then
64 +- :
65 +- AC_SUBST([SQLITE3_CFLAGS])
66 +- AC_SUBST([SQLITE3_LIBS])
67 +- else
68 +- use_tofu=no
69 ++ AS_IF([test "$have_sqlite" = "yes"], [
70 ++ AC_SUBST([SQLITE3_CFLAGS])
71 ++ AC_SUBST([SQLITE3_LIBS])
72 ++ ])
73 ++ ])
74 ++
75 ++AS_IF([test "$have_sqlite" != "yes"], [
76 ++ AS_IF([test x"$use_tofu" = xyes], [
77 ++ use_tofu=no
78 ++ ])
79 + build_keyboxd=no
80 + tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
81 + AC_MSG_WARN([[
82 +@@ -988,8 +990,7 @@ if test x"$use_tofu" = xyes ; then
83 + *** Building without SQLite support - TOFU and Keyboxd disabled
84 + ***
85 + *** $tmp]])
86 +- fi
87 +-fi
88 ++])
89 +
90 + AM_CONDITIONAL(SQLITE3, test "$have_sqlite" = "yes")
91 +
92 +--
93 +2.31.1
94 +
95
96 diff --git a/app-crypt/gnupg/gnupg-2.3.0.ebuild b/app-crypt/gnupg/gnupg-2.3.0.ebuild
97 new file mode 100644
98 index 00000000000..e1137e00992
99 --- /dev/null
100 +++ b/app-crypt/gnupg/gnupg-2.3.0.ebuild
101 @@ -0,0 +1,158 @@
102 +# Copyright 1999-2021 Gentoo Authors
103 +# Distributed under the terms of the GNU General Public License v2
104 +
105 +EAPI=7
106 +
107 +inherit autotools flag-o-matic systemd toolchain-funcs
108 +
109 +MY_P="${P/_/-}"
110 +
111 +DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
112 +HOMEPAGE="https://gnupg.org/"
113 +SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
114 +
115 +LICENSE="GPL-3"
116 +SLOT="0"
117 +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"
118 +IUSE="bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb user-socket wks-server"
119 +
120 +# Existence of executables is checked during configuration.
121 +DEPEND=">=dev-libs/libassuan-2.5.0
122 + >=dev-libs/libgcrypt-1.9.1
123 + >=dev-libs/libgpg-error-1.29
124 + >=dev-libs/libksba-1.3.4
125 + >=dev-libs/npth-1.2
126 + >=net-misc/curl-7.10
127 + bzip2? ( app-arch/bzip2 )
128 + ldap? ( net-nds/openldap )
129 + readline? ( sys-libs/readline:0= )
130 + smartcard? ( usb? ( virtual/libusb:1 ) )
131 + sqlite? ( >=dev-db/sqlite-3.27 )
132 + ssl? ( >=net-libs/gnutls-3.0:0= )
133 + sys-libs/zlib
134 +"
135 +
136 +RDEPEND="${DEPEND}
137 + app-crypt/pinentry
138 + nls? ( virtual/libintl )
139 + selinux? ( sec-policy/selinux-gpg )
140 + wks-server? ( virtual/mta )"
141 +
142 +BDEPEND="virtual/pkgconfig
143 + doc? ( sys-apps/texinfo )
144 + nls? ( sys-devel/gettext )"
145 +
146 +S="${WORKDIR}/${MY_P}"
147 +
148 +REQUIRED_USE="tofu? ( sqlite )"
149 +
150 +DOCS=(
151 + ChangeLog NEWS README THANKS TODO VERSION
152 + doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
153 +)
154 +
155 +PATCHES=(
156 + "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
157 + #"${FILESDIR}/${PN}-2.3.0-sqlite_check.patch"
158 +)
159 +
160 +src_prepare() {
161 + default
162 +
163 + #eautoreconf
164 +
165 + # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
166 + # idea borrowed from libdbus, see
167 + # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
168 + #
169 + # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
170 + # which in turn requires discovery in Autoconf, something that upstream deeply resents.
171 + sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
172 + -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
173 +}
174 +
175 +src_configure() {
176 + local myconf=(
177 + $(use_enable bzip2)
178 + $(use_enable nls)
179 + $(use_enable smartcard scdaemon)
180 + $(use_enable sqlite)
181 + $(use_enable ssl gnutls)
182 + $(use_enable tofu)
183 + $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
184 + $(use_enable wks-server wks-tools)
185 + $(use_with ldap)
186 + $(use_with readline)
187 + --with-mailprog=/usr/libexec/sendmail
188 + --disable-ntbtls
189 + --enable-all-tests
190 + --enable-gpgsm
191 + --enable-large-secmem
192 + CC_FOR_BUILD="$(tc-getBUILD_CC)"
193 + GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
194 + KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
195 + LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
196 + LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
197 + NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
198 + $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
199 + )
200 +
201 + if use prefix && use usb; then
202 + # bug #649598
203 + append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
204 + fi
205 +
206 + #bug 663142
207 + if use user-socket; then
208 + myconf+=( --enable-run-gnupg-user-socket )
209 + fi
210 +
211 + # glib fails and picks up clang's internal stdint.h causing weird errors
212 + [[ ${CC} == *clang ]] && \
213 + export gl_cv_absolute_stdint_h=/usr/include/stdint.h
214 +
215 + # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
216 + # As of GnuPG 2.3, the mailprog substitution is used for the binary called
217 + # by wks-client & wks-server; and if it's autodetected but not not exist at
218 + # build time, then then 'gpg-wks-client --send' functionality will not
219 + # work. This has an unwanted side-effect in stage3 builds: there was a
220 + # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
221 + # the build where the install guide previously make the user chose the
222 + # logger & mta early in the install.
223 +
224 + econf "${myconf[@]}"
225 +}
226 +
227 +src_compile() {
228 + default
229 +
230 + use doc && emake -C doc html
231 +}
232 +
233 +src_test() {
234 + #Bug: 638574
235 + use tofu && export TESTFLAGS=--parallel
236 + default
237 +}
238 +
239 +src_install() {
240 + default
241 +
242 + use tools &&
243 + dobin \
244 + tools/{convert-from-106,gpg-check-pattern} \
245 + tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
246 + tools/make-dns-cert
247 +
248 + dosym gpg /usr/bin/gpg2
249 + dosym gpgv /usr/bin/gpgv2
250 + echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
251 + echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
252 +
253 + dodir /etc/env.d
254 + echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
255 +
256 + use doc && dodoc doc/gnupg.html/* doc/*.png
257 +
258 + systemd_douserunit doc/examples/systemd-user/*.{service,socket}
259 +}