rpms/pcs
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Added @esbuild/linux-riscv64 source to fix web UI build on riscv64

Browse Source
This commit is contained in:
Andrew Lukoshko 2026-05-08 02:39:39 +00:00 committed by root
commit 9f76691539
5 changed files with 69 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@ -90,3 +90,13 @@
/pcs-web-ui-node-modules-0.1.24.1.tar.xz
/pcs-web-ui-node-modules-0.1.24.2.tar.xz
/pcs-web-ui-0.1.24.2.tar.gz
/pcs-c0509d123e727bc28ef690694e8c3258dc5de12d.tar.gz
/pcs-web-ui-ce49beeeb386cb9c6773e72ee8ca320f73cf8eda.tar.gz
/pcs-web-ui-node-modules-0.1.24.1+26-ce49b.tar.xz
/backports-3.25.3.gem
/mustermann-3.1.1.gem
/puma-8.0.1.gem
/rack-3.2.6.gem
/rack-session-2.1.2.gem
/rackup-2.3.1.gem
/tilt-2.7.0.gem

12
do-not-support-cluster-setup-with-udp-u-transport.patch
View File

@ -1,4 +1,4 @@
From b81cb787380e1d09919a758070966a7805815937 Mon Sep 17 00:00:00 2001
From 28ee321baeb569a2df9382103b627e977a8181fc Mon Sep 17 00:00:00 2001
From: Michal Pospisil <mpospisi@redhat.com>
Date: Thu, 23 May 2024 17:22:12 +0200
Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport in
@ -10,10 +10,10 @@ Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport in
2 files changed, 3 insertions(+)
diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
index e2ca2d59..051de0c4 100644
index aeeec4b3d..cbecdfdac 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
@@ -492,6 +492,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
Transports udp and udpu:
.br
@ -23,10 +23,10 @@ index e2ca2d59..051de0c4 100644
.br
Transport options are: ip_version, netmtu
diff --git a/pcs/usage.py b/pcs/usage.py
index ac1376f2..187d0b1a 100644
index 4231c3435..db43c2f11 100644
--- a/pcs/usage.py
+++ b/pcs/usage.py
@@ -1502,6 +1502,7 @@ Commands:
@@ -1536,6 +1536,7 @@ Commands:
hash=sha256. To disable encryption, set cipher=none and hash=none.
Transports udp and udpu:
@ -35,5 +35,5 @@ index ac1376f2..187d0b1a 100644
support traffic encryption nor compression.
Transport options are:
--
2.50.0
2.53.0

31
pcs.spec
View File

