[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/, sys-cluster/pcs/files/
commit: eac77dc802a4a8311341930300e0583f1929c827
Author: Andrea Postiglione gmail com>
AuthorDate: Thu Apr 7 15:10:16 2022 +
Commit: Andrea Postiglione gmail com>
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:dev commit in: sys-cluster/pcs/, sys-cluster/pcs/files/
commit: fe3c738c21b0f614174fdc508340c83a3df2052e
Author: Alessandro Barbieri gmail com>
AuthorDate: Sun Jun 27 22:17:43 2021 +
Commit: Alessandro Barbieri gmail com>
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:dev commit in: sys-cluster/pcs/, sys-cluster/pcs/files/
commit: 40ab2c0bdac57c335afe04c951e99a9054f71f54
Author: Andrea Postiglione gmail com>
AuthorDate: Sun Apr 11 14:27:10 2021 +
Commit: Andrea Postiglione gmail com>
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:dev commit in: sys-cluster/pcs/, sys-cluster/pcs/files/
commit: 13fb9bbf96bb12441d89fefb08979871d17b10af
Author: Andrea Postiglione gmail com>
AuthorDate: Tue Mar 23 20:05:00 2021 +
Commit: Andrea Postiglione gmail com>
CommitDate: Tue Mar 23 20:05:00 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13fb9bbf
sys-cluster/pcs-0.10.8-r1: fix systemd service
Signed-off-by: Andrea Postiglione gmail.com>
sys-cluster/pcs/files/pcsd-daemon.service.patch | 17 +
sys-cluster/pcs/pcs-0.10.8-r1.ebuild| 4 +++-
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/pcs/files/pcsd-daemon.service.patch
b/sys-cluster/pcs/files/pcsd-daemon.service.patch
new file mode 100644
index 0..00b61cf9a
--- /dev/null
+++ b/sys-cluster/pcs/files/pcsd-daemon.service.patch
@@ -0,0 +1,17 @@
+--- 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 @@
+ After=network-online.target
+ # Stop the service automatically if nothing that depends on it is running
+ StopWhenUnneeded=true
+-# When stopping or restarting pcsd, stop or restart pcsd-ruby as well
++# When stopping or restarting pcsd, stop or restart pcsd-daemon as well
+ PartOf=pcsd.service
+
+ [Service]
+-EnvironmentFile=/etc/sysconfig/pcsd
+-Environment=GEM_HOME=/usr/lib/pcsd/vendor/bundle/ruby
++EnvironmentFile=/etc/default/pcsd
+ # This file holds the selinux context
+ ExecStart=/usr/lib/pcsd/pcsd
+ Type=notify
diff --git a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
index a6acdb475..1af214e5f 100644
--- a/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
+++ b/sys-cluster/pcs/pcs-0.10.8-r1.ebuild
@@ -61,7 +61,9 @@ ruby_add_rdepend "
www-servers/thin
"
-PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch"
"${FILESDIR}/openrc-${PV}.patch" )
+PATCHES=( "${FILESDIR}/remove-ruby-bundle-path.patch"
+ "${FILESDIR}/openrc-${PV}.patch"
+ "${FILESDIR}/pcsd-daemon.service.patch" )
S="${WORKDIR}/all/${P}"
[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/, sys-cluster/pcs/files/
commit: 8c4cb3a14c9af037b8c4d9663d733c776932cb9a
Author: Andrea Postiglione gmail com>
AuthorDate: Sat Mar 20 11:40:36 2021 +
Commit: Andrea Postiglione gmail com>
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
