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 9E5E813835C for ; Mon, 12 Apr 2021 05:39:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1AA6E0855; Mon, 12 Apr 2021 05:39:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 C5C65E0858 for ; Mon, 12 Apr 2021 05:39:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 CE033340C69 for ; Mon, 12 Apr 2021 05:39:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE142720 for ; Mon, 12 Apr 2021 05:38:51 +0000 (UTC) From: "Theo Anderson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Anderson" Message-ID: <1618156281.e6581a614a430e488146fbc25d46eeaced82f8ac.telans@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.7.patch sys-cluster/pcs/files/openrc-0.10.8.patch sys-cluster/pcs/files/pcsd-daemon.service.patch X-VCS-Directories: sys-cluster/pcs/files/ X-VCS-Committer: telans X-VCS-Committer-Name: Theo Anderson X-VCS-Revision: e6581a614a430e488146fbc25d46eeaced82f8ac X-VCS-Branch: master Date: Mon, 12 Apr 2021 05:38:51 +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: 509f4b06-53bf-46b7-a12e-9722d6a845ad X-Archives-Hash: c8d850da9b0b508c8a46a1ebd438bb77 commit: e6581a614a430e488146fbc25d46eeaced82f8ac Author: Alessandro Barbieri gmail com> AuthorDate: Sun Apr 11 15:50:52 2021 +0000 Commit: Theo Anderson posteo de> CommitDate: Sun Apr 11 15:51:21 2021 +0000 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.debian 2020-12-15 17:02:49.055879169 +0100 ++++ b/pcs-0.10.7/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 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.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 +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 @@ -3,7 +3,7 @@ PCSD_EXEC_LOCATION = '/usr/lib/pcsd/' PCSD_VAR_LOCATION = '/var/lib/pcsd/' @@ -251,9 +251,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 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 @@ -3,7 +3,7 @@ PCSD_EXEC_LOCATION = '/usr/share/pcsd/' PCSD_VAR_LOCATION = '/var/lib/pcsd/' @@ -263,9 +263,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 a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py +--- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100 ++++ b/pcs-0.10.7/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 diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch b/sys-cluster/pcs/files/openrc-0.10.8.patch index 4cd3915e5..b7dcbce8c 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.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 +diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py +--- a/pcs-0.10.8/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100 ++++ b/pcs-0.10.8/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.8/pcs/lib/external.py pcs-0.10.8-openrc/pcs/lib/external.py 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 +diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_default.py +--- a/pcs-0.10.8/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100 ++++ b/pcs-0.10.8/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.8/pcs/settings_default.py pcs-0.10.8-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.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 +diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debian +--- a/pcs-0.10.8/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100 ++++ b/pcs-0.10.8/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.8/pcs/settings.py.debian pcs-0.10.8-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.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 +diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py +--- a/pcs-0.10.8/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100 ++++ b/pcs-0.10.8/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.8/pcs/utils.py pcs-0.10.8-openrc/pcs/utils.py ) 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 +diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb +--- a/pcs-0.10.8/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100 ++++ b/pcs-0.10.8/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.8/pcsd/pcs.rb pcs-0.10.8-openrc/pcsd/pcs.rb 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 +diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb +--- a/pcs-0.10.8/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100 ++++ b/pcs-0.10.8/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.8/pcsd/settings.rb pcs-0.10.8-openrc/pcsd/settings.rb 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 +diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.debian +--- a/pcs-0.10.8/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100 ++++ b/pcs-0.10.8/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.8/pcsd/settings.rb.debian pcs-0.10.8-openrc/pcsd/settings.rb 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 +diff -uPNr a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py +--- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100 ++++ b/pcs-0.10.8/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 diff --git a/sys-cluster/pcs/files/pcsd-daemon.service.patch b/sys-cluster/pcs/files/pcsd-daemon.service.patch index fa86ef764..ab615c366 100644 --- a/sys-cluster/pcs/files/pcsd-daemon.service.patch +++ b/sys-cluster/pcs/files/pcsd-daemon.service.patch @@ -1,5 +1,5 @@ ---- pcs-0.10.8/pcsd/pcsd-ruby.service 2021-02-01 09:22:26.000000000 -0000 -+++ pcs-0.10.8/pcsd/pcsd-ruby.service.new 2021-04-11 14:13:00.176650050 -0000 +--- a/pcs-0.10.8/pcsd/pcsd-ruby.service 2021-02-01 09:22:26.000000000 -0000 ++++ b/pcs-0.10.8/pcsd/pcsd-ruby.service 2021-04-11 14:13:00.176650050 -0000 @@ -5,13 +5,12 @@ Requires=network-online.target After=network-online.target