@ -1,6 +1,6 @@
Name: pcs
Version: 0.12.2
Release: 3%{?dist}.alma.1
Release: 4%{?dist}.alma.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
@ -24,7 +24,7 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64 riscv64
# To build an official pcs release, comment out branch_or_commit
%global esbuild_version 0.25.12
# Use long commit hash or branch name to build an unreleased version
# %%global branch_or_commit 9240ae694fc17f1cd05c7518856cc61581af4e06
%global branch_or_commit c0509d123e727bc28ef690694e8c3258dc5de12d
%global version_or_commit %{clean_version}
%if 0%{?branch_or_commit:1}
%global version_or_commit %{branch_or_commit}
@ -35,9 +35,9 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64 riscv64
# 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.24.2
%global ui_modules_version 0.1.24.2
%global ui_modules_version 0.1.24.1+26-ce49b
# Use long commit hash or branch name to build an unreleased version
# %%global ui_branch_or_commit 1dcc2142bbba73c758ab2f3d8499156780689e34
%global ui_branch_or_commit ce49beeeb386cb9c6773e72ee8ca320f73cf8eda
%global ui_version_or_commit %{ui_version}
%if 0%{?ui_branch_or_commit:1}
%global ui_version_or_commit %{ui_branch_or_commit}
@ -60,21 +60,21 @@ ExclusiveArch: x86_64 s390x ppc64le aarch64 riscv64
%global curlver_h /usr/include/curl/curlver.h
%global libcurl_ver %(sed %{libcurl_sed} %{curlver_h} 2>/dev/null || echo 0)
%global version_rubygem_backports 3.25.2
%global version_rubygem_backports 3.25.3
%global version_rubygem_base64 0.2.0
%global version_rubygem_childprocess 5.1.0
%global version_rubygem_ethon 0.18.0
%global version_rubygem_ffi 1.17.2
%global version_rubygem_mustermann 3.0.4
%global version_rubygem_mustermann 3.1.1
%global version_rubygem_nio4r 2.7.5
%global version_rubygem_puma 7.1.0
%global version_rubygem_rack 3.2.4
%global version_rubygem_puma 8.0.1
%global version_rubygem_rack 3.2.6
%global version_rubygem_rack_protection 4.2.1
%global version_rubygem_rack_session 2.1.1
%global version_rubygem_rack_session 2.1.2
%global version_rubygem_rack_test 2.2.0
%global version_rubygem_rackup 2.2.1
%global version_rubygem_rackup 2.3.1
%global version_rubygem_sinatra 4.2.1
%global version_rubygem_tilt 2.6.1
%global version_rubygem_tilt 2.7.0
%global required_pacemaker_version 3.0.0
@ -685,9 +685,16 @@ run_all_tests
%changelog
* Fri Feb 20 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 0.12.2-3.alma.1
* Fri May 08 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 0.12.2-4.alma.1
- Added @esbuild/linux-riscv64 source to fix web UI build on riscv64
* Tue May 5 2026 Michal Pospíšil <mpospisi@redhat.com> - 0.12.2-4
- Rebased pcs to the latest sources (see CHANGELOG.md)
Resolves: RHEL-7585, RHEL-7604, RHEL-84511, RHEL-149608, RHEL-164096
- Rebased HA Cluster Management add-on to the latest sources (see CHANGELOG_WUI.md)
Resolves: RHEL-148956
- Updated bundled rubygems: backports, mustermann, puma, rack, rack-session, rackup, tilt
* Tue Feb 17 2026 Michal Pospíšil <mpospisi@redhat.com> - 0.12.2-3
- Fixed CVE-2025-13465 by updating pcs-web-ui to 0.1.24.2
Resolves: RHEL-144191

46
show-info-page-instead-of-webui.patch
View File

