[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Andrea Postiglione]

commit:     02ce9b5b3873847fef789c80f8ca430846dc59dc
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Wed Dec 16 21:43:29 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Wed Dec 16 21:43:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=02ce9b5b

sys-cluster/pcs: fix openrc patch

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.7.patch | 62 +++++++++++++++----------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch
index b2a59381..ef822e2d 100644
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -84,16 +84,15 @@ diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
  
 diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_default.py
 --- pcs-0.10.7/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/settings_default.py	2020-12-16 10:21:42.110032722 +0100
++++ pcs-0.10.7-openrc/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
 @@ -1,8 +1,8 @@
  import os.path
  
--systemctl_binary = "/bin/systemctl"
+ systemctl_binary = "/bin/systemctl"
 -chkconfig_binary = "/sbin/chkconfig"
 -service_binary = "/sbin/service"
-+systemctl_binary="/bin/systemctl"
-+rc_config_binary="/usr/bin/rc-config"
-+rc_service_binary="/sbin/rc-service"
++rc_config_binary = "/usr/bin/rc-config"
++rc_service_binary = "/sbin/rc-service"
  pacemaker_binaries = "/usr/sbin/"
  crm_resource_binary = os.path.join(pacemaker_binaries, "crm_resource")
  corosync_binaries = "/usr/sbin/"
@@ -136,13 +135,13 @@ diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.d
  pcsd_config = "/etc/default/pcsd"
 diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
 --- pcs-0.10.7/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/utils.py	2020-12-15 17:36:27.914500816 +0100
++++ pcs-0.10.7-openrc/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
 @@ -2187,7 +2187,7 @@
          )
      else:
          stdout, stderr, retval = cmd_runner().run(
 -            [settings.service_binary, service, "start"]
-+            [settings.rc-service_binary, service, "start"]
++            [settings.rc_service_binary, service, "start"]
          )
      return join_multilines([stderr, stdout]), retval
  
@@ -151,13 +150,13 @@ diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
      else:
          stdout, stderr, retval = cmd_runner().run(
 -            [settings.service_binary, service, "stop"]
-+            [settings.rc-service_binary, service, "stop"]
++            [settings.rc_service_binary, service, "stop"]
          )
      return join_multilines([stderr, stdout]), retval
  
 diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
 --- pcs-0.10.7/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
-+++ pcs-0.10.7-openrc/pcsd/pcs.rb	2020-12-16 09:19:41.341318599 +0100
++++ pcs-0.10.7-openrc/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -198,7 +197,7 @@ diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
    protected
    def run_command
 -    return run_cmd(PCSAuth.getSuperuserAuth(), 'chkconfig')
-+    cmd = ['/usr/bin/rc-config', 'list']
++    cmd = ['rc-config', 'list']
 +    return run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    end
  
@@ -239,6 +238,7 @@ diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
+I file binari pcs-0.10.7/pcsd/.pcs.rb.swp e pcs-0.10.7-openrc/pcsd/.pcs.rb.swp sono diversi
 diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
 --- pcs-0.10.7/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
 +++ pcs-0.10.7-openrc/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
@@ -265,15 +265,15 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
 diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py
 --- pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
-+++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py	2020-12-15 17:44:33.382213643 +0100
++++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
 @@ -16,8 +16,8 @@
  import pcs.lib.external as lib
  
  
 -_chkconfig = settings.chkconfig_binary
 -_service = settings.service_binary
-+_rc-config = settings.rc-config_binary
-+_rc-service = settings.rc-service_binary
++_rc_config = settings.rc_config_binary
++_rc_service = settings.rc_service_binary
  _systemctl = settings.systemctl_binary
  
  
@@ -282,7 +282,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          )
          self.mock_runner.run.assert_called_once_with(
 -            [_chkconfig, self.service, "off"]
-+            [_rc-config, "delete", self.service, "default"]
++            [_rc_config, "delete", self.service, "default"]
          )
  
      def test_not_systemctl_failed(self, mock_is_installed, mock_systemctl):
@@ -291,7 +291,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          )
          self.mock_runner.run.assert_called_once_with(
 -            [_chkconfig, self.service, "off"]
-+            [_rc-config, "delete", self.service, "default"]
++            [_rc_config, "delete", self.service, "default"]
          )
  
      def test_systemctl_not_installed(self, mock_is_installed, mock_systemctl):
@@ -300,7 +300,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          )
          self.mock_runner.run.assert_called_once_with(
 -            [_chkconfig, self.service, "off"]
-+            [_rc-config, "delete", self.service, "default"]
++            [_rc_config, "delete", self.service, "default"]
          )
  
  
@@ -309,7 +309,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          lib.enable_service(self.mock_runner, self.service)
          self.mock_runner.run.assert_called_once_with(
 -            [_chkconfig, self.service, "on"]
-+            [_rc-config, "add", self.service, "default"]
++            [_rc_config, "add", self.service, "default"]
          )
  
      def test_not_systemctl_failed(self, mock_systemctl):
@@ -318,7 +318,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          )
          self.mock_runner.run.assert_called_once_with(
 -            [_chkconfig, self.service, "on"]
-+            [_rc-config, "add", self.service, "default"]
++            [_rc_config, "add", self.service, "default"]
          )
  
      def test_instance_systemctl(self, mock_systemctl):
@@ -327,7 +327,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          lib.enable_service(self.mock_runner, self.service, instance="test")
          self.mock_runner.run.assert_called_once_with(
 -            [_chkconfig, self.service, "on"]
-+            [_rc-config, "add", self.service, "default"]
++            [_rc_config, "add", self.service, "default"]
          )
  
  
@@ -336,7 +336,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          lib.start_service(self.mock_runner, self.service)
          self.mock_runner.run.assert_called_once_with(
 -            [_service, self.service, "start"]
-+            [_rc-service, self.service, "start"]
++            [_rc_service, self.service, "start"]
          )
  
      def test_not_systemctl_failed(self, mock_systemctl):
@@ -345,7 +345,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          )
          self.mock_runner.run.assert_called_once_with(
 -            [_service, self.service, "start"]
-+            [_rc-service, self.service, "start"]
++            [_rc_service, self.service, "start"]
          )
  
      def test_instance_systemctl(self, mock_systemctl):
@@ -354,7 +354,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          lib.start_service(self.mock_runner, self.service, instance="test")
          self.mock_runner.run.assert_called_once_with(
 -            [_service, self.service, "start"]
-+            [_rc-service, self.service, "start"]
++            [_rc_service, self.service, "start"]
          )
  
  
@@ -363,7 +363,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          lib.stop_service(self.mock_runner, self.service)
          self.mock_runner.run.assert_called_once_with(
 -            [_service, self.service, "stop"]
-+            [_rc-service, self.service, "stop"]
++            [_rc_service, self.service, "stop"]
          )
  
      def test_not_systemctl_failed(self, mock_systemctl):
@@ -372,7 +372,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          )
          self.mock_runner.run.assert_called_once_with(
 -            [_service, self.service, "stop"]
-+            [_rc-service, self.service, "stop"]
++            [_rc_service, self.service, "stop"]
          )
  
      def test_instance_systemctl(self, mock_systemctl):
