[Pkg-gnupg-commit] [gnupg2] 184/185: simplify systemd user services

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 5cce707df7d4b747f42f85f68af91d57d16a919f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Aug 7 04:16:42 2017 -0400

    simplify systemd user services
---
 ...-systemd-user-Drop-RefuseManualStart-true.patch | 44 ++++++++++++++++++++++
 ...systemd-user-Drop-redundant-After-.socket.patch | 44 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 90 insertions(+)

diff --git a/debian/patches/0016-systemd-user-Drop-RefuseManualStart-true.patch b/debian/patches/0016-systemd-user-Drop-RefuseManualStart-true.patch
new file mode 100644
index 0000000..5ee631a
--- /dev/null
+++ b/debian/patches/0016-systemd-user-Drop-RefuseManualStart-true.patch
@@ -0,0 +1,44 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Mon, 7 Aug 2017 04:11:51 -0400
+Subject: systemd-user: Drop RefuseManualStart=true.
+
+* doc/examples/systemd-user/*.service: drop RefuseManualStart=true
+
+--
+
+These user services can be safely started manually as long as at least
+their primary sockets are available.  They'll just start with nothing
+to do, which should be fine.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+---
+ doc/examples/systemd-user/dirmngr.service   | 2 --
+ doc/examples/systemd-user/gpg-agent.service | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/doc/examples/systemd-user/dirmngr.service b/doc/examples/systemd-user/dirmngr.service
+index ded533b..2a7c76e 100644
+--- a/doc/examples/systemd-user/dirmngr.service
++++ b/doc/examples/systemd-user/dirmngr.service
+@@ -3,8 +3,6 @@ Description=GnuPG network certificate management daemon
+ Documentation=man:dirmngr(8)
+ Requires=dirmngr.socket
+ After=dirmngr.socket
+-## This is a socket-activated service:
+-RefuseManualStart=true
+ 
+ [Service]
+ ExecStart=/usr/bin/dirmngr --supervised
+diff --git a/doc/examples/systemd-user/gpg-agent.service b/doc/examples/systemd-user/gpg-agent.service
+index e88dc7f..a909f0b 100644
+--- a/doc/examples/systemd-user/gpg-agent.service
++++ b/doc/examples/systemd-user/gpg-agent.service
+@@ -3,8 +3,6 @@ Description=GnuPG cryptographic agent and passphrase cache
+ Documentation=man:gpg-agent(1)
+ Requires=gpg-agent.socket
+ After=gpg-agent.socket
+-## This is a socket-activated service:
+-RefuseManualStart=true
+ 
+ [Service]
+ ExecStart=/usr/bin/gpg-agent --supervised
diff --git a/debian/patches/0017-systemd-user-Drop-redundant-After-.socket.patch b/debian/patches/0017-systemd-user-Drop-redundant-After-.socket.patch
new file mode 100644
index 0000000..e229143
--- /dev/null
+++ b/debian/patches/0017-systemd-user-Drop-redundant-After-.socket.patch
@@ -0,0 +1,44 @@
+From: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+Date: Mon, 7 Aug 2017 04:14:02 -0400
+Subject: systemd-user: Drop redundant After=*.socket.
+
+* doc/examples/systemd-user/*.service: Drop redundant After=*.socket
+directive.
+
+--
+
+systemd.socket(5) says:
+
+   Socket units will have a Before= dependency on the service which
+   they trigger added implicitly.
+
+Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+---
+ doc/examples/systemd-user/dirmngr.service   | 1 -
+ doc/examples/systemd-user/gpg-agent.service | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/doc/examples/systemd-user/dirmngr.service b/doc/examples/systemd-user/dirmngr.service
+index 2a7c76e..3c060cd 100644
+--- a/doc/examples/systemd-user/dirmngr.service
++++ b/doc/examples/systemd-user/dirmngr.service
+@@ -2,7 +2,6 @@
+ Description=GnuPG network certificate management daemon
+ Documentation=man:dirmngr(8)
+ Requires=dirmngr.socket
+-After=dirmngr.socket
+ 
+ [Service]
+ ExecStart=/usr/bin/dirmngr --supervised
+diff --git a/doc/examples/systemd-user/gpg-agent.service b/doc/examples/systemd-user/gpg-agent.service
+index a909f0b..a050fcc 100644
+--- a/doc/examples/systemd-user/gpg-agent.service
++++ b/doc/examples/systemd-user/gpg-agent.service
+@@ -2,7 +2,6 @@
+ Description=GnuPG cryptographic agent and passphrase cache
+ Documentation=man:gpg-agent(1)
+ Requires=gpg-agent.socket
+-After=gpg-agent.socket
+ 
+ [Service]
+ ExecStart=/usr/bin/gpg-agent --supervised
diff --git a/debian/patches/series b/debian/patches/series
index 1880c40..5e8e5de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,5 @@ skip-missing-signing-keys/0013-g10-Skip-signing-keys-where-no-secret-key-is-avai
 0013-Explain-the-server-is-older-than-xxx-warning.patch
 0014-g10-Always-save-standard-revocation-certificate-in-f.patch
 0015-gpg-Avoid-double-fingerprint-printing-with-import-sh.patch
+0016-systemd-user-Drop-RefuseManualStart-true.patch
+0017-systemd-user-Drop-redundant-After-.socket.patch

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