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

Valentin Vidic vvidic-guest at moszumanska.debian.org
Fri Nov 3 17:35:17 UTC 2017


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

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

commit 4bb570eb871f4707f9f79b269241a8f2485580ab
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Fri Nov 3 10:27:29 2017 +0100

    d/patches: refresh for new version
---
 debian/patches/0004-settings.py                    |  2 +-
 debian/patches/0007-Fix-testsuite.patch            | 14 ++++++------
 debian/patches/0008-Replace-chkconfig.patch        |  8 +++----
 debian/patches/0009-Fix-pcsd-port.patch            | 17 --------------
 debian/patches/0009-Fix-python3-build.patch        | 14 ++++++++++++
 debian/patches/0010-Fix-python3-build.patch        | 26 ----------------------
 .../patches/0011-Add-service-documentation.patch   | 26 ----------------------
 debian/patches/series                              |  4 +---
 8 files changed, 27 insertions(+), 84 deletions(-)

diff --git a/debian/patches/0004-settings.py b/debian/patches/0004-settings.py
index 85ac8d8..405533a 100644
--- a/debian/patches/0004-settings.py
+++ b/debian/patches/0004-settings.py
@@ -20,7 +20,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  sbd_config = "/etc/default/sbd"
 --- a/pcsd/settings.rb.debian
 +++ b/pcsd/settings.rb.debian
-@@ -6,8 +6,8 @@
+@@ -7,8 +7,8 @@
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
  COOKIE_FILE = PCSD_VAR_LOCATION + 'pcsd.cookiesecret'
  
diff --git a/debian/patches/0007-Fix-testsuite.patch b/debian/patches/0007-Fix-testsuite.patch
index 2ced297..0c60be8 100644
--- a/debian/patches/0007-Fix-testsuite.patch
+++ b/debian/patches/0007-Fix-testsuite.patch
@@ -280,7 +280,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/pcs/test/test_stonith.py
 +++ b/pcs/test/test_stonith.py
-@@ -280,7 +280,7 @@
+@@ -298,7 +298,7 @@
  
          output, returnVal = pcs(
              temp_cib,
@@ -289,7 +289,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          )
          ac(output, "")
          self.assertEqual(0, returnVal)
-@@ -296,7 +296,7 @@
+@@ -314,7 +314,7 @@
   Resource: f3 (class=stonith type=fence_scsi)
    Meta Attrs: provides=unfencing 
    Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -298,7 +298,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
    Meta Attrs: provides=something 
    Operations: monitor interval=60s (f4-monitor-interval-60s)
  """)
-@@ -329,7 +329,7 @@
+@@ -347,7 +347,7 @@
  
          output, returnVal = pcs(
              temp_cib,
@@ -307,7 +307,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          )
          ac(output, "")
          self.assertEqual(0, returnVal)
-@@ -348,7 +348,7 @@
+@@ -366,7 +366,7 @@
    Attributes: key=abc
    Meta Attrs: provides=unfencing 
    Operations: monitor interval=60s (f3-monitor-interval-60s)
@@ -318,7 +318,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  """)
 --- a/pcs/test/test_resource.py
 +++ b/pcs/test/test_resource.py
-@@ -2531,13 +2531,13 @@
+@@ -2537,13 +2537,13 @@
  
      def testLSBResource(self):
          self.assert_pcs_fail(
@@ -334,7 +334,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
              "Warning: invalid resource option 'foo', there are no options"
                  " allowed\n"
          )
-@@ -2546,7 +2546,7 @@
+@@ -2552,7 +2552,7 @@
              "resource show --full",
              outdent(
                  """\
@@ -343,7 +343,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                    Attributes: foo=bar
                    Operations: monitor interval=15 timeout=15 (D2-monitor-interval-15)
                  """
-@@ -2569,7 +2569,7 @@
+@@ -2575,7 +2575,7 @@
              "resource show --full",
              outdent(
                  """\
diff --git a/debian/patches/0008-Replace-chkconfig.patch b/debian/patches/0008-Replace-chkconfig.patch
index 2d583eb..6878d4b 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
-@@ -2094,11 +2094,22 @@
+@@ -2111,11 +2111,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)
-@@ -2113,12 +2124,13 @@
+@@ -2130,12 +2141,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
      }
-@@ -2148,7 +2160,7 @@
+@@ -2165,7 +2177,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)
-@@ -2163,7 +2175,7 @@
+@@ -2180,7 +2192,7 @@
    if ISSYSTEMCTL
      cmd = ['systemctl', 'disable', "#{service}.service"]
    else
diff --git a/debian/patches/0009-Fix-pcsd-port.patch b/debian/patches/0009-Fix-pcsd-port.patch
deleted file mode 100644
index 76079d8..0000000
--- a/debian/patches/0009-Fix-pcsd-port.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Add missing pcsd port
- pcsd service fails to start because the default port value
- is not defined in the debian version of the settings file.
-Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Last-Update: 2017-10-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pcsd/settings.rb.debian
-+++ b/pcsd/settings.rb.debian
-@@ -1,6 +1,7 @@
- PCS_EXEC = '/usr/sbin/pcs'
- PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
- PCSD_VAR_LOCATION = '/var/lib/pcsd/'
-+PCSD_DEFAULT_PORT = 2224
- 
- CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
- KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
diff --git a/debian/patches/0009-Fix-python3-build.patch b/debian/patches/0009-Fix-python3-build.patch
new file mode 100644
index 0000000..08f9e3f
--- /dev/null
+++ b/debian/patches/0009-Fix-python3-build.patch
@@ -0,0 +1,14 @@
+Description: Fixes for python3 support
+ Update pcs script to run using python3.
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Last-Update: 2017-11-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/pcs/pcs
++++ b/pcs/pcs
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ from __future__ import absolute_import
+ import os.path
diff --git a/debian/patches/0010-Fix-python3-build.patch b/debian/patches/0010-Fix-python3-build.patch
deleted file mode 100644
index a671707..0000000
--- a/debian/patches/0010-Fix-python3-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fixes for python3 support
- Update Makefile and pcs script to build and run using python3.
-Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Last-Update: 2017-10-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Makefile
-+++ b/Makefile
-@@ -28,6 +28,9 @@
- ifeq ($(PYTHON_SITELIB), /usr/lib/python2.7/dist-packages)
-   EXTRA_SETUP_OPTS="--install-layout=deb"
- endif
-+ifeq ($(PYTHON_SITELIB), /usr/lib/python3/dist-packages)
-+  EXTRA_SETUP_OPTS="--install-layout=deb"
-+endif
- 
- # Check for systemd presence
- ifeq ($(SYSTEMCTL_OVERRIDE),true)
---- a/pcs/pcs
-+++ b/pcs/pcs
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from __future__ import absolute_import
- import os.path
diff --git a/debian/patches/0011-Add-service-documentation.patch b/debian/patches/0011-Add-service-documentation.patch
deleted file mode 100644
index 063c11e..0000000
--- a/debian/patches/0011-Add-service-documentation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Link manpages in pcsd service file
- Can be accessed with the systemctl help command.
-Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Last-Update: 2017-10-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pcsd/pcsd.service
-+++ b/pcsd/pcsd.service
-@@ -1,5 +1,7 @@
- [Unit]
- Description=PCS GUI and remote configuration interface
-+Documentation=man:pcsd(8)
-+Documentation=man:pcs(8)
- 
- [Service]
- EnvironmentFile=/etc/sysconfig/pcsd
---- a/pcsd/pcsd.service.debian
-+++ b/pcsd/pcsd.service.debian
-@@ -1,5 +1,7 @@
- [Unit]
- Description=PCS GUI and remote configuration interface
-+Documentation=man:pcsd(8)
-+Documentation=man:pcs(8)
- 
- [Service]
- EnvironmentFile=/etc/default/pcsd
diff --git a/debian/patches/series b/debian/patches/series
index b20da6d..033c6fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,4 @@
 0006-Fix-corosync-log.patch
 0007-Fix-testsuite.patch
 0008-Replace-chkconfig.patch
-0009-Fix-pcsd-port.patch
-0010-Fix-python3-build.patch
-0011-Add-service-documentation.patch
+0009-Fix-python3-build.patch

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



More information about the Debian-HA-Commits mailing list