diffstat for gnupg2-2.1.15 gnupg2-2.1.15 Xsession.d/90gpg-agent | 5 changelog | 161 +++++++++++++++++++++++++++++ control | 8 + gnupg-agent.install | 5 gnupg-agent.links | 1 gnupg2.udev | 12 ++ patches/0005-set-gnupghome-for-tests.patch | 25 ++++ patches/CVE-2018-12020.patch | 44 +++++++ patches/dirmngr-honor-http-proxy.patch | 22 +++ patches/series | 3 systemd-user/gpg-agent.service | 29 ++++- upstart-user/gpg-agent.conf | 29 +++++ upstart-user/gpg-agent.override | 1 upstart-user/no-pinentry-gnome3.conf | 14 ++ 14 files changed, 352 insertions(+), 7 deletions(-) diff -Nru gnupg2-2.1.15/debian/Xsession.d/90gpg-agent gnupg2-2.1.15/debian/Xsession.d/90gpg-agent --- gnupg2-2.1.15/debian/Xsession.d/90gpg-agent 2016-08-29 16:49:05.000000000 +0000 +++ gnupg2-2.1.15/debian/Xsession.d/90gpg-agent 2016-08-31 12:04:13.000000000 +0000 @@ -12,6 +12,10 @@ # variables to be set in order to find the agent, so we will set those # here. +# On Ubuntu all of below is done in the user systemd units +if [ ! -d /run/user/$(id -u)/systemd ] +then + agent_sock=$(gpgconf --list-dirs | grep ^agent-socket: | cut -d: -f2) export GPG_AGENT_INFO=${agent_sock}:0:1 if [ -n "$(gpgconf --list-options gpg-agent | \ @@ -19,3 +23,4 @@ export SSH_AUTH_SOCK=${agent_sock}.ssh fi +fi diff -Nru gnupg2-2.1.15/debian/changelog gnupg2-2.1.15/debian/changelog --- gnupg2-2.1.15/debian/changelog 2016-08-30 17:19:23.000000000 +0000 +++ gnupg2-2.1.15/debian/changelog 2018-06-09 21:15:54.000000000 +0000 @@ -1,3 +1,91 @@ +gnupg2 (2.1.15-1ubuntu8.1) artful-security; urgency=medium + + * SECURITY UPDATE: missing sanitization of verbose output + - debian/patches/CVE-2018-12020.patch: Sanitize diagnostic with + the original file name. + - CVE-2018-12020 + + -- Steve Beattie Sat, 09 Jun 2018 14:15:54 -0700 + +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 @@ -165,6 +253,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) @@ -369,6 +509,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.1.15/debian/control gnupg2-2.1.15/debian/control --- gnupg2-2.1.15/debian/control 2016-08-30 17:19:23.000000000 +0000 +++ gnupg2-2.1.15/debian/control 2016-09-01 10:33:44.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 , @@ -52,6 +53,10 @@ pinentry-curses | pinentry, ${misc:Depends}, ${shlibs:Depends}, +Breaks: + gnupg2 (<< 2.1.15-1ubuntu1~), +Replaces: + gnupg2 (<< 2.1.15-1ubuntu1~), Recommends: gnupg (= ${binary:Version}) | gpgsm, Provides: @@ -131,6 +136,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), Replaces: gnupg2 (<< 2.1.11-7+exp1), Provides: diff -Nru gnupg2-2.1.15/debian/gnupg-agent.install gnupg2-2.1.15/debian/gnupg-agent.install --- gnupg2-2.1.15/debian/gnupg-agent.install 2016-08-30 08:46:35.000000000 +0000 +++ gnupg2-2.1.15/debian/gnupg-agent.install 2016-08-31 12:20:23.000000000 +0000 @@ -1,5 +1,10 @@ debian/Xsession.d/90gpg-agent etc/X11/Xsession.d debian/systemd-user/gpg-agent.service usr/lib/systemd/user +# upstart override, when user systemd is available +debian/upstart-user/gpg-agent.override usr/share/upstart/systemd-session/upstart/ +# upstart user session +debian/upstart-user/gpg-agent.conf usr/share/upstart/sessions/ +debian/upstart-user/no-pinentry-gnome3.conf usr/share/upstart/sessions/ debian/tmp/usr/bin/gpg-agent debian/tmp/usr/bin/gpg-connect-agent debian/tmp/usr/bin/symcryptrun diff -Nru gnupg2-2.1.15/debian/gnupg-agent.links gnupg2-2.1.15/debian/gnupg-agent.links --- gnupg2-2.1.15/debian/gnupg-agent.links 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/gnupg-agent.links 2016-08-31 13:18:13.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/systemd/user/gpg-agent.service usr/lib/systemd/user/graphical-session-pre.target.wants/gpg-agent.service diff -Nru gnupg2-2.1.15/debian/gnupg2.udev gnupg2-2.1.15/debian/gnupg2.udev --- gnupg2-2.1.15/debian/gnupg2.udev 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/gnupg2.udev 2016-08-31 11:53:34.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.1.15/debian/patches/0005-set-gnupghome-for-tests.patch gnupg2-2.1.15/debian/patches/0005-set-gnupghome-for-tests.patch --- gnupg2-2.1.15/debian/patches/0005-set-gnupghome-for-tests.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/patches/0005-set-gnupghome-for-tests.patch 2017-10-12 07:48:16.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Set GNUPGHOME for tests + By default GNUPGHOME is set to $HOME/.gnupg, but during tests gnupg + shouldn't be using that directory at all. + This patch fixes that and sets it to use a .gnupg directory inside + the build tree. +Author: Tiago Stürmer Daitx +Bug-Ubuntu: https://launchpad.net/bugs/1722939 +Forwarded: not-needed +Last-Update: 2017-10-11 + +--- +The headers above follow DEP3 - see http://dep.debian.net/deps/dep3/ + +--- gnupg2-2.1.15.orig/tests/openpgp/Makefile.am ++++ gnupg2-2.1.15/tests/openpgp/Makefile.am +@@ -42,7 +42,8 @@ TESTS_ENVIRONMENT = LC_ALL=C \ + TMP=$(TMP) \ + srcdir=$(abs_srcdir) \ + objdir=$(abs_top_builddir) \ +- GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm:$(abs_top_srcdir)/tests/openpgp ++ GPGSCM_PATH=$(abs_top_srcdir)/tests/gpgscm:$(abs_top_srcdir)/tests/openpgp \ ++ GNUPGHOME=$(abs_top_builddir)/.gnupg + + XTESTS = \ + version.scm \ diff -Nru gnupg2-2.1.15/debian/patches/CVE-2018-12020.patch gnupg2-2.1.15/debian/patches/CVE-2018-12020.patch --- gnupg2-2.1.15/debian/patches/CVE-2018-12020.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/patches/CVE-2018-12020.patch 2018-06-09 21:14:52.000000000 +0000 @@ -0,0 +1,44 @@ +From 210e402acd3e284b32db1901e43bf1470e659e49 Mon Sep 17 00:00:00 2001 +From: Werner Koch +Date: Fri, 8 Jun 2018 10:45:21 +0200 +Subject: [PATCH] gpg: Sanitize diagnostic with the original file name. + +* g10/mainproc.c (proc_plaintext): Sanitize verbose output. +-- + +This fixes a forgotten sanitation of user supplied data in a verbose +mode diagnostic. The mention CVE is about using this to inject +status-fd lines into the stderr output. Other harm good as well be +done. Note that GPGME based applications are not affected because +GPGME does not fold status output into stderr. + +CVE-id: CVE-2018-12020 +GnuPG-bug-id: 4012 +(cherry picked from commit 13f135c7a252cc46cff96e75968d92b6dc8dce1b) +--- + g10/mainproc.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/g10/mainproc.c b/g10/mainproc.c +index 116b72a6b..72b0dd828 100644 +--- a/g10/mainproc.c ++++ b/g10/mainproc.c +@@ -758,7 +758,14 @@ proc_plaintext( CTX c, PACKET *pkt ) + if (pt->namelen == 8 && !memcmp( pt->name, "_CONSOLE", 8)) + log_info (_("Note: sender requested \"for-your-eyes-only\"\n")); + else if (opt.verbose) +- log_info (_("original file name='%.*s'\n"), pt->namelen, pt->name); ++ { ++ /* We don't use print_utf8_buffer because that would require a ++ * string change which we don't want in 2.2. It is also not ++ * clear whether the filename is always utf-8 encoded. */ ++ char *tmp = make_printable_string (pt->name, pt->namelen, 0); ++ log_info (_("original file name='%.*s'\n"), (int)strlen (tmp), tmp); ++ xfree (tmp); ++ } + + free_md_filter_context (&c->mfx); + if (gcry_md_open (&c->mfx.md, 0, 0)) +-- +2.17.1 + diff -Nru gnupg2-2.1.15/debian/patches/dirmngr-honor-http-proxy.patch gnupg2-2.1.15/debian/patches/dirmngr-honor-http-proxy.patch --- gnupg2-2.1.15/debian/patches/dirmngr-honor-http-proxy.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/patches/dirmngr-honor-http-proxy.patch 2016-09-21 01:28:33.000000000 +0000 @@ -0,0 +1,22 @@ +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 + +--- a/g10/dirmngr-conf.skel ++++ b/g10/dirmngr-conf.skel +@@ -67,3 +67,12 @@ + # more root certificates. Tilde expansion is supported. + + #hkp-cacert /path/to/CA/sks-keyservers.netCA.pem ++ ++# --honor-http-proxy ++# ++# Upstream default is to ignore http_proxy= environment variable when ++# accessing the keyserver, unless this key is set. On Ubuntu, this ++# behaviour is enabled by default and http_proxy environment variable ++# is honored. ++ ++honor-http-proxy diff -Nru gnupg2-2.1.15/debian/patches/series gnupg2-2.1.15/debian/patches/series --- gnupg2-2.1.15/debian/patches/series 2016-08-30 17:19:23.000000000 +0000 +++ gnupg2-2.1.15/debian/patches/series 2018-06-09 21:15:54.000000000 +0000 @@ -2,3 +2,6 @@ 0002-Avoid-simple-memory-dumps-via-ptrace.patch 0003-avoid-regenerating-defsincdate-use-shipped-file.patch 0004-spelling-s-achived-achieved-and-s-alternativly-alter.patch +dirmngr-honor-http-proxy.patch +0005-set-gnupghome-for-tests.patch +CVE-2018-12020.patch diff -Nru gnupg2-2.1.15/debian/systemd-user/gpg-agent.service gnupg2-2.1.15/debian/systemd-user/gpg-agent.service --- gnupg2-2.1.15/debian/systemd-user/gpg-agent.service 2016-08-29 16:49:05.000000000 +0000 +++ gnupg2-2.1.15/debian/systemd-user/gpg-agent.service 2016-10-07 09:49:06.000000000 +0000 @@ -1,11 +1,28 @@ [Unit] -Description=GnuPG secret key agent and passphrase cache -Documentation=man:gpg-agent(1) +Description=GPG 1.x agent compatibility +ConditionPathIsDirectory=%h/.gnupg +Before=gnome-keyring-ssh.service ssh-agent.service [Service] Type=forking -ExecStart=/usr/bin/gpg-agent --daemon --homedir %h/.gnupg -Restart=always +Environment=GNUPGHOME=%h/.gnupg -[Install] -WantedBy=default.target +ExecStartPre=/usr/bin/dbus-update-activation-environment --verbose --systemd GPG_AGENT_INFO=${GNUPGHOME}/S.gpg-agent:0:1: +ExecStartPre=-/sbin/initctl set-env --global GPG_AGENT_INFO=${GNUPGHOME}/S.gpg-agent:0:1 +ExecStartPre=/bin/sh -ec '\ + out=$$(gpgconf --list-options gpg-agent | awk -F: "/^enable-ssh-support:/{ print \\$$10 }"); \ + if [ -n "$$out" ]; then \ + dbus-update-activation-environment --verbose --systemd SSH_AUTH_SOCK=$$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh SSH_AGENT_LAUNCHER=gpg-agent; \ + initctl set-env --global SSH_AUTH_SOCK=$$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh || true; \ + fi' + +ExecStart=/usr/bin/gpgconf --launch gpg-agent + +ExecStop=/usr/bin/gpgconf --kill gpg-agent +ExecStopPost=/usr/bin/dbus-update-activation-environment --verbose --systemd GPG_AGENT_INFO= +ExecStopPost=-/sbin/initctl unset-env --global GPG_AGENT_INFO +ExecStopPost=/bin/sh -ec '\ + if [ "${SSH_AGENT_LAUNCHER}" = gpg-agent ]; then \ + dbus-update-activation-environment --verbose --systemd SSH_AUTH_SOCK= SSH_AGENT_LAUNCHER=; \ + initctl unset-env --global SSH_AUTH_SOCK || true; \ + fi' diff -Nru gnupg2-2.1.15/debian/upstart-user/gpg-agent.conf gnupg2-2.1.15/debian/upstart-user/gpg-agent.conf --- gnupg2-2.1.15/debian/upstart-user/gpg-agent.conf 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/upstart-user/gpg-agent.conf 2017-03-29 15:15:00.000000000 +0000 @@ -0,0 +1,29 @@ +description "GPG Agent" +author "Stéphane Graber " + +start on starting xsession-init and (no-pinentry-gnome3 or started dbus) + +pre-start script + GNUPGHOME=$HOME/.gnupg + [ -d $GNUPGHOME ] || { stop; exit 0; } + + # /etc/X11/Xsession.d/90gpg-agent starts the agent without DBUS, + # thus can't use pinentry-gnome3 + # but we know we have dbus now, restart gpg-agent + gpgconf --kill gpg-agent + gpgconf --launch gpg-agent + initctl set-env --global GPG_AGENT_INFO=$GNUPGHOME/S.gpg-agent:0:1 + + if [ -n "$(gpgconf --list-options gpg-agent | awk -F: '/^enable-ssh-support:/{ print $10 }')" ]; then + initctl set-env --global SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh + fi +end script + +post-stop script + gpgconf --kill gpg-agent + initctl unset-env --global GPG_AGENT_INFO + + if [ -n "$(gpgconf --list-options gpg-agent | awk -F: '/^enable-ssh-support:/{ print $10 }')" ]; then + initctl unset-env --global SSH_AUTH_SOCK + fi +end script diff -Nru gnupg2-2.1.15/debian/upstart-user/gpg-agent.override gnupg2-2.1.15/debian/upstart-user/gpg-agent.override --- gnupg2-2.1.15/debian/upstart-user/gpg-agent.override 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/upstart-user/gpg-agent.override 2016-08-31 11:54:12.000000000 +0000 @@ -0,0 +1 @@ +manual diff -Nru gnupg2-2.1.15/debian/upstart-user/no-pinentry-gnome3.conf gnupg2-2.1.15/debian/upstart-user/no-pinentry-gnome3.conf --- gnupg2-2.1.15/debian/upstart-user/no-pinentry-gnome3.conf 1970-01-01 00:00:00.000000000 +0000 +++ gnupg2-2.1.15/debian/upstart-user/no-pinentry-gnome3.conf 2016-08-31 11:54:12.000000000 +0000 @@ -0,0 +1,14 @@ +description "Don't make gpg-agent require dbus" +author "Iain Lane " + +start on startup + +emits no-pinenty-gnome3 + +task + +script + if [ ! -L "/usr/bin/pinentry" ] || [ "$(readlink -f /usr/bin/pinentry)" != "/usr/bin/pinentry-gnome3" ]; then + initctl --no-wait emit no-pinentry-gnome3 + fi +end script