[Pkg-gnupg-commit] [gnupg2] 109/116: update systemd integration documentation

[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 44bbcb12482e7f2ce1d10d583ece7e678668ab73
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Jan 23 22:57:04 2017 -0500

    update systemd integration documentation
---
 debian/dirmngr.NEWS              | 10 ++++++++++
 debian/dirmngr.README.Debian     |  9 +++++----
 debian/gnupg-agent.NEWS          | 10 ++++++++++
 debian/gnupg-agent.README.Debian |  9 +++++----
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/debian/dirmngr.NEWS b/debian/dirmngr.NEWS
index bd0ccb7..b0c550f 100644
--- a/debian/dirmngr.NEWS
+++ b/debian/dirmngr.NEWS
@@ -1,3 +1,13 @@
+dirmngr (2.1.18-1) unstable; urgency=medium
+
+  If your machine is configured with system user session management,
+  dirmngr will be managed automatically by systemd's user sessions on
+  machines configured with use systemd.  Please consider installing the
+  packages that the dirmngr package Suggests:, and see
+  /usr/share/doc/dirmngr/README.Debian for more details.
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Mon, 23 Jan 2017 22:50:34 -0500
+
 dirmngr (2.1.13-3) experimental; urgency=medium
 
   gpg and most related processes will auto-launch dirmngr if needed.
diff --git a/debian/dirmngr.README.Debian b/debian/dirmngr.README.Debian
index b0281b3..099240a 100644
--- a/debian/dirmngr.README.Debian
+++ b/debian/dirmngr.README.Debian
@@ -17,10 +17,11 @@ process down at session logout.
 Users who don't want systemd to manage their dirmngr in this way for
 all future sessions should do:
 
-    systemctl --user mask dirmngr.socket
+    systemctl --user mask --now dirmngr.socket
 
 Doing this means that dirmngr will fall back to its manual mode of
-operation.
+operation.  (This decision can be reversed by the user with "unmask"
+instead of "mask")
 
 See systemctl(1) for more details about managing the dirmngr.socket
 unit.
@@ -38,9 +39,9 @@ If dirmngr is launched manually or automatically (but not supervised
 by systemd), you also probably want to ensure that it terminates when
 your session ends with:
 
-   gpgconf --no-autostart --kill dirmngr
+   gpgconf --kill dirmngr
 
 If you're not using systemd, you may wish to add this command to your
 session logout scripts.
 
- -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Wed, 18 Jan 2017 12:56:09 -0500
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Mon, 23 Jan 2017 22:49:45 -0500
diff --git a/debian/gnupg-agent.NEWS b/debian/gnupg-agent.NEWS
index 72cdeb4..58b6b55 100644
--- a/debian/gnupg-agent.NEWS
+++ b/debian/gnupg-agent.NEWS
@@ -1,3 +1,13 @@
+gnupg-agent (2.1.18-1) experimental; urgency=medium
+
+  If your machine is configured with system user session management,
+  gpg-agent will be managed automatically by systemd's user sessions on
+  machines configured with use systemd.  Please consider installing the
+  packages that the gnupg-agent package Suggests:, and see
+  /usr/share/doc/gnupg-agent/README.Debian for more details.
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Mon, 23 Jan 2017 22:54:48 -0500
+
 gnupg-agent (2.1.13-3) experimental; urgency=medium
 
   gpg-agent is no longer auto-launched by
diff --git a/debian/gnupg-agent.README.Debian b/debian/gnupg-agent.README.Debian
index 8f15c8e..f57d278 100644
--- a/debian/gnupg-agent.README.Debian
+++ b/debian/gnupg-agent.README.Debian
@@ -24,10 +24,11 @@ environments like GNOME.
 Users who don't want systemd to manage their gpg-agent in this way for
 all future sessions should do:
 
-    systemctl --user mask 'gpg-agent*.socket'
+    systemctl --user mask --now gpg-agent.service gpg-agent.socket gpg-agent-ssh.socket gpg-agent-extra.socket gpg-agent-browser.socket
 
 Doing this means that gpg-agent will fall back to its manual mode of
-operation.
+operation.  (This decision can be reversed by the user with "unmask"
+instead of "mask")
 
 See systemctl(1) for more details about managing the gpg-agent*.socket
 units.
@@ -73,9 +74,9 @@ If gpg-agent is launched manually or automatically (but not supervised
 by systemd), you probably want to ensure that it terminates when your
 session ends with:
 
-    gpgconf --no-autostart --kill gpg-agent
+    gpgconf --kill gpg-agent
 
 If you're not using systemd, you may wish to add this to your session
 logout scripts.
 
- -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Wed, 18 Jan 2017 12:56:20 -0500
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>, Mon, 23 Jan 2017 22:56:08 -0500

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