[Pkg-fedora-ds-maintainers] 389-ds-base: Changes to 'master'

[Timo Aaltonen]

 debian/changelog                       |    7 ++++++
 debian/patches/fix-systemctl-path.diff |   35 +++++++++++++++++++++++++++++++++
 debian/patches/series                  |    1 
 3 files changed, 43 insertions(+)

New commits:
commit d2752240ac210b093b8a0b63e3f07d9e18a5d56f
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Dec 9 08:32:00 2015 +0200

    releasing package 389-ds-base version 1.3.4.5-2

diff --git a/debian/changelog b/debian/changelog
index 8c075f5..d78226d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-389-ds-base (1.3.4.5-2) UNRELEASED; urgency=medium
+389-ds-base (1.3.4.5-2) unstable; urgency=medium
 
   * fix-systemctl-path.diff: Use correct path to /bin/systemctl.
     (Closes: #779653)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Wed, 09 Dec 2015 08:30:43 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 09 Dec 2015 08:31:20 +0200
 
 389-ds-base (1.3.4.5-1) unstable; urgency=medium
 

commit 2c0db89bd155ef82da5dfa987c050a52c9513696
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Wed Dec 9 08:31:00 2015 +0200

    fix-systemctl-path.diff: Use correct path to /bin/systemctl. (Closes: #779653)

diff --git a/debian/changelog b/debian/changelog
index c8e2fea..8c075f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+389-ds-base (1.3.4.5-2) UNRELEASED; urgency=medium
+
+  * fix-systemctl-path.diff: Use correct path to /bin/systemctl.
+    (Closes: #779653)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 09 Dec 2015 08:30:43 +0200
+
 389-ds-base (1.3.4.5-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/fix-systemctl-path.diff b/debian/patches/fix-systemctl-path.diff
new file mode 100644
index 0000000..5ef17d6
--- /dev/null
+++ b/debian/patches/fix-systemctl-path.diff
@@ -0,0 +1,35 @@
+Description: Fix the path to systemctl binary
+Author: Timo Aaltonen <tjaalton at debian.org>
+
+diff --git a/ldap/admin/src/scripts/start-dirsrv.in b/ldap/admin/src/scripts/start-dirsrv.in
+index 458f0e8..8285070 100755
+--- a/ldap/admin/src/scripts/start-dirsrv.in
++++ b/ldap/admin/src/scripts/start-dirsrv.in
+@@ -65,7 +65,7 @@ start_instance() {
+     # otherwise start the instance the old way.
+     #
+     if [ -d "@systemdsystemunitdir@" ] && [ $(id -u) -eq 0 ];then
+-        @bindir@/systemctl start @package_name@@$SERV_ID.service
++        /bin/systemctl start @package_name@@$SERV_ID.service
+         if [ $? -ne 0 ]; then
+             return 1
+         fi
+diff --git a/ldap/admin/src/scripts/stop-dirsrv.in b/ldap/admin/src/scripts/stop-dirsrv.in
+index 72e2b85..cb5b690 100755
+--- a/ldap/admin/src/scripts/stop-dirsrv.in
++++ b/ldap/admin/src/scripts/stop-dirsrv.in
+@@ -43,12 +43,12 @@ stop_instance() {
+         # 
+         # Now, check if systemctl is aware of this running instance
+         #
+-        @bindir@/systemctl is-active @package_name@@$SERV_ID.service > /dev/null 2>&1
++        /bin/systemctl is-active @package_name@@$SERV_ID.service > /dev/null 2>&1
+         if [ $? -eq 0 ]; then
+             # 
+             # systemctl sees the running process, so stop it correctly
+             #
+-            @bindir@/systemctl stop @package_name@@$SERV_ID.service
++            /bin/systemctl stop @package_name@@$SERV_ID.service
+         else
+             # 
+             # Have to kill it since systemctl doesn't think it's running
diff --git a/debian/patches/series b/debian/patches/series
index 549be83..f2b5082 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ support-kfreebsd.patch
 fix-obsolete-target.diff
 fix-saslpath.diff
 reproducible-build.diff
+fix-systemctl-path.diff