gentoo Easter resync : 12.04.2020

4 files changed, 37 insertions, 42 deletions

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index e3612b87c070..ab4dd83c3711 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,7 +1,6 @@
 AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048 BLAKE2B 36f37b74da309100191f4d8f9c27d08a1b00d2d30fbaf169dbb74ebbe42293357a4fb62332e286fe5725dcfdc30645a602dc2a51c51924b06215b68fd5235658 SHA512 fd12827150e96cd7979ea9611d64ed4ab9e6c61cfecdd697b8fb4d162f20985b734c2bfc365a921809b9029e86a85a9b36c10ec472b3dd49c25ea18f5aef56ce
-AUX gnupg-2.2.14-quiet-sending.patch 1225 BLAKE2B 3165d5b8242a0bad7913881dfac66433bcea9f5d97a58f43999166ce682671060a934ea1618fd90c7b892b4f3565ae0c3e57ad2f8f7b200a52145452d56ad8bc SHA512 f61f029ac72626e0c7d3bf29d483fd313ba723ae47bd7659b4fa72252ec9b5f329510d37ae92c41dd7dd45a3b99e846ae3d83a7bb37825e95e6d10f29b131853
-DIST gnupg-2.2.17.tar.bz2 6717554 BLAKE2B ad052a0d1e970fe7748563a0ffa105d427e3d9299237f15ce93aa47b676cc1fbf0691cf2112dd5b55ba5fc9d2a6988f999415dd5026d44c5cb4bfef9f99189cd SHA512 a3cd094addac62b4b4ec1683005a2bec761ea2aacf6daf904316b1819f4f6a41f256a8d9452cf28cad71b3e68228465baa27ae0eb1fa734fa91542ef0f159c5d
 DIST gnupg-2.2.19.tar.bz2 6754972 BLAKE2B fc1b9afb398ef78a6d239c62fc88cba7148679b1b666ac39dbd9644847e99de1a683a7938bc112cb33adafe555472319dde4f64860071446a66cd79934f7d69c SHA512 d7700136ac9f0a8cf04b33da4023a42427fced648c2f90d76250c92904353b85fe728bdd89a713d847e8d38e5900c98d46075614492fdc3d1421f927a92f49dd
-EBUILD gnupg-2.2.17.ebuild 4527 BLAKE2B 22eff1b198b982b48fbd54ab68f5ae265f67cc098abf22cc76d98824688ca8ee9b80d6f20f552c1452dba5a12f19c86fe94dd2d526a3062fc421a687d5e2a573 SHA512 99ff0cb81c5ca29942178851e0ebb58cb719985354bfffba78deacac844c78f5af48b88616ece4a52c124a1625bb062dea93ac68142c67052632c38f7d7dcdb2
-EBUILD gnupg-2.2.19.ebuild 4489 BLAKE2B bb208c75fd25593169ab9683837ae8e1eaf2b804bc5e9ef0603d8b1f4419ac004b2e98efcefb11bb06a8b36a9cb4d2d3117b9333c329a1c2dd2998fd6abe5a20 SHA512 773032d850e56b525332b5589f564b79b85c2cab7c8909f5fc945b0e4a5cd33364f56eec6b2655d34f5e8ca034bea1e484d218f609787c652bc3336012417f9f
+DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc
+EBUILD gnupg-2.2.19.ebuild 5324 BLAKE2B 5c294c51bd7a8866f64b1c10e8dcfe4cca8e3ba11ab17b21a057654d969bdb8b9b598461f757ed61f1a00bfdf49632b97c53642e6549c9d9a75434c2885f328a SHA512 67fbaa708dcd39a31a4d61a413e1c27eec94758e8e7dca56303c9d6dd97ea750e74a3a8ef551f42df0d5575e23e0916bb0b99d6834f9bd2930f4b72d8f1e0255
+EBUILD gnupg-2.2.20.ebuild 5124 BLAKE2B 3cc31261ff50eaef8b62a076f7d317c6e511de6500247fcf86f0f8f2bae23a72c381f02985c6cd582d6fa6d2042d787192473e7340456273d40b42a05120c10a SHA512 bd7b342b565bd7e23b71e92faaf26d33a3b9809fe8d45566d49f59132ecdb5aff61f0d1f89fb48c6bba553797685578d2684cdad50151e4192474cea0e84d85b
 MISC metadata.xml 1212 BLAKE2B 36bd1e7478abbb579b33292418dc621c65869151cfd0cbe9cb7b553adf92b606273f415db763ec5c3884e91f29929f79de1cbf15cc47626b1115b168d567790e SHA512 646ec87262b7069808976e17fae4b2101f9a8aae7ad5bbd10abce6077a5e4e741eb5692997af4383cf8cd3e6b03ded83f9dd5245ed112533c6a6e4c752b1060a