@ -1,4 +1,4 @@
From 1ba74b14e91c49c0e6f5618f5572748dc4e1e11e Mon Sep 17 00:00:00 2001
From 79a905b488be1d8583c71331fe79bfdb26579347 Mon Sep 17 00:00:00 2001
From: Ivan Devat <idevat@redhat.com>
Date: Tue, 5 Nov 2024 16:35:02 +0100
Subject: [PATCH 2/2] show info page instead of webui
@ -6,27 +6,27 @@ Subject: [PATCH 2/2] show info page instead of webui
---
pcs/Makefile.am | 1 +
pcs/daemon/app/webui_info_handler.py | 31 ++++++++++++++++++++++++++++
pcs/daemon/run.py | 4 +++-
pcs/daemon/run.py | 6 ++++++
pcs_test/smoke.sh.in | 4 ++--
pcsd/public/ui_instructions.html | 26 ++++++++++-------------
5 files changed, 48 insertions(+), 18 deletions(-)
5 files changed, 51 insertions(+), 17 deletions(-)
create mode 100644 pcs/daemon/app/webui_info_handler.py
diff --git a/pcs/Makefile.am b/pcs/Makefile.am
index 1297473f..8d4b9307 100644
index 510c126fe..cb563e355 100644
--- a/pcs/Makefile.am
+++ b/pcs/Makefile.am
@@ -219,6 +219,7 @@ EXTRA_DIST = \
@@ -238,6 +238,7 @@ EXTRA_DIST = \
daemon/app/webui/auth_provider.py \
daemon/app/webui/core.py \
daemon/app/webui/session.py \
daemon/app/webui/sinatra_ui.py \
+ daemon/app/webui_info_handler.py \
daemon/async_tasks/__init__.py \
daemon/async_tasks/scheduler.py \
daemon/async_tasks/task.py \
diff --git a/pcs/daemon/app/webui_info_handler.py b/pcs/daemon/app/webui_info_handler.py
new file mode 100644
index 00000000..3ab8275b
index 000000000..3ab8275bf
--- /dev/null
+++ b/pcs/daemon/app/webui_info_handler.py
@@ -0,0 +1,31 @@
@ -62,29 +62,31 @@ index 00000000..3ab8275b
+ (r"/ui/.*", _WebuiInfoHandler, dict(path=path)),
+ ]
diff --git a/pcs/daemon/run.py b/pcs/daemon/run.py
index 558315c2..cfe9999f 100644
index 6be6dfc86..614e601e4 100644
--- a/pcs/daemon/run.py
+++ b/pcs/daemon/run.py
@@ -33,6 +33,7 @@ from pcs.daemon.app import (
auth,
@@ -34,6 +34,7 @@ from pcs.daemon.app import (
sinatra_remote,
sinatra_ui,
ui_manage,
+ webui_info_handler,
)
from pcs.daemon.app import capabilities as capabilities_app
@@ -168,7 +169,8 @@ def configure_app( # noqa: PLR0913
# Even with disabled (standalone) webui the following routes must be
# provided because they can be used via unix socket from cockpit.
routes.extend(
- sinatra_ui.get_routes(auth_provider, ruby_pcsd_wrapper)
+ webui_info_handler.get_routes(webui_fallback)
+ + sinatra_ui.get_routes(auth_provider, ruby_pcsd_wrapper)
@@ -198,6 +199,11 @@ def configure_app( # noqa: PLR0913
auth_provider=lib_auth_provider,
)
)
return Application(
+ else:
+ routes.extend(
+ webui_info_handler.get_routes(webui_fallback)
+ )
+
# Even with disabled (standalone) webui the following routes must be
# provided because they can be used via unix socket from cockpit.
# Handlers for these routes are the same in both cases, the only
diff --git a/pcs_test/smoke.sh.in b/pcs_test/smoke.sh.in
index fdfe8be2..a9bb8344 100755
index fdfe8be2c..a9bb83447 100755
--- a/pcs_test/smoke.sh.in
+++ b/pcs_test/smoke.sh.in
@@ -71,10 +71,10 @@ if [ "$webui_http_code_response" = "200" ]; then
@ -101,7 +103,7 @@ index fdfe8be2..a9bb8344 100755
echo "Unexpected response from https://localhost:2224/ui/ - http code: '${webui_http_code_response}'"
exit 1
diff --git a/pcsd/public/ui_instructions.html b/pcsd/public/ui_instructions.html
index a120ed3d..ac0117c8 100644
index a120ed3d4..ac0117c88 100644
--- a/pcsd/public/ui_instructions.html
+++ b/pcsd/public/ui_instructions.html
@@ -1,27 +1,23 @@
@ -144,5 +146,5 @@ index a120ed3d..ac0117c8 100644
</body>
</html>
--
2.50.0
2.53.0

20
sources
View File

@ -1,22 +1,22 @@
SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a
SHA512 (linux-riscv64-0.25.12.tgz) = 66beca478860294a560306f57f7a39ca04f4e0ccea56b18419718b9e3d796100c912b62efc11a0fb09859480ce749a743e607494bbf1148397660151add8d1d3
SHA512 (base64-0.2.0.gem) = ee5cdc30e73e625c15cb674cdd16a839ad44ffb0a27d1363f94491b48d95da37a2976c34f6f616b722a35750a067eb2245c4746d7d36f8e9a9ecee68ff5540fb
SHA512 (rackup-2.2.1.gem) = e63c4dee6f1a677d507df0ae7bcebec88673e7a0a8d6621997949045db60801907038a148a0608f6e62864cb2ac056fca382f3438dc227b0fa7a3be52d56ea66
SHA512 (childprocess-5.1.0.gem) = 487ee82e6e7cc1e81ed6740e3eb54e12e9d1065de92eda71f48039e377db8a827c647ce6c9314157ece577be52519bbe014aadcda4a7a748589fad7dbf19ae3a
SHA512 (ffi-1.17.2.gem) = 61fd30c546d9d4a695dd3954eba205cd6ddf36f2c67eb2f823591a6ece540d2d11fcc792704218d969d21bf7111e36bc54f40e5d9eeb1be4fdb06274a17bec13
SHA512 (rack-session-2.1.1.gem) = 2cb385879a6d5e67056303daee861e1a45d75571bf68a5339f9c23ba512aa29f4cc1473d60de6f8ed7c0a0ea2932ad83657e54686725346783a135352ce7a03c
SHA512 (rack-test-2.2.0.gem) = 9c758151d89d86f04a92ba20c43221c4346b8d23f62accb955e759f85910c0e179a5c2e1ff74f131f337afd6b6ae72c36f5d53f600649480769a29468e14f44a
SHA512 (dacite-1.9.2.tar.gz) = 69513bc1acd43e45a208ce4b4186072f92d9057a6a88c77d56f21405fbed7964d94fe4f6a37c99754a793caa2bd0584664dfab69169ef0d3564bb09d37769e59
SHA512 (pycurl-7.45.6.tar.gz) = 4eb53cbb3c8801950c76adb920b30919ca9f70e3f93dcef898d048244c475ec4a135590d173398efeb7642be33c11cb1742cb2519713088223870141e0cef8b3
SHA512 (tilt-2.6.1.gem) = 3b4eaaaa037c831179c3f630851cd2012da9e158c9f6a2eea2fcb4e51aca0a23894c0e75ca8e12f99427f740867738898e669e511c835488d7381900e7de325d
SHA512 (sinatra-4.2.1.gem) = 4aba5941251249cb6a3e8623a88da405476302de95f6d76cd8da6f0eb45ee642b485d12d5f1f8ad54b988eb80cd0a28d2099e7d3f75205eac7340d5be54c3777
SHA512 (rack-protection-4.2.1.gem) = 647852fdbddc1f5b8470f8a7d7cde9ce01c2101f9c448224a983a86718e4705a1fbf71dd93341a8c549d43681084ccaee78d7bc1ff49980b3cec74af3194fbe1
SHA512 (rack-3.2.4.gem) = 1fd00e2fb3bcb05886434c843648ad8d28b69e12321ecd058242f7a814e269ad8ec44d66d17ae079b3d1022b7b7473397718dd032a74a6eac5f64ce973c9fe82
SHA512 (puma-7.1.0.gem) = 5ae17ae8f9805db3f6d37cde74161dd0e2c99ea6eb62b75930eeb26894f4d044eadb5d8fd9cbaa28de0cdd165f63b67736c573b71038c4b6bd41b088f7ca18f9
SHA512 (nio4r-2.7.5.gem) = 9be8d843506807b279d63f3521f369d036fbc8dfb09578f5ef7eb9378c2b2e5bf00fed14e9bed18188b80346f1b39272ef68c97ba597852e1e23751731eb61c6
SHA512 (mustermann-3.0.4.gem) = 5815e898c9b6b3a7126ab17aa7a742c9f81d17ef948ea3cf24d63bbaf196bc004f1e7f439e018d8a32068799fbc8cfda1f0ad6d58e232f96350ff21419550765
SHA512 (ethon-0.18.0.gem) = 4feb6949ce0b183b663600e12ac8c2ff0052769cd7a5f5ae424192198db84883c233a077a2ceea35ef6b34d3bb67b8d15e2a040fa9925fe0c230919e2a61bbf9
SHA512 (backports-3.25.2.gem) = 0c212ca09450a438b6f5ff22950afdaf109327c21c865e04ed717cf67b12d920f3d027bc3fc13a84eafe4d7015ab734f1c2cdaef45449599b57d502f4ccce172
SHA512 (pcs-0.12.2.tar.gz) = dacefc4acf7a5857606ddbe4a9dcb539af6288740f564ee565d25bc05cfa9f5a0d72e45262548d8d5c20a4facb5c14c2c70e859f0d4c091acae45e962b99e6ea
SHA512 (pcs-web-ui-node-modules-0.1.24.2.tar.xz) = c186543d005829e56ee3f6f500e4126b116c95c4f19ae24a1f3a32a6be19d64ee10636c817b5a4582e4407403f8a0967a228e8c8a18b840d4682a8f065f2688d
SHA512 (pcs-web-ui-0.1.24.2.tar.gz) = 602fc9d40d99ed854d53676832ffdf434c542ce61c0ec20a8f6e754d12fd17a116f6347e37382d49c267fffe13261f08a29ec0354fd2bc7c26db1836fe339c59
SHA512 (pcs-c0509d123e727bc28ef690694e8c3258dc5de12d.tar.gz) = 87d11fe910aac9c1d31829a973d75f3cdd92e2e8e170da87ad0e5b909c26d127a95ced4a9db97b6d1bc05e045e9f2b2a87394b9c49019efcda82463bb80300e5
SHA512 (pcs-web-ui-ce49beeeb386cb9c6773e72ee8ca320f73cf8eda.tar.gz) = edb54e58b0b8da95b278794ac658ca29ff0eb612653a218bcc3d3abd9fe380723110ddd0ad6140a0e9155767580169b4714c0865ae837e3cf215d8cc056c69ad
SHA512 (pcs-web-ui-node-modules-0.1.24.1+26-ce49b.tar.xz) = b36a8514ce764ea66dead6a211504e3c13352caecb3b8958631b68f425f45636b0af40fc996635a9b04752b5f95b1cc3d3c273c7bae90180d6a359cd571565ac
SHA512 (backports-3.25.3.gem) = a9d929d945032387064e43fa0a3bda55d345ae1ad9fbceb8819ae2d413b29054e22cc5be80c65335a6f14f13dbbe8ddfd0ea1636634c5555bd5b9054e34afd23
SHA512 (mustermann-3.1.1.gem) = 10dd72c7e44c76e2d04cf68d62f2d81a9cbb6fe457e2b81219467356627c2ae99db34d8c149371f92c79fd4652eb9a0ede7998b7d74f886a26c1b071b66df97b
SHA512 (puma-8.0.1.gem) = f8d7a59f8aa1c6a6bded25449ab1e926d52da927c0b71a8d17b8624e3b2507ef1cf9ba4c91dee092c4d20d5c8a9538dd4f33fa7533e7aef9536f26e925cab926
SHA512 (rack-3.2.6.gem) = 61d6f880dd4bd7078da1135f905a0aedb63837996b8cd80f770d5a6270d1bbd63f3e2189aca65fd06000840d1c8700dd8568f1a16e29061fbde6f52e258cc7ee
SHA512 (rack-session-2.1.2.gem) = 61ed37b6a3acaa8c3958a6973e5bc03067806e809c79833d98a5dc2e358faf370d6b2018cfe03ff3c5d246a54cd58c60fc638d37d83579a9be99534a1a4361eb
SHA512 (rackup-2.3.1.gem) = 23e4ff3a3134d61b4a737f8d3f7d3868265a4ebdfb75dd4644a7bf411e6e1ee7475352ccd3fb3f58ab3dccc9f5e3e13d92c487fa6974a9a4df8802818c7368e7
SHA512 (tilt-2.7.0.gem) = 713f42fa04e4083aa1be26b149c57ac6af7889014214c65584abc16659225114a5d971d07614ebb145d901b3c90a1f9ca40999a9659b848fbc5a2a0b9ac49235