[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Alessandro Barbieri" <lssndrbarbieri@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/
Date: Wed, 21 Apr 2021 01:55:57 +0000 (UTC)	[thread overview]
Message-ID: <1618969878.6eb0e7e6aed0f60a129f771eb9382a1ef63e2913.Alessandro-Barbieri@gentoo> (raw)

commit:     6eb0e7e6aed0f60a129f771eb9382a1ef63e2913
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Wed Apr 21 01:51:18 2021 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Wed Apr 21 01:51:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6eb0e7e6

sys-cluster/pcs: scrub patch

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 sys-cluster/pcs/files/openrc-0.10.7.patch          | 40 +++++++++-------------
 sys-cluster/pcs/files/openrc-0.10.8.patch          | 40 +++++++++-------------
 .../pcs/files/remove-ruby-bundle-path.patch        |  4 +--
 3 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch
index 96a4b7e17..18c56936a 100644
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch
@@ -1,6 +1,5 @@
-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
+--- 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
  
@@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py
      if return_code != 0:
          return []
  
-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
+--- a/pcs-0.10.7/pcs/settings_default.py
++++ b/pcs-0.10.7/pcs/settings_default.py
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_defaul
  # 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 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
+--- a/pcs-0.10.7/pcs/settings.py.debian
++++ b/pcs-0.10.7/pcs/settings.py.debian
 @@ -1,10 +1,10 @@
  from pcs.settings_default import *
 -service_binary = "/usr/sbin/service"
@@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debi
  pcsd_exec_location = "/usr/share/pcsd/"
  pcsd_gem_path = None
  pcsd_config = "/etc/default/pcsd"
-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
+--- a/pcs-0.10.7/pcs/utils.py
++++ b/pcs-0.10.7/pcs/utils.py
 @@ -2187,7 +2187,7 @@
          )
      else:
@@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py
          )
      return join_multilines([stderr, stdout]), retval
  
-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
+--- a/pcs-0.10.7/pcsd/pcs.rb
++++ b/pcs-0.10.7/pcsd/pcs.rb
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -239,9 +234,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
 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
+--- a/pcs-0.10.7/pcsd/settings.rb
++++ b/pcs-0.10.7/pcsd/settings.rb
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -251,9 +245,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-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
+--- a/pcs-0.10.7/pcsd/settings.rb.debian
++++ b/pcs-0.10.7/pcsd/settings.rb.debian
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -263,9 +256,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.de
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-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
+--- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
++++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py
 @@ -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 b7dcbce8c..5a1261002 100644
--- a/sys-cluster/pcs/files/openrc-0.10.8.patch
+++ b/sys-cluster/pcs/files/openrc-0.10.8.patch
@@ -1,6 +1,5 @@
-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
+--- a/pcs-0.10.8/pcs/lib/external.py
++++ b/pcs-0.10.8/pcs/lib/external.py
 @@ -13,8 +13,8 @@
  from pcs.lib.errors import LibraryError
  
@@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py
      if return_code != 0:
          return []
  
-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
+--- a/pcs-0.10.8/pcs/settings_default.py
++++ b/pcs-0.10.8/pcs/settings_default.py
 @@ -1,8 +1,8 @@
  import os.path
  
@@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_defaul
  # 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 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
+--- a/pcs-0.10.8/pcs/settings.py.debian
++++ b/pcs-0.10.8/pcs/settings.py.debian
 @@ -1,10 +1,10 @@
  from pcs.settings_default import *
 -service_binary = "/usr/sbin/service"
@@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debi
  pcsd_exec_location = "/usr/share/pcsd/"
  pcsd_gem_path = None
  pcsd_config = "/etc/default/pcsd"
-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
+--- a/pcs-0.10.8/pcs/utils.py
++++ b/pcs-0.10.8/pcs/utils.py
 @@ -2187,7 +2187,7 @@
          )
      else:
@@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py
          )
      return join_multilines([stderr, stdout]), retval
  
-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
+--- a/pcs-0.10.8/pcsd/pcs.rb
++++ b/pcs-0.10.8/pcsd/pcs.rb
 @@ -1708,11 +1708,22 @@
  def is_service_enabled?(service)
    if ISSYSTEMCTL
@@ -238,9 +233,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb
    end
    _, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd)
    return (retcode == 0)
-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
+--- a/pcs-0.10.8/pcsd/settings.rb
++++ b/pcs-0.10.8/pcsd/settings.rb
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/lib/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -250,9 +244,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-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
+--- a/pcs-0.10.8/pcsd/settings.rb.debian
++++ b/pcs-0.10.8/pcsd/settings.rb.debian
 @@ -3,7 +3,7 @@
  PCSD_EXEC_LOCATION = '/usr/share/pcsd/'
  PCSD_VAR_LOCATION = '/var/lib/pcsd/'
@@ -262,9 +255,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.de
  
  CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt'
  KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key'
-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
+--- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
++++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py
 @@ -16,8 +16,8 @@
  import pcs.lib.external as lib
  

diff --git a/sys-cluster/pcs/files/remove-ruby-bundle-path.patch b/sys-cluster/pcs/files/remove-ruby-bundle-path.patch
index 69052b8e3..bf54e59f0 100644
--- a/sys-cluster/pcs/files/remove-ruby-bundle-path.patch
+++ b/sys-cluster/pcs/files/remove-ruby-bundle-path.patch
@@ -1,5 +1,5 @@
---- a/pcs/settings_default.py	2018-11-23 12:57:53.000000000 +0000
-+++ b/pcs/settings_default.py	2019-05-11 20:07:19.080000000 +0000
+--- a/pcs/settings_default.py
++++ b/pcs/settings_default.py
 @@ -81,7 +81,7 @@
  ])
  # Set pcsd_gem_path to None if there are no bundled ruby gems and the path does

next             reply	other threads:[~2021-04-21  1:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-21  1:55 Alessandro Barbieri [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-04-24 11:30 [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/ Andrea Postiglione
2022-04-08 10:11 Andrea Postiglione
2021-04-11 15:51 Alessandro Barbieri
2021-03-20 12:08 Andrea Postiglione
2020-12-16 21:44 Andrea Postiglione
2020-12-16 17:56 Andrea Postiglione
2020-12-16  9:27 Andrea Postiglione
2020-12-16  8:40 Andrea Postiglione
2020-12-06 17:38 Andrea Postiglione

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:96a4b7e1 dfblob:18c56936 dfblob:b7dcbce8 dfblob:5a126100
dfblob:69052b8e dfblob:bf54e59f )
 OR (
bs:"[gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/pcs/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1618969878.6eb0e7e6aed0f60a129f771eb9382a1ef63e2913.Alessandro-Barbieri@gentoo \
    --to=lssndrbarbieri@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox