[Debian-ha-commits] [pcs] 03/04: d/patches: update for new version

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository pcs.

commit 2a125c99d2665895c826a7d8bc3a3ba06de775b3
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Thu Feb 22 06:05:17 2018 +0100

    d/patches: update for new version
---
 debian/patches/0007-Fix-testsuite.patch     | 13 ++++++++++++-
 debian/patches/0008-Replace-chkconfig.patch |  8 ++++----
 debian/patches/0010-Fix-SNMP-install.patch  |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/debian/patches/0007-Fix-testsuite.patch b/debian/patches/0007-Fix-testsuite.patch
index c700469..b018bfe 100644
--- a/debian/patches/0007-Fix-testsuite.patch
+++ b/debian/patches/0007-Fix-testsuite.patch
@@ -231,7 +231,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      to_syslog: yes
  }
  """)
-@@ -2823,7 +2823,7 @@
+@@ -2803,7 +2803,7 @@
  
  logging {
      to_logfile: yes
@@ -390,3 +390,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              ),
          ])
  
+--- a/pcs/test/tools/command_env/config_runner_pcmk.py
++++ b/pcs/test/tools/command_env/config_runner_pcmk.py
+@@ -149,7 +149,7 @@
+         self.__calls.place(
+             name,
+             RunnerCall(
+-                "/usr/libexec/pacemaker/stonithd metadata",
++                "/usr/lib/pacemaker/stonithd metadata",
+                 stdout=(
+                     stdout if stdout is not None
+                     else open(rc("stonithd_metadata.xml")).read()
diff --git a/debian/patches/0008-Replace-chkconfig.patch b/debian/patches/0008-Replace-chkconfig.patch
index 6878d4b..22695c2 100644
--- a/debian/patches/0008-Replace-chkconfig.patch
+++ b/debian/patches/0008-Replace-chkconfig.patch
@@ -7,7 +7,7 @@ Last-Update: 2016-11-13
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/pcsd/pcs.rb
 +++ b/pcsd/pcs.rb
-@@ -2111,11 +2111,22 @@
+@@ -2110,11 +2110,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
      cmd = ['systemctl', 'is-enabled', "#{service}.service"]
@@ -33,7 +33,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  end
  
  def is_service_running?(service)
-@@ -2130,12 +2141,13 @@
+@@ -2129,12 +2140,13 @@
  
  def is_service_installed?(service)
    unless ISSYSTEMCTL
@@ -49,7 +49,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          return true
        end
      }
-@@ -2165,7 +2177,7 @@
+@@ -2164,7 +2176,7 @@
      cmd = ['systemctl', 'enable', "#{service}.service"]
    else
      # fails when the service is not installed
@@ -58,7 +58,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-@@ -2180,7 +2192,7 @@
+@@ -2179,7 +2191,7 @@
    if ISSYSTEMCTL
      cmd = ['systemctl', 'disable', "#{service}.service"]
    else
diff --git a/debian/patches/0010-Fix-SNMP-install.patch b/debian/patches/0010-Fix-SNMP-install.patch
index fd3b610..e03194b 100644
--- a/debian/patches/0010-Fix-SNMP-install.patch
+++ b/debian/patches/0010-Fix-SNMP-install.patch
@@ -1,4 +1,4 @@
-Description: Fixes for SNMP instalation
+Description: Fixes for SNMP installation
  Make sure SNMP installs cleanly for now
 Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
 Last-Update: 2017-11-27

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