@@ -381,7 +381,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          lib.stop_service(self.mock_runner, self.service, instance="test")
          self.mock_runner.run.assert_called_once_with(
 -            [_service, self.service, "stop"]
-+            [_rc-service, self.service, "stop"]
++            [_rc_service, self.service, "stop"]
          )
  
  
@@ -390,14 +390,14 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          self.mock_runner.run.return_value = ("", "", 0)
          self.assertTrue(lib.is_service_enabled(self.mock_runner, self.service))
 -        self.mock_runner.run.assert_called_once_with([_chkconfig, self.service])
-+        self.mock_runner.run.assert_called_once_with([_rc-config, self.service])
++        self.mock_runner.run.assert_called_once_with([_rc_config, self.service])
  
      def test_not_systemctl_disabled(self, mock_systemctl):
          mock_systemctl.return_value = False
          self.mock_runner.run.return_value = ("", "", 3)
          self.assertFalse(lib.is_service_enabled(self.mock_runner, self.service))
 -        self.mock_runner.run.assert_called_once_with([_chkconfig, self.service])
-+        self.mock_runner.run.assert_called_once_with([_rc-config, self.service])
++        self.mock_runner.run.assert_called_once_with([_rc_config, self.service])
  
  
  @mock.patch("pcs.lib.external.is_systemctl")
@@ -406,7 +406,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          self.assertTrue(lib.is_service_running(self.mock_runner, self.service))
          self.mock_runner.run.assert_called_once_with(
 -            [_service, self.service, "status"]
-+            [_rc-service, self.service, "status"]
++            [_rc_service, self.service, "status"]
          )
  
      def test_not_systemctl_not_running(self, mock_systemctl):
@@ -415,7 +415,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          self.assertFalse(lib.is_service_running(self.mock_runner, self.service))
          self.mock_runner.run.assert_called_once_with(
 -            [_service, self.service, "status"]
-+            [_rc-service, self.service, "status"]
++            [_rc_service, self.service, "status"]
          )
  
  
@@ -424,7 +424,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          )
          self.assertEqual(mock_is_systemctl.call_count, 1)
 -        self.mock_runner.run.assert_called_once_with([_chkconfig])
-+        self.mock_runner.run.assert_called_once_with([_rc-config])
++        self.mock_runner.run.assert_called_once_with([_rc_config])
  
      def test_failed(self, mock_is_systemctl):
          mock_is_systemctl.return_value = False
@@ -432,7 +432,7 @@ diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_
          self.assertEqual(lib.get_non_systemd_services(self.mock_runner), [])
          self.assertEqual(mock_is_systemctl.call_count, 1)
 -        self.mock_runner.run.assert_called_once_with([_chkconfig])
-+        self.mock_runner.run.assert_called_once_with([_rc-config])
++        self.mock_runner.run.assert_called_once_with([_rc_config])
  
      def test_systemd(self, mock_is_systemctl):
          mock_is_systemctl.return_value = True

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Andrea Postiglione]

commit:     ceac712a60a3e72df8b28fc7a096c96c6c29356a
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sun Apr 24 11:30:02 2022 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sun Apr 24 11:30:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ceac712a

sys-cluster/pcs-0.11.2: fix bashism

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/pcs-0.11.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/files/pcs-0.11.initd b/sys-cluster/pcs/files/pcs-0.11.initd
index 1df6317f3..38aa0c9d6 100644
--- a/sys-cluster/pcs/files/pcs-0.11.initd
+++ b/sys-cluster/pcs/files/pcs-0.11.initd
@@ -10,7 +10,7 @@ command_args="${pcsd_args}"
 PIDFILE=/var/run/$name.pid
 
 # load defaults
-if [ -f /etc/default/pcsd ]; then source /etc/default/pcsd; fi
+if [ -f /etc/default/pcsd ]; then . /etc/default/pcsd; fi
 
 depend() {
         need net pcsd

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Andrea Postiglione]

commit:     8c95b0d12f51bd6a4efb77f4ca944b07b0e98154
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Fri Apr  8 10:10:55 2022 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Fri Apr  8 10:10:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8c95b0d1

sys-cluster/pcs-0.11.2: fix initd dep

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/pcs-0.11.initd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/files/pcs-0.11.initd b/sys-cluster/pcs/files/pcs-0.11.initd
index 62ed7cccd..1df6317f3 100644
--- a/sys-cluster/pcs/files/pcs-0.11.initd
+++ b/sys-cluster/pcs/files/pcs-0.11.initd
@@ -13,7 +13,7 @@ PIDFILE=/var/run/$name.pid
 if [ -f /etc/default/pcsd ]; then source /etc/default/pcsd; fi
 
 depend() {
-        need net pcsd-daemon
+        need net pcsd
         use syslog
 }
 

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Alessandro Barbieri]

commit:     6eb0e7e6aed0f60a129f771eb9382a1ef63e2913
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Apr 21 01:51:18 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed Apr 21 01:51:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6eb0e7e6

sys-cluster/pcs: scrub patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.7.patch          | 40 +++++++++-------------
 sys-cluster/pcs/files/openrc-0.10.8.patch          | 40 +++++++++-------------
 .../pcs/files/remove-ruby-bundle-path.patch        |  4 +--
 3 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch
index 96a4b7e17..18c56936a 100644
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -1,6 +1,5 @@
-diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py
---- a/pcs-0.10.7/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
-+++ b/pcs-0.10.7/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
+--- a/pcs-0.10.7/pcs/lib/external.py
++++ b/pcs-0.10.7/pcs/lib/external.py
 @@ -13,8 +13,8 @@
  from pcs.lib.errors import LibraryError
  
@@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py
      if return_code != 0:
          return []
  
-diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_default.py
---- a/pcs-0.10.7/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
-+++ b/pcs-0.10.7/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
+--- a/pcs-0.10.7/pcs/settings_default.py
++++ b/pcs-0.10.7/pcs/settings_default.py
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_defaul
  # this limit is also mentioned in docs, change there as well
  sbd_max_device_num = 3
  # message types are also mentioned in docs, change there as well
-diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debian
---- a/pcs-0.10.7/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
-+++ b/pcs-0.10.7/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
+--- a/pcs-0.10.7/pcs/settings.py.debian
++++ b/pcs-0.10.7/pcs/settings.py.debian
 @@ -1,10 +1,10 @@
  from pcs.settings_default import *
 -service_binary = "/usr/sbin/service"
@@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debi
  pcsd_exec_location = "/usr/share/pcsd/"
  pcsd_gem_path = None
  pcsd_config = "/etc/default/pcsd"
-diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py
---- a/pcs-0.10.7/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
-+++ b/pcs-0.10.7/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
+--- a/pcs-0.10.7/pcs/utils.py
++++ b/pcs-0.10.7/pcs/utils.py
 @@ -2187,7 +2187,7 @@
          )
      else:
@@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py
          )
      return join_multilines([stderr, stdout]), retval
  
-diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb
---- a/pcs-0.10.7/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
-+++ b/pcs-0.10.7/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
+--- a/pcs-0.10.7/pcsd/pcs.rb
++++ b/pcs-0.10.7/pcsd/pcs.rb
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -239,9 +234,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
 I file binari a/pcs-0.10.7/pcsd/.pcs.rb.swp e b/pcs-0.10.7/pcsd/.pcs.rb.swp sono diversi
-diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb
---- a/pcs-0.10.7/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
-+++ b/pcs-0.10.7/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
+--- a/pcs-0.10.7/pcsd/settings.rb
++++ b/pcs-0.10.7/pcsd/settings.rb
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -251,9 +245,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.debian
---- a/pcs-0.10.7/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
-+++ b/pcs-0.10.7/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
+--- a/pcs-0.10.7/pcsd/settings.rb.debian
++++ b/pcs-0.10.7/pcsd/settings.rb.debian
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -263,9 +256,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.de
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
---- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
-+++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
+--- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
++++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
 @@ -16,8 +16,8 @@
  import pcs.lib.external as lib
  

diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch b/sys-cluster/pcs/files/openrc-0.10.8.patch
index b7dcbce8c..5a1261002 100644
--- a/sys-cluster/pcs/files/openrc-0.10.8.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.8.patch
@@ -1,6 +1,5 @@
-diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py
---- a/pcs-0.10.8/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
-+++ b/pcs-0.10.8/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
+--- a/pcs-0.10.8/pcs/lib/external.py
++++ b/pcs-0.10.8/pcs/lib/external.py
 @@ -13,8 +13,8 @@
  from pcs.lib.errors import LibraryError
  
@@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py
      if return_code != 0:
          return []
  
-diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_default.py
---- a/pcs-0.10.8/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
-+++ b/pcs-0.10.8/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
+--- a/pcs-0.10.8/pcs/settings_default.py
++++ b/pcs-0.10.8/pcs/settings_default.py
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_defaul
  # this limit is also mentioned in docs, change there as well
  sbd_max_device_num = 3
  # message types are also mentioned in docs, change there as well
-diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debian
---- a/pcs-0.10.8/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
-+++ b/pcs-0.10.8/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
+--- a/pcs-0.10.8/pcs/settings.py.debian
++++ b/pcs-0.10.8/pcs/settings.py.debian
 @@ -1,10 +1,10 @@
  from pcs.settings_default import *
 -service_binary = "/usr/sbin/service"
@@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debi
  pcsd_exec_location = "/usr/share/pcsd/"
  pcsd_gem_path = None
  pcsd_config = "/etc/default/pcsd"
-diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py
---- a/pcs-0.10.8/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
-+++ b/pcs-0.10.8/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
+--- a/pcs-0.10.8/pcs/utils.py
++++ b/pcs-0.10.8/pcs/utils.py
 @@ -2187,7 +2187,7 @@
          )
      else:
@@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py
          )
      return join_multilines([stderr, stdout]), retval
  
-diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb
---- a/pcs-0.10.8/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
-+++ b/pcs-0.10.8/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
+--- a/pcs-0.10.8/pcsd/pcs.rb
++++ b/pcs-0.10.8/pcsd/pcs.rb
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -238,9 +233,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb
---- a/pcs-0.10.8/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
-+++ b/pcs-0.10.8/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
+--- a/pcs-0.10.8/pcsd/settings.rb
++++ b/pcs-0.10.8/pcsd/settings.rb
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -250,9 +244,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.debian
---- a/pcs-0.10.8/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
-+++ b/pcs-0.10.8/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
+--- a/pcs-0.10.8/pcsd/settings.rb.debian
++++ b/pcs-0.10.8/pcsd/settings.rb.debian
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -262,9 +255,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.de
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
---- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
-+++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
+--- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
++++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
 @@ -16,8 +16,8 @@
  import pcs.lib.external as lib
  

diff --git a/sys-cluster/pcs/files/remove-ruby-bundle-path.patch b/sys-cluster/pcs/files/remove-ruby-bundle-path.patch
index 69052b8e3..bf54e59f0 100644
--- a/sys-cluster/pcs/files/remove-ruby-bundle-path.patch
+++ b/sys-cluster/pcs/files/remove-ruby-bundle-path.patch
@@ -1,5 +1,5 @@
---- a/pcs/settings_default.py	2018-11-23 12:57:53.000000000 +0000
-+++ b/pcs/settings_default.py	2019-05-11 20:07:19.080000000 +0000
+--- a/pcs/settings_default.py
++++ b/pcs/settings_default.py
 @@ -81,7 +81,7 @@
  ])
  # Set pcsd_gem_path to None if there are no bundled ruby gems and the path does

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Alessandro Barbieri]

commit:     e6581a614a430e488146fbc25d46eeaced82f8ac
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Sun Apr 11 15:50:52 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Sun Apr 11 15:51:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e6581a61

sys-cluster/pcs: fix patch header

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.7.patch       | 50 ++++++++++++-------------
 sys-cluster/pcs/files/openrc-0.10.8.patch       | 48 ++++++++++++------------
 sys-cluster/pcs/files/pcsd-daemon.service.patch |  4 +-
 3 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch
index ef822e2da..96a4b7e17 100644
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -1,6 +1,6 @@
-diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
---- pcs-0.10.7/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
-+++ pcs-0.10.7-openrc/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
+diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py
+--- a/pcs-0.10.7/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
++++ b/pcs-0.10.7/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
 @@ -13,8 +13,8 @@
  from pcs.lib.errors import LibraryError
  
@@ -82,9 +82,9 @@ diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
      if return_code != 0:
          return []
  
-diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_default.py
---- pcs-0.10.7/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
+diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_default.py
+--- a/pcs-0.10.7/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
++++ b/pcs-0.10.7/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -114,9 +114,9 @@ diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_def
  # this limit is also mentioned in docs, change there as well
  sbd_max_device_num = 3
  # message types are also mentioned in docs, change there as well
-diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.debian
---- pcs-0.10.7/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
-+++ pcs-0.10.7-openrc/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
+diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debian
+--- a/pcs-0.10.7/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
++++ b/pcs-0.10.7/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
 @@ -1,10 +1,10 @@
  from pcs.settings_default import *
 -service_binary = "/usr/sbin/service"
@@ -133,9 +133,9 @@ diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.d
  pcsd_exec_location = "/usr/share/pcsd/"
  pcsd_gem_path = None
  pcsd_config = "/etc/default/pcsd"
-diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
---- pcs-0.10.7/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
+diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py
+--- a/pcs-0.10.7/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
++++ b/pcs-0.10.7/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
 @@ -2187,7 +2187,7 @@
          )
      else:
@@ -154,9 +154,9 @@ diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
          )
      return join_multilines([stderr, stdout]), retval
  
-diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
---- pcs-0.10.7/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
-+++ pcs-0.10.7-openrc/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
+diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb
+--- a/pcs-0.10.7/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
++++ b/pcs-0.10.7/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -238,10 +238,10 @@ diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-I file binari pcs-0.10.7/pcsd/.pcs.rb.swp e pcs-0.10.7-openrc/pcsd/.pcs.rb.swp sono diversi
-diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
---- pcs-0.10.7/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
-+++ pcs-0.10.7-openrc/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
+I file binari a/pcs-0.10.7/pcsd/.pcs.rb.swp e b/pcs-0.10.7/pcsd/.pcs.rb.swp sono diversi
+diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb
+--- a/pcs-0.10.7/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
++++ b/pcs-0.10.7/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -251,9 +251,9 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb.debian
---- pcs-0.10.7/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
-+++ pcs-0.10.7-openrc/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
+diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.debian
+--- a/pcs-0.10.7/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
++++ b/pcs-0.10.7/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -263,9 +263,9 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py
---- pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
-+++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
+diff -uPNr a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
+--- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
++++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
 @@ -16,8 +16,8 @@
  import pcs.lib.external as lib
  

diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch b/sys-cluster/pcs/files/openrc-0.10.8.patch
index 4cd3915e5..b7dcbce8c 100644
--- a/sys-cluster/pcs/files/openrc-0.10.8.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.8.patch
@@ -1,6 +1,6 @@
-diff -uPNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-openrc/pcs/lib/external.py
---- pcs-0.10.8/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
-+++ pcs-0.10.8-openrc/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
+diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py
+--- a/pcs-0.10.8/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
++++ b/pcs-0.10.8/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
 @@ -13,8 +13,8 @@
  from pcs.lib.errors import LibraryError
  
@@ -82,9 +82,9 @@ diff -uPNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-openrc/pcs/lib/external.py
      if return_code != 0:
          return []
  
-diff -uPNr pcs-0.10.8/pcs/settings_default.py pcs-0.10.8-openrc/pcs/settings_default.py
---- pcs-0.10.8/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.8-openrc/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
+diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_default.py
+--- a/pcs-0.10.8/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
++++ b/pcs-0.10.8/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -114,9 +114,9 @@ diff -uPNr pcs-0.10.8/pcs/settings_default.py pcs-0.10.8-openrc/pcs/settings_def
  # this limit is also mentioned in docs, change there as well
  sbd_max_device_num = 3
  # message types are also mentioned in docs, change there as well
-diff -uPNr pcs-0.10.8/pcs/settings.py.debian pcs-0.10.8-openrc/pcs/settings.py.debian
---- pcs-0.10.8/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
-+++ pcs-0.10.8-openrc/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
+diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debian
+--- a/pcs-0.10.8/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
++++ b/pcs-0.10.8/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
 @@ -1,10 +1,10 @@
  from pcs.settings_default import *
 -service_binary = "/usr/sbin/service"
@@ -133,9 +133,9 @@ diff -uPNr pcs-0.10.8/pcs/settings.py.debian pcs-0.10.8-openrc/pcs/settings.py.d
  pcsd_exec_location = "/usr/share/pcsd/"
  pcsd_gem_path = None
  pcsd_config = "/etc/default/pcsd"
-diff -uPNr pcs-0.10.8/pcs/utils.py pcs-0.10.8-openrc/pcs/utils.py
---- pcs-0.10.8/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.8-openrc/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
+diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py
+--- a/pcs-0.10.8/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
++++ b/pcs-0.10.8/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
 @@ -2187,7 +2187,7 @@
          )
      else:
@@ -154,9 +154,9 @@ diff -uPNr pcs-0.10.8/pcs/utils.py pcs-0.10.8-openrc/pcs/utils.py
          )
      return join_multilines([stderr, stdout]), retval
  
-diff -uPNr pcs-0.10.8/pcsd/pcs.rb pcs-0.10.8-openrc/pcsd/pcs.rb
---- pcs-0.10.8/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
-+++ pcs-0.10.8-openrc/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
+diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb
+--- a/pcs-0.10.8/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
++++ b/pcs-0.10.8/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -238,9 +238,9 @@ diff -uPNr pcs-0.10.8/pcsd/pcs.rb pcs-0.10.8-openrc/pcsd/pcs.rb
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-diff -uPNr pcs-0.10.8/pcsd/settings.rb pcs-0.10.8-openrc/pcsd/settings.rb
---- pcs-0.10.8/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
-+++ pcs-0.10.8-openrc/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
+diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb
+--- a/pcs-0.10.8/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
++++ b/pcs-0.10.8/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -250,9 +250,9 @@ diff -uPNr pcs-0.10.8/pcsd/settings.rb pcs-0.10.8-openrc/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr pcs-0.10.8/pcsd/settings.rb.debian pcs-0.10.8-openrc/pcsd/settings.rb.debian
---- pcs-0.10.8/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
-+++ pcs-0.10.8-openrc/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
+diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.debian
+--- a/pcs-0.10.8/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
++++ b/pcs-0.10.8/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -262,9 +262,9 @@ diff -uPNr pcs-0.10.8/pcsd/settings.rb.debian pcs-0.10.8-openrc/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr pcs-0.10.8/pcs_test/tier0/lib/test_external.py pcs-0.10.8-openrc/pcs_test/tier0/lib/test_external.py
---- pcs-0.10.8/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
-+++ pcs-0.10.8-openrc/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
+diff -uPNr a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
+--- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
++++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
 @@ -16,8 +16,8 @@
  import pcs.lib.external as lib
  

diff --git a/sys-cluster/pcs/files/pcsd-daemon.service.patch b/sys-cluster/pcs/files/pcsd-daemon.service.patch
index fa86ef764..ab615c366 100644
--- a/sys-cluster/pcs/files/pcsd-daemon.service.patch
+++ b/sys-cluster/pcs/files/pcsd-daemon.service.patch
@@ -1,5 +1,5 @@
---- pcs-0.10.8/pcsd/pcsd-ruby.service	2021-02-01 09:22:26.000000000 -0000
-+++ pcs-0.10.8/pcsd/pcsd-ruby.service.new	2021-04-11 14:13:00.176650050 -0000
+--- a/pcs-0.10.8/pcsd/pcsd-ruby.service	2021-02-01 09:22:26.000000000 -0000
++++ b/pcs-0.10.8/pcsd/pcsd-ruby.service	2021-04-11 14:13:00.176650050 -0000
 @@ -5,13 +5,12 @@
  Requires=network-online.target
  After=network-online.target

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Andrea Postiglione]

commit:     fcea218dfc8edb841e460bc0737ac9ef7de7d89d
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sat Mar 20 12:08:09 2021 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sat Mar 20 12:08:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fcea218d

sys-cluster/pcs-0.10.8: fix openrc patch

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.8.patch | 48 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch b/sys-cluster/pcs/files/openrc-0.10.8.patch
index ad73352f..4cd3915e 100644
--- a/sys-cluster/pcs/files/openrc-0.10.8.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.8.patch
@@ -1,6 +1,6 @@
-diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
---- pcs-0.10.7/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
-+++ pcs-0.10.7-openrc/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
+diff -uPNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-openrc/pcs/lib/external.py
+--- pcs-0.10.8/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
++++ pcs-0.10.8-openrc/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
 @@ -13,8 +13,8 @@
  from pcs.lib.errors import LibraryError
  
@@ -82,9 +82,9 @@ diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
      if return_code != 0:
          return []
  
-diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_default.py
---- pcs-0.10.7/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
+diff -uPNr pcs-0.10.8/pcs/settings_default.py pcs-0.10.8-openrc/pcs/settings_default.py
+--- pcs-0.10.8/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
++++ pcs-0.10.8-openrc/pcs/settings_default.py	2020-12-16 21:59:28.541361537 +0100
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -114,9 +114,9 @@ diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_def
  # this limit is also mentioned in docs, change there as well
  sbd_max_device_num = 3
  # message types are also mentioned in docs, change there as well
-diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.debian
---- pcs-0.10.7/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
-+++ pcs-0.10.7-openrc/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
+diff -uPNr pcs-0.10.8/pcs/settings.py.debian pcs-0.10.8-openrc/pcs/settings.py.debian
+--- pcs-0.10.8/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
++++ pcs-0.10.8-openrc/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
 @@ -1,10 +1,10 @@
  from pcs.settings_default import *
 -service_binary = "/usr/sbin/service"
@@ -133,9 +133,9 @@ diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.d
  pcsd_exec_location = "/usr/share/pcsd/"
  pcsd_gem_path = None
  pcsd_config = "/etc/default/pcsd"
-diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
---- pcs-0.10.7/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
+diff -uPNr pcs-0.10.8/pcs/utils.py pcs-0.10.8-openrc/pcs/utils.py
+--- pcs-0.10.8/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
++++ pcs-0.10.8-openrc/pcs/utils.py	2020-12-16 21:57:09.487686936 +0100
 @@ -2187,7 +2187,7 @@
          )
      else:
@@ -154,9 +154,9 @@ diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
          )
      return join_multilines([stderr, stdout]), retval
  
-diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
---- pcs-0.10.7/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
-+++ pcs-0.10.7-openrc/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
+diff -uPNr pcs-0.10.8/pcsd/pcs.rb pcs-0.10.8-openrc/pcsd/pcs.rb
+--- pcs-0.10.8/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
++++ pcs-0.10.8-openrc/pcsd/pcs.rb	2020-12-16 21:54:52.337982100 +0100
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -238,9 +238,9 @@ diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
---- pcs-0.10.7/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
-+++ pcs-0.10.7-openrc/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
+diff -uPNr pcs-0.10.8/pcsd/settings.rb pcs-0.10.8-openrc/pcsd/settings.rb
+--- pcs-0.10.8/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
++++ pcs-0.10.8-openrc/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -250,9 +250,9 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb.debian
---- pcs-0.10.7/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
-+++ pcs-0.10.7-openrc/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
+diff -uPNr pcs-0.10.8/pcsd/settings.rb.debian pcs-0.10.8-openrc/pcsd/settings.rb.debian
+--- pcs-0.10.8/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
++++ pcs-0.10.8-openrc/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -262,9 +262,9 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py
---- pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
-+++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
+diff -uPNr pcs-0.10.8/pcs_test/tier0/lib/test_external.py pcs-0.10.8-openrc/pcs_test/tier0/lib/test_external.py
+--- pcs-0.10.8/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
++++ pcs-0.10.8-openrc/pcs_test/tier0/lib/test_external.py	2020-12-16 21:52:40.531155033 +0100
 @@ -16,8 +16,8 @@
  import pcs.lib.external as lib
  

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Andrea Postiglione]

commit:     2d604fd68cfb7dbcdc8c95d6e288ea108b593030
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Wed Dec 16 17:55:40 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Wed Dec 16 17:55:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2d604fd6

sys-cluster/pcs: fix openrc patch

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.7.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch
index 65cc5ea3..b2a59381 100644
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -247,6 +247,18 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
  PCSD_DEFAULT_PORT = 2224
 -PCSD_RUBY_SOCKET = '/run/pcsd-ruby.socket'
++PCSD_RUBY_SOCKET = '/run/pcsd-daemon.socket'
+ 
+ CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
+ KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
+diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb.debian
+--- pcs-0.10.7/pcsd/settings.rb.debian	2020-12-15 17:02:49.065879020 +0100
++++ pcs-0.10.7-openrc/pcsd/settings.rb.debian	2020-12-16 18:52:24.289921676 +0100
+@@ -3,7 +3,7 @@
+ PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
+ PCSD_VAR_LOCATION = '/var/lib/pcsd/'
+ PCSD_DEFAULT_PORT = 2224
+-PCSD_RUBY_SOCKET = '/run/pcsd-ruby.socket'
 +PCSD_RUBY_SOCKET = '/run/pcsd-daemon.socket'
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Andrea Postiglione]

commit:     fa51c4339c1046b076c2a728eb20820b6d79d590
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Wed Dec 16 09:26:55 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Wed Dec 16 09:26:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa51c433

sys-cluster/pcs: new openrc patch

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.7.patch | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch
index 5efe85ec..65cc5ea3 100644
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -84,7 +84,7 @@ diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
  
 diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_default.py
 --- pcs-0.10.7/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
-+++ pcs-0.10.7-openrc/pcs/settings_default.py	2020-12-15 20:31:14.156706578 +0100
++++ pcs-0.10.7-openrc/pcs/settings_default.py	2020-12-16 10:21:42.110032722 +0100
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -97,6 +97,24 @@ diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_def
  pacemaker_binaries = "/usr/sbin/"
  crm_resource_binary = os.path.join(pacemaker_binaries, "crm_resource")
  corosync_binaries = "/usr/sbin/"
+@@ -41,7 +41,7 @@
+ crm_mon_schema = "/usr/share/pacemaker/crm_mon.rng"
+ agent_metadata_schema = "/usr/share/resource-agents/ra-api-1.dtd"
+ pcsd_var_location = "/var/lib/pcsd/"
+-pcsd_ruby_socket = "/run/pcsd-ruby.socket"
++pcsd_ruby_socket = "/run/pcsd-daemon.socket"
+ pcsd_cert_location = os.path.join(pcsd_var_location, "pcsd.crt")
+ pcsd_key_location = os.path.join(pcsd_var_location, "pcsd.key")
+ pcsd_known_hosts_location = os.path.join(pcsd_var_location, "known-hosts")
+@@ -59,7 +59,7 @@
+ pacemaker_gname = "haclient"
+ sbd_binary = "/usr/sbin/sbd"
+ sbd_watchdog_default = "/dev/watchdog"
+-sbd_config = "/etc/sysconfig/sbd"
++sbd_config = "/etc/default/sbd"
+ # this limit is also mentioned in docs, change there as well
+ sbd_max_device_num = 3
+ # message types are also mentioned in docs, change there as well
 diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.debian
 --- pcs-0.10.7/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
 +++ pcs-0.10.7-openrc/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Andrea Postiglione]

commit:     b519113a54e34f615affae43b526e5872696a779
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Wed Dec 16 08:40:10 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Wed Dec 16 08:40:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b519113a

