[Pkg-gnupg-commit] [gnupg2] 04/05: publish SSH_AUTH_SOCK for wayland users (Closes: #855868)

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit c8b01ce7ad77dceeae3464fbb8e202dc0aecd46c
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Sep 7 20:49:43 2017 -0400

    publish SSH_AUTH_SOCK for wayland users (Closes: #855868)
---
 debian/gpg-agent.install                         |  1 +
 debian/systemd-environment-generator/90gpg-agent | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/debian/gpg-agent.install b/debian/gpg-agent.install
index 4f6babf..ae93fb5 100644
--- a/debian/gpg-agent.install
+++ b/debian/gpg-agent.install
@@ -1,4 +1,5 @@
 debian/Xsession.d/90gpg-agent etc/X11/Xsession.d
+debian/systemd-environment-generator/90gpg-agent usr/lib/systemd/user-environment-generators
 debian/tmp/usr/bin/gpg-agent
 debian/tmp/usr/lib/gnupg/gpg-check-pattern
 debian/tmp/usr/lib/gnupg/gpg-preset-passphrase
diff --git a/debian/systemd-environment-generator/90gpg-agent b/debian/systemd-environment-generator/90gpg-agent
new file mode 100755
index 0000000..38fea9c
--- /dev/null
+++ b/debian/systemd-environment-generator/90gpg-agent
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Author: rufo <rufo at rufoa.com>
+# See https://bugs.debian.org/855868
+
+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)
+    echo GSM_SKIP_SSH_AGENT_WORKAROUND=true
+fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git