rpms
/
pcs
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import pcs-0.11.8-1.el9

Browse Source
c9 imports/c9/pcs-0.11.8-1.el9
MSVSphere Packaging Team 3 months ago
parent e513b601ba
commit 6221de44ac
Signed by: sys_gitsync
GPG Key ID: B2B0B9F29E528FE8
6 changed files with 93 additions and 131 deletions
Show Stats Download Patch File Download Diff File

26
.gitignore vendored
Unescape View File

@ -1,19 +1,23 @@
SOURCES/backports-3.24.1.gem
SOURCES/childprocess-4.1.0.gem
SOURCES/backports-3.25.0.gem
SOURCES/base64-0.2.0.gem
SOURCES/childprocess-5.0.0.gem
SOURCES/dacite-1.8.1.tar.gz
SOURCES/ethon-0.16.0.gem
SOURCES/ffi-1.16.3.gem
SOURCES/mustermann-3.0.0.gem
SOURCES/nio4r-2.5.9.gem
SOURCES/pcs-0.11.7.tar.gz
SOURCES/pcs-web-ui-0.1.18.tar.gz
SOURCES/pcs-web-ui-node-modules-0.1.18.tar.xz
SOURCES/puma-6.4.0.gem
SOURCES/nio4r-2.7.3.gem
SOURCES/pcs-0.11.8.tar.gz
SOURCES/pcs-web-ui-0.1.20.tar.gz
SOURCES/pcs-web-ui-node-modules-0.1.20.tar.xz
SOURCES/puma-6.4.2.gem
SOURCES/pyagentx-0.4.pcs.2.tar.gz
SOURCES/rack-2.2.8.1.gem
SOURCES/rack-protection-3.1.0.gem
SOURCES/rack-3.0.11.gem
SOURCES/rack-protection-4.0.0.gem
SOURCES/rack-session-2.0.0.gem
SOURCES/rack-test-2.1.0.gem
SOURCES/rackup-2.1.0.gem
SOURCES/ruby2_keywords-0.0.5.gem
SOURCES/sinatra-3.1.0.gem
SOURCES/sinatra-4.0.0.gem
SOURCES/tilt-2.3.0.gem
SOURCES/tornado-6.3.3.tar.gz
SOURCES/tornado-6.4.0.tar.gz
SOURCES/webrick-1.8.1.gem

26
.pcs.metadata
Unescape View File

