diff --git a/dev-db/pg_repack/Manifest b/dev-db/pg_repack/Manifest index 467900af06..467c88b23e 100644 --- a/dev-db/pg_repack/Manifest +++ b/dev-db/pg_repack/Manifest @@ -1 +1 @@ -DIST pg_repack-1.4.5.tar.gz 94769 BLAKE2B e15c31b5c9337abf1b01483580734509c1611592efb9d8f5c3c218da7fe613477172e09708a58721579cd6c47f3935559a1a860fa638c74c23a1081e3a7ce312 SHA512 6aa2c6f72b6bfd6c5712bdad08aa1d7fe589da263259383d4546a8cfd881922e3f2bdac733ecd2a0c301f73a3909d8dad095029ddd33279cf580162f2e53f313 +DIST pg_repack-1.4.6.tar.gz 94760 BLAKE2B e85d4cf3c31c9a96db818d2be8137c3d3ca3b3bfb3d2cf28cd0a77742c2487e9c9627b3ca5724963d6af1dd0e95dc8c8be7e00ff98d1f58d0ac1fef30393bc60 SHA512 c36081847d09fbcec8a98ce97ae0f93a8fa686b81fa3915b616481cef88da0db398e7985b98a6e6d1b80cba7b08f6501de0e53edeb876eeb317417fe6ba7571d diff --git a/dev-db/pg_repack/pg_repack-1.4.5.ebuild b/dev-db/pg_repack/pg_repack-1.4.6.ebuild similarity index 78% rename from dev-db/pg_repack/pg_repack-1.4.5.ebuild rename to dev-db/pg_repack/pg_repack-1.4.6.ebuild index 1ce6978d63..39c58c0add 100644 --- a/dev-db/pg_repack/pg_repack-1.4.5.ebuild +++ b/dev-db/pg_repack/pg_repack-1.4.6.ebuild @@ -3,12 +3,12 @@ EAPI=7 -POSTGRES_COMPAT=( 9.5 9.6 10 11 12 ) +POSTGRES_COMPAT=( 9.6 10 11 12 13 ) POSTGRES_USEDEP="server" inherit postgres-multi -DESCRIPTION="RUM access method - inverted index with additional information in posting lists" +DESCRIPTION="Reorganize tables in PostgreSQL databases with minimal locks" HOMEPAGE="https://github.com/reorg/pg_repack" SRC_URI="https://github.com/reorg/pg_repack/archive/ver_${PV}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-ver_${PV}" diff --git a/dev-db/rum/Manifest b/dev-db/rum/Manifest index b7982a7ad2..098691a629 100644 --- a/dev-db/rum/Manifest +++ b/dev-db/rum/Manifest @@ -1 +1 @@ -DIST rum-1.3.6.tar.gz 306580 BLAKE2B 0462067b7d49deabefb1b2f220e96cf33ea14990f66ee3d62e8d14a8cd4898fc3e8892fa588be39f4c24e063e6ae64789b31f971d0ca75c377aded7370ac031b SHA512 decdf649b7742d082fce6d7151b9f73fe526e444bcec6c1c639740630a5149d63fdbc119a52e03b3ef5bc828d19dab3eb18d12dab24c48f9be3be8f99f5cb295 +DIST rum-1.3.7.tar.gz 314685 BLAKE2B 0e54a935460b230dfc5ed26413118d0009d42feb823f19c094b738e737e4b6a23447a488cd6512bb854256c08e2797f58947c384dafb63d0d010c2686bfe11db SHA512 fecbeac6145e37f76e2425a1db40e2dae7912763be5150ef1f00daba176843f0c5ff32311d45819c2fb085ad8b15793bbd284797074d24c2bc0f4a331b24e82c diff --git a/dev-db/rum/rum-1.3.6.ebuild b/dev-db/rum/rum-1.3.7.ebuild similarity index 95% rename from dev-db/rum/rum-1.3.6.ebuild rename to dev-db/rum/rum-1.3.7.ebuild index 1bb5676f27..90b8ad2b82 100644 --- a/dev-db/rum/rum-1.3.6.ebuild +++ b/dev-db/rum/rum-1.3.7.ebuild @@ -3,7 +3,7 @@ EAPI=7 -POSTGRES_COMPAT=( 9.6 10 11 12 ) +POSTGRES_COMPAT=( 9.6 10 11 12 13 ) POSTGRES_USEDEP="server" inherit postgres-multi diff --git a/games-action/ATLauncher/ATLauncher-3.4.0.2.ebuild b/games-action/ATLauncher/ATLauncher-3.4.1.0.ebuild similarity index 100% rename from games-action/ATLauncher/ATLauncher-3.4.0.2.ebuild rename to games-action/ATLauncher/ATLauncher-3.4.1.0.ebuild diff --git a/games-action/ATLauncher/Manifest b/games-action/ATLauncher/Manifest index 7382ce846a..f70e63790d 100644 --- a/games-action/ATLauncher/Manifest +++ b/games-action/ATLauncher/Manifest @@ -1,2 +1,2 @@ -DIST ATLauncher-3.4.0.2.jar 13500061 BLAKE2B 57be156b84f7a327f7519035bd44383217230d1b0d3aedb0febe5c000b9f301e1d2980699b650fea8009a4f59b7d4d2cb75b2337b877463b65a4e924c81a3203 SHA512 403618a669453873f85e4d2b412e931cd3b168b3ea726b53afb7e561a7cc23ecf420488f0be4ad47fea7da1926f2d260c972310329fc6348bdcb1355b71078e8 +DIST ATLauncher-3.4.1.0.jar 13707764 BLAKE2B e6a3bba34f818f457982bd5aa8dcb96023048a9771474a428db62d88318be2d766cb2a0bb06a1c5186b59932dfbba6e4cb53769dd16a577ac563921f098268ba SHA512 335223b7c046d76a38c50b8fbacaecfbbf668d57e158904793ba76d8e03739e8599102ba105f85905f1c965b20cbb2eee7b3c8786d6182723e306658938c7b3e DIST ATLauncher.ico 370070 BLAKE2B 992e5df968054884c21f136b8f16f2b14e8d321b2196ebc07f7a59621223ca79b896f63b21dba864f61f238ca1864039a410d8089127714163092f65d0ca7f27 SHA512 353f6dd68475778cc8e97a773e800fe532df2f6d28d5babc751cfb5ed7ef24ef6246f76d26e3e25706e458741d604bb8fa8e79cb8904900284f0f7b0f9488bfb diff --git a/games-action/minecraft-launcher/Manifest b/games-action/minecraft-launcher/Manifest index 6a0f7827f6..aa0355432e 100644 --- a/games-action/minecraft-launcher/Manifest +++ b/games-action/minecraft-launcher/Manifest @@ -1,5 +1,4 @@ DIST minecraft-launcher-1.6.93.jar 4481683 BLAKE2B 29597977cc70f831bff7f77cb2493d8c8f8138518c79f5e92f91ed6440ae2224b4140546c37645370173c668d9db894ca6b548b6cfd41da40c4e1ff51f0d820b SHA512 85739c0c0828af5b901b9933173f08229175aef1e8dec40c83981fb6fc330285b4c3a206cdf4405408106eff56ce1e516368d18bf44f631446ebac45e9aba125 -DIST minecraft-launcher-2.1.17785.tar.gz 90369245 BLAKE2B bbfb104ec8a223416145745f579a6fafaf979619058bbcdede3070dfe805f51d22fbf4091d96fd6b8ffcc50541844408dda76c1d7d08ba779262d7471a20a675 SHA512 d3c34efce03f12e1d7e1566b7777a7c99b9e4aea36d95417aa18c91f8ee621012ef7216e6d69008bacab23ddc0a12d06ba9ca7461c29c4855ff95477a3a15941 -DIST minecraft-launcher-2.2.548_beta.tar.gz 81468723 BLAKE2B 4c54641809aa6aa4a9606c3d56e9753c7db025e38728a35797748125b16a597c80d77736022188b670345400d85ed7dec043c79c82664675bf4d90b5f2cc2014 SHA512 81e31e6bfc6c0d800e375db88500ac00dfedc8d2246ae3de242a8d52cee16e972d51138e9d920dfb8c180e2b4817db90ee11e7c4e0bb2ae5fcd5768bbafb6928 +DIST minecraft-launcher-2.2.909.tar.gz 81697814 BLAKE2B 066c0074df2479cabfa1e5a53a22c7fa990c70183df02643ea5b1a92092aaaf31c426102873106ad122a74a9f1af10474de98270aba058a37eaefa93b05f5a90 SHA512 d74725b49dd0bad1c9ffbaceda8fa4061e6e7367df084e84533a3adc9192c0f7f40f34c517d3731a06be127e30ca068ec1dd463f303347dc10acce5ad669ef8a DIST minecraft-launcher-legacy.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a DIST minecraft-launcher.svg 61803 BLAKE2B 6527c869aec955f5e457e57f6c60b6391c29f2bc6f83d72b9a432cc9b77df6fb842549158f38e32a0bec6973d6fac4af3a1a5562cb84b5a4fd1d95de645da842 SHA512 aa08e8fa2a5c1c3e2d714644cb9648adb779c09fff5a9e5b79cea42c53be3f53631d199f72c1eec56e4b4f8e46be8f4ae88fbe456865621b589a7c4f9438549a diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.2.548_beta.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.2.548_beta.ebuild deleted file mode 100644 index 155e06678b..0000000000 --- a/games-action/minecraft-launcher/minecraft-launcher-2.2.548_beta.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2019-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop xdg - -DESCRIPTION="An open-world game whose gameplay revolves around breaking and placing blocks" -HOMEPAGE="https://www.minecraft.net/" -SRC_URI="https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${PV/_beta}.tar.gz -> ${P}.tar.gz - https://launcher.mojang.com/download/minecraft-launcher.svg" - -KEYWORDS="~amd64 ~x86" -LICENSE="Mojang" -SLOT="2" - -RESTRICT="bindist mirror" - -RDEPEND=" - >=x11-libs/gtk+-2.24.32-r1[X] - dev-libs/nss - dev-libs/libbsd - dev-libs/libffi - dev-libs/libpcre - media-libs/alsa-lib - media-libs/openal - net-libs/gnutls[idn] - net-print/cups - sys-apps/dbus - virtual/jre:1.8 - virtual/opengl - x11-apps/xrandr - x11-libs/libXScrnSaver - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util -" - -S="${WORKDIR}/${PN}" - -QA_PRESTRIPPED=" - /opt/minecraft-launcher/libcef.so - /opt/minecraft-launcher/liblauncher.so - /opt/minecraft-launcher/minecraft-launcher -" - -src_install() { - dodir /opt/${PN} - insinto /opt/${PN}/ - doins -r . - - fperms +x /opt/${PN}/${PN} - - dosym ../${PN}/${PN} /opt/bin/${PN} - - doicon -s scalable "${DISTDIR}/${PN}.svg" - make_desktop_entry ${PN} "Minecraft" ${PN} Game -} diff --git a/games-action/minecraft-launcher/minecraft-launcher-2.1.17785.ebuild b/games-action/minecraft-launcher/minecraft-launcher-2.2.909.ebuild similarity index 100% rename from games-action/minecraft-launcher/minecraft-launcher-2.1.17785.ebuild rename to games-action/minecraft-launcher/minecraft-launcher-2.2.909.ebuild diff --git a/games-action/technic-launcher/Manifest b/games-action/technic-launcher/Manifest index b0f2d0a439..b2e5f040fb 100644 --- a/games-action/technic-launcher/Manifest +++ b/games-action/technic-launcher/Manifest @@ -1,2 +1,2 @@ -DIST technic-launcher-4.607.jar 5739994 BLAKE2B 34703786b42fbca3bfb70f4ade57bae06dda452ac86aeec6579486d35832c69af194943999f2f61e88d468945c5444e0f2ef5afc4bb999a0fa82cfe5939d291c SHA512 01b6a6cc0e1208cdf18e3720e72897b681bbe4e295deae0704283f2ffe007c4954d81874ffbf81a638b206d7c369890456e943ab44c5ffb522cb97543b0e576f +DIST technic-launcher-4.608.jar 5741059 BLAKE2B e60aef7921fc1700de38cc23012ee81c3a116fc1569e9f4c23a4058b6d8bb80cb878203aa939981a13cc7d13e62776a3e0c412b04eec5e31f171f22f572425ec SHA512 b9c3a02c2f8d8404aa58cacb7c35c2cce51d5adf70203ad6502ad2795d42c412a9de977025b30eb5e4da120fe0b5936aae5a82aed1a9e48a05a6a98dfc8b905e DIST technic-launcher.ico 15086 BLAKE2B 4f5be0661bfbdca971cf022767618acef1e912b60c3f0574f383a8bd0281a6d66ca1b8b105412ec9579f3999514a471412fb16da66d937acfb4d3236b8f99663 SHA512 c109113a0e1be10bc013bfb79b742396a768fa683860a83d734e158b709e66b9e21067e1791ae5f7a854ccd21b1bf9adf6eeb27bc33d9da03f902dfe5d8be710 diff --git a/games-action/technic-launcher/technic-launcher-4.607.ebuild b/games-action/technic-launcher/technic-launcher-4.608.ebuild similarity index 100% rename from games-action/technic-launcher/technic-launcher-4.607.ebuild rename to games-action/technic-launcher/technic-launcher-4.608.ebuild diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch index aad70cb107..65cc5ea3e0 100644 --- a/sys-cluster/pcs/files/openrc-0.10.7.patch +++ b/sys-cluster/pcs/files/openrc-0.10.7.patch @@ -1,37 +1,199 @@ ---- 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-16 10:21:42.110032722 +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 @@ +@@ -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 +@@ -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 +203,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"] + ) + + 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"] ) - 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 -@@ -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 [] +@@ -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"] + ) - 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_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/www-servers/thin/thin-1.8.0.ebuild b/www-servers/thin/thin-1.8.0.ebuild index 2715b040dc..3ea7476f74 100644 --- a/www-servers/thin/thin-1.8.0.ebuild +++ b/www-servers/thin/thin-1.8.0.ebuild @@ -57,7 +57,6 @@ all_ruby_prepare() { use doc || rm tasks/rdoc.rake } - each_ruby_configure() { ${RUBY} -Cext/thin_parser extconf.rb || die }