commit: efddb1f00fcee1b6d957755d6e76f71cb6d0c27c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 8 09:15:45 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 8 09:21:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efddb1f0
app-crypt/gnupg: Bump to version 2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-crypt/gnupg/Manifest | 1 +
.../gnupg/files/gnupg-2.3.0-sqlite_check.patch | 62 ++++++++
app-crypt/gnupg/gnupg-2.3.0.ebuild | 158 +++++++++++++++++++++
3 files changed, 221 insertions(+)
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 4f8d716e719..f4c3e9db0ff 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,3 +1,4 @@
DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B
42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663
SHA512
38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84
DIST gnupg-2.2.25.tar.bz2 7195857 BLAKE2B
c930edf9259a0e1c508af8d76a86f979860adfe2c525020b37d3741679200f96483f0ad8bc1f72e2dbf7fe77696cd04d4272a2ee23e4c4abe1ed6ba88b95f365
SHA512
ab1d7cc9d8be3e7189bc4bea431b9d5db313cbd1739823950f32fbb611b2f4374889f444efbf43ce1fbf498b9865d7e6e953cd4c86d58fd688f63923c434ea2c
DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B
d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3
SHA512
cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab
+DIST gnupg-2.3.0.tar.bz2 7557228 BLAKE2B
10a1e37a7f6aa3d429905b3e048e69b8e321dd616e3a26b0f778c3bd9e8298562ade439f7e27b8605ed155e55a0939c35a7b8554f8a89eb33cdb724506126fdf
SHA512
f8d2b31e9ae750b132ecb7b478be52cdb7628a5806967a2ee3be19d3e955c3f64214997b168b1ec00caa6830c26711f2ea8430cc6269d6b980b21239186ba29f
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
new file mode 100644
index 00000000000..dd529da7a7c
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.3.0-sqlite_check.patch
@@ -0,0 +1,62 @@
+From 58aa0e8547a29e147f3d9d1792117d96bc00ffda Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomia...@gentoo.org>
+Date: Thu, 8 Apr 2021 11:05:36 +0200
+Subject: [PATCH] gnupg: configure.ac: Fix sqlite3 detection
+
+or else --disable-sqlite has no effect and linking later fails with:
+
+ keyboxd-backend-sqlite.o: in function `show_sqlstmt.part.0':
+ backend-sqlite.c:(.text+0x42): undefined reference to `sqlite3_expanded_sql'
+
+Signed-off-by: Lars Wendler <polynomia...@gentoo.org>
+---
+ configure.ac | 23 ++++++++++++-----------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9cf0c6a7f..d46469cbb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -969,18 +969,20 @@ AC_ARG_ENABLE(sqlite,
+ [disable the use of SQLITE]),
+ try_sqlite=$enableval, try_sqlite=yes)
+
+-if test x"$use_tofu" = xyes ; then
+- if test x"$try_sqlite" = xyes ; then
++AS_IF([test x"$try_sqlite" = xyes], [
+ PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $NEED_SQLITE_VERSION],
+ [have_sqlite=yes],
+ [have_sqlite=no])
+- fi
+- if test "$have_sqlite" = "yes"; then
+- :
+- AC_SUBST([SQLITE3_CFLAGS])
+- AC_SUBST([SQLITE3_LIBS])
+- else
+- use_tofu=no
++ AS_IF([test "$have_sqlite" = "yes"], [
++ AC_SUBST([SQLITE3_CFLAGS])
++ AC_SUBST([SQLITE3_LIBS])
++ ])
++ ])
++
++AS_IF([test "$have_sqlite" != "yes"], [
++ AS_IF([test x"$use_tofu" = xyes], [
++ use_tofu=no
++ ])
+ build_keyboxd=no
+ tmp=$(echo "$SQLITE3_PKG_ERRORS" | tr '\n' '\v' | sed 's/\v/\n*** /g')
+ AC_MSG_WARN([[
+@@ -988,8 +990,7 @@ if test x"$use_tofu" = xyes ; then
+ *** Building without SQLite support - TOFU and Keyboxd disabled
+ ***
+ *** $tmp]])
+- fi
+-fi
++])
+
+ AM_CONDITIONAL(SQLITE3, test "$have_sqlite" = "yes")
+
+--
+2.31.1
+
diff --git a/app-crypt/gnupg/gnupg-2.3.0.ebuild
b/app-crypt/gnupg/gnupg-2.3.0.ebuild
new file mode 100644
index 00000000000..e1137e00992
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.3.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/";
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+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"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard sqlite ssl tofu tools usb
user-socket wks-server"
+
+# Existence of executables is checked during configuration.
+DEPEND=">=dev-libs/libassuan-2.5.0
+ >=dev-libs/libgcrypt-1.9.1
+ >=dev-libs/libgpg-error-1.29
+ >=dev-libs/libksba-1.3.4
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap )
+ readline? ( sys-libs/readline:0= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ sqlite? ( >=dev-db/sqlite-3.27 )
+ ssl? ( >=net-libs/gnutls-3.0:0= )
+ sys-libs/zlib
+"
+
+RDEPEND="${DEPEND}
+ app-crypt/pinentry
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )"
+
+BDEPEND="virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="tofu? ( sqlite )"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+
"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
+ #"${FILESDIR}/${PN}-2.3.0-sqlite_check.patch"
+)
+
+src_prepare() {
+ default
+
+ #eautoreconf
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling
gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ #
https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact
prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream
deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl
--user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+src_configure() {
+ local myconf=(
+ $(use_enable bzip2)
+ $(use_enable nls)
+ $(use_enable smartcard scdaemon)
+ $(use_enable sqlite)
+ $(use_enable ssl gnutls)
+ $(use_enable tofu)
+ $(use smartcard && use_enable usb ccid-driver || echo
'--disable-ccid-driver')
+ $(use_enable wks-server wks-tools)
+ $(use_with ldap)
+ $(use_with readline)
+ --with-mailprog=/usr/libexec/sendmail
+ --disable-ntbtls
+ --enable-all-tests
+ --enable-gpgsm
+ --enable-large-secmem
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+ KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+ LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+ LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+ NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
+ fi
+
+ #bug 663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ [[ ${CC} == *clang ]] && \
+ export gl_cv_absolute_stdint_h=/usr/include/stdint.h
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary
called
+ # by wks-client & wks-server; and if it's autodetected but not not
exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger,
bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+
+ econf "${myconf[@]}"
+}
+
+src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+src_test() {
+ #Bug: 638574
+ use tofu && export TESTFLAGS=--parallel
+ default
+}
+
+src_install() {
+ default
+
+ use tools &&
+ dobin \
+ tools/{convert-from-106,gpg-check-pattern} \
+ tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
+ tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >>
"${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/* doc/*.png
+
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