sys-cluster/pcs-0.10.7: new openrc patch

Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.7.patch | 436 +++++++++++++++++++++++++-----
 1 file changed, 363 insertions(+), 73 deletions(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch
index aad70cb1..5efe85ec 100644
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -1,37 +1,181 @@
---- a/pcs/settings_default.py	2019-06-12 23:35:02.146909492 +0900
-+++ b/pcs/settings_default.py	2019-06-12 23:31:27.795771910 +0900
+diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py
+--- pcs-0.10.7/pcs/lib/external.py	2020-12-15 17:02:49.055879169 +0100
++++ pcs-0.10.7-openrc/pcs/lib/external.py	2020-12-15 21:13:41.878627331 +0100
+@@ -13,8 +13,8 @@
+ from pcs.lib.errors import LibraryError
+ 
+ 
+-_chkconfig = settings.chkconfig_binary
+-_service = settings.service_binary
++_rc_config = settings.rc_config_binary
++_rc_service = settings.rc_service_binary
+ _systemctl = settings.systemctl_binary
+ 
+ 
+@@ -192,7 +192,7 @@
+             [_systemctl, "disable", _get_service_name(service, instance)]
+         )
+     else:
+-        stdout, stderr, retval = runner.run([_chkconfig, service, "off"])
++        stdout, stderr, retval = runner.run([_rc_config, 'delete', service, "default"])
+     if retval != 0:
+         raise DisableServiceError(
+             service, join_multilines([stderr, stdout]), instance
+@@ -214,7 +214,7 @@
+             [_systemctl, "enable", _get_service_name(service, instance)]
+         )
+     else:
+-        stdout, stderr, retval = runner.run([_chkconfig, service, "on"])
++        stdout, stderr, retval = runner.run([_rc_config, 'add', service, "default"])
+     if retval != 0:
+         raise EnableServiceError(
+             service, join_multilines([stderr, stdout]), instance
+@@ -234,7 +234,7 @@
+             [_systemctl, "start", _get_service_name(service, instance)]
+         )
+     else:
+-        stdout, stderr, retval = runner.run([_service, service, "start"])
++        stdout, stderr, retval = runner.run([_rc_service, service, "start"])
+     if retval != 0:
+         raise StartServiceError(
+             service, join_multilines([stderr, stdout]), instance
+@@ -254,7 +254,7 @@
+             [_systemctl, "stop", _get_service_name(service, instance)]
+         )
+     else:
+-        stdout, stderr, retval = runner.run([_service, service, "stop"])
++        stdout, stderr, retval = runner.run([_rc_service, service, "stop"])
+     if retval != 0:
+         raise StopServiceError(
+             service, join_multilines([stderr, stdout]), instance
+@@ -295,8 +295,12 @@
+             [_systemctl, "is-enabled", _get_service_name(service, instance)]
+         )
+     else:
+-        dummy_stdout, dummy_stderr, retval = runner.run([_chkconfig, service])
+-
++        stdout, dummy_stderr, dummy_retval = runner.run([_rc_config, 'list', 'default'])
++        retval = 1
++        for line in stdout.splitlines():
++            line = line.split(' ')[0]
++            if service == line:
++                retval = 0
+     return retval == 0
+ 
+ 
+@@ -316,7 +320,7 @@
+         )
+     else:
+         dummy_stdout, dummy_stderr, retval = runner.run(
+-            [_service, service, "status"]
++            [_rc_service, service, "status"]
+         )
+ 
+     return retval == 0
+@@ -344,8 +348,7 @@
+     """
+     if is_systemctl():
+         return []
+-
+-    stdout, dummy_stderr, return_code = runner.run([_chkconfig])
++    stdout, dummy_stderr, return_code = runner.run([_rc_config, "list"])
+     if return_code != 0:
+         return []
+ 
+diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_default.py
+--- pcs-0.10.7/pcs/settings_default.py	2020-12-15 17:02:49.056879154 +0100
++++ pcs-0.10.7-openrc/pcs/settings_default.py	2020-12-15 20:31:14.156706578 +0100
 @@ -1,8 +1,8 @@
  import os.path
  
- systemctl_binary = "/bin/systemctl"
+-systemctl_binary = "/bin/systemctl"
 -chkconfig_binary = "/sbin/chkconfig"
 -service_binary = "/sbin/service"
-+chkconfig_binary = "/usr/bin/rc-config"
-+service_binary = "/sbin/rc-service"
++systemctl_binary="/bin/systemctl"
++rc_config_binary="/usr/bin/rc-config"
++rc_service_binary="/sbin/rc-service"
  pacemaker_binaries = "/usr/sbin/"
  crm_resource_binary = os.path.join(pacemaker_binaries, "crm_resource")
  corosync_binaries = "/usr/sbin/"
---- a/pcsd/pcs.rb	2019-06-12 23:35:13.882862268 +0900
-+++ b/pcsd/pcs.rb	2019-06-12 23:31:11.357838047 +0900
-@@ -1712,7 +1712,7 @@
+diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.debian
+--- pcs-0.10.7/pcs/settings.py.debian	2020-12-15 17:02:49.055879169 +0100
++++ pcs-0.10.7-openrc/pcs/settings.py.debian	2020-12-16 09:36:10.493104892 +0100
+@@ -1,10 +1,10 @@
+ from pcs.settings_default import *
+-service_binary = "/usr/sbin/service"
++rc-service_binary = "/sbin/rc-service"
+ corosync_log_file = "/var/log/corosync/corosync.log"
+-pacemaker_schedulerd = "/usr/lib/pacemaker/pacemaker-schedulerd"
+-pacemaker_controld = "/usr/lib/pacemaker/pacemaker-controld"
+-pacemaker_based = "/usr/lib/pacemaker/pacemaker-based"
+-pacemaker_fenced = "/usr/lib/pacemaker/pacemaker-fenced"
++pacemaker_schedulerd = "/usr/libexec/pacemaker/pacemaker-schedulerd"
++pacemaker_controld = "/usr/libexec/pacemaker/pacemaker-controld"
++pacemaker_based = "/usr/libexec/pacemaker/pacemaker-based"
++pacemaker_fenced = "/usr/libexec/pacemaker/pacemaker-fenced"
+ pcsd_exec_location = "/usr/share/pcsd/"
+ pcsd_gem_path = None
+ pcsd_config = "/etc/default/pcsd"
+diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py
+--- pcs-0.10.7/pcs/utils.py	2020-12-15 17:02:49.056879154 +0100
++++ pcs-0.10.7-openrc/pcs/utils.py	2020-12-15 17:36:27.914500816 +0100
+@@ -2187,7 +2187,7 @@
+         )
+     else:
+         stdout, stderr, retval = cmd_runner().run(
+-            [settings.service_binary, service, "start"]
++            [settings.rc-service_binary, service, "start"]
+         )
+     return join_multilines([stderr, stdout]), retval
+ 
+@@ -2202,7 +2202,7 @@
+         )
+     else:
+         stdout, stderr, retval = cmd_runner().run(
+-            [settings.service_binary, service, "stop"]
++            [settings.rc-service_binary, service, "stop"]
+         )
+     return join_multilines([stderr, stdout]), retval
+ 
+diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb
+--- pcs-0.10.7/pcsd/pcs.rb	2020-12-15 17:02:49.063879050 +0100
++++ pcs-0.10.7-openrc/pcsd/pcs.rb	2020-12-16 09:19:41.341318599 +0100
+@@ -1708,11 +1708,22 @@
+ def is_service_enabled?(service)
    if ISSYSTEMCTL
      cmd = ['systemctl', 'is-enabled', "#{service}.service"]
++    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
++    return (retcode == 0)
    else
 -    cmd = ['chkconfig', service]
-+    cmd = ['/usr/bin/rc-config','list default|/bin/grep -q', service]
++    cmd = ['rc-config', 'list', 'default']
++    stdout, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
++    if retcode != 0
++      return false
++    end
++    stdout.each { |line|
++    line = line.split(' ')
++      if line[0] == service
++        return true
++      end
++    }
++  return false
    end
-   _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
-   return (retcode == 0)
-@@ -1722,7 +1722,7 @@
-   if ISSYSTEMCTL
-     cmd = ['systemctl', 'status', "#{service}.service"]
+-  _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+-  return (retcode == 0)
+ end
+ 
+ def is_service_running?(service)
+@@ -1722,7 +1733,7 @@
+     # encoding/decoding errors. We are not interested in the lines anyway.
+     cmd = ['systemctl', 'status', '--lines=0', "#{service}.service"]
    else
 -    cmd = ['service', service, 'status']
-+    cmd = ['/bin/rc-status', 'default|/bin/grep started| /bin/grep -q', service]
++    cmd = ['rc-service', service, 'status']
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-@@ -1778,11 +1778,12 @@
+@@ -1775,7 +1786,8 @@
  class ServiceInstalledCheckerChkconfig < ServiceInstalledChecker
    protected
    def run_command
@@ -41,78 +185,224 @@
    end
  
    def contains_line_service?(line, service)
--    return line.split(' ')[0] == service
-+    return line.strip == service
-   end
- end
-
-@@ -1765,7 +1766,7 @@
+@@ -1802,7 +1814,7 @@
      cmd = ['systemctl', 'enable', "#{service}.service"]
    else
      # fails when the service is not installed
 -    cmd = ['chkconfig', service, 'on']
-+    cmd = ['/usr/bin/rc-config', 'add', service, 'default']
++    cmd = ['rc-config', 'add', service, 'default']
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-@@ -1780,7 +1781,7 @@
+@@ -1817,7 +1829,7 @@
    if ISSYSTEMCTL
      cmd = ['systemctl', 'disable', "#{service}.service"]
    else
 -    cmd = ['chkconfig', service, 'off']
-+    cmd = ['/usr/bin/rc-config', 'delete', service, 'default']
++    cmd = ['rc-config', 'delete', service, 'default']
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
---- a/pcs/lib/external.py	2019-06-12 23:35:06.017893916 +0900
-+++ b/pcs/lib/external.py	2019-06-12 23:31:18.962807448 +0900
-@@ -69,7 +69,7 @@
-             _systemctl, "disable", _get_service_name(service, instance)
-         ])
-     else:
--        stdout, stderr, retval = runner.run([_chkconfig, service, "off"])
-+        stdout, stderr, retval = runner.run([_chkconfig, 'delete', service, "default"])
-     if retval != 0:
-         raise DisableServiceError(
-             service,
-@@ -93,7 +93,7 @@
-             _systemctl, "enable", _get_service_name(service, instance)
-         ])
-     else:
--        stdout, stderr, retval = runner.run([_chkconfig, service, "on"])
-+        stdout, stderr, retval = runner.run([_chkconfig, 'add', service, "default"])
-     if retval != 0:
-         raise EnableServiceError(
-             service,
-@@ -177,8 +177,12 @@
-             [_systemctl, "is-enabled", _get_service_name(service, instance)]
+@@ -1827,7 +1839,7 @@
+   if ISSYSTEMCTL
+     cmd = ['systemctl', 'start', "#{service}.service"]
+   else
+-    cmd = ['service', service, 'start']
++    cmd = ['rc-service', service, 'start']
+   end
+   _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+   return (retcode == 0)
+@@ -1840,7 +1852,7 @@
+   if ISSYSTEMCTL
+     cmd = ['systemctl', 'stop', "#{service}.service"]
+   else
+-    cmd = ['service', service, 'stop']
++    cmd = ['rc-service', service, 'stop']
+   end
+   _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+   return (retcode == 0)
+diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb
+--- pcs-0.10.7/pcsd/settings.rb	2020-12-15 17:02:49.065879020 +0100
++++ pcs-0.10.7-openrc/pcsd/settings.rb	2020-12-16 09:26:46.782426991 +0100
+@@ -3,7 +3,7 @@
+ PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
+ PCSD_VAR_LOCATION = '/var/lib/pcsd/'
+ PCSD_DEFAULT_PORT = 2224
+-PCSD_RUBY_SOCKET = '/run/pcsd-ruby.socket'
++PCSD_RUBY_SOCKET = '/run/pcsd-daemon.socket'
+ 
+ CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
+ KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
+diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py
+--- pcs-0.10.7/pcs_test/tier0/lib/test_external.py	2020-12-15 17:02:49.061879080 +0100
++++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py	2020-12-15 17:44:33.382213643 +0100
+@@ -16,8 +16,8 @@
+ import pcs.lib.external as lib
+ 
+ 
+-_chkconfig = settings.chkconfig_binary
+-_service = settings.service_binary
++_rc-config = settings.rc-config_binary
++_rc-service = settings.rc-service_binary
+ _systemctl = settings.systemctl_binary
+ 
+ 
+@@ -415,7 +415,7 @@
+             self.mock_runner, self.service, None
+         )
+         self.mock_runner.run.assert_called_once_with(
+-            [_chkconfig, self.service, "off"]
++            [_rc-config, "delete", self.service, "default"]
          )
-     else:
--        dummy_stdout, dummy_stderr, retval = runner.run([_chkconfig, service])
--
-+        stdout, dummy_stderr, dummy_retval = runner.run([_chkconfig, 'list', 'default'])
-+        retval = 1
-+        for line in stdout.splitlines():
-+            line = line.strip()
-+            if service == line:
-+                retval = 0
-     return retval == 0
  
+     def test_not_systemctl_failed(self, mock_is_installed, mock_systemctl):
+@@ -430,7 +430,7 @@
+             self.mock_runner, self.service, None
+         )
+         self.mock_runner.run.assert_called_once_with(
+-            [_chkconfig, self.service, "off"]
++            [_rc-config, "delete", self.service, "default"]
+         )
  
-@@ -225,14 +229,13 @@
-     """
-     if is_systemctl():
-         return []
--
--    stdout, dummy_stderr, return_code = runner.run([_chkconfig])
-+    stdout, dummy_stderr, return_code = runner.run([_chkconfig, "list"])
-     if return_code != 0:
-         return []
+     def test_systemctl_not_installed(self, mock_is_installed, mock_systemctl):
+@@ -480,7 +480,7 @@
+             self.mock_runner, self.service, instance
+         )
+         self.mock_runner.run.assert_called_once_with(
+-            [_chkconfig, self.service, "off"]
++            [_rc-config, "delete", self.service, "default"]
+         )
+ 
+ 
+@@ -514,7 +514,7 @@
+         self.mock_runner.run.return_value = ("", "", 0)
+         lib.enable_service(self.mock_runner, self.service)
+         self.mock_runner.run.assert_called_once_with(
+-            [_chkconfig, self.service, "on"]
++            [_rc-config, "add", self.service, "default"]
+         )
+ 
+     def test_not_systemctl_failed(self, mock_systemctl):
+@@ -525,7 +525,7 @@
+             lambda: lib.enable_service(self.mock_runner, self.service),
+         )
+         self.mock_runner.run.assert_called_once_with(
+-            [_chkconfig, self.service, "on"]
++            [_rc-config, "add", self.service, "default"]
+         )
+ 
+     def test_instance_systemctl(self, mock_systemctl):
+@@ -545,7 +545,7 @@
+         self.mock_runner.run.return_value = ("", "", 0)
+         lib.enable_service(self.mock_runner, self.service, instance="test")
+         self.mock_runner.run.assert_called_once_with(
+-            [_chkconfig, self.service, "on"]
++            [_rc-config, "add", self.service, "default"]
+         )
+ 
+ 
+@@ -579,7 +579,7 @@
+         self.mock_runner.run.return_value = ("Starting...", "", 0)
+         lib.start_service(self.mock_runner, self.service)
+         self.mock_runner.run.assert_called_once_with(
+-            [_service, self.service, "start"]
++            [_rc-service, self.service, "start"]
+         )
+ 
+     def test_not_systemctl_failed(self, mock_systemctl):
+@@ -590,7 +590,7 @@
+             lambda: lib.start_service(self.mock_runner, self.service),
+         )
+         self.mock_runner.run.assert_called_once_with(
+-            [_service, self.service, "start"]
++            [_rc-service, self.service, "start"]
+         )
+ 
+     def test_instance_systemctl(self, mock_systemctl):
+@@ -610,7 +610,7 @@
+         self.mock_runner.run.return_value = ("Starting...", "", 0)
+         lib.start_service(self.mock_runner, self.service, instance="test")
+         self.mock_runner.run.assert_called_once_with(
+-            [_service, self.service, "start"]
++            [_rc-service, self.service, "start"]
+         )
+ 
+ 
+@@ -644,7 +644,7 @@
+         self.mock_runner.run.return_value = ("Stopping...", "", 0)
+         lib.stop_service(self.mock_runner, self.service)
+         self.mock_runner.run.assert_called_once_with(
+-            [_service, self.service, "stop"]
++            [_rc-service, self.service, "stop"]
+         )
+ 
+     def test_not_systemctl_failed(self, mock_systemctl):
+@@ -655,7 +655,7 @@
+             lambda: lib.stop_service(self.mock_runner, self.service),
+         )
+         self.mock_runner.run.assert_called_once_with(
+-            [_service, self.service, "stop"]
++            [_rc-service, self.service, "stop"]
+         )
+ 
+     def test_instance_systemctl(self, mock_systemctl):
+@@ -671,7 +671,7 @@
+         self.mock_runner.run.return_value = ("Stopping...", "", 0)
+         lib.stop_service(self.mock_runner, self.service, instance="test")
+         self.mock_runner.run.assert_called_once_with(
+-            [_service, self.service, "stop"]
++            [_rc-service, self.service, "stop"]
+         )
+ 
+ 
+@@ -734,13 +734,13 @@
+         mock_systemctl.return_value = False
+         self.mock_runner.run.return_value = ("", "", 0)
+         self.assertTrue(lib.is_service_enabled(self.mock_runner, self.service))
+-        self.mock_runner.run.assert_called_once_with([_chkconfig, self.service])
++        self.mock_runner.run.assert_called_once_with([_rc-config, self.service])
+ 
+     def test_not_systemctl_disabled(self, mock_systemctl):
+         mock_systemctl.return_value = False
+         self.mock_runner.run.return_value = ("", "", 3)
+         self.assertFalse(lib.is_service_enabled(self.mock_runner, self.service))
+-        self.mock_runner.run.assert_called_once_with([_chkconfig, self.service])
++        self.mock_runner.run.assert_called_once_with([_rc-config, self.service])
+ 
+ 
+ @mock.patch("pcs.lib.external.is_systemctl")
+@@ -770,7 +770,7 @@
+         self.mock_runner.run.return_value = ("is running", "", 0)
+         self.assertTrue(lib.is_service_running(self.mock_runner, self.service))
+         self.mock_runner.run.assert_called_once_with(
+-            [_service, self.service, "status"]
++            [_rc-service, self.service, "status"]
+         )
+ 
+     def test_not_systemctl_not_running(self, mock_systemctl):
+@@ -778,7 +778,7 @@
+         self.mock_runner.run.return_value = ("is stopped", "", 3)
+         self.assertFalse(lib.is_service_running(self.mock_runner, self.service))
+         self.mock_runner.run.assert_called_once_with(
+-            [_service, self.service, "status"]
++            [_rc-service, self.service, "status"]
+         )
+ 
+ 
+@@ -942,14 +942,14 @@
+             ["pcsd", "sbd", "pacemaker"],
+         )
+         self.assertEqual(mock_is_systemctl.call_count, 1)
+-        self.mock_runner.run.assert_called_once_with([_chkconfig])
++        self.mock_runner.run.assert_called_once_with([_rc-config])
+ 
+     def test_failed(self, mock_is_systemctl):
+         mock_is_systemctl.return_value = False
+         self.mock_runner.run.return_value = ("stdout", "failed", 1)
+         self.assertEqual(lib.get_non_systemd_services(self.mock_runner), [])
+         self.assertEqual(mock_is_systemctl.call_count, 1)
+-        self.mock_runner.run.assert_called_once_with([_chkconfig])
++        self.mock_runner.run.assert_called_once_with([_rc-config])
  