@ -1,19 +1,23 @@
0ef72a288913e220695ad62718aeb75171924028 SOURCES/backports-3.24.1.gem
81639c8886342e01d189c10a6beab6ad0526dc4e SOURCES/childprocess-4.1.0.gem
7bfaf5b42c0992bbc5055d7bd4013f0ca4731775 SOURCES/backports-3.25.0.gem
ea3a591bdfa93655d8eec9d7bdd7fb87ecb5616a SOURCES/base64-0.2.0.gem
8f910640f84d085707138aa70d6eedb7df10ca73 SOURCES/childprocess-5.0.0.gem
07b26abbf7ff0dcba5c7f9e814ff7eebafefb058 SOURCES/dacite-1.8.1.tar.gz
5b56a68268708c474bef04550639ded3add5e946 SOURCES/ethon-0.16.0.gem
10e4cf0e11ef4581ec4ad5fe2cdf3c78b6077d39 SOURCES/ffi-1.16.3.gem
e892678aaf02ccb27f3a6cd58482cda00aea6ce8 SOURCES/mustermann-3.0.0.gem
2f65d371f5f37460ad74afcedcb97d2b41a46806 SOURCES/nio4r-2.5.9.gem
3aec6fd614169e4d0272a71eb3688ad3a54f91b3 SOURCES/pcs-0.11.7.tar.gz
59d3e570bcbb7b3bcb2b9bf519425b2036e0faad SOURCES/pcs-web-ui-0.1.18.tar.gz
252cc42bf9715209c67981da06f2791a91c2f3fb SOURCES/pcs-web-ui-node-modules-0.1.18.tar.xz
d6049c4555f3c9d198e6eb1d7e53ce9b68e175ff SOURCES/puma-6.4.0.gem
632c455f6e27a5f568e9d24761b8a4246cfcc603 SOURCES/nio4r-2.7.3.gem
ee97cec01761e5b727a265eb551d784dfdc6f548 SOURCES/pcs-0.11.8.tar.gz
c75288254b282cb8aed7307fd18dbdd8dda9252d SOURCES/pcs-web-ui-0.1.20.tar.gz
1dbe81ac08cfe60da25cc8650292cdc7c33cdb89 SOURCES/pcs-web-ui-node-modules-0.1.20.tar.xz
623cb3ebec75de449cad3c9f50d5d370edf9e2f9 SOURCES/puma-6.4.2.gem
3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz
fcdee79d1b0bb7e3666bad96321fc124bc8215e9 SOURCES/rack-2.2.8.1.gem
d34d1d308e3a1028c85bd0a7e4ba1d4f1ec0f725 SOURCES/rack-protection-3.1.0.gem
a156440aaee17f60b83f2f681ec60fce2329a480 SOURCES/rack-3.0.11.gem
f91158b296882aa5b3798ff6c24f01cdf233ef48 SOURCES/rack-protection-4.0.0.gem
9e7935696af0b64cc5f5ce2dfeabdb7e0d3a84f0 SOURCES/rack-session-2.0.0.gem
ae09ea83748b55875edc3708fffba90db180cb8e SOURCES/rack-test-2.1.0.gem
657a2dc63695e1bf9eb5feae4d9d65a7c6b900ad SOURCES/rackup-2.1.0.gem
d017b9e4d1978e0b3ccc3e2a31493809e4693cd3 SOURCES/ruby2_keywords-0.0.5.gem
cd57dfa17b103c514dd0b107ebda6ee4bfb6b0d4 SOURCES/sinatra-3.1.0.gem
28c671c6d061475ed2bfd3e6a4a17970a0a12d8a SOURCES/sinatra-4.0.0.gem
4a38a9a55887b2882182a2c5771e592efe514e5e SOURCES/tilt-2.3.0.gem
4db49c4d5570e6fdc7ec845335bb341ebd5346a7 SOURCES/tornado-6.3.3.tar.gz
ee95560139af1bb8d0d49d4acf0518deb04877d2 SOURCES/tornado-6.4.0.tar.gz
0696afa9cc0b56f541aacb7483aecdb385a5bd37 SOURCES/webrick-1.8.1.gem

37
SOURCES/RHEL-45237-01-use-forkserver-process-creation-method.patch
Unescape View File

