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

pcs-0.11.7-1

Browse Source 
- Rebased to the latest sources (see CHANGELOG.md)
  Resolves: RHEL-7740
- Removed workaround for skipping copying of rubygems
- Removed workaround for unsupported distro in configure.ac
This commit is contained in:
Michal Pospisil 2024-01-05 17:59:13 +01:00
parent f0557fdd16
commit e0f71ca976
8 changed files with 37 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -217,3 +217,4 @@
/pcs-web-ui-0.1.18.tar.gz /pcs-web-ui-0.1.18.tar.gz
/pcs-web-ui-node-modules-0.1.18.tar.xz /pcs-web-ui-node-modules-0.1.18.tar.xz
/tornado-6.3.3.tar.gz /tornado-6.3.3.tar.gz
/pcs-0.11.7.tar.gz

25
daemon-fix-serving-static-files.patch
View File

@ -1,25 +0,0 @@
From bbc3970d2425f403593374a4372c890fbaa04f3f Mon Sep 17 00:00:00 2001
From: Tomas Jelinek <tojeline@redhat.com>
Date: Wed, 22 Nov 2023 10:02:45 +0100
Subject: [PATCH] daemon: fix serving static files
---
pcs/daemon/app/ui.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pcs/daemon/app/ui.py b/pcs/daemon/app/ui.py
index d839f2c8..eaf6f54f 100644
--- a/pcs/daemon/app/ui.py
+++ b/pcs/daemon/app/ui.py
@@ -102,7 +102,7 @@ class StaticFileMayBe(StaticFile):
# spa is probably not installed
self.set_status(404, "Not Found")
return None
- return super().get(*args, **kwargs)
+ return await super().get(*args, **kwargs)
def get_routes(
--
2.41.0

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

@ -1,4 +1,4 @@
From 9848d882dbb050bf9bfb4a4582a921757c0119da Mon Sep 17 00:00:00 2001 From cf1e0cc06a94804a4a98a12ee06d09e5786bad1b Mon Sep 17 00:00:00 2001
From: Ivan Devat <idevat@redhat.com> From: Ivan Devat <idevat@redhat.com>
Date: Tue, 20 Nov 2018 15:03:56 +0100 Date: Tue, 20 Nov 2018 15:03:56 +0100
Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9 Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9
@ -34,5 +34,5 @@ index cc6c5803..a7d4b24b 100644
support traffic encryption nor compression. support traffic encryption nor compression.
Transport options are: Transport options are:
-- --
2.41.0 2.43.0

30
fix-routing-of-web-ui-manifest-files.patch
View File

@ -1,30 +0,0 @@
From 3f1bc69cc8394f2748d50b7c4e1d5fc57d825246 Mon Sep 17 00:00:00 2001
From: Ivan Devat <idevat@redhat.com>
Date: Thu, 23 Nov 2023 09:38:45 +0100
Subject: [PATCH] fix routing of web-ui manifest*.json files
---
pcs/daemon/app/ui.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pcs/daemon/app/ui.py b/pcs/daemon/app/ui.py
index eaf6f54f..f375806d 100644
--- a/pcs/daemon/app/ui.py
+++ b/pcs/daemon/app/ui.py
@@ -127,7 +127,12 @@ def get_routes(
return [
(f"{url_prefix}static/(.*)", StaticFileMayBe, static_path("static")),
- (f"{url_prefix}manifest.json", StaticFileMayBe, static_path()),
+ (f"{url_prefix}(manifest\\.json)", StaticFileMayBe, static_path()),
+ (
+ f"{url_prefix}(manifest_test_marks\\.json)",
+ StaticFileMayBe,
+ static_path(),
+ ),
(
f"{url_prefix}login",
Login,
--
2.41.0

32
login-fix-autocomplete-attribute-placement.patch
View File

@ -1,32 +0,0 @@
From b07e80dcef2642b8bbfaa4baf01983b9f9ed1982 Mon Sep 17 00:00:00 2001
From: Michal Pospisil <mpospisi@redhat.com>
Date: Wed, 22 Nov 2023 17:38:24 +0100
Subject: [PATCH] login: fix autocomplete attribute placement
---
packages/app/src/app/view/app/login/LoginForm.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/app/src/app/view/app/login/LoginForm.tsx b/packages/app/src/app/view/app/login/LoginForm.tsx
index e3d2e2c0..7d7781b5 100644
--- a/packages/app/src/app/view/app/login/LoginForm.tsx
+++ b/packages/app/src/app/view/app/login/LoginForm.tsx
@@ -39,7 +39,6 @@ export const LoginForm = (props: {
name="pf-login-username-id"
value={props.usernameValue}
onChange={props.onChangeUsername}
- autoComplete="off"
{...form.username.mark}
/>
</FormGroup>
@@ -57,6 +56,7 @@ export const LoginForm = (props: {
validated="default"
value={props.passwordValue}
onChange={props.onChangePassword}
+ autoComplete="off"
{...form.password.mark}
/>
</FormGroup>
--
2.41.0

66
pcs.spec
View File

@ -1,6 +1,6 @@
Name: pcs Name: pcs
Version: 0.11.6 Version: 0.11.7
Release: 6%{?dist} Release: 1%{?dist}
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPL-2.0-only: pcs # GPL-2.0-only: pcs
@ -19,8 +19,8 @@ Summary: Pacemaker/Corosync Configuration System
ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
# When specifying a commit, use its long hash # When specifying a commit, use its long hash
# %%global version_or_commit %%{version} %global version_or_commit %{version}
%global version_or_commit aaa16e0de986890e6ca3038f907bbad331e41a87 # %%global version_or_commit aaa16e0de986890e6ca3038f907bbad331e41a87
%global pcs_source_name %{name}-%{version_or_commit} %global pcs_source_name %{name}-%{version_or_commit}
# ui_commit can be determined by hash, tag or branch # ui_commit can be determined by hash, tag or branch
@ -101,12 +101,9 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_comm
# pcs patches: <= 200 # pcs patches: <= 200
# Patch0: bzNUMBER-01-name.patch # Patch0: bzNUMBER-01-name.patch
Patch0: do-not-support-cluster-setup-with-udp-u-transport.patch Patch0: do-not-support-cluster-setup-with-udp-u-transport.patch
Patch1: daemon-fix-serving-static-files.patch
Patch2: fix-routing-of-web-ui-manifest-files.patch
# ui patches: >200 # ui patches: >200
# Patch201: bzNUMBER-01-name.patch # Patch201: bzNUMBER-01-name.patch
Patch201: login-fix-autocomplete-attribute-placement.patch
# git for patches # git for patches
BuildRequires: git-core BuildRequires: git-core
@ -290,15 +287,12 @@ update_times_patch(){
%autosetup -D -T -b 100 -a 101 -S git -n %{ui_src_name} -N %autosetup -D -T -b 100 -a 101 -S git -n %{ui_src_name} -N
%autopatch -p1 -m 201 %autopatch -p1 -m 201
# update_times_patch %%{PATCH201} # update_times_patch %%{PATCH201}
update_times_patch %{PATCH201}
# patch pcs sources # patch pcs sources
%autosetup -S git -n %{pcs_source_name} -N %autosetup -S git -n %{pcs_source_name} -N
%autopatch -p1 -M 200 %autopatch -p1 -M 200
# update_times_patch %%{PATCH0} # update_times_patch %%{PATCH0}
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 # 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 # autogen uses git-version-gen which uses .tarball-version for generating version number
@ -306,35 +300,31 @@ update_times_patch %{PATCH2}
echo "%version+$(echo "%{version_or_commit}" | head -c 8)" > %{_builddir}/%{pcs_source_name}/.tarball-version echo "%version+$(echo "%{version_or_commit}" | head -c 8)" > %{_builddir}/%{pcs_source_name}/.tarball-version
%endif %endif
%if 0%{?skip_bundle_prep} # prepare dirs/files necessary for building all bundles
echo "Skipping copying bundled dependencies." # -----------------------------------------------------
%else # 1) rubygems sources
# prepare dirs/files necessary for building all bundles
# -----------------------------------------------------
# 1) rubygems sources
mkdir -p %{rubygem_cache_dir} mkdir -p %{rubygem_cache_dir}
cp -f %SOURCE81 %{rubygem_cache_dir} cp -f %SOURCE81 %{rubygem_cache_dir}
cp -f %SOURCE82 %{rubygem_cache_dir} cp -f %SOURCE82 %{rubygem_cache_dir}
cp -f %SOURCE83 %{rubygem_cache_dir} cp -f %SOURCE83 %{rubygem_cache_dir}
cp -f %SOURCE84 %{rubygem_cache_dir} cp -f %SOURCE84 %{rubygem_cache_dir}
cp -f %SOURCE85 %{rubygem_cache_dir} cp -f %SOURCE85 %{rubygem_cache_dir}
cp -f %SOURCE86 %{rubygem_cache_dir} cp -f %SOURCE86 %{rubygem_cache_dir}
cp -f %SOURCE87 %{rubygem_cache_dir} cp -f %SOURCE87 %{rubygem_cache_dir}
cp -f %SOURCE88 %{rubygem_cache_dir} cp -f %SOURCE88 %{rubygem_cache_dir}
cp -f %SOURCE89 %{rubygem_cache_dir} cp -f %SOURCE89 %{rubygem_cache_dir}
cp -f %SOURCE90 %{rubygem_cache_dir} cp -f %SOURCE90 %{rubygem_cache_dir}
cp -f %SOURCE91 %{rubygem_cache_dir} cp -f %SOURCE91 %{rubygem_cache_dir}
cp -f %SOURCE92 %{rubygem_cache_dir} cp -f %SOURCE92 %{rubygem_cache_dir}
cp -f %SOURCE93 %{rubygem_cache_dir} cp -f %SOURCE93 %{rubygem_cache_dir}
# 2) prepare python bundles # 2) prepare python bundles
mkdir -p %{pcs_bundled_dir}/src mkdir -p %{pcs_bundled_dir}/src
cp -f %SOURCE41 rpm/ cp -f %SOURCE41 rpm/
cp -f %SOURCE42 rpm/ cp -f %SOURCE42 rpm/
cp -f %SOURCE44 rpm/ cp -f %SOURCE44 rpm/
%endif
%build %build
%define debug_package %{nil} %define debug_package %{nil}
@ -546,6 +536,10 @@ run_all_tests
%license pyagentx_LICENSE.txt %license pyagentx_LICENSE.txt
%changelog %changelog
* Fri Jan 05 2024 Michal Pospisil <mpospisi@redhat.com> - 0.11.7-1
- Rebased to the latest sources (see CHANGELOG.md)
Resolves: RHEL-7740
* Mon Nov 13 2023 Michal Pospisil <mpospisi@redhat.com> - 0.11.6-6 * Mon Nov 13 2023 Michal Pospisil <mpospisi@redhat.com> - 0.11.6-6
- Rebased to the latest upstream sources (see CHANGELOG.md) - Rebased to the latest upstream sources (see CHANGELOG.md)
Resolves: RHEL-7582, RHEL-7583, RHEL-7669, RHEL-7672, RHEL-7697, RHEL-7698, RHEL-7700, RHEL-7703, RHEL-7719, RHEL-7725, RHEL-7730, RHEL-7738, RHEL-7739, RHEL-7740, RHEL-7744, RHEL-7746 Resolves: RHEL-7582, RHEL-7583, RHEL-7669, RHEL-7672, RHEL-7697, RHEL-7698, RHEL-7700, RHEL-7703, RHEL-7719, RHEL-7725, RHEL-7730, RHEL-7738, RHEL-7739, RHEL-7740, RHEL-7744, RHEL-7746

7
prepare-env.sh
View File

@ -2,10 +2,8 @@ set -eo xtrace
# Rpmbuild expects patches in the _sourcedir # Rpmbuild expects patches in the _sourcedir
mv *.patch $TMT_SOURCE_DIR mv *.patch $TMT_SOURCE_DIR
mkdir builddir mkdir builddir
# Workaround for tmt not downloading rubygems, there is a spec macro that skips
# copying them during prep phase
rpmbuild -bp pcs.spec --nodeps --define "_sourcedir $TMT_SOURCE_DIR" \ rpmbuild -bp pcs.spec --nodeps --define "_sourcedir $TMT_SOURCE_DIR" \
--define "_builddir $(pwd)/builddir" --define="skip_bundle_prep 1" --define "_builddir $(pwd)/builddir"
# Remove pcs-web-ui in builddir for "cd pcs-*" to have exactly one match # Remove pcs-web-ui in builddir for "cd pcs-*" to have exactly one match
rm -rf builddir/pcs-web-ui-* rm -rf builddir/pcs-web-ui-*
cd builddir/pcs-* cd builddir/pcs-*
@ -13,7 +11,6 @@ cd builddir/pcs-*
export PYTHONPATH=/usr/lib64/pcs/pcs_bundled/packages/ export PYTHONPATH=/usr/lib64/pcs/pcs_bundled/packages/
export GEM_HOME=/usr/lib64/pcsd/vendor/bundle/ export GEM_HOME=/usr/lib64/pcsd/vendor/bundle/
./autogen.sh ./autogen.sh
# Workaround until configure.ac is prepared for centos-stream-* ./configure
./configure --with-distro=rhel
# Remove pcs sources to make sure tests are not using any of those files # Remove pcs sources to make sure tests are not using any of those files
rm -rf pcs rm -rf pcs

4
sources
View File

@ -14,6 +14,6 @@ SHA512 (rack-protection-3.1.0.gem) = 18a5ffe614a906ca876926bff3e4d1657f0b6963005
SHA512 (sinatra-3.1.0.gem) = e2b1f72f6ac57ce56006b6c39c72bec8135a448b2b235d6fd061fe3d02bd32b6bd8521c8083975e2ec758b8ba9634d6bc2e90b0f5ffae954437ffb26f808b50b SHA512 (sinatra-3.1.0.gem) = e2b1f72f6ac57ce56006b6c39c72bec8135a448b2b235d6fd061fe3d02bd32b6bd8521c8083975e2ec758b8ba9634d6bc2e90b0f5ffae954437ffb26f808b50b
SHA512 (tilt-2.3.0.gem) = 78a3de34e3d096e40cb245807bad07cc3ebfa192986addbd228c25153166808b379f3ce086ff68fa5959997946187fe8923e84100653b2b109007390969875b3 SHA512 (tilt-2.3.0.gem) = 78a3de34e3d096e40cb245807bad07cc3ebfa192986addbd228c25153166808b379f3ce086ff68fa5959997946187fe8923e84100653b2b109007390969875b3
SHA512 (tornado-6.3.3.tar.gz) = d4813de111139da2f5bd390bdd8d456797a48ba2ebe730946aabd66d9269ce4425d9b70ce62aa443ea5590d667b9056766841d99dcb0f383b2c9acd409474c8d SHA512 (tornado-6.3.3.tar.gz) = d4813de111139da2f5bd390bdd8d456797a48ba2ebe730946aabd66d9269ce4425d9b70ce62aa443ea5590d667b9056766841d99dcb0f383b2c9acd409474c8d
SHA512 (pcs-aaa16e0de986890e6ca3038f907bbad331e41a87.tar.gz) = 582a644e7f39902ccb08b64d8c66716f3f98eee98d683ce91ba311ba5134175d44143aecb917b978c1e91ff976701460b7f44d89ef444335707e071591709013
SHA512 (pcs-web-ui-0.1.18.tar.gz) = 3c7c90608a2140d366668943e2985267519b9352ab7843b689f3583a577873a292e9746820278fdedba3f6981ca16926a5656d7b7a78c6546c9a7ebb0a396436
SHA512 (pcs-web-ui-node-modules-0.1.18.tar.xz) = 237ff976d67a7bf881e45334261af1da32c6330fbf9e7436dcf33e63c9373f85f36db52622676f77e27bb6a853c046223cfe0cca25de68bd004c6535aa077fd7 SHA512 (pcs-web-ui-node-modules-0.1.18.tar.xz) = 237ff976d67a7bf881e45334261af1da32c6330fbf9e7436dcf33e63c9373f85f36db52622676f77e27bb6a853c046223cfe0cca25de68bd004c6535aa077fd7
SHA512 (pcs-web-ui-0.1.18.tar.gz) = edbe88d113e967b2d3f345e74e8c4409b013fb8474fe70a8813a1aba5ea8b4deb61a3bb8c4cd4b4d1a9dc9e67216e518ee5bf832a25188e95173317533d7bf69
SHA512 (pcs-0.11.7.tar.gz) = cbe81acb14680948cfe642930012c896e617d976b33ebbb5c202f85d02ec1c0e22f901e73766628926caef2d5568fc6c36d7f9cf4091714f207911b7d4d1c1ef