From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59BD71382C5 for ; Sat, 20 Mar 2021 17:38:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85865E083D; Sat, 20 Mar 2021 17:38:45 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BA13E083D for ; Sat, 20 Mar 2021 17:38:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57294340A5C for ; Sat, 20 Mar 2021 17:38:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF3B85C9 for ; Sat, 20 Mar 2021 17:38:41 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1616242089.fcea218dfc8edb841e460bc0737ac9ef7de7d89d.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-cluster/pcs/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-cluster/pcs/files/openrc-0.10.8.patch X-VCS-Directories: sys-cluster/pcs/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: fcea218dfc8edb841e460bc0737ac9ef7de7d89d X-VCS-Branch: master Date: Sat, 20 Mar 2021 17:38:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fadc9a22-b3ad-42b3-9896-7a91ceb879ab X-Archives-Hash: 988f060ae5e4cdbd7cfdd9efdf1ae419 commit: fcea218dfc8edb841e460bc0737ac9ef7de7d89d Author: Andrea Postiglione gmail com> AuthorDate: Sat Mar 20 12:08:09 2021 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Mar 20 12:08:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=fcea218d sys-cluster/pcs-0.10.8: fix openrc patch Signed-off-by: Andrea Postiglione gmail.com> sys-cluster/pcs/files/openrc-0.10.8.patch | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch b/sys-cluster/pcs/files/openrc-0.10.8.patch index ad73352f..4cd3915e 100644 --- a/sys-cluster/pcs/files/openrc-0.10.8.patch +++ b/sys-cluster/pcs/files/openrc-0.10.8.patch @@ -1,6 +1,6 @@ -diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py ---- pcs-0.10.7/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100 -+++ pcs-0.10.7-openrc/pcs/lib/external.py 2020-12-15 21:13:41.878627331 +0100 +diff -uPNr pcs-0.10.8/pcs/lib/external.py pcs-0.10.8-openrc/pcs/lib/external.py +--- pcs-0.10.8/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100 ++++ pcs-0.10.8-openrc/pcs/lib/external.py 2020-12-15 21:13:41.878627331 +0100 @@ -13,8 +13,8 @@ from pcs.lib.errors import LibraryError @@ -82,9 +82,9 @@ diff -uPNr pcs-0.10.7/pcs/lib/external.py pcs-0.10.7-openrc/pcs/lib/external.py if return_code != 0: return [] -diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_default.py ---- pcs-0.10.7/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100 -+++ pcs-0.10.7-openrc/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100 +diff -uPNr pcs-0.10.8/pcs/settings_default.py pcs-0.10.8-openrc/pcs/settings_default.py +--- pcs-0.10.8/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100 ++++ pcs-0.10.8-openrc/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100 @@ -1,8 +1,8 @@ import os.path @@ -114,9 +114,9 @@ diff -uPNr pcs-0.10.7/pcs/settings_default.py pcs-0.10.7-openrc/pcs/settings_def # this limit is also mentioned in docs, change there as well sbd_max_device_num = 3 # message types are also mentioned in docs, change there as well -diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.debian ---- pcs-0.10.7/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100 -+++ pcs-0.10.7-openrc/pcs/settings.py.debian 2020-12-16 09:36:10.493104892 +0100 +diff -uPNr pcs-0.10.8/pcs/settings.py.debian pcs-0.10.8-openrc/pcs/settings.py.debian +--- pcs-0.10.8/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100 ++++ pcs-0.10.8-openrc/pcs/settings.py.debian 2020-12-16 09:36:10.493104892 +0100 @@ -1,10 +1,10 @@ from pcs.settings_default import * -service_binary = "/usr/sbin/service" @@ -133,9 +133,9 @@ diff -uPNr pcs-0.10.7/pcs/settings.py.debian pcs-0.10.7-openrc/pcs/settings.py.d pcsd_exec_location = "/usr/share/pcsd/" pcsd_gem_path = None pcsd_config = "/etc/default/pcsd" -diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py ---- pcs-0.10.7/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100 -+++ pcs-0.10.7-openrc/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100 +diff -uPNr pcs-0.10.8/pcs/utils.py pcs-0.10.8-openrc/pcs/utils.py +--- pcs-0.10.8/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100 ++++ pcs-0.10.8-openrc/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100 @@ -2187,7 +2187,7 @@ ) else: @@ -154,9 +154,9 @@ diff -uPNr pcs-0.10.7/pcs/utils.py pcs-0.10.7-openrc/pcs/utils.py ) return join_multilines([stderr, stdout]), retval -diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb ---- pcs-0.10.7/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100 -+++ pcs-0.10.7-openrc/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100 +diff -uPNr pcs-0.10.8/pcsd/pcs.rb pcs-0.10.8-openrc/pcsd/pcs.rb +--- pcs-0.10.8/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100 ++++ pcs-0.10.8-openrc/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100 @@ -1708,11 +1708,22 @@ def is_service_enabled?(service) if ISSYSTEMCTL @@ -238,9 +238,9 @@ diff -uPNr pcs-0.10.7/pcsd/pcs.rb pcs-0.10.7-openrc/pcsd/pcs.rb end _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) return (retcode == 0) -diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb ---- pcs-0.10.7/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100 -+++ pcs-0.10.7-openrc/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100 +diff -uPNr pcs-0.10.8/pcsd/settings.rb pcs-0.10.8-openrc/pcsd/settings.rb +--- pcs-0.10.8/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100 ++++ pcs-0.10.8-openrc/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100 @@ -3,7 +3,7 @@ PCSD_EXEC_LOCATION = '/usr/lib/pcsd/' PCSD_VAR_LOCATION = '/var/lib/pcsd/' @@ -250,9 +250,9 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb pcs-0.10.7-openrc/pcsd/settings.rb CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' -diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb.debian ---- pcs-0.10.7/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100 -+++ pcs-0.10.7-openrc/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100 +diff -uPNr pcs-0.10.8/pcsd/settings.rb.debian pcs-0.10.8-openrc/pcsd/settings.rb.debian +--- pcs-0.10.8/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100 ++++ pcs-0.10.8-openrc/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100 @@ -3,7 +3,7 @@ PCSD_EXEC_LOCATION = '/usr/share/pcsd/' PCSD_VAR_LOCATION = '/var/lib/pcsd/' @@ -262,9 +262,9 @@ diff -uPNr pcs-0.10.7/pcsd/settings.rb.debian pcs-0.10.7-openrc/pcsd/settings.rb CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' -diff -uPNr pcs-0.10.7/pcs_test/tier0/lib/test_external.py pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py ---- pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100 -+++ pcs-0.10.7-openrc/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100 +diff -uPNr pcs-0.10.8/pcs_test/tier0/lib/test_external.py pcs-0.10.8-openrc/pcs_test/tier0/lib/test_external.py +--- pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100 ++++ pcs-0.10.8-openrc/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100 @@ -16,8 +16,8 @@ import pcs.lib.external as lib