diff --git a/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch b/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch
deleted file mode 100644
index 1f7a561d3f7a..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8db73615e68d1c549b3ed50057a49d84a31b334 Mon Sep 17 00:00:00 2001
-From: "Robin H. Johnson" <robbat2@gentoo.org>
-Date: Tue, 9 Apr 2019 10:27:11 -0700
-Subject: [PATCH] g10: support --quiet for --send-key
-
-The --recv-key command supports --quiet, but --send-key does not.
-Add support for it for parity and better scripting.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
----
- g10/keyserver.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/g10/keyserver.c b/g10/keyserver.c
-index 66900f7a9..e5fc011c0 100644
---- a/g10/keyserver.c
-+++ b/g10/keyserver.c
-@@ -1814,9 +1814,10 @@ keyserver_put (ctrl_t ctrl, strlist_t keyspecs)
-         log_error (_("skipped \"%s\": %s\n"), kspec->d, gpg_strerror (err));
-       else
-         {
--          log_info (_("sending key %s to %s\n"),
--                    keystr (keyblock->pkt->pkt.public_key->keyid),
--                    ksurl?ksurl:"[?]");
-+	  if (!opt.quiet)
-+            log_info (_("sending key %s to %s\n"),
-+                      keystr (keyblock->pkt->pkt.public_key->keyid),
-+                      ksurl?ksurl:"[?]");
- 
-           err = gpg_dirmngr_ks_put (ctrl, data, datalen, keyblock);
-           release_kbnode (keyblock);
--- 
-2.21.0
-
diff --git a/app-crypt/gnupg/gnupg-2.2.19.ebuild b/app-crypt/gnupg/gnupg-2.2.19.ebuild
index 8a253de4ad99..5282aaf4c937 100644
--- a/app-crypt/gnupg/gnupg-2.2.19.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
@@ -53,6 +53,19 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
 )
 
+src_prepare() {
+	default
+
+	# 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=()
 
@@ -61,6 +74,11 @@ src_configure() {
 		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
 	fi
 
+	# Remove when https://dev.gnupg.org/T4831 gets released.
+	[[ $PV != 2.2.19 ]] && die "Check if -fcommon workaround is still needed."
+	# Workaround gcc-10 build failure (bug #705884).
+	append-cflags -fcommon
+
 	if use elibc_SunOS || use elibc_AIX; then
 		myconf+=( --disable-symcryptrun )
 	else
diff --git a/app-crypt/gnupg/gnupg-2.2.17.ebuild b/app-crypt/gnupg/gnupg-2.2.20.ebuild
index b121681e8046..cc4778f3c4b9 100644
--- a/app-crypt/gnupg/gnupg-2.2.17.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.20.ebuild
@@ -13,7 +13,7 @@ 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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server"
 
 # Existence of executables is checked during configuration.
@@ -51,9 +51,21 @@ DOCS=(
 
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-	"${FILESDIR}/${PN}-2.2.14-quiet-sending.patch"
 )
 
+src_prepare() {
+	default
+
+	# 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=()