| 1 |
commit: 6eb0e7e6aed0f60a129f771eb9382a1ef63e2913 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Apr 21 01:51:18 2021 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Wed Apr 21 01:51:18 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6eb0e7e6 |
| 7 |
|
| 8 |
sys-cluster/pcs: scrub patch |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 12 |
|
| 13 |
sys-cluster/pcs/files/openrc-0.10.7.patch | 40 +++++++++------------- |
| 14 |
sys-cluster/pcs/files/openrc-0.10.8.patch | 40 +++++++++------------- |
| 15 |
.../pcs/files/remove-ruby-bundle-path.patch | 4 +-- |
| 16 |
3 files changed, 34 insertions(+), 50 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sys-cluster/pcs/files/openrc-0.10.7.patch b/sys-cluster/pcs/files/openrc-0.10.7.patch |
| 19 |
index 96a4b7e17..18c56936a 100644 |
| 20 |
--- a/sys-cluster/pcs/files/openrc-0.10.7.patch |
| 21 |
+++ b/sys-cluster/pcs/files/openrc-0.10.7.patch |
| 22 |
@@ -1,6 +1,5 @@ |
| 23 |
-diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py |
| 24 |
---- a/pcs-0.10.7/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100 |
| 25 |
-+++ b/pcs-0.10.7/pcs/lib/external.py 2020-12-15 21:13:41.878627331 +0100 |
| 26 |
+--- a/pcs-0.10.7/pcs/lib/external.py |
| 27 |
++++ b/pcs-0.10.7/pcs/lib/external.py |
| 28 |
@@ -13,8 +13,8 @@ |
| 29 |
from pcs.lib.errors import LibraryError |
| 30 |
|
| 31 |
@@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.7/pcs/lib/external.py b/pcs-0.10.7/pcs/lib/external.py |
| 32 |
if return_code != 0: |
| 33 |
return [] |
| 34 |
|
| 35 |
-diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_default.py |
| 36 |
---- a/pcs-0.10.7/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100 |
| 37 |
-+++ b/pcs-0.10.7/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100 |
| 38 |
+--- a/pcs-0.10.7/pcs/settings_default.py |
| 39 |
++++ b/pcs-0.10.7/pcs/settings_default.py |
| 40 |
@@ -1,8 +1,8 @@ |
| 41 |
import os.path |
| 42 |
|
| 43 |
@@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings_default.py b/pcs-0.10.7/pcs/settings_defaul |
| 44 |
# this limit is also mentioned in docs, change there as well |
| 45 |
sbd_max_device_num = 3 |
| 46 |
# message types are also mentioned in docs, change there as well |
| 47 |
-diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debian |
| 48 |
---- a/pcs-0.10.7/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100 |
| 49 |
-+++ b/pcs-0.10.7/pcs/settings.py.debian 2020-12-16 09:36:10.493104892 +0100 |
| 50 |
+--- a/pcs-0.10.7/pcs/settings.py.debian |
| 51 |
++++ b/pcs-0.10.7/pcs/settings.py.debian |
| 52 |
@@ -1,10 +1,10 @@ |
| 53 |
from pcs.settings_default import * |
| 54 |
-service_binary = "/usr/sbin/service" |
| 55 |
@@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.7/pcs/settings.py.debian b/pcs-0.10.7/pcs/settings.py.debi |
| 56 |
pcsd_exec_location = "/usr/share/pcsd/" |
| 57 |
pcsd_gem_path = None |
| 58 |
pcsd_config = "/etc/default/pcsd" |
| 59 |
-diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py |
| 60 |
---- a/pcs-0.10.7/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100 |
| 61 |
-+++ b/pcs-0.10.7/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100 |
| 62 |
+--- a/pcs-0.10.7/pcs/utils.py |
| 63 |
++++ b/pcs-0.10.7/pcs/utils.py |
| 64 |
@@ -2187,7 +2187,7 @@ |
| 65 |
) |
| 66 |
else: |
| 67 |
@@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.7/pcs/utils.py b/pcs-0.10.7/pcs/utils.py |
| 68 |
) |
| 69 |
return join_multilines([stderr, stdout]), retval |
| 70 |
|
| 71 |
-diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb |
| 72 |
---- a/pcs-0.10.7/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100 |
| 73 |
-+++ b/pcs-0.10.7/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100 |
| 74 |
+--- a/pcs-0.10.7/pcsd/pcs.rb |
| 75 |
++++ b/pcs-0.10.7/pcsd/pcs.rb |
| 76 |
@@ -1708,11 +1708,22 @@ |
| 77 |
def is_service_enabled?(service) |
| 78 |
if ISSYSTEMCTL |
| 79 |
@@ -239,9 +234,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/pcs.rb b/pcs-0.10.7/pcsd/pcs.rb |
| 80 |
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) |
| 81 |
return (retcode == 0) |
| 82 |
I file binari a/pcs-0.10.7/pcsd/.pcs.rb.swp e b/pcs-0.10.7/pcsd/.pcs.rb.swp sono diversi |
| 83 |
-diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb |
| 84 |
---- a/pcs-0.10.7/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100 |
| 85 |
-+++ b/pcs-0.10.7/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100 |
| 86 |
+--- a/pcs-0.10.7/pcsd/settings.rb |
| 87 |
++++ b/pcs-0.10.7/pcsd/settings.rb |
| 88 |
@@ -3,7 +3,7 @@ |
| 89 |
PCSD_EXEC_LOCATION = '/usr/lib/pcsd/' |
| 90 |
PCSD_VAR_LOCATION = '/var/lib/pcsd/' |
| 91 |
@@ -251,9 +245,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb b/pcs-0.10.7/pcsd/settings.rb |
| 92 |
|
| 93 |
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' |
| 94 |
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' |
| 95 |
-diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.debian |
| 96 |
---- a/pcs-0.10.7/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100 |
| 97 |
-+++ b/pcs-0.10.7/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100 |
| 98 |
+--- a/pcs-0.10.7/pcsd/settings.rb.debian |
| 99 |
++++ b/pcs-0.10.7/pcsd/settings.rb.debian |
| 100 |
@@ -3,7 +3,7 @@ |
| 101 |
PCSD_EXEC_LOCATION = '/usr/share/pcsd/' |
| 102 |
PCSD_VAR_LOCATION = '/var/lib/pcsd/' |
| 103 |
@@ -263,9 +256,8 @@ diff -uPNr a/pcs-0.10.7/pcsd/settings.rb.debian b/pcs-0.10.7/pcsd/settings.rb.de |
| 104 |
|
| 105 |
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' |
| 106 |
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' |
| 107 |
-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 |
| 108 |
---- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100 |
| 109 |
-+++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100 |
| 110 |
+--- a/pcs-0.10.7/pcs_test/tier0/lib/test_external.py |
| 111 |
++++ b/pcs-0.10.7/pcs_test/tier0/lib/test_external.py |
| 112 |
@@ -16,8 +16,8 @@ |
| 113 |
import pcs.lib.external as lib |
| 114 |
|
| 115 |
|
| 116 |
diff --git a/sys-cluster/pcs/files/openrc-0.10.8.patch b/sys-cluster/pcs/files/openrc-0.10.8.patch |
| 117 |
index b7dcbce8c..5a1261002 100644 |
| 118 |
--- a/sys-cluster/pcs/files/openrc-0.10.8.patch |
| 119 |
+++ b/sys-cluster/pcs/files/openrc-0.10.8.patch |
| 120 |
@@ -1,6 +1,5 @@ |
| 121 |
-diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py |
| 122 |
---- a/pcs-0.10.8/pcs/lib/external.py 2020-12-15 17:02:49.055879169 +0100 |
| 123 |
-+++ b/pcs-0.10.8/pcs/lib/external.py 2020-12-15 21:13:41.878627331 +0100 |
| 124 |
+--- a/pcs-0.10.8/pcs/lib/external.py |
| 125 |
++++ b/pcs-0.10.8/pcs/lib/external.py |
| 126 |
@@ -13,8 +13,8 @@ |
| 127 |
from pcs.lib.errors import LibraryError |
| 128 |
|
| 129 |
@@ -82,9 +81,8 @@ diff -uPNr a/pcs-0.10.8/pcs/lib/external.py b/pcs-0.10.8/pcs/lib/external.py |
| 130 |
if return_code != 0: |
| 131 |
return [] |
| 132 |
|
| 133 |
-diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_default.py |
| 134 |
---- a/pcs-0.10.8/pcs/settings_default.py 2020-12-15 17:02:49.056879154 +0100 |
| 135 |
-+++ b/pcs-0.10.8/pcs/settings_default.py 2020-12-16 21:59:28.541361537 +0100 |
| 136 |
+--- a/pcs-0.10.8/pcs/settings_default.py |
| 137 |
++++ b/pcs-0.10.8/pcs/settings_default.py |
| 138 |
@@ -1,8 +1,8 @@ |
| 139 |
import os.path |
| 140 |
|
| 141 |
@@ -114,9 +112,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings_default.py b/pcs-0.10.8/pcs/settings_defaul |
| 142 |
# this limit is also mentioned in docs, change there as well |
| 143 |
sbd_max_device_num = 3 |
| 144 |
# message types are also mentioned in docs, change there as well |
| 145 |
-diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debian |
| 146 |
---- a/pcs-0.10.8/pcs/settings.py.debian 2020-12-15 17:02:49.055879169 +0100 |
| 147 |
-+++ b/pcs-0.10.8/pcs/settings.py.debian 2020-12-16 09:36:10.493104892 +0100 |
| 148 |
+--- a/pcs-0.10.8/pcs/settings.py.debian |
| 149 |
++++ b/pcs-0.10.8/pcs/settings.py.debian |
| 150 |
@@ -1,10 +1,10 @@ |
| 151 |
from pcs.settings_default import * |
| 152 |
-service_binary = "/usr/sbin/service" |
| 153 |
@@ -133,9 +130,8 @@ diff -uPNr a/pcs-0.10.8/pcs/settings.py.debian b/pcs-0.10.8/pcs/settings.py.debi |
| 154 |
pcsd_exec_location = "/usr/share/pcsd/" |
| 155 |
pcsd_gem_path = None |
| 156 |
pcsd_config = "/etc/default/pcsd" |
| 157 |
-diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py |
| 158 |
---- a/pcs-0.10.8/pcs/utils.py 2020-12-15 17:02:49.056879154 +0100 |
| 159 |
-+++ b/pcs-0.10.8/pcs/utils.py 2020-12-16 21:57:09.487686936 +0100 |
| 160 |
+--- a/pcs-0.10.8/pcs/utils.py |
| 161 |
++++ b/pcs-0.10.8/pcs/utils.py |
| 162 |
@@ -2187,7 +2187,7 @@ |
| 163 |
) |
| 164 |
else: |
| 165 |
@@ -154,9 +150,8 @@ diff -uPNr a/pcs-0.10.8/pcs/utils.py b/pcs-0.10.8/pcs/utils.py |
| 166 |
) |
| 167 |
return join_multilines([stderr, stdout]), retval |
| 168 |
|
| 169 |
-diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb |
| 170 |
---- a/pcs-0.10.8/pcsd/pcs.rb 2020-12-15 17:02:49.063879050 +0100 |
| 171 |
-+++ b/pcs-0.10.8/pcsd/pcs.rb 2020-12-16 21:54:52.337982100 +0100 |
| 172 |
+--- a/pcs-0.10.8/pcsd/pcs.rb |
| 173 |
++++ b/pcs-0.10.8/pcsd/pcs.rb |
| 174 |
@@ -1708,11 +1708,22 @@ |
| 175 |
def is_service_enabled?(service) |
| 176 |
if ISSYSTEMCTL |
| 177 |
@@ -238,9 +233,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/pcs.rb b/pcs-0.10.8/pcsd/pcs.rb |
| 178 |
end |
| 179 |
_, _, retcode = run_cmd(PCSAuth.getSuperuserAuth(), *cmd) |
| 180 |
return (retcode == 0) |
| 181 |
-diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb |
| 182 |
---- a/pcs-0.10.8/pcsd/settings.rb 2020-12-15 17:02:49.065879020 +0100 |
| 183 |
-+++ b/pcs-0.10.8/pcsd/settings.rb 2020-12-16 09:26:46.782426991 +0100 |
| 184 |
+--- a/pcs-0.10.8/pcsd/settings.rb |
| 185 |
++++ b/pcs-0.10.8/pcsd/settings.rb |
| 186 |
@@ -3,7 +3,7 @@ |
| 187 |
PCSD_EXEC_LOCATION = '/usr/lib/pcsd/' |
| 188 |
PCSD_VAR_LOCATION = '/var/lib/pcsd/' |
| 189 |
@@ -250,9 +244,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb b/pcs-0.10.8/pcsd/settings.rb |
| 190 |
|
| 191 |
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' |
| 192 |
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' |
| 193 |
-diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.debian |
| 194 |
---- a/pcs-0.10.8/pcsd/settings.rb.debian 2020-12-15 17:02:49.065879020 +0100 |
| 195 |
-+++ b/pcs-0.10.8/pcsd/settings.rb.debian 2020-12-16 18:52:24.289921676 +0100 |
| 196 |
+--- a/pcs-0.10.8/pcsd/settings.rb.debian |
| 197 |
++++ b/pcs-0.10.8/pcsd/settings.rb.debian |
| 198 |
@@ -3,7 +3,7 @@ |
| 199 |
PCSD_EXEC_LOCATION = '/usr/share/pcsd/' |
| 200 |
PCSD_VAR_LOCATION = '/var/lib/pcsd/' |
| 201 |
@@ -262,9 +255,8 @@ diff -uPNr a/pcs-0.10.8/pcsd/settings.rb.debian b/pcs-0.10.8/pcsd/settings.rb.de |
| 202 |
|
| 203 |
CRT_FILE = PCSD_VAR_LOCATION + 'pcsd.crt' |
| 204 |
KEY_FILE = PCSD_VAR_LOCATION + 'pcsd.key' |
| 205 |
-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 |
| 206 |
---- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2020-12-15 17:02:49.061879080 +0100 |
| 207 |
-+++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py 2020-12-16 21:52:40.531155033 +0100 |
| 208 |
+--- a/pcs-0.10.8/pcs_test/tier0/lib/test_external.py |
| 209 |
++++ b/pcs-0.10.8/pcs_test/tier0/lib/test_external.py |
| 210 |
@@ -16,8 +16,8 @@ |
| 211 |
import pcs.lib.external as lib |
| 212 |
|
| 213 |
|
| 214 |
diff --git a/sys-cluster/pcs/files/remove-ruby-bundle-path.patch b/sys-cluster/pcs/files/remove-ruby-bundle-path.patch |
| 215 |
index 69052b8e3..bf54e59f0 100644 |
| 216 |
--- a/sys-cluster/pcs/files/remove-ruby-bundle-path.patch |
| 217 |
+++ b/sys-cluster/pcs/files/remove-ruby-bundle-path.patch |
| 218 |
@@ -1,5 +1,5 @@ |
| 219 |
---- a/pcs/settings_default.py 2018-11-23 12:57:53.000000000 +0000 |
| 220 |
-+++ b/pcs/settings_default.py 2019-05-11 20:07:19.080000000 +0000 |
| 221 |
+--- a/pcs/settings_default.py |
| 222 |
++++ b/pcs/settings_default.py |
| 223 |
@@ -81,7 +81,7 @@ |
| 224 |
]) |
| 225 |
# Set pcsd_gem_path to None if there are no bundled ruby gems and the path does |
Archives