@ -1,37 +0,0 @@
From 3b116169ec0f2213968780b6a2e3a85743a1a30f Mon Sep 17 00:00:00 2001
From: Miroslav Lisik <mlisik@redhat.com>
Date: Thu, 21 Mar 2024 13:32:10 +0100
Subject: [PATCH] Use 'forkserver' process creation method for multiprocessing
* 'fork' method could cause deadlock in multiprocessing.pool.Pool on
terminate (https://github.com/python/cpython/issues/73945)
* https://docs.python.org/3/library/multiprocessing.html#contexts-and-start-methods
---
pcs/daemon/run.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pcs/daemon/run.py b/pcs/daemon/run.py
index 5fa083fd..cecce750 100644
--- a/pcs/daemon/run.py
+++ b/pcs/daemon/run.py
@@ -1,3 +1,4 @@
+import multiprocessing as mp
import os
import signal
import socket
@@ -157,6 +158,12 @@ def _print_version(argv: StringCollection) -> None:
def main(argv=None) -> None:
+ # set the way how processes are started
+ # https://docs.python.org/3/library/multiprocessing.html#contexts-and-start-methods
+ # avoid deadlock in multiprocessing.pool.Pool on terminate
+ # https://github.com/python/cpython/issues/73945
+ mp.set_start_method(method="forkserver")
+
argv = argv if argv is not None else sys.argv[1:]
if "--version" in argv:
_print_version(argv)
--
2.45.2

43
SOURCES/RHEL-45237-02-fix-logging-handlers-imports.patch
Unescape View File

@ -1,43 +0,0 @@
From 661183b7352ee3e1d13398ad7571db1f811da50d Mon Sep 17 00:00:00 2001
From: Miroslav Lisik <mlisik@redhat.com>
Date: Fri, 22 Mar 2024 15:01:19 +0100
Subject: [PATCH] fix logging handlers imports
* https://stackoverflow.com/questions/64951836/python-logging-attributeerror-module-logging-has-no-attribute-handlers/65814814#65814814
---
pcs/daemon/async_tasks/worker/logging.py | 3 ++-
pcs/daemon/log.py | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/pcs/daemon/async_tasks/worker/logging.py b/pcs/daemon/async_tasks/worker/logging.py
index cf5fb287..1319d651 100644
--- a/pcs/daemon/async_tasks/worker/logging.py
+++ b/pcs/daemon/async_tasks/worker/logging.py
@@ -1,4 +1,5 @@
import logging
+import logging.handlers
import multiprocessing as mp
import os
@@ -44,7 +45,7 @@ def setup_worker_logger(queue: mp.Queue) -> logging.Logger:
logger = logging.getLogger(WORKER_LOGGER)
logger.setLevel(logging.DEBUG)
- queue_handler = logging.handlers.QueueHandler(queue) # type: ignore
+ queue_handler = logging.handlers.QueueHandler(queue)
logger.addHandler(queue_handler)
return logger
diff --git a/pcs/daemon/log.py b/pcs/daemon/log.py
index 07ca764a..a38cbbdf 100644
--- a/pcs/daemon/log.py
+++ b/pcs/daemon/log.py
@@ -1,4 +1,5 @@
import logging
+import logging.handlers
LOGGER_NAMES = [
"pcs.daemon",
--
2.45.2

10
SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch
Unescape View File

@ -1,4 +1,4 @@
From cf1e0cc06a94804a4a98a12ee06d09e5786bad1b Mon Sep 17 00:00:00 2001
From 071b189a3a72610361f8d31d2ebbb0b9083c872f Mon Sep 17 00:00:00 2001
From: Ivan Devat <idevat@redhat.com>
Date: Tue, 20 Nov 2018 15:03:56 +0100
Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9
@ -9,7 +9,7 @@ Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9
2 files changed, 3 insertions(+)
diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
index 55f4b4a9..8cc9360d 100644
index 63c40b78..f69a75b8 100644
--- a/pcs/pcs.8.in
+++ b/pcs/pcs.8.in
@@ -479,6 +479,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
@ -22,10 +22,10 @@ index 55f4b4a9..8cc9360d 100644
.br
Transport options are: ip_version, netmtu
diff --git a/pcs/usage.py b/pcs/usage.py
index cc6c5803..a7d4b24b 100644
index a4af30d4..7c7fc7ea 100644
--- a/pcs/usage.py
+++ b/pcs/usage.py
@@ -1482,6 +1482,7 @@ Commands:
@@ -1490,6 +1490,7 @@ Commands:
hash=sha256. To disable encryption, set cipher=none and hash=none.
Transports udp and udpu:
@ -34,5 +34,5 @@ index cc6c5803..a7d4b24b 100644
support traffic encryption nor compression.
Transport options are:
--
2.43.0
2.45.2

82
SPECS/pcs.spec
Unescape View File

@ -1,14 +1,14 @@
Name: pcs
Version: 0.11.7
Release: 2%{?dist}.1
Version: 0.11.8
Release: 1%{?dist}
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPL-2.0-only: pcs
# Apache-2.0: tornado
# MIT: backports, childprocess, dacite, ethon, mustermann, rack,
# rack-protection, rack-test, sinatra, tilt
# rack-protection, rack-session, rack-test, rackup, sinatra, tilt
# MIT and (BSD-2-Clause or GPL-2.0-or-later): nio4r
# BSD-2-Clause or Ruby: ruby2_keywords
# BSD-2-Clause or Ruby: base64, ruby2_keywords, webrick
# BSD-3-Clause: puma
# BSD-3-Clause and MIT: ffi
License: GPL-2.0-only AND Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause OR Ruby) AND (BSD-2-Clause OR GPL-2.0-or-later)
@ -20,32 +20,36 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
# When specifying a commit, use its long hash
%global version_or_commit %{version}
# %%global version_or_commit aaa16e0de986890e6ca3038f907bbad331e41a87
# %%global version_or_commit be17a9beeb9a55e0c10a34cce5672ebe793bf650
%global pcs_source_name %{name}-%{version_or_commit}
# ui_commit can be determined by hash, tag or branch
%global ui_commit 0.1.18
%global ui_modules_version 0.1.18
%global ui_commit 0.1.20
%global ui_modules_version 0.1.20
%global ui_src_name pcs-web-ui-%{ui_commit}
%global pcs_snmp_pkg_name pcs-snmp
%global pyagentx_version 0.4.pcs.2
%global tornado_version 6.3.3
%global tornado_version 6.4.0
%global dacite_version 1.8.1
%global version_rubygem_backports 3.24.1
%global version_rubygem_childprocess 4.1.0
%global version_rubygem_backports 3.25.0
%global version_rubygem_base64 0.2.0
%global version_rubygem_childprocess 5.0.0
%global version_rubygem_ethon 0.16.0
%global version_rubygem_ffi 1.16.3
%global version_rubygem_mustermann 3.0.0
%global version_rubygem_nio4r 2.5.9
%global version_rubygem_puma 6.4.0
%global version_rubygem_rack 2.2.8.1
%global version_rubygem_rack_protection 3.1.0
%global version_rubygem_nio4r 2.7.3
%global version_rubygem_puma 6.4.2
%global version_rubygem_rack 3.0.11
%global version_rubygem_rack_protection 4.0.0
%global version_rubygem_rack_session 2.0.0
%global version_rubygem_rack_test 2.1.0
%global version_rubygem_rackup 2.1.0
%global version_rubygem_ruby2_keywords 0.0.5
%global version_rubygem_sinatra 3.1.0
%global version_rubygem_sinatra 4.0.0
%global version_rubygem_tilt 2.3.0
%global version_rubygem_webrick 1.8.1
%global required_pacemaker_version 2.1.0
@ -94,6 +98,10 @@ Source90: https://rubygems.org/downloads/rack-test-%{version_rubygem_rack_test}.
Source91: https://rubygems.org/downloads/sinatra-%{version_rubygem_sinatra}.gem
Source92: https://rubygems.org/downloads/tilt-%{version_rubygem_tilt}.gem
Source93: https://rubygems.org/downloads/ruby2_keywords-%{version_rubygem_ruby2_keywords}.gem
Source94: https://rubygems.org/downloads/base64-%{version_rubygem_base64}.gem
Source95: https://rubygems.org/downloads/rack-session-%{version_rubygem_rack_session}.gem
Source96: https://rubygems.org/downloads/rackup-%{version_rubygem_rackup}.gem
Source97: https://rubygems.org/downloads/webrick-%{version_rubygem_webrick}.gem
Source100: https://github.com/ClusterLabs/pcs-web-ui/archive/%{ui_commit}/%{ui_src_name}.tar.gz
Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_commit}/pcs-web-ui-node-modules-%{ui_modules_version}.tar.xz
@ -101,8 +109,6 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_comm
# pcs patches: <= 200
# Patch0: bzNUMBER-01-name.patch
Patch0: do-not-support-cluster-setup-with-udp-u-transport.patch
Patch1: RHEL-45237-01-use-forkserver-process-creation-method.patch
Patch2: RHEL-45237-02-fix-logging-handlers-imports.patch
# ui patches: >200
# Patch201: bzNUMBER-01-name.patch
@ -203,6 +209,7 @@ Requires: nss-tools
Provides: bundled(tornado) = %{tornado_version}
Provides: bundled(dacite) = %{dacite_version}
Provides: bundled(backports) = %{version_rubygem_backports}
Provides: bundled(base64) = %{version_rubygem_base64}
Provides: bundled(childprocess) = %{version_rubygem_childprocess}
Provides: bundled(ethon) = %{version_rubygem_ethon}
Provides: bundled(ffi) = %{version_rubygem_ffi}
@ -211,10 +218,13 @@ Provides: bundled(nio4r) = %{version_rubygem_nio4r}
Provides: bundled(puma) = %{version_rubygem_puma}
Provides: bundled(rack) = %{version_rubygem_rack}
Provides: bundled(rack_protection) = %{version_rubygem_rack_protection}
Provides: bundled(rack_session) = %{version_rubygem_rack_session}
Provides: bundled(rack_test) = %{version_rubygem_rack_test}
Provides: bundled(rackup) = %{version_rubygem_rackup}
Provides: bundled(ruby2_keywords) = %{version_rubygem_ruby2_keywords}
Provides: bundled(sinatra) = %{version_rubygem_sinatra}
Provides: bundled(tilt) = %{version_rubygem_tilt}
Provides: bundled(webrick) = %{version_rubygem_webrick}
%description
pcs is a corosync and pacemaker configuration tool. It permits users to
@ -227,7 +237,7 @@ Summary: Pacemaker cluster SNMP agent
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPL-2.0-only: pcs
# BSD-2-Clause: pyagentx
License: GPL-2.0-only and BSD-2-Clause
License: GPL-2.0-only AND BSD-2-Clause
URL: https://github.com/ClusterLabs/pcs
# tar for unpacking pyagentx source tarball
@ -295,8 +305,6 @@ update_times_patch(){
%autopatch -p1 -M 200
# update_times_patch %%{PATCH0}
update_times_patch %{PATCH0}
update_times_patch %{PATCH1}
update_times_patch %{PATCH2}
# generate .tarball-version if building from an untagged commit, not a released version
# autogen uses git-version-gen which uses .tarball-version for generating version number
@ -322,6 +330,10 @@ cp -f %SOURCE90 %{rubygem_cache_dir}
cp -f %SOURCE91 %{rubygem_cache_dir}
cp -f %SOURCE92 %{rubygem_cache_dir}
cp -f %SOURCE93 %{rubygem_cache_dir}
cp -f %SOURCE94 %{rubygem_cache_dir}
cp -f %SOURCE95 %{rubygem_cache_dir}
cp -f %SOURCE96 %{rubygem_cache_dir}
cp -f %SOURCE97 %{rubygem_cache_dir}
# 2) prepare python bundles
@ -361,8 +373,8 @@ mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui/static/media
ln -fs /etc/favicon.png ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui/static/media/favicon.png
# prepare license files
# some rubygems do not have a license file (thin)
mv %{rubygem_bundle_dir}/gems/backports-%{version_rubygem_backports}/LICENSE.txt backports_LICENSE.txt
mv %{rubygem_bundle_dir}/gems/base64-%{version_rubygem_base64}/LICENSE.txt base64_LICENSE.txt
mv %{rubygem_bundle_dir}/gems/childprocess-%{version_rubygem_childprocess}/LICENSE childprocess_LICENSE
mv %{rubygem_bundle_dir}/gems/ethon-%{version_rubygem_ethon}/LICENSE ethon_LICENSE
mv %{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/COPYING ffi_COPYING
@ -374,10 +386,13 @@ mv %{rubygem_bundle_dir}/gems/nio4r-%{version_rubygem_nio4r}/ext/libev/LICENSE n
mv %{rubygem_bundle_dir}/gems/puma-%{version_rubygem_puma}/LICENSE puma_LICENSE
mv %{rubygem_bundle_dir}/gems/rack-%{version_rubygem_rack}/MIT-LICENSE rack_MIT-LICENSE
mv %{rubygem_bundle_dir}/gems/rack-protection-%{version_rubygem_rack_protection}/License rack-protection_License
mv %{rubygem_bundle_dir}/gems/rack-session-%{version_rubygem_rack_session}/license.md rack-session_license.md
mv %{rubygem_bundle_dir}/gems/rack-test-%{version_rubygem_rack_test}/MIT-LICENSE.txt rack-test_MIT-LICENSE.txt
mv %{rubygem_bundle_dir}/gems/rackup-%{version_rubygem_rackup}/license.md rackup_license.md
mv %{rubygem_bundle_dir}/gems/ruby2_keywords-%{version_rubygem_ruby2_keywords}/LICENSE ruby2_keywords_LICENSE
mv %{rubygem_bundle_dir}/gems/sinatra-%{version_rubygem_sinatra}/LICENSE sinatra_LICENSE
mv %{rubygem_bundle_dir}/gems/tilt-%{version_rubygem_tilt}/COPYING tilt_COPYING
mv %{rubygem_bundle_dir}/gems/webrick-%{version_rubygem_webrick}/LICENSE.txt webrick_LICENSE.txt
cp %{pcs_bundled_dir}/src/pyagentx-*/LICENSE.txt pyagentx_LICENSE.txt
cp %{pcs_bundled_dir}/src/pyagentx-*/CONTRIBUTORS.txt pyagentx_CONTRIBUTORS.txt
@ -485,6 +500,7 @@ run_all_tests
%license COPYING
# rubygem licenses
%license backports_LICENSE.txt
%license base64_LICENSE.txt
%license childprocess_LICENSE
%license ethon_LICENSE
%license ffi_COPYING
@ -496,10 +512,13 @@ run_all_tests
%license puma_LICENSE
%license rack_MIT-LICENSE
%license rack-protection_License
%license rack-session_license.md
%license rack-test_MIT-LICENSE.txt
%license rackup_license.md
%license ruby2_keywords_LICENSE
%license sinatra_LICENSE
%license tilt_COPYING
%license webrick_LICENSE.txt
%{python3_sitelib}/*
%{_sbindir}/pcs
%{_sbindir}/pcsd
@ -540,9 +559,24 @@ run_all_tests
%license pyagentx_LICENSE.txt
%changelog
* Tue Jul 2 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.7-2.el9_4.1
- Avoid deadlock on pcsd termination
Resolves: RHEL-45237
* Tue Jul 9 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.8-1
- Updated pcs-web-ui to 0.1.20
- Rebased to the latest sources (see CHANGELOG.md)
Resolves: RHEL-34781
* Tue Jun 18 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.7-4
- Rebased to the latest sources (see CHANGELOG.md)
Resolves: RHEL-7701, RHEL-7737, RHEL-17962, RHEL-34781
- Fixed grammatical error in pcs-web-ui
Resolves: RHEL-7726
* Tue May 21 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.7-3
- Rebased to the latest sources (see CHANGELOG.md)
Resolves: RHEL-2977, RHEL-16231, RHEL-21051, RHEL-25854, RHEL-27492, RHEL-28749, RHEL-34781, RHEL-36514
- Updated pcs-web-ui to 0.1.19
Resolves: RHEL-7726, RHEL-21895, RHEL-21896, RHEL-21897
- Updated bundled rubygems: backports, childprocess, nio4r, puma, rack, rack-protection, sinatra
- Bundled new rubygems: base64, rack-session, rackup, webrick
* Tue Mar 19 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.7-2
- Fixed CVE-2024-25126, CVE-2024-26141, CVE-2024-26146 in bundled dependency rack

Write Preview
Loading…
Cancel
Save