[Pkg-gnupg-commit] [gnupg2] 03/04: track upstream decision-making about gpg-agent socket names

[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 aeaf13084e7c5fb2d8fba7315135ed47c4d2391e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Oct 17 17:08:11 2016 -0400

    track upstream decision-making about gpg-agent socket names
---
 debian/gnupg-agent.README.Debian                | 8 ++++----
 debian/systemd-user/gpg-agent-browser.socket    | 2 +-
 debian/systemd-user/gpg-agent-restricted.socket | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/gnupg-agent.README.Debian b/debian/gnupg-agent.README.Debian
index b3229d6..dd4e51a 100644
--- a/debian/gnupg-agent.README.Debian
+++ b/debian/gnupg-agent.README.Debian
@@ -15,11 +15,11 @@ logout by doing:
 
     systemctl --user enable gpg-agent.socket
 
-If you also want the ssh or restricted sockets to be available, you
-might also add:
+If you also want the ssh or extra (restricted) sockets to be
+available, you might also add:
 
     systemctl --user enable gpg-agent-ssh.socket
-    systemctl --user enable gpg-agent-restricted.socket
+    systemctl --user enable gpg-agent-extra.socket
 
 If you do this from the middle of a running session, you probably also
 want to clean up any other running gpg-agent, and ensure that the
@@ -52,4 +52,4 @@ session ends with:
 You may wish to add this to your session logout scripts if you're not
 using systemd.
 
- -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Tue,  4 Oct 2016 17:20:49 -0400
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Mon, 17 Oct 2016 17:06:22 -0400
diff --git a/debian/systemd-user/gpg-agent-browser.socket b/debian/systemd-user/gpg-agent-browser.socket
index c451275..67690ce 100644
--- a/debian/systemd-user/gpg-agent-browser.socket
+++ b/debian/systemd-user/gpg-agent-browser.socket
@@ -3,7 +3,7 @@ Description=GnuPG cryptographic agent (access for web browsers)
 Documentation=man:gpg-agent(1)
 
 [Socket]
-ListenStream=%t/gnupg/S.gpg-agent.brwsr
+ListenStream=%t/gnupg/S.gpg-agent.browser
 FileDescriptorName=browser
 Service=gpg-agent.service
 SocketMode=0600
diff --git a/debian/systemd-user/gpg-agent-restricted.socket b/debian/systemd-user/gpg-agent-restricted.socket
index bb5e01a..5b87d09 100644
--- a/debian/systemd-user/gpg-agent-restricted.socket
+++ b/debian/systemd-user/gpg-agent-restricted.socket
@@ -3,7 +3,7 @@ Description=GnuPG cryptographic agent and passphrase cache (restricted)
 Documentation=man:gpg-agent(1)
 
 [Socket]
-ListenStream=%t/gnupg/S.gpg-agent.rstrd
+ListenStream=%t/gnupg/S.gpg-agent.extra
 FileDescriptorName=extra
 Service=gpg-agent.service
 SocketMode=0600

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