diff --git a/.gitignore b/.gitignore index 0980e05..1691214 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,22 @@ -SOURCES/backports-3.25.1.gem +SOURCES/backports-3.25.2.gem SOURCES/base64-0.2.0.gem SOURCES/childprocess-5.1.0.gem SOURCES/dacite-1.9.2.tar.gz -SOURCES/ethon-0.16.0.gem +SOURCES/ethon-0.18.0.gem SOURCES/ffi-1.17.2.gem SOURCES/logger-1.7.0.gem -SOURCES/mustermann-3.0.3.gem -SOURCES/nio4r-2.7.4.gem -SOURCES/pcs-0.11.10.tar.gz -SOURCES/pcs-web-ui-0.1.23.tar.gz -SOURCES/pcs-web-ui-node-modules-0.1.23.tar.xz -SOURCES/puma-6.6.0.gem +SOURCES/mustermann-3.0.4.gem +SOURCES/nio4r-2.7.5.gem +SOURCES/pcs-0.11.11.tar.gz +SOURCES/pcs-web-ui-0.1.24.2.tar.gz +SOURCES/pcs-web-ui-node-modules-0.1.24.2.tar.xz +SOURCES/puma-7.1.0.gem SOURCES/pyagentx-0.4.pcs.2.tar.gz -SOURCES/rack-3.1.16.gem -SOURCES/rack-protection-4.1.1.gem +SOURCES/rack-3.2.4.gem +SOURCES/rack-protection-4.2.1.gem SOURCES/rack-session-2.1.1.gem SOURCES/rack-test-2.2.0.gem SOURCES/rackup-2.2.1.gem SOURCES/ruby2_keywords-0.0.5.gem -SOURCES/sinatra-4.1.1.gem -SOURCES/tilt-2.6.0.gem +SOURCES/sinatra-4.2.1.gem +SOURCES/tilt-2.6.1.gem diff --git a/.pcs.metadata b/.pcs.metadata index 1b2e51c..d1c72e4 100644 --- a/.pcs.metadata +++ b/.pcs.metadata @@ -1,22 +1,22 @@ -5a346174c2d09489759fe47f73d7e072753a127c SOURCES/backports-3.25.1.gem +83f4267dacf83004d47a4cac784b2dea403810f5 SOURCES/backports-3.25.2.gem ea3a591bdfa93655d8eec9d7bdd7fb87ecb5616a SOURCES/base64-0.2.0.gem 963b12b359251f41998eebe6f6adfec92fe6f49f SOURCES/childprocess-5.1.0.gem 01690d9883c149890e04dce4db43ec305959aa39 SOURCES/dacite-1.9.2.tar.gz -5b56a68268708c474bef04550639ded3add5e946 SOURCES/ethon-0.16.0.gem +ffd8b3e5ac044a1a69791411e3e5cf4b5d4a6768 SOURCES/ethon-0.18.0.gem 01747fce469e932b701cb7a35d1ef4b3c68eb170 SOURCES/ffi-1.17.2.gem abfa641d98ab2e71bc8102b0aab2f466569668d2 SOURCES/logger-1.7.0.gem -249a573022dde130372f0ebbeaf2430f36c2b664 SOURCES/mustermann-3.0.3.gem -34b5b1cb50f18d6ec6c5d5cbcb823e7f81f54290 SOURCES/nio4r-2.7.4.gem -75ffdc7ecaad560d26ce453cbc6d05ec755dbdcc SOURCES/pcs-0.11.10.tar.gz -6ce5e06811ffcaa492fce44383e1576219812096 SOURCES/pcs-web-ui-0.1.23.tar.gz -ada7c4bba63a59195aee0780256773ebc2370d2e SOURCES/pcs-web-ui-node-modules-0.1.23.tar.xz -0b7e5a3f71fc28d19e4758a44ffe07d20eff1e8e SOURCES/puma-6.6.0.gem +09083bd58f23a4a9153f440e8f398601b75bae51 SOURCES/mustermann-3.0.4.gem +34420ab7703c0033e18680504a9f8899322ac908 SOURCES/nio4r-2.7.5.gem +62daec4b5c7b796434021927ed738776ea75575b SOURCES/pcs-0.11.11.tar.gz +bc3ce8d4486b8fc9651047f2194854d40341556f SOURCES/pcs-web-ui-0.1.24.2.tar.gz +080b9735cfd8a5e777c1ab6e0219c6b045ba9b59 SOURCES/pcs-web-ui-node-modules-0.1.24.2.tar.xz +68945ed88cc06ad8fa963abcf302fd49da2154b3 SOURCES/puma-7.1.0.gem 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz -85933f70100a1c7a2b226aec518dce8e4fe0c6d6 SOURCES/rack-3.1.16.gem -2d54ab33eeefdca80b76fc3b749add669182877d SOURCES/rack-protection-4.1.1.gem +a2ad0e1c27926296f2489a3f2c1385de313fc639 SOURCES/rack-3.2.4.gem +1457dded6ffa0f564b33329861dd6b257f07498d SOURCES/rack-protection-4.2.1.gem 654168c0755ffe10443dd066276d4661bafdb2a4 SOURCES/rack-session-2.1.1.gem 922c597f0503f97dc3a058fe997590b108bc429a SOURCES/rack-test-2.2.0.gem efa414fe946ccc1f70e64337d206e98807baa717 SOURCES/rackup-2.2.1.gem d017b9e4d1978e0b3ccc3e2a31493809e4693cd3 SOURCES/ruby2_keywords-0.0.5.gem -805ac713697fa096402b55497aa72f0e81be4a4c SOURCES/sinatra-4.1.1.gem -a646616f117285087d4a8df99d53cf8b01c5405e SOURCES/tilt-2.6.0.gem +611999f43e27779278c80acfb5825c7255497988 SOURCES/sinatra-4.2.1.gem +43d4eaaed4bb0f481afd079cb1dd22be41b24ad4 SOURCES/tilt-2.6.1.gem diff --git a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch index 03a221f..21c5e19 100644 --- a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch +++ b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch @@ -1,4 +1,4 @@ -From cfb2014ad5b360c51d89ea318f0f9ddb2825b4a3 Mon Sep 17 00:00:00 2001 +From 289189cae07bc934efafe0dd3988f2345c6935a6 Mon Sep 17 00:00:00 2001 From: Ivan Devat 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 14c1674a..ee71bb03 100644 +index 930d9ec58..2d2b44ff4 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,7 +22,7 @@ index 14c1674a..ee71bb03 100644 .br Transport options are: ip_version, netmtu diff --git a/pcs/usage.py b/pcs/usage.py -index 102deceb..4d63192d 100644 +index 102deceb1..4d63192d9 100644 --- a/pcs/usage.py +++ b/pcs/usage.py @@ -1498,6 +1498,7 @@ Commands: @@ -34,5 +34,5 @@ index 102deceb..4d63192d 100644 support traffic encryption nor compression. Transport options are: -- -2.50.0 +2.51.0 diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec index 6e243cc..a62150c 100644 --- a/SPECS/pcs.spec +++ b/SPECS/pcs.spec @@ -1,6 +1,6 @@ Name: pcs -Version: 0.11.10 -Release: 1%{?dist} +Version: 0.11.11 +Release: 2%{?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 @@ -19,7 +19,7 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 # To build an official pcs release, comment out branch_or_commit # Use long commit hash or branch name to build an unreleased version -# %%global branch_or_commit dbb53b89e16735d4edf85248d02024bb6de53a55 +# %%global branch_or_commit 4eb4cc1f9e7184021b3f5ed74752301af9fef8a5 %global version_or_commit %{version} %if 0%{?branch_or_commit:1} @@ -30,10 +30,10 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 # To build an official pcs-web-ui release, comment out ui_branch_or_commit # Last tagged version, also used as fallback version for untagged tarballs -%global ui_version 0.1.23 +%global ui_version 0.1.24.2 # Use long commit hash or branch name to build an unreleased version -# %%global ui_branch_or_commit 54730df523389a3c87abad7e47c44e30b33a2647 -%global ui_modules_version 0.1.23 +# %%global ui_branch_or_commit 1dcc2142bbba73c758ab2f3d8499156780689e34 +%global ui_modules_version 0.1.24.2 %global ui_version_or_commit %{ui_version} %if 0%{?ui_branch_or_commit:1} @@ -47,23 +47,23 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %global pyagentx_version 0.4.pcs.2 %global dacite_version 1.9.2 -%global version_rubygem_backports 3.25.1 +%global version_rubygem_backports 3.25.2 %global version_rubygem_base64 0.2.0 %global version_rubygem_childprocess 5.1.0 -%global version_rubygem_ethon 0.16.0 +%global version_rubygem_ethon 0.18.0 %global version_rubygem_ffi 1.17.2 %global version_rubygem_logger 1.7.0 -%global version_rubygem_mustermann 3.0.3 -%global version_rubygem_nio4r 2.7.4 -%global version_rubygem_puma 6.6.0 -%global version_rubygem_rack 3.1.16 -%global version_rubygem_rack_protection 4.1.1 +%global version_rubygem_mustermann 3.0.4 +%global version_rubygem_nio4r 2.7.5 +%global version_rubygem_puma 7.1.0 +%global version_rubygem_rack 3.2.4 +%global version_rubygem_rack_protection 4.2.1 %global version_rubygem_rack_session 2.1.1 %global version_rubygem_rack_test 2.2.0 %global version_rubygem_rackup 2.2.1 %global version_rubygem_ruby2_keywords 0.0.5 -%global version_rubygem_sinatra 4.1.1 -%global version_rubygem_tilt 2.6.0 +%global version_rubygem_sinatra 4.2.1 +%global version_rubygem_tilt 2.6.1 %global min_compatible_pacemaker_version 2.1.0 %global first_incompatible_pacemaker_version 3.0.0 @@ -219,24 +219,25 @@ Requires: logrotate # for working with qdevice certificates (certutil) Requires: nss-tools -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} -Provides: bundled(logger) = %{version_rubygem_logger} -Provides: bundled(mustermann) = %{version_rubygem_mustermann} -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(python3-dacite) = %{dacite_version} + +Provides: bundled(rubygem-backports) = %{version_rubygem_backports} +Provides: bundled(rubygem-base64) = %{version_rubygem_base64} +Provides: bundled(rubygem-childprocess) = %{version_rubygem_childprocess} +Provides: bundled(rubygem-ethon) = %{version_rubygem_ethon} +Provides: bundled(rubygem-ffi) = %{version_rubygem_ffi} +Provides: bundled(rubygem-logger) = %{version_rubygem_logger} +Provides: bundled(rubygem-mustermann) = %{version_rubygem_mustermann} +Provides: bundled(rubygem-nio4r) = %{version_rubygem_nio4r} +Provides: bundled(rubygem-puma) = %{version_rubygem_puma} +Provides: bundled(rubygem-rack) = %{version_rubygem_rack} +Provides: bundled(rubygem-rack-protection) = %{version_rubygem_rack_protection} +Provides: bundled(rubygem-rack-session) = %{version_rubygem_rack_session} +Provides: bundled(rubygem-rack-test) = %{version_rubygem_rack_test} +Provides: bundled(rubygem-rackup) = %{version_rubygem_rackup} +Provides: bundled(rubygem-ruby2_keywords) = %{version_rubygem_ruby2_keywords} +Provides: bundled(rubygem-sinatra) = %{version_rubygem_sinatra} +Provides: bundled(rubygem-tilt) = %{version_rubygem_tilt} Provides: bundled(pcs-web-ui) = %{!?ui_tarball_version:%{ui_version}}%{?ui_tarball_version} @@ -262,7 +263,7 @@ Requires: pcs = %{version}-%{release} Requires: pacemaker Requires: net-snmp -Provides: bundled(pyagentx) = %{pyagentx_version} +Provides: bundled(python3-pyagentx) = %{pyagentx_version} %description -n %{pcs_snmp_pkg_name} SNMP agent that provides information about pacemaker cluster to the master agent (snmpd) @@ -623,6 +624,26 @@ run_all_tests %changelog +* Tue Feb 17 2026 Michal Pospíšil - 0.11.11-2 +- Fixed CVE-2025-13465 by updating pcs-web-ui to 0.1.24.2 + Resolves: RHEL-144308 + +* Wed Jan 7 2026 Michal Pospisil - 0.11.11-1 +- Rebased pcs to the latest sources (see CHANGELOG.md) + Resolves: RHEL-114420 +- Updated pcs-web-ui to 0.1.24 (see CHANGELOG_WUI.md) + Resolves: RHEL-132572 + +* Wed Nov 12 2025 Michal Pospisil - 0.11.10-2 +- Rebased pcs to the latest sources (see CHANGELOG.md) + Resolves: RHEL-113763 +- Rebased pcs-web-ui to the latest sources (see CHANGELOG_WUI.md) + Resolves: RHEL-104372, RHEL-114028, RHEL-114166, RHEL-114173 +- Modified Provides for bundled components + Resolves: RHEL-114470 +- Updated bundled rubygems: backports, ethon, mustermann, nio4r, puma, rack, rack-protection, sinatra, tilt + Resolves: RHEL-120944, RHEL-121038, RHEL-123632, RHEL-123646, RHEL-124940 + * Wed Jul 9 2025 Michal Pospisil - 0.11.10-1 - Rebased pcs to the latest sources (see CHANGELOG.md) Resolves: RHEL-77194, RHEL-92044