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

[Ronny Gutbrod]

commit: 8c95b0d12f51bd6a4efb77f4ca944b07b0e98154
Author: Andrea Postiglione  gmail  com>
AuthorDate: Fri Apr  8 10:10:55 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Fri Apr  8 10:10:55 2022 +
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  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:master commit in: sys-cluster/pcs/files/, sys-cluster/pcs/

[Ronny Gutbrod]

commit: eac77dc802a4a8311341930300e0583f1929c827
Author: Andrea Postiglione  gmail  com>
AuthorDate: Thu Apr  7 15:10:16 2022 +
Commit: Ronny Gutbrod  tastytea  de>
CommitDate: Thu Apr  7 15:10:16 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=eac77dc8

sys-cluster/pcs : remove bashism

Signed-off-by: Andrea Postiglione  gmail.com>

 sys-cluster/pcs/files/remove_bashism.patch | 41 ++
 sys-cluster/pcs/pcs-0.11.2.ebuild  |  3 ++-
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/pcs/files/remove_bashism.patch 
b/sys-cluster/pcs/files/remove_bashism.patch
new file mode 100644
index 0..a54d612f0
--- /dev/null
+++ b/sys-cluster/pcs/files/remove_bashism.patch
@@ -0,0 +1,41 @@
+From 73e90ae7f31600ff9c0edf0aed3cace9cd8c8a35 Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri 
+Date: Thu, 7 Apr 2022 17:02:55 +0200
+Subject: [PATCH] remove bashisms
+
+`==` is not POSIX
+---
+ m4/ac_compare_versions.m4 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/m4/ac_compare_versions.m4 b/m4/ac_compare_versions.m4
+index 77d03330a..74846704e 100644
+--- a/m4/ac_compare_versions.m4
 b/m4/ac_compare_versions.m4