-     service_list = []
-     for service in stdout.splitlines():
--        service = service.split(" ", 1)[0]
-+        service = service.strip().split(' ')[0]
-         if service:
-             service_list.append(service)
-     return service_list
+     def test_systemd(self, mock_is_systemctl):
+         mock_is_systemctl.return_value = True

[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

[Andrea Postiglione]

commit:     ff3c16a753bb56cf05c8ddd03354dbc8a36d0aa7
Author:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
AuthorDate: Sun Dec  6 17:38:19 2020 +0000
Commit:     Andrea Postiglione <andrea.postiglione <AT> gmail <DOT> com>
CommitDate: Sun Dec  6 17:38:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ff3c16a7

sys-cluster/pcs: modify patch openrc

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Andrea Postiglione <andrea.postiglione <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.7.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch
index a2cd30d0..aad70cb1 100644
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -18,7 +18,7 @@
      cmd = ['systemctl', 'is-enabled', "#{service}.service"]
    else
 -    cmd = ['chkconfig', service]
-+    cmd = ['/usr/bin/rc-config','list default|/bin/grep -ow', service]
++    cmd = ['/usr/bin/rc-config','list default|/bin/grep -q', service]
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
@@ -27,7 +27,7 @@
      cmd = ['systemctl', 'status', "#{service}.service"]
    else
 -    cmd = ['service', service, 'status']
-+    cmd = ['/bin/rc-status', 'default|/bin/grep started| /bin/grep -ow', service]
++    cmd = ['/bin/rc-status', 'default|/bin/grep started| /bin/grep -q', service]
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)