From 6452fd40a9728c685af112fee2be1989bd98fa26 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 4 Dec 2025 12:25:37 +0300
Subject: [PATCH] Import OL pcs-0.12.1-1.el10_1.1

---
 .gitignore |  1 +
 pcs.spec   | 40 ++++++++++++++++++++++------------------
 sources    |  2 +-
 3 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0bed32c..bcec743 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,3 +71,4 @@
 /pcs-web-ui-node-modules-0.1.23.tar.xz
 /pycurl-7.45.6.tar.gz
 /rack-3.1.16.gem
+/rack-3.2.3.gem
diff --git a/pcs.spec b/pcs.spec
index 13193cc..6b87134 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,6 +1,6 @@
 Name: pcs
 Version: 0.12.1
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPL-2.0-only: pcs
@@ -67,7 +67,7 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64 riscv64
 %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 3.2.3
 %global version_rubygem_rack_protection 4.1.1
 %global version_rubygem_rack_session 2.1.1
 %global version_rubygem_rack_test  2.2.0
@@ -238,21 +238,21 @@ Requires: nss-tools
 Provides: bundled(dacite) = %{dacite_version}
 Provides: bundled(pycurl) = %{pycurl_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(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(sinatra) = %{version_rubygem_sinatra}
-Provides: bundled(tilt) = %{version_rubygem_tilt}
+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-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-sinatra) = %{version_rubygem_sinatra}
+Provides: bundled(rubygem-tilt) = %{version_rubygem_tilt}
 
 
 # pcs-snmp subpackage definition
@@ -272,7 +272,7 @@ Requires: pcs = %{version}-%{release}
 Requires: pacemaker
 Requires: net-snmp
 
-Provides: bundled(pyagentx) = %{pyagentx_version}
+Provides: bundled(python3-pyagentx) = %{pyagentx_version}
 
 # cockpit-ha-cluster subpackage definition
 %package -n %{pkg_cockpit_ha_cluster}
@@ -669,6 +669,10 @@ run_all_tests
 
 
 %changelog
+* Tue Nov 25 2025 Alan Steinberg <alan.steinberg@oracle.com> - 0.12.1-1%{?dist}.1
+- Fixed CVE-2025-59830, CVE-2025-61770, CVE-2025-61771, CVE-2025-61772, CVE-2025-61919 by updating bundled rubygem rack
+  Resolves: RHEL-120945, RHEL-121035, RHEL-123630, RHEL-123642, RHEL-124938
+
 * Mon Jul 7 2025 Michal Pospíšil <mpospisi@redhat.com> - 0.12.1-1
 - Rebased pcs to the latest sources (see CHANGELOG.md)
   Resolves: RHEL-77193, RHEL-92043, RHEL-92883, RHEL-93757
diff --git a/sources b/sources
index 069f330..43636cd 100644
--- a/sources
+++ b/sources
@@ -18,4 +18,4 @@ SHA512 (pcs-0.12.1.tar.gz) = 90c95b0056377ba0d0710092bb2d8106fecd605a2431b45a417
 SHA512 (pcs-web-ui-0.1.23.tar.gz) = ac4ab488388e279f585bc69a30c949613b3da7b27601d36a0f5435c102ba1a3913ec6bc4482239cebdc63e245fe10ee9fa8f16e354f793fb6395646741633537
 SHA512 (pcs-web-ui-node-modules-0.1.23.tar.xz) = f39dd1fd391f10b874b5fec34da1a2f2496d66b31af736ee1dfc2ef6e0b518efd03053fd00312c84e10a33ffda492e12d48a898a21efb6241e5459828e500e80
 SHA512 (pycurl-7.45.6.tar.gz) = 4eb53cbb3c8801950c76adb920b30919ca9f70e3f93dcef898d048244c475ec4a135590d173398efeb7642be33c11cb1742cb2519713088223870141e0cef8b3
-SHA512 (rack-3.1.16.gem) = 65d8863d2d33a3ce5106cd8ac647389133eab0acfe5fa0cb02dff246313fdbc726c89f495c73e814258694b22508736958170d114edce8b7c15b7c444c7dcaa0
+SHA512 (rack-3.2.3.gem) = 8c4ac738556560c2d2e07a33e054b970d1224f7959e9ff3ffd410ec2290dd3443cc603cc343ec66ace97662c551c186767308222b034ab5f5f68d6007a37868c