+@@ -6,7 +6,7 @@ dnl op can be:
+ dnl
+ dnl lt or <
+ dnl le or <=
+-dnl eq or ==
++dnl eq or =
+ dnl ge or >=
+ dnl gt or >
+ dnl
+@@ -20,7 +20,7 @@ AC_DEFUN([AC_COMPARE_VERSIONS],[
+   verA="$1"
+   op="$2"
+   verB="$3"
+-  if test "x$verA" == "x" || test "x$verB" == "x" || test "x$op" == x; 
then
++  if test "x$verA" = "x" || test "x$verB" = "x" || test "x$op" = x; then
+   AC_MSG_ERROR([ac_compare_versions: Missing parameters])
+   fi
+   case "$op" in
+@@ -36,7 +36,7 @@ AC_DEFUN([AC_COMPARE_VERSIONS],[
+   result=true
+   fi
+   ;;
+-  "eq"|"==")
++  "eq"|"=")
+   if test "$verB" = "$verA"; then
+   result=true
+   fi

diff --git a/sys-cluster/pcs/pcs-0.11.2.ebuild 
b/sys-cluster/pcs/pcs-0.11.2.ebuild
index b9fc87951..40733de60 100644
--- a/sys-cluster/pcs/pcs-0.11.2.ebuild
+++ b/sys-cluster/pcs/pcs-0.11.2.ebuild
@@ -65,7 +65,8 @@ ruby_add_rdepend "
www-servers/thin"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch"
+PATCHES="${FILESDIR}/pcs-0.11-gentoo-support.patch
+   ${FILESDIR}/remove_bashism.patch"
 
 src_prepare() {
default

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

[Florian Schmaus]

commit: fe3c738c21b0f614174fdc508340c83a3df2052e
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Jun 27 22:17:43 2021 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jun 27 22:17:43 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fe3c738c

sys-cluster/pcs: fix patches, remove old

Signed-off-by: Alessandro Barbieri  gmail.com>

 sys-cluster/pcs/Manifest   |   1 -
 sys-cluster/pcs/files/openrc-0.10.7.patch  | 430 -
 sys-cluster/pcs/files/openrc-0.10.8.patch  |  32 +-
 sys-cluster/pcs/files/pcsd-daemon.service.patch|   4 +-
 sys-cluster/pcs/pcs-0.10.7.ebuild  | 112 --
 .../{pcs-0.10.8-r2.ebuild => pcs-0.10.8-r3.ebuild} |   7 +-
 sys-cluster/pcs/pcs-0.10.8.ebuild  | 112 --
 7 files changed, 22 insertions(+), 676 deletions(-)

diff --git a/sys-cluster/pcs/Manifest b/sys-cluster/pcs/Manifest
index 79ce84cab..95eae5e99 100644
--- a/sys-cluster/pcs/Manifest
+++ b/sys-cluster/pcs/Manifest
@@ -1,2 +1 @@
-DIST pcs-0.10.7.tar.gz 1818215 BLAKE2B 
345ba114f92c1f555a948b1f6eafb532056d3196c9f0cf3007d7d27d8a8957c886f3a5ab2519e0922908c3d11ed9dc54632376d5556f6b1dc5dfb035bcfda4bf
 SHA512 
c76a11fa162258ee311dcceca50674d7638396880596a826a711d944aab421ed06a6c4eb41f9dc997c01b72bce73c98c4f7be3fcd8fafb8ae16902f6a1e0c521
 DIST pcs-0.10.8.tar.gz 1852902 BLAKE2B 
ef023ca27c2dbd1d765e1d68f67a55c79f57b1dbc7d571b8f21e1c30f8a8510b1148459a0e683c682fb969c7635ef726c8e227b995d1a35dfd27894f40bdaa26
 SHA512 
8b9ba62279431e481d062e804d24480d2a274d2f4897a82149df6116ff3df2394d97a3ee77a6dee4c563d915bab0142124a8942524fcc4e894912086e865353c

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch 
b/sys-cluster/pcs/files/openrc-0.10.7.patch
deleted file mode 100644
index 18c56936a..0
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ /dev/null
@@ -1,430 +0,0 @@
 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
- 
- 
--_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 []
- 
 a/pcs-0.10.7/pcs/settings_default.py
-+++ b/pcs-0.10.7/pcs/settings_default.py
-@@ -1,8 +1,8 @@
- 

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

[Andrew Ammerlaan]

commit: 6eb0e7e6aed0f60a129f771eb9382a1ef63e2913
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Wed Apr 21 01:51:18 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Apr 21 01:51:18 2021 +
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  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.debian2020-12-15 17:02:49.055879169 
+0100
-+++ b/pcs-0.10.7/pcs/settings.py.debian2020-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 + 

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

[Theo Anderson]

commit: e6581a614a430e488146fbc25d46eeaced82f8ac
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Apr 11 15:50:52 2021 +
Commit: Theo Anderson  posteo  de>
CommitDate: Sun Apr 11 15:51:21 2021 +
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  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.debian2020-12-15 17:02:49.055879169 
+0100
 b/pcs-0.10.7/pcs/settings.py.debian2020-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.py2020-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.rb2020-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 

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

[Theo Anderson]

commit: 40ab2c0bdac57c335afe04c951e99a9054f71f54
Author: Andrea Postiglione  gmail  com>
AuthorDate: Sun Apr 11 14:27:10 2021 +
Commit: Theo Anderson  posteo  de>
CommitDate: Sun Apr 11 14:27:10 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=40ab2c0b

sys-cluster/pcs-0.10.8-r2 fix systemd service

Signed-off-by: Andrea Postiglione  gmail.com>

 sys-cluster/pcs/files/pcsd-daemon.service.patch | 10 ++
 sys-cluster/pcs/pcs-0.10.8-r2.ebuild|  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/pcs/files/pcsd-daemon.service.patch 
b/sys-cluster/pcs/files/pcsd-daemon.service.patch
index 00b61cf9a..fa86ef764 100644
--- a/sys-cluster/pcs/files/pcsd-daemon.service.patch
+++ b/sys-cluster/pcs/files/pcsd-daemon.service.patch
@@ -1,10 +1,12 @@
 pcs-0.10.8/pcsd/pcsd-ruby.service  2021-02-01 10:22:26.0 +0100
-+++ pcs-0.10.8/pcsd/pcsd-ruby.service.new  2021-03-23 20:13:24.380792446 
+0100
-@@ -6,12 +6,11 @@
+--- pcs-0.10.8/pcsd/pcsd-ruby.service  2021-02-01 09:22:26.0 -
 pcs-0.10.8/pcsd/pcsd-ruby.service.new  2021-04-11 14:13:00.176650050 
-
+@@ -5,13 +5,12 @@
+ Requires=network-online.target
  After=network-online.target
  # Stop the service automatically if nothing that depends on it is running
- StopWhenUnneeded=true
+-StopWhenUnneeded=true
 -# When stopping or restarting pcsd, stop or restart pcsd-ruby as well
++StopWhenUnneeded=false
 +# When stopping or restarting pcsd, stop or restart pcsd-daemon as well
  PartOf=pcsd.service
  

diff --git a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild 
b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
index 830a07632..1444be359 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 inherit python-single-r1 ruby-ng systemd
 
 DESCRIPTION="Pacemaker/Corosync Configuration System"
@@ -100,6 +100,8 @@ src_install() {
if use systemd ; then
systemd_newunit "${S}/pcsd/pcsd.service.debian" "pcsd.service"
systemd_newunit "${S}/pcsd/pcsd-ruby.service" 
"pcsd-daemon.service"
+   rm "${D}"/usr/lib/systemd/system/pcsd-ruby.service
+   rm "${D}"/usr/lib/systemd/system/pcsd.service
fi
# custom service file for openRC
newinitd "${FILESDIR}/pcsd.initd" pcsd

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

[Andrew Ammerlaan]

commit: fcea218dfc8edb841e460bc0737ac9ef7de7d89d
Author: Andrea Postiglione  gmail  com>
AuthorDate: Sat Mar 20 12:08:09 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Mar 20 12:08:09 2021 +
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  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.py2020-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.py2020-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.rb2020-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.rb2020-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 

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

[Andrew Ammerlaan]

commit: 8c4cb3a14c9af037b8c4d9663d733c776932cb9a
Author: Andrea Postiglione  gmail  com>
AuthorDate: Sat Mar 20 11:40:36 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Mar 20 11:40:36 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8c4cb3a1

sys-cluster/pcs-0.10.8 version bump

Signed-off-by: Andrea Postiglione  gmail.com>

 sys-cluster/pcs/Manifest  |   1 +
 sys-cluster/pcs/files/openrc-0.10.8.patch | 437 ++
 sys-cluster/pcs/pcs-0.10.8.ebuild | 112 
 3 files changed, 550 insertions(+)

diff --git a/sys-cluster/pcs/Manifest b/sys-cluster/pcs/Manifest
index ecae6dae..79ce84ca 100644
--- a/sys-cluster/pcs/Manifest
+++ b/sys-cluster/pcs/Manifest
@@ -1 +1,2 @@
 DIST pcs-0.10.7.tar.gz 1818215 BLAKE2B 
345ba114f92c1f555a948b1f6eafb532056d3196c9f0cf3007d7d27d8a8957c886f3a5ab2519e0922908c3d11ed9dc54632376d5556f6b1dc5dfb035bcfda4bf
 SHA512 
c76a11fa162258ee311dcceca50674d7638396880596a826a711d944aab421ed06a6c4eb41f9dc997c01b72bce73c98c4f7be3fcd8fafb8ae16902f6a1e0c521
+DIST pcs-0.10.8.tar.gz 1852902 BLAKE2B 
ef023ca27c2dbd1d765e1d68f67a55c79f57b1dbc7d571b8f21e1c30f8a8510b1148459a0e683c682fb969c7635ef726c8e227b995d1a35dfd27894f40bdaa26
 SHA512 
8b9ba62279431e481d062e804d24480d2a274d2f4897a82149df6116ff3df2394d97a3ee77a6dee4c563d915bab0142124a8942524fcc4e894912086e865353c

diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch 
b/sys-cluster/pcs/files/openrc-0.10.8.patch
new file mode 100644
index ..ad73352f
--- /dev/null
+++ b/sys-cluster/pcs/files/openrc-0.10.8.patch
@@ -0,0 +1,437 @@
+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-16 

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

[Andrew Ammerlaan]

commit: 02ce9b5b3873847fef789c80f8ca430846dc59dc
Author: Andrea Postiglione  gmail  com>
AuthorDate: Wed Dec 16 21:43:29 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Dec 16 21:43:29 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=02ce9b5b

sys-cluster/pcs: fix openrc patch

Signed-off-by: Andrea Postiglione  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.py2020-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.rb2020-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
  
  
@@ 

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

[Andrew Ammerlaan]

commit: 2d604fd68cfb7dbcdc8c95d6e288ea108b593030
Author: Andrea Postiglione  gmail  com>
AuthorDate: Wed Dec 16 17:55:40 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Dec 16 17:55:40 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2d604fd6

sys-cluster/pcs: fix openrc patch

Signed-off-by: Andrea Postiglione  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:master commit in: sys-cluster/pcs/files/

[Andrew Ammerlaan]

commit: fa51c4339c1046b076c2a728eb20820b6d79d590
Author: Andrea Postiglione  gmail  com>
AuthorDate: Wed Dec 16 09:26:55 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Dec 16 09:26:55 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fa51c433

sys-cluster/pcs: new openrc patch

Signed-off-by: Andrea Postiglione  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:master commit in: sys-cluster/pcs/files/

[Andrew Ammerlaan]

commit: b519113a54e34f615affae43b526e5872696a779
Author: Andrea Postiglione  gmail  com>
AuthorDate: Wed Dec 16 08:40:10 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Dec 16 08:40:10 2020 +
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  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 

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

[Andrew Ammerlaan]

commit: ff3c16a753bb56cf05c8ddd03354dbc8a36d0aa7
Author: Andrea Postiglione  gmail  com>
AuthorDate: Sun Dec  6 17:38:19 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sun Dec  6 17:38:19 2020 +
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  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)

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

[Andrew Ammerlaan]

commit: 32affc186e1f6661c0a2ff1e3d1a5c5cb2df50c2
Author: Andrea Postiglione  gmail  com>
AuthorDate: Sat Dec  5 21:08:33 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Sat Dec  5 21:08:33 2020 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=32affc18

sys-cluster/pcs-0.10.7: initial ebuild

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

 sys-cluster/pcs/Manifest   |   1 +
 sys-cluster/pcs/files/openrc-0.10.7.patch  | 118 +
 sys-cluster/pcs/files/pcsd-daemon.initd|  27 +
 sys-cluster/pcs/files/pcsd.initd   |  35 ++
 .../pcs/files/remove-ruby-bundle-path.patch|  11 ++
 sys-cluster/pcs/metadata.xml   |  18 
 sys-cluster/pcs/pcs-0.10.7.ebuild  | 106 ++
 7 files changed, 316 insertions(+)

diff --git a/sys-cluster/pcs/Manifest b/sys-cluster/pcs/Manifest
new file mode 100644
index ..ecae6dae
--- /dev/null
+++ b/sys-cluster/pcs/Manifest
@@ -0,0 +1 @@
+DIST pcs-0.10.7.tar.gz 1818215 BLAKE2B 
345ba114f92c1f555a948b1f6eafb532056d3196c9f0cf3007d7d27d8a8957c886f3a5ab2519e0922908c3d11ed9dc54632376d5556f6b1dc5dfb035bcfda4bf
 SHA512 
c76a11fa162258ee311dcceca50674d7638396880596a826a711d944aab421ed06a6c4eb41f9dc997c01b72bce73c98c4f7be3fcd8fafb8ae16902f6a1e0c521

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch 
b/sys-cluster/pcs/files/openrc-0.10.7.patch
new file mode 100644
index ..a2cd30d0
--- /dev/null
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -0,0 +1,118 @@
+--- 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
+@@ -1,8 +1,8 @@
+ import os.path
+ 
+ systemctl_binary = "/bin/systemctl"
+-chkconfig_binary = "/sbin/chkconfig"
+-service_binary = "/sbin/service"
++chkconfig_binary = "/usr/bin/rc-config"
++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 @@
+   if ISSYSTEMCTL
+ cmd = ['systemctl', 'is-enabled', "#{service}.service"]
+   else
+-cmd = ['chkconfig', service]
++cmd = ['/usr/bin/rc-config','list default|/bin/grep -ow', service]
+   end
+   _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+   return (retcode == 0)
+@@ -1722,7 +1722,7 @@
+   if ISSYSTEMCTL
+ cmd = ['systemctl', 'status', "#{service}.service"]
+   else
+-cmd = ['service', service, 'status']
++cmd = ['/bin/rc-status', 'default|/bin/grep started| /bin/grep -ow', 
service]
+   end
+   _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+   return (retcode == 0)
+@@ -1778,11 +1778,12 @@
+ class ServiceInstalledCheckerChkconfig < ServiceInstalledChecker
+   protected
+   def run_command
+-return run_cmd(PCSAuth.getSuperuserAuth(), 'chkconfig')
++cmd = ['/usr/bin/rc-config', 'list']
++return run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+   end
+ 
+   def contains_line_service?(line, service)
+-return line.split(' ')[0] == service
++return line.strip == service
+   end
+ end
+
+@@ -1765,7 +1766,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']
+   end
+   _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
+   return (retcode == 0)
+@@ -1780,7 +1781,7 @@
+   if ISSYSTEMCTL
+ cmd = ['systemctl', 'disable', "#{service}.service"]
+   else
+-cmd = ['chkconfig', service, 'off']
++cmd = ['/usr/bin/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)]
+ )
+