diff --git a/media-sound/noson-app/Manifest b/media-sound/noson-app/Manifest index 69b5adb083..0855f0856b 100644 --- a/media-sound/noson-app/Manifest +++ b/media-sound/noson-app/Manifest @@ -1 +1 @@ -DIST noson-app-4.4.8.tar.gz 2142069 BLAKE2B 9d2a8088431327b3bf9a8c76ba43313ee8615ade0519fe114c213be04387fec6f97bdb9b2906c367ca946a9b0b3f89ed250fc58a80b6415d5e4eda856d65bd41 SHA512 8424610d3c925ea305cc8044a4aa5e02f0cf6fabecd9b39c0c44be9d922440b8ea2e7d2eee27a465055ffb0e42e74a88133c99284060a7f9e363b6af2e3e8561 +DIST noson-app-4.4.9.tar.gz 2144366 BLAKE2B ae4e48dda68fb7cca2042a002a50c6478684d6ab2bbcbeb3c3be7448530345a79cbab173858d942e4e4e97e00b9a10b501ded2761f2503cc386ee8f5ef6c7319 SHA512 9da9dd49f5fcdc53ef696ae662e8cc4960cd05bf0d5fb57d2d82585506d1d5b1a8996d832cdd7adadb37847212ab4b2a9ac5476ec2dd158e9c8ef13e243adaa0 diff --git a/media-sound/noson-app/noson-app-4.4.8.ebuild b/media-sound/noson-app/noson-app-4.4.9.ebuild similarity index 100% rename from media-sound/noson-app/noson-app-4.4.8.ebuild rename to media-sound/noson-app/noson-app-4.4.9.ebuild diff --git a/sys-cluster/pcs/Manifest b/sys-cluster/pcs/Manifest index ecae6daea7..79ce84cab5 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 0000000000..4cd3915e57 --- /dev/null +++ b/sys-cluster/pcs/files/openrc-0.10.8.patch @@ -0,0 +1,437 @@ +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 + + +-_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.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 + + systemctl_binary = "/bin/systemctl" +-chkconfig_binary = "/sbin/chkconfig" +-service_binary = "/sbin/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/" +@@ -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.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" ++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.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: + 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.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 + cmd = ['systemctl', 'is-enabled', "#{service}.service"] ++ _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) ++ return (retcode == 0) + else +- cmd = ['chkconfig', 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) + 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 = ['rc-service', service, 'status'] + end + _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) + return (retcode == 0) +@@ -1775,7 +1786,8 @@ + class ServiceInstalledCheckerChkconfig < ServiceInstalledChecker + protected + def run_command +- return run_cmd(PCSAuth.getSuperuserAuth(), 'chkconfig') ++ cmd = ['rc-config', 'list'] ++ return run_cmd(PCSAuth.getSuperuserAuth(), *cmd) + end + + def contains_line_service?(line, service) +@@ -1802,7 +1814,7 @@ + cmd = ['systemctl', 'enable', "#{service}.service"] + else + # fails when the service is not installed +- cmd = ['chkconfig', service, 'on'] ++ cmd = ['rc-config', 'add', service, 'default'] + end + _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) + return (retcode == 0) +@@ -1817,7 +1829,7 @@ + if ISSYSTEMCTL + cmd = ['systemctl', 'disable', "#{service}.service"] + else +- cmd = ['chkconfig', service, 'off'] ++ cmd = ['rc-config', 'delete', service, 'default'] + end + _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) + return (retcode == 0) +@@ -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.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/' + 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.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/' + 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.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 + + +-_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"] + ) + + 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"] + ) + + 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]) + + def test_systemd(self, mock_is_systemctl): + mock_is_systemctl.return_value = True diff --git a/sys-cluster/pcs/pcs-0.10.8.ebuild b/sys-cluster/pcs/pcs-0.10.8.ebuild new file mode 100644 index 0000000000..3a7f366d9e --- /dev/null +++ b/sys-cluster/pcs/pcs-0.10.8.ebuild @@ -0,0 +1,112 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +USE_RUBY="ruby25 ruby26" +inherit distutils-r1 ruby-ng systemd + +DESCRIPTION="Pacemaker/Corosync Configuration System" +HOMEPAGE="https://github.com/ClusterLabs/pcs" +SRC_URI="https://github.com/ClusterLabs/pcs/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="snmp systemd" + +DEPEND=" + dev-libs/libffi + media-libs/fontconfig + sys-apps/coreutils +" +RDEPEND=" + ${DEPEND} + dev-libs/openssl + dev-python/distro[${PYTHON_USEDEP}] + dev-python/dacite[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/pycurl[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/pyparsing[${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + >=sys-cluster/corosync-3.0 + >=sys-cluster/pacemaker-2.0 + sys-libs/pam + sys-process/psmisc + >=www-servers/tornado-6.0[${PYTHON_USEDEP}] +