[Pkg-gnupg-commit] [gnupg2] 291/292: switch to using systemd user service files shipped upstream

[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 8407e53d2dc9bd22f5dc93913db35055a85adb92
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Nov 21 01:09:01 2016 -0500

    switch to using systemd user service files shipped upstream
---
 debian/dirmngr.install                     |  4 ++--
 debian/gnupg-agent.install                 |  7 +++++--
 debian/systemd-user/dirmngr.service        | 10 ----------
 debian/systemd-user/dirmngr.socket         | 11 -----------
 debian/systemd-user/gpg-agent-extra.socket | 13 -------------
 debian/systemd-user/gpg-agent-ssh.socket   | 13 -------------
 debian/systemd-user/gpg-agent.service      | 10 ----------
 debian/systemd-user/gpg-agent.socket       | 12 ------------
 8 files changed, 7 insertions(+), 73 deletions(-)

diff --git a/debian/dirmngr.install b/debian/dirmngr.install
index 1ca2db6..54e4b26 100644
--- a/debian/dirmngr.install
+++ b/debian/dirmngr.install
@@ -1,5 +1,5 @@
-debian/systemd-user/dirmngr.service usr/lib/systemd/user
-debian/systemd-user/dirmngr.socket usr/lib/systemd/user
+doc/examples/systemd-user/dirmngr.service usr/lib/systemd/user
+doc/examples/systemd-user/dirmngr.socket usr/lib/systemd/user
 debian/tmp/usr/bin/dirmngr
 debian/tmp/usr/bin/dirmngr-client
 debian/tmp/usr/lib/gnupg/dirmngr_ldap
diff --git a/debian/gnupg-agent.install b/debian/gnupg-agent.install
index f4a11cd..468fd08 100644
--- a/debian/gnupg-agent.install
+++ b/debian/gnupg-agent.install
@@ -1,6 +1,9 @@
 debian/Xsession.d/90gpg-agent etc/X11/Xsession.d
-debian/systemd-user/gpg-agent.service usr/lib/systemd/user
-debian/systemd-user/gpg-agent*.socket usr/lib/systemd/user
+doc/examples/systemd-user/gpg-agent.service usr/lib/systemd/user
+doc/examples/systemd-user/gpg-agent.socket usr/lib/systemd/user
+doc/examples/systemd-user/gpg-agent-ssh.socket usr/lib/systemd/user
+doc/examples/systemd-user/gpg-agent-extra.socket usr/lib/systemd/user
+debian/systemd-user/gpg-agent-browser.socket usr/lib/systemd/user
 debian/tmp/usr/bin/gpg-agent
 debian/tmp/usr/bin/gpg-connect-agent
 debian/tmp/usr/bin/symcryptrun
diff --git a/debian/systemd-user/dirmngr.service b/debian/systemd-user/dirmngr.service
deleted file mode 100644
index c79dfc5..0000000
--- a/debian/systemd-user/dirmngr.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-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/debian/systemd-user/dirmngr.socket b/debian/systemd-user/dirmngr.socket
deleted file mode 100644
index ebabf89..0000000
--- a/debian/systemd-user/dirmngr.socket
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=GnuPG network certificate management daemon
-Documentation=man:dirmngr(8)
-
-[Socket]
-ListenStream=%t/gnupg/S.dirmngr
-SocketMode=0600
-DirectoryMode=0700
-
-[Install]
-WantedBy=sockets.target
diff --git a/debian/systemd-user/gpg-agent-extra.socket b/debian/systemd-user/gpg-agent-extra.socket
deleted file mode 100644
index 5b87d09..0000000
--- a/debian/systemd-user/gpg-agent-extra.socket
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=GnuPG cryptographic agent and passphrase cache (restricted)
-Documentation=man:gpg-agent(1)
-
-[Socket]
-ListenStream=%t/gnupg/S.gpg-agent.extra
-FileDescriptorName=extra
-Service=gpg-agent.service
-SocketMode=0600
-DirectoryMode=0700
-
-[Install]
-WantedBy=sockets.target
diff --git a/debian/systemd-user/gpg-agent-ssh.socket b/debian/systemd-user/gpg-agent-ssh.socket
deleted file mode 100644
index 798c1d9..0000000
--- a/debian/systemd-user/gpg-agent-ssh.socket
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=GnuPG cryptographic agent (ssh-agent emulation)
-Documentation=man:gpg-agent(1) man:ssh-add(1) man:ssh-agent(1) man:ssh(1)
-
-[Socket]
-ListenStream=%t/gnupg/S.gpg-agent.ssh
-FileDescriptorName=ssh
-Service=gpg-agent.service
-SocketMode=0600
-DirectoryMode=0700
-
-[Install]
-WantedBy=sockets.target
diff --git a/debian/systemd-user/gpg-agent.service b/debian/systemd-user/gpg-agent.service
deleted file mode 100644
index 9ab9220..0000000
--- a/debian/systemd-user/gpg-agent.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-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/systemd-user/gpg-agent.socket b/debian/systemd-user/gpg-agent.socket
deleted file mode 100644
index 4257c2c..0000000
--- a/debian/systemd-user/gpg-agent.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=GnuPG cryptographic agent and passphrase cache
-Documentation=man:gpg-agent(1)
-
-[Socket]
-ListenStream=%t/gnupg/S.gpg-agent
-FileDescriptorName=std
-SocketMode=0600
-DirectoryMode=0700
-
-[Install]
-WantedBy=sockets.target

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