diffstat of debian/ for gnupg2_2.2.4-1 gnupg2_2.2.4-1ubuntu1 changelog | 171 ++++++++++++++++++++++++++++++ control | 4 gnupg2.udev | 12 ++ patches/dirmngr-honor-http-proxy.patch | 18 +++ patches/series | 1 systemd-environment-generator/90gpg-agent | 2 6 files changed, 207 insertions(+), 1 deletion(-) diff -Nru gnupg2-2.2.4/debian/changelog gnupg2-2.2.4/debian/changelog --- gnupg2-2.2.4/debian/changelog 2018-01-03 17:43:40.000000000 +0000 +++ gnupg2-2.2.4/debian/changelog 2018-01-11 13:33:17.000000000 +0000 @@ -1,3 +1,22 @@ +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 @@ -397,6 +416,85 @@ -- 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 @@ -564,6 +662,58 @@ -- 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) @@ -768,6 +918,27 @@ -- 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. diff -Nru gnupg2-2.2.4/debian/control gnupg2-2.2.4/debian/control --- gnupg2-2.2.4/debian/control 2018-01-03 17:43:40.000000000 +0000 +++ gnupg2-2.2.4/debian/control 2018-01-11 13:33:17.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 , @@ -267,6 +268,7 @@ php-crypt-gpg (<= 1.4.1-1), python-apt (<= 1.1.0~beta4), python-gnupg (<< 0.3.8-3), + software-properties-common (<= 0.96.24.3), python3-apt (<= 1.1.0~beta4), Replaces: gnupg2 (<< 2.1.11-7+exp1), diff -Nru gnupg2-2.2.4/debian/gnupg2.udev gnupg2-2.2.4/debian/gnupg2.udev --- gnupg2-2.2.4/debian/gnupg2.udev 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.2.4/debian/gnupg2.udev 2018-01-11 13:22:09.000000000 +0000 @@ -0,0 +1,12 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!="usb", GOTO="gnupg_rules_end" +ACTION!="add", GOTO="gnupg_rules_end" + +# USB SmartCard Readers +## SCM readers (SCR335, SPR532, & Co) +ATTR{idVendor}=="04e6", ATTR{idProduct}=="e001", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg" +ATTR{idVendor}=="04e6", ATTR{idProduct}=="e003", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg" +ATTR{idVendor}=="04e6", ATTR{idProduct}=="5115", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg" + +LABEL="gnupg_rules_end" diff -Nru gnupg2-2.2.4/debian/patches/dirmngr-honor-http-proxy.patch gnupg2-2.2.4/debian/patches/dirmngr-honor-http-proxy.patch --- gnupg2-2.2.4/debian/patches/dirmngr-honor-http-proxy.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.2.4/debian/patches/dirmngr-honor-http-proxy.patch 2018-01-11 13:32:46.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 -Nru gnupg2-2.2.4/debian/patches/series gnupg2-2.2.4/debian/patches/series --- gnupg2-2.2.4/debian/patches/series 2018-01-03 17:43:40.000000000 +0000 +++ gnupg2-2.2.4/debian/patches/series 2018-01-11 13:33:17.000000000 +0000 @@ -26,3 +26,4 @@ scd-Fix-for-inactive-card-at-start-by-internal-CCID-drive.patch gpg-Allow-the-use-of-cv25519-and-ed25519-in-the-keygen-pa.patch gpg-Allow-futuredefault-as-alias-for-future-default.patch +dirmngr-honor-http-proxy.patch diff -Nru gnupg2-2.2.4/debian/systemd-environment-generator/90gpg-agent gnupg2-2.2.4/debian/systemd-environment-generator/90gpg-agent --- gnupg2-2.2.4/debian/systemd-environment-generator/90gpg-agent 2017-11-30 23:42:42.000000000 +0000 +++ gnupg2-2.2.4/debian/systemd-environment-generator/90gpg-agent 2018-01-11 13:33:17.000000000 +0000 @@ -3,6 +3,8 @@ # Author: rufo # See https://bugs.debian.org/855868 +agent_sock=$(gpgconf --list-dirs agent-socket) +export GPG_AGENT_INFO=${agent_sock}:0:1 if [ -n "$(gpgconf --list-options gpg-agent | \ awk -F: '/^enable-ssh-support:/{ print $10 }')" ]; then echo SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)