diff -pruN 2.2.20-1/debian/changelog 2.2.20-1ubuntu2/debian/changelog --- 2.2.20-1/debian/changelog 2020-03-23 19:05:13.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/changelog 2021-01-16 14:53:14.000000000 +0000 @@ -1,3 +1,24 @@ +gnupg2 (2.2.20-1ubuntu2) hirsute; urgency=medium + + * d/p/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch: + - Fix IPv6 connectivity for dirmngr (LP: #1910432) + + -- Heitor Alves de Siqueira Sat, 16 Jan 2021 14:53:14 +0000 + +gnupg2 (2.2.20-1ubuntu1) groovy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop the gpgv-win32 test + - Honor http_proxy= environment variables by default in the systemd + user session dirmngr service. + (debian/patches/dirmngr-honor-http-proxy.patch) + - Export GPG_AGENT_INFO in the systemd-environment-generator too. + - Don't declare diffutils as a test dependency, this package is + essential so always installed; and the dependency declaration breaks + cross-arch testing. + + -- Steve Langasek Fri, 01 May 2020 14:58:28 -0700 + gnupg2 (2.2.20-1) unstable; urgency=medium * New upstream release @@ -5,6 +26,25 @@ gnupg2 (2.2.20-1) unstable; urgency=medi -- Daniel Kahn Gillmor Mon, 23 Mar 2020 15:05:13 -0400 +gnupg2 (2.2.19-3ubuntu2) focal; urgency=medium + + * Don't declare diffutils as a test dependency, this package is essential + so always installed; and the dependency declaration breaks + cross-arch testing. + + -- Steve Langasek Tue, 10 Mar 2020 11:50:46 -0700 + +gnupg2 (2.2.19-3ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop the gpgv-win32 test + - Honor http_proxy= environment variables by default in the systemd + user session dirmngr service. + (debian/patches/dirmngr-honor-http-proxy.patch) + - Export GPG_AGENT_INFO in the systemd-environment-generator too. + + -- Gianfranco Costamagna Tue, 10 Mar 2020 10:59:47 +0100 + gnupg2 (2.2.19-3) unstable; urgency=medium * d/copyright update years @@ -44,6 +84,17 @@ gnupg2 (2.2.19-1) unstable; urgency=medi -- Daniel Kahn Gillmor Wed, 08 Jan 2020 10:33:12 -0500 +gnupg2 (2.2.17-3ubuntu1) focal; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Drop the gpgv-win32 test + - Honor http_proxy= environment variables by default in the systemd + user session dirmngr service. + (debian/patches/dirmngr-honor-http-proxy.patch) + - Export GPG_AGENT_INFO in the systemd-environment-generator too. + + -- Dimitri John Ledkov Wed, 20 Nov 2019 16:26:23 +0000 + gnupg2 (2.2.17-3) unstable; urgency=medium * avoid data loss when using keyservers (see https://dev.gnupg.org/T4628) @@ -149,6 +200,30 @@ gnupg2 (2.2.13-1) unstable; urgency=medi -- Daniel Kahn Gillmor Sat, 02 Mar 2019 11:50:15 -0500 +gnupg2 (2.2.12-1ubuntu3) disco; urgency=medium + + * Drop the gpgv-win32 test, and add some simple tests for gpg{,v} instead + + -- Julian Andres Klode Wed, 30 Jan 2019 11:39:21 +0100 + +gnupg2 (2.2.12-1ubuntu2) disco; urgency=medium + + * No-change rebuild for readline soname change. + + -- Matthias Klose Mon, 14 Jan 2019 20:09:13 +0000 + +gnupg2 (2.2.12-1ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Honor http_proxy= environment variables by default in the systemd + user session dirmngr service. LP: #1625848 + (debian/patches/dirmngr-honor-http-proxy.patch) + - Export GPG_AGENT_INFO in the systemd-environment-generator too. + * debian/tests/gpgv-win32: Create /run/user/$(id -u) if it does not + exist - wine hardcodes that location. + + -- Julian Andres Klode Tue, 08 Jan 2019 10:19:49 +0100 + gnupg2 (2.2.12-1) unstable; urgency=medium * New upstream release @@ -220,6 +295,16 @@ gnupg2 (2.2.9-1) unstable; urgency=mediu -- Daniel Kahn Gillmor Thu, 19 Jul 2018 14:02:31 -0400 +gnupg2 (2.2.8-3ubuntu1) cosmic; urgency=medium + + * Sync with Debian. Remaining changes: + - Honor http_proxy= environment variables by default in the systemd + user session dirmngr service. LP: #1625848 + (debian/patches/dirmngr-honor-http-proxy.patch) + - Export GPG_AGENT_INFO in the systemd-environment-generator too. + + -- Jeremy Bicha Mon, 03 Sep 2018 20:43:20 -0400 + gnupg2 (2.2.8-3) unstable; urgency=medium * Ensure arch: all gnupg package supports binMNUs @@ -241,6 +326,23 @@ gnupg2 (2.2.8-2) unstable; urgency=mediu -- Daniel Kahn Gillmor Wed, 20 Jun 2018 06:56:09 -0400 +gnupg2 (2.2.8-1ubuntu1) cosmic; urgency=low + + * Merge from Debian unstable to fix CVE-2018-12020. Remaining changes: + - Honor http_proxy= environment variables by default in the systemd + user session dirmngr service. LP: #1625848 + (debian/patches/dirmngr-honor-http-proxy.patch) + - Export GPG_AGENT_INFO in the systemd-environment-generator too. + * dropped due to applied in debian: + - debian/gnupg2.udev: + - udev rules to set ACLs on SCM smartcard readers. + - Add udev rules to give gpg access to some smartcard readers; + Debian #543217. (applied in scdaemon in 2.1.11-7+exp1) + * dropped (no longer needed): + - Add breaks for software-properties-common at 0.96.24.3 or lower. + + -- Steve Beattie Wed, 13 Jun 2018 11:44:59 -0700 + gnupg2 (2.2.8-1) unstable; urgency=medium * New upstream release @@ -285,6 +387,25 @@ gnupg2 (2.2.4-2) unstable; urgency=mediu -- Daniel Kahn Gillmor Mon, 05 Feb 2018 23:07:21 -0500 +gnupg2 (2.2.4-1ubuntu1) bionic; urgency=medium + + * Merge from Debian unstable, remaining changes: + - debian/gnupg2.udev: + - Add udev rules to give gpg access to some smartcard readers; + Debian #543217. + - udev rules to set ACLs on SCM smartcard readers. + - Add breaks for software-properties-common at 0.96.24.3 or lower. + - Honor http_proxy= environment variables by default in the systemd + user session dirmngr service. LP: #1625848 + - Export GPG_AGENT_INFO in the systemd-environment-generator too. + + * Dropped changes: + - Removed user session upstart support. + - Removed gpg-agent.service changes, use Debian's environment generator instead. + - Patch to set GNUPGHOME for tests, fixed in debian/upstream. + + -- Dimitri John Ledkov Thu, 11 Jan 2018 13:33:17 +0000 + gnupg2 (2.2.4-1) unstable; urgency=medium * New upstream release @@ -684,6 +805,85 @@ gnupg2 (2.1.15-2) unstable; urgency=medi -- Daniel Kahn Gillmor Wed, 31 Aug 2016 12:37:48 -0400 +gnupg2 (2.1.15-1ubuntu8) artful; urgency=medium + + * debian/patches/0005-set-gnupghome-for-tests.patch: + - set GNUPGHOME to a directory under the build directory as the + default value relies on $HOME which shouldn't be used during + the package build. LP: #1722939. + + -- Tiago Stürmer Daitx Wed, 11 Oct 2017 20:20:46 +0000 + +gnupg2 (2.1.15-1ubuntu7) zesty; urgency=medium + + * gpg-agent.conf: use XDG_RUNTIME_DIR for ssh-agent socket, in the + upstart user session job too. LP: #1675925. + + -- Dimitri John Ledkov Wed, 29 Mar 2017 16:15:15 +0100 + +gnupg2 (2.1.15-1ubuntu6) yakkety; urgency=medium + + * gpg-agent.service: use XDG_RUNTIME_DIR for ssh-agent socket, instead + of GNUPGHOME. LP: #1631320. + + -- Dimitri John Ledkov Fri, 07 Oct 2016 11:20:28 +0100 + +gnupg2 (2.1.15-1ubuntu5) yakkety; urgency=medium + + * gpg-agent.service: Properly escape "\$10" to avoid warning. (LP: #1615726) + + -- Martin Pitt Thu, 06 Oct 2016 23:10:50 +0200 + +gnupg2 (2.1.15-1ubuntu4) yakkety; urgency=medium + + * Honor http_proxy= environment variables by default, in the newly + generated dirmngr.conf files. Existing users behing proxies should set + honor-http-proxy in $GNUPGHOME/dirmngr.conf, see + /usr/share/gnupg/dirmngr-conf.skel. LP: #1625848 + + -- Dimitri John Ledkov Wed, 21 Sep 2016 02:23:54 +0100 + +gnupg2 (2.1.15-1ubuntu3) yakkety; urgency=medium + + * No-change rebuild for readline soname change. + + -- Matthias Klose Sat, 17 Sep 2016 12:02:46 +0000 + +gnupg2 (2.1.15-1ubuntu2) yakkety; urgency=medium + + * Add breaks for software-properties-common at 0.96.24.3 or lower. + + -- Dimitri John Ledkov Thu, 01 Sep 2016 11:34:12 +0100 + +gnupg2 (2.1.15-1ubuntu1) yakkety; urgency=medium + + * gnupg is now 2.1. LP: #1615039 + * Merge from Debian unstable, remaining changes: + - debian/systemd-user/gpg-agent.service: + - Set the environment variables in ExecStartPre - Post has a race + condition as other SSH agent providers can start up after ExecStart + finishes. The ExecStopPost commands are run in the case of failure, to + unset them. + - Be Before= gnome-keyring-ssh and ssh-agent - if someone has explicitly + asked for gpg-agent to be their SSH agent then we want to win. + - Set $SSH_AGENT_LAUNCHER so that we can avoid executing gpgconf in the + ExecStopPost. + - Ignore initctl failures - eventually this will go away. + - debian/upstart-user/: + - Add upstart user session jobs + - Add upstart override for the upstart user session jobs, when user + systemd is present + - debian/Xsession.d/90gpg-agent: + - Don't run if we have a systemd user instance. We want to phase out + the Xsession.d scripts, and use the systemd/upstart scripts so that + things also work under Mir. + - debian/gnupg2.udev: + - Add udev rules to give gpg access to some smartcard readers; + Debian #543217. + - udev rules to set ACLs on SCM smartcard readers. + + -- Dimitri John Ledkov Wed, 31 Aug 2016 13:35:55 +0100 + gnupg2 (2.1.15-1) unstable; urgency=medium * new upstream release @@ -851,6 +1051,58 @@ gnupg2 (2.1.11-6+exp1) experimental; urg -- Daniel Kahn Gillmor Mon, 28 Mar 2016 23:27:43 -0400 +gnupg2 (2.1.11-6ubuntu4) yakkety; urgency=medium + + * debian/user/gpg-agent.service: + - Set the environment variables in ExecStartPre - Post has a race + condition as other SSH agent providers can start up after ExecStart + finishes. The ExecStopPost commands are run in the case of failure, to + unset them. + - Be Before= gnome-keyring-ssh and ssh-agent - if someone has explicitly + asked for gpg-agent to be their SSH agent then we want to win. + - Set $SSH_AGENT_LAUNCHER so that we can avoid executing gpgconf in the + ExecStopPost. + - Ignore initctl failures - eventually this will go away. + + -- Iain Lane Thu, 04 Aug 2016 11:16:01 +0100 + +gnupg2 (2.1.11-6ubuntu3) yakkety; urgency=medium + + * debian/user/: Add systemd user unit and upstart override for gpg-agent. + * debian/gnupg-agent.xsession: Don't run if we have a systemd user instance. + We want to phase out the Xsession.d scripts, and use the systemd/upstart + scripts so that things also work under Mir. + + -- Martin Pitt Tue, 19 Jul 2016 17:35:01 +0200 + +gnupg2 (2.1.11-6ubuntu2) xenial; urgency=medium + + * Fix upstart user-session integration with new pinentry: + - restart gpg-agent, once dbus is started, such that agent has DBUS + session environemnt set and can connect to the pinentry-gnome3 Closes: + #790316 Closes: #795368 LP: #1566928 + - use gpgconf to launch/kill gpg-agent and to check settings + + -- Dimitri John Ledkov Fri, 08 Apr 2016 08:55:10 +0100 + +gnupg2 (2.1.11-6ubuntu1) xenial; urgency=medium + + * Adds support for --pinentry= argument for gpgme1.0 (LP: #1564234) + * Merge with debian, remaining changes: + - Add udev rules to give gpg access to some smartcard readers; + Debian #543217. + - debian/gnupg2.udev: udev rules to set ACLs on SCM smartcard readers. + - Add upstart user job for gpg-agent. + * Dropped no longer applicable changes in merge: + - Drop sh prefix from openpgp test environment as it leads to exec + invocations of sh /bin/bash leading to syntax errors from sh. Fixes + FTBFS detected in Ubuntu saucy archive rebuild. + - debian/control: drop dirmngr to Suggests as it is in universe. + - gcc5-fix.patch: add upstream fix for an optimization issue when + compiling with gcc 5. + + -- Mario Limonciello Wed, 30 Mar 2016 23:20:09 -0500 + gnupg2 (2.1.11-6) unstable; urgency=medium * avoid FTBFS with patch from upstream (Closes: #814842) @@ -1055,6 +1307,27 @@ gnupg2 (2.1.0~beta895-1) experimental; u -- Daniel Kahn Gillmor Wed, 29 Oct 2014 17:53:06 -0400 +gnupg2 (2.0.28-3ubuntu2) xenial; urgency=medium + + * debian/gcc5-fix.patch: add upstream fix for an optimization issue when + compiling with gcc 5. (LP: #1501634) + + -- Marc Deslauriers Tue, 09 Feb 2016 16:11:42 -0500 + +gnupg2 (2.0.28-3ubuntu1) wily; urgency=low + + * Merge from Debian, remaining changes: + - Drop sh prefix from openpgp test environment as it leads to exec + invocations of sh /bin/bash leading to syntax errors from sh. Fixes + FTBFS detected in Ubuntu saucy archive rebuild. + - Add udev rules to give gpg access to some smartcard readers; + Debian #543217. + - debian/gnupg2.udev: udev rules to set ACLs on SCM smartcard readers. + - Add upstart user job for gpg-agent. + - debian/control: drop dirmngr to Suggests as it is in universe. + + -- Iain Lane Mon, 13 Jul 2015 13:18:38 +0100 + gnupg2 (2.0.28-3) unstable; urgency=medium * pass DBUS_SESION_BUS_ADDRESS to the agent for gnome3. @@ -2461,3 +2734,4 @@ g10 (0.2.7-1) unstable; urgency=low * Initial release. -- James Troup Fri, 20 Feb 1998 02:05:34 +0000 + diff -pruN 2.2.20-1/debian/control 2.2.20-1ubuntu2/debian/control --- 2.2.20-1/debian/control 2020-03-23 19:04:11.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/control 2021-01-16 14:53:14.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnupg2 Section: utils Priority: optional -Maintainer: Debian GnuPG Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GnuPG Maintainers Uploaders: Eric Dorland , Daniel Kahn Gillmor , diff -pruN 2.2.20-1/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch 2.2.20-1ubuntu2/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch --- 2.2.20-1/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/patches/dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch 2021-01-16 14:53:14.000000000 +0000 @@ -0,0 +1,38 @@ +From ca937cf390662b830d4fc5d295e69b24b1778050 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Mon, 13 Jul 2020 10:00:58 +0900 +Subject: [PATCH] dirmngr: Handle EAFNOSUPPORT at connect_server. + +* dirmngr/http.c (connect_server): Skip server with EAFNOSUPPORT. + +-- + +GnuPG-bug-id: 4977 +Signed-off-by: NIIBE Yutaka + +Origin: backport, https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=109d16e8f644 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1910432 +--- + dirmngr/http.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Index: gnupg2/dirmngr/http.c +=================================================================== +--- gnupg2.orig/dirmngr/http.c ++++ gnupg2/dirmngr/http.c +@@ -3005,6 +3005,15 @@ connect_server (const char *server, unsi + sock = my_sock_new_for_addr (ai->addr, ai->socktype, ai->protocol); + if (sock == ASSUAN_INVALID_FD) + { ++ if (errno == EAFNOSUPPORT) ++ { ++ if (ai->family == AF_INET) ++ v4_valid = 0; ++ if (ai->family == AF_INET6) ++ v6_valid = 0; ++ continue; ++ } ++ + err = gpg_err_make (default_errsource, + gpg_err_code_from_syserror ()); + log_error ("error creating socket: %s\n", gpg_strerror (err)); diff -pruN 2.2.20-1/debian/patches/dirmngr-honor-http-proxy.patch 2.2.20-1ubuntu2/debian/patches/dirmngr-honor-http-proxy.patch --- 2.2.20-1/debian/patches/dirmngr-honor-http-proxy.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/patches/dirmngr-honor-http-proxy.patch 2021-01-16 14:53:14.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Honor http_proxy= environment variables by default + In the newly generated dirmngr.conf files only. Existing users behing + proxies should set honor-http-proxy in $GNUPGHOME/dirmngr.conf, + see /usr/share/gnupg/dirmngr-conf.skel. +Author: Dimitri John Ledkov +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1625848 + +Index: gnupg2-2.2.4/doc/examples/systemd-user/dirmngr.service +=================================================================== +--- gnupg2-2.2.4.orig/doc/examples/systemd-user/dirmngr.service ++++ gnupg2-2.2.4/doc/examples/systemd-user/dirmngr.service +@@ -4,5 +4,5 @@ Documentation=man:dirmngr(8) + Requires=dirmngr.socket + + [Service] +-ExecStart=/usr/bin/dirmngr --supervised ++ExecStart=/usr/bin/dirmngr --supervised --honor-http-proxy + ExecReload=/usr/bin/gpgconf --reload dirmngr diff -pruN 2.2.20-1/debian/patches/series 2.2.20-1ubuntu2/debian/patches/series --- 2.2.20-1/debian/patches/series 2020-03-23 19:04:16.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/patches/series 2021-01-16 14:53:14.000000000 +0000 @@ -19,3 +19,5 @@ dirmngr-Only-use-SKS-pool-CA-for-SKS-poo Use-hkps-keys.openpgp.org-as-the-default-keyserver.patch Make-gpg-zip-use-tar-from-PATH.patch gpg-drop-import-clean-from-default-keyserver-import-optio.patch +dirmngr-honor-http-proxy.patch +dirmngr-handle-EAFNOSUPPORT-at-connect_server.patch diff -pruN 2.2.20-1/debian/systemd-environment-generator/90gpg-agent 2.2.20-1ubuntu2/debian/systemd-environment-generator/90gpg-agent --- 2.2.20-1/debian/systemd-environment-generator/90gpg-agent 2020-03-23 19:04:11.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/systemd-environment-generator/90gpg-agent 2021-01-16 14:53:14.000000000 +0000 @@ -7,6 +7,9 @@ # rufo # Daniel Kahn Gillmor +agent_sock=$(gpgconf --list-dirs agent-socket) +export GPG_AGENT_INFO=${agent_sock}:0:1 + # See https://bugs.debian.org/855868 # see gpgconf(1): $5 is the "okay" field. diff -pruN 2.2.20-1/debian/tests/control 2.2.20-1ubuntu2/debian/tests/control --- 2.2.20-1/debian/tests/control 2020-03-23 18:45:14.000000000 +0000 +++ 2.2.20-1ubuntu2/debian/tests/control 2021-01-16 14:53:14.000000000 +0000 @@ -1,11 +1,7 @@ -Tests: gpgv-win32 -Depends: gpgv-win32, gnupg2, gpgv2, wine32, diffutils -Restrictions: allow-stderr, skip-not-installable - Tests: simple-tests Depends: gnupg2, gpgv2 Restrictions: allow-stderr Tests: migration -Depends: gpg, gnupg1, gnupg-utils, debian-archive-keyring, diffutils +Depends: gpg, gnupg1, gnupg-utils, debian-archive-keyring Restrictions: allow-stderr