[Pkg-samba-maint] [samba] 02/03: Fix kill path (Closes: #828730)

[Jelmer Vernooij]

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

jelmer pushed a commit to branch master
in repository samba.

commit 5d774c96a893e03a4f0fd1fdade14483434d6245
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Mon Jun 27 21:34:03 2016 +0200

    Fix kill path (Closes: #828730)
---
 debian/patches/fix_kill_path_in_units.patch | 69 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 packaging/systemd/nmb.service               |  2 +-
 packaging/systemd/samba.service             |  2 +-
 packaging/systemd/smb.service               |  2 +-
 packaging/systemd/winbind.service           |  2 +-
 6 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/debian/patches/fix_kill_path_in_units.patch b/debian/patches/fix_kill_path_in_units.patch
new file mode 100644
index 0000000..4151f54
--- /dev/null
+++ b/debian/patches/fix_kill_path_in_units.patch
@@ -0,0 +1,69 @@
+From caeaa5a019b0a2f1d8096920e81fa5596767fa51 Mon Sep 17 00:00:00 2001
+From: Mathieu Parent <math.parent at gmail.com>
+Date: Mon, 27 Jun 2016 21:34:03 +0200
+Subject: Fix kill path
+
+Debian-bug: https://bugs.debian.org/828730
+
+---
+ 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 2c152ba..c02e65d 100644
+--- a/packaging/systemd/nmb.service
++++ b/packaging/systemd/nmb.service
+@@ -9,7 +9,7 @@ NotifyAccess=all
+ PIDFile=/run/nmbd.pid
+ EnvironmentFile=-/etc/sysconfig/samba
+ ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
+-ExecReload=/usr/bin/kill -HUP $MAINPID
++ExecReload=/bin/kill -HUP $MAINPID
+ LimitCORE=infinity
+ 
+ [Install]
+diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
+index 6512bef..11d2e47 100644
+--- a/packaging/systemd/samba.service
++++ b/packaging/systemd/samba.service
+@@ -10,7 +10,7 @@ PIDFile=/run/samba.pid
+ LimitNOFILE=16384
+ EnvironmentFile=-/etc/sysconfig/samba
+ ExecStart=/usr/sbin/samba $SAMBAOPTIONS
+-ExecReload=/usr/bin/kill -HUP $MAINPID
++ExecReload=/bin/kill -HUP $MAINPID
+ 
+ [Install]
+ WantedBy=multi-user.target
+diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
+index 491f45e..cc7831c 100644
+--- a/packaging/systemd/smb.service
++++ b/packaging/systemd/smb.service
+@@ -10,7 +10,7 @@ PIDFile=/run/smbd.pid
+ LimitNOFILE=16384
+ EnvironmentFile=-/etc/sysconfig/samba
+ ExecStart=/usr/sbin/smbd $SMBDOPTIONS
+-ExecReload=/usr/bin/kill -HUP $MAINPID
++ExecReload=/bin/kill -HUP $MAINPID
+ LimitCORE=infinity
+ 
+ [Install]
+diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
+index cd28767..e7f1651 100644
+--- a/packaging/systemd/winbind.service
++++ b/packaging/systemd/winbind.service
+@@ -9,7 +9,7 @@ NotifyAccess=all
+ PIDFile=/run/winbindd.pid
+ EnvironmentFile=-/etc/sysconfig/samba
+ ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
+-ExecReload=/usr/bin/kill -HUP $MAINPID
++ExecReload=/bin/kill -HUP $MAINPID
+ LimitCORE=infinity
+ 
+ [Install]
+-- 
+2.8.1
+
diff --git a/debian/patches/series b/debian/patches/series
index e9c34fb..70227fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ no_build_system.patch
 Skip-raw.write-tests.patch
 systemd-syslog.target-is-obsolete.patch
 Add-documentation-to-systemd-Unit-files.patch
+fix_kill_path_in_units.patch
diff --git a/packaging/systemd/nmb.service b/packaging/systemd/nmb.service
index 2c152ba..c02e65d 100644
--- a/packaging/systemd/nmb.service
+++ b/packaging/systemd/nmb.service
@@ -9,7 +9,7 @@ NotifyAccess=all
 PIDFile=/run/nmbd.pid
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
 LimitCORE=infinity
 
 [Install]
diff --git a/packaging/systemd/samba.service b/packaging/systemd/samba.service
index 6512bef..11d2e47 100644
--- a/packaging/systemd/samba.service
+++ b/packaging/systemd/samba.service
@@ -10,7 +10,7 @@ PIDFile=/run/samba.pid
 LimitNOFILE=16384
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/samba $SAMBAOPTIONS
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packaging/systemd/smb.service b/packaging/systemd/smb.service
index 491f45e..cc7831c 100644
--- a/packaging/systemd/smb.service
+++ b/packaging/systemd/smb.service
@@ -10,7 +10,7 @@ PIDFile=/run/smbd.pid
 LimitNOFILE=16384
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/smbd $SMBDOPTIONS
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
 LimitCORE=infinity
 
 [Install]
diff --git a/packaging/systemd/winbind.service b/packaging/systemd/winbind.service
index cd28767..e7f1651 100644
--- a/packaging/systemd/winbind.service
+++ b/packaging/systemd/winbind.service
@@ -9,7 +9,7 @@ NotifyAccess=all
 PIDFile=/run/winbindd.pid
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
-ExecReload=/usr/bin/kill -HUP $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
 LimitCORE=infinity
 
 [Install]

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