[Pkg-samba-maint] [samba] 04/06: Add patches related to systemd

[Mathieu Parent]

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

sathieu pushed a commit to branch master
in repository samba.

commit 25ec39a43a26a39a273b0b75faa1c43033e1b382
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Sat May 14 07:18:14 2016 +0200

    Add patches related to systemd
---
 .../Add-documentation-to-systemd-Unit-files.patch  | 71 ++++++++++++++++++++++
 debian/patches/series                              |  2 +
 .../systemd-syslog.target-is-obsolete.patch        | 66 ++++++++++++++++++++
 3 files changed, 139 insertions(+)

diff --git a/debian/patches/Add-documentation-to-systemd-Unit-files.patch b/debian/patches/Add-documentation-to-systemd-Unit-files.patch
new file mode 100644
index 0000000..0dff620
--- /dev/null
+++ b/debian/patches/Add-documentation-to-systemd-Unit-files.patch
@@ -0,0 +1,71 @@
+From bf7245b7b39f70f37e1bb34999b016a655dce8c2 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Thu, 12 May 2016 22:16:24 +0200
+Subject: Add documentation to systemd Unit files
+
+---
+ ctdb/config/ctdb.service          | 1 +
+ packaging/systemd/nmb.service     | 1 +
+ packaging/systemd/samba.service   | 1 +
+ packaging/systemd/smb.service     | 1 +
+ packaging/systemd/winbind.service | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/ctdb/config/ctdb.service b/ctdb/config/ctdb.service
+index ea37c30..f4abfb6 100644
+--- a/ctdb/config/ctdb.service
++++ b/ctdb/config/ctdb.service
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=CTDB
++Documentation=man:ctdbd(1) man:ctdb(7)
+ After=network.target
+ 
+ [Service]
+diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
+index 98d8080..3033c6b 100644
+--- a/packaging/systemd/nmb.service
++++ b/packaging/systemd/nmb.service
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Samba NMB Daemon
++Documentation=man:nmbd(8) man:samba(7) man:smb.conf(5)
+ After=network.target
+ 
+ [Service]
+diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
+index 83e0daf..6512bef 100644
+--- a/packaging/systemd/samba.service
++++ b/packaging/systemd/samba.service
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Samba AD Daemon
++Documentation=man:samba(8) man:samba(7) man:smb.conf(5)
+ After=network.target
+ 
+ [Service]
+diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
+index 949f798..a732d19 100644
+--- a/packaging/systemd/smb.service
++++ b/packaging/systemd/smb.service
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Samba SMB Daemon
++Documentation=man:smbd(8) man:samba(7) man:smb.conf(5)
+ After=network.target nmb.service winbind.service
+ 
+ [Service]
+diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
+index 26c6752..a937f51 100644
+--- a/packaging/systemd/winbind.service
++++ b/packaging/systemd/winbind.service
+@@ -1,5 +1,6 @@
+ [Unit]
+ Description=Samba Winbind Daemon
++Documentation=man:winbindd(8) man:samba(7) man:smb.conf(5)
+ After=network.target nmb.service
+ 
+ [Service]
+-- 
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 2c007c3..11c5711 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,5 @@ ctdb-Fix-detection-of-gnukfreebsd.patch
 no_build_env.patch
 no_build_system.patch
 Skip-raw.write-tests.patch
+systemd-syslog.target-is-obsolete.patch
+Add-documentation-to-systemd-Unit-files.patch
diff --git a/debian/patches/systemd-syslog.target-is-obsolete.patch b/debian/patches/systemd-syslog.target-is-obsolete.patch
new file mode 100644
index 0000000..ff55302
--- /dev/null
+++ b/debian/patches/systemd-syslog.target-is-obsolete.patch
@@ -0,0 +1,66 @@
+From a8fe4ce53f23667684883000f9dbec1b4c149f76 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Thu, 12 May 2016 22:04:24 +0200
+Subject: systemd: syslog.target is obsolete
+
+After=syslog.target is unnecessary by now because syslog is socket-activated and will therefore be started when needed.
+
+Ref: https://lintian.debian.org/tags/systemd-service-file-refers-to-obsolete-target.html
+---
+ packaging/systemd/nmb.service     | 2 +-
+ packaging/systemd/samba.service   | 2 +-
+ packaging/systemd/smb.service     | 2 +-
+ packaging/systemd/winbind.service | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
+index 3d71a7d..98d8080 100644
+--- a/packaging/systemd/nmb.service
++++ b/packaging/systemd/nmb.service
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Samba NMB Daemon
+-After=syslog.target network.target
++After=network.target
+ 
+ [Service]
+ Type=notify
+diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
+index 824f89c..83e0daf 100644
+--- a/packaging/systemd/samba.service
++++ b/packaging/systemd/samba.service
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Samba AD Daemon
+-After=syslog.target network.target
++After=network.target
+ 
+ [Service]
+ Type=notify
+diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
+index 9810891..949f798 100644
+--- a/packaging/systemd/smb.service
++++ b/packaging/systemd/smb.service
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Samba SMB Daemon
+-After=syslog.target network.target nmb.service winbind.service
++After=network.target nmb.service winbind.service
+ 
+ [Service]
+ Type=notify
+diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
+index f711a17..26c6752 100644
+--- a/packaging/systemd/winbind.service
++++ b/packaging/systemd/winbind.service
+@@ -1,6 +1,6 @@
+ [Unit]
+ Description=Samba Winbind Daemon
+-After=syslog.target network.target nmb.service
++After=network.target nmb.service
+ 
+ [Service]
+ Type=notify
+-- 
+2.8.1
+

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