From e0f71ca976d35c77470b60680ad36026028c5e2e Mon Sep 17 00:00:00 2001 From: Michal Pospisil Date: Fri, 5 Jan 2024 17:59:13 +0100 Subject: [PATCH] pcs-0.11.7-1 - 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 --- .gitignore | 1 + daemon-fix-serving-static-files.patch | 25 ------- ...t-cluster-setup-with-udp-u-transport.patch | 4 +- fix-routing-of-web-ui-manifest-files.patch | 30 --------- ...fix-autocomplete-attribute-placement.patch | 32 --------- pcs.spec | 66 +++++++++---------- prepare-env.sh | 7 +- sources | 4 +- 8 files changed, 37 insertions(+), 132 deletions(-) delete mode 100644 daemon-fix-serving-static-files.patch delete mode 100644 fix-routing-of-web-ui-manifest-files.patch delete mode 100644 login-fix-autocomplete-attribute-placement.patch diff --git a/.gitignore b/.gitignore index d3a9654..af44d4d 100644 --- a/.gitignore +++ b/.gitignore @@ -217,3 +217,4 @@ /pcs-web-ui-0.1.18.tar.gz /pcs-web-ui-node-modules-0.1.18.tar.xz /tornado-6.3.3.tar.gz +/pcs-0.11.7.tar.gz diff --git a/daemon-fix-serving-static-files.patch b/daemon-fix-serving-static-files.patch deleted file mode 100644 index 6509c23..0000000 --- a/daemon-fix-serving-static-files.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bbc3970d2425f403593374a4372c890fbaa04f3f Mon Sep 17 00:00:00 2001 -From: Tomas Jelinek -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 - diff --git a/do-not-support-cluster-setup-with-udp-u-transport.patch b/do-not-support-cluster-setup-with-udp-u-transport.patch index 833e3dd..168a20f 100644 --- a/do-not-support-cluster-setup-with-udp-u-transport.patch +++ b/do-not-support-cluster-setup-with-udp-u-transport.patch @@ -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 Date: Tue, 20 Nov 2018 15:03:56 +0100 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. Transport options are: -- -2.41.0 +2.43.0 diff --git a/fix-routing-of-web-ui-manifest-files.patch b/fix-routing-of-web-ui-manifest-files.patch deleted file mode 100644 index 6e5eeea..0000000 --- a/fix-routing-of-web-ui-manifest-files.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3f1bc69cc8394f2748d50b7c4e1d5fc57d825246 Mon Sep 17 00:00:00 2001 -From: Ivan Devat -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 - diff --git a/login-fix-autocomplete-attribute-placement.patch b/login-fix-autocomplete-attribute-placement.patch deleted file mode 100644 index d7af4ee..0000000 --- a/login-fix-autocomplete-attribute-placement.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b07e80dcef2642b8bbfaa4baf01983b9f9ed1982 Mon Sep 17 00:00:00 2001 -From: Michal Pospisil -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} - /> - -@@ -57,6 +56,7 @@ export const LoginForm = (props: { - validated="default" - value={props.passwordValue} - onChange={props.onChangePassword} -+ autoComplete="off" - {...form.password.mark} - /> - --- -2.41.0 - diff --git a/pcs.spec b/pcs.spec index e00e563..60f2a13 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,6 +1,6 @@ Name: pcs -Version: 0.11.6 -Release: 6%{?dist} +Version: 0.11.7 +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 @@ -19,8 +19,8 @@ Summary: Pacemaker/Corosync Configuration System 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 %{version} +# %%global version_or_commit aaa16e0de986890e6ca3038f907bbad331e41a87 %global pcs_source_name %{name}-%{version_or_commit} # 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 # Patch0: bzNUMBER-01-name.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 # Patch201: bzNUMBER-01-name.patch -Patch201: login-fix-autocomplete-attribute-placement.patch # git for patches BuildRequires: git-core @@ -290,15 +287,12 @@ update_times_patch(){ %autosetup -D -T -b 100 -a 101 -S git -n %{ui_src_name} -N %autopatch -p1 -m 201 # update_times_patch %%{PATCH201} -update_times_patch %{PATCH201} # patch pcs sources %autosetup -S git -n %{pcs_source_name} -N %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 @@ -306,35 +300,31 @@ update_times_patch %{PATCH2} echo "%version+$(echo "%{version_or_commit}" | head -c 8)" > %{_builddir}/%{pcs_source_name}/.tarball-version %endif -%if 0%{?skip_bundle_prep} - echo "Skipping copying bundled dependencies." -%else - # prepare dirs/files necessary for building all bundles - # ----------------------------------------------------- - # 1) rubygems sources +# prepare dirs/files necessary for building all bundles +# ----------------------------------------------------- +# 1) rubygems sources - mkdir -p %{rubygem_cache_dir} - cp -f %SOURCE81 %{rubygem_cache_dir} - cp -f %SOURCE82 %{rubygem_cache_dir} - cp -f %SOURCE83 %{rubygem_cache_dir} - cp -f %SOURCE84 %{rubygem_cache_dir} - cp -f %SOURCE85 %{rubygem_cache_dir} - cp -f %SOURCE86 %{rubygem_cache_dir} - cp -f %SOURCE87 %{rubygem_cache_dir} - cp -f %SOURCE88 %{rubygem_cache_dir} - cp -f %SOURCE89 %{rubygem_cache_dir} - cp -f %SOURCE90 %{rubygem_cache_dir} - cp -f %SOURCE91 %{rubygem_cache_dir} - cp -f %SOURCE92 %{rubygem_cache_dir} - cp -f %SOURCE93 %{rubygem_cache_dir} +mkdir -p %{rubygem_cache_dir} +cp -f %SOURCE81 %{rubygem_cache_dir} +cp -f %SOURCE82 %{rubygem_cache_dir} +cp -f %SOURCE83 %{rubygem_cache_dir} +cp -f %SOURCE84 %{rubygem_cache_dir} +cp -f %SOURCE85 %{rubygem_cache_dir} +cp -f %SOURCE86 %{rubygem_cache_dir} +cp -f %SOURCE87 %{rubygem_cache_dir} +cp -f %SOURCE88 %{rubygem_cache_dir} +cp -f %SOURCE89 %{rubygem_cache_dir} +cp -f %SOURCE90 %{rubygem_cache_dir} +cp -f %SOURCE91 %{rubygem_cache_dir} +cp -f %SOURCE92 %{rubygem_cache_dir} +cp -f %SOURCE93 %{rubygem_cache_dir} - # 2) prepare python bundles - mkdir -p %{pcs_bundled_dir}/src - cp -f %SOURCE41 rpm/ - cp -f %SOURCE42 rpm/ - cp -f %SOURCE44 rpm/ -%endif +# 2) prepare python bundles +mkdir -p %{pcs_bundled_dir}/src +cp -f %SOURCE41 rpm/ +cp -f %SOURCE42 rpm/ +cp -f %SOURCE44 rpm/ %build %define debug_package %{nil} @@ -546,6 +536,10 @@ run_all_tests %license pyagentx_LICENSE.txt %changelog +* Fri Jan 05 2024 Michal Pospisil - 0.11.7-1 +- Rebased to the latest sources (see CHANGELOG.md) + Resolves: RHEL-7740 + * Mon Nov 13 2023 Michal Pospisil - 0.11.6-6 - 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 diff --git a/prepare-env.sh b/prepare-env.sh index 27411e4..b55b355 100755 --- a/prepare-env.sh +++ b/prepare-env.sh @@ -2,10 +2,8 @@ set -eo xtrace # Rpmbuild expects patches in the _sourcedir mv *.patch $TMT_SOURCE_DIR 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" \ - --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 rm -rf builddir/pcs-web-ui-* cd builddir/pcs-* @@ -13,7 +11,6 @@ cd builddir/pcs-* export PYTHONPATH=/usr/lib64/pcs/pcs_bundled/packages/ export GEM_HOME=/usr/lib64/pcsd/vendor/bundle/ ./autogen.sh -# Workaround until configure.ac is prepared for centos-stream-* -./configure --with-distro=rhel +./configure # Remove pcs sources to make sure tests are not using any of those files rm -rf pcs diff --git a/sources b/sources index eda262e..680ea30 100644 --- a/sources +++ b/sources @@ -14,6 +14,6 @@ SHA512 (rack-protection-3.1.0.gem) = 18a5ffe614a906ca876926bff3e4d1657f0b6963005 SHA512 (sinatra-3.1.0.gem) = e2b1f72f6ac57ce56006b6c39c72bec8135a448b2b235d6fd061fe3d02bd32b6bd8521c8083975e2ec758b8ba9634d6bc2e90b0f5ffae954437ffb26f808b50b SHA512 (tilt-2.3.0.gem) = 78a3de34e3d096e40cb245807bad07cc3ebfa192986addbd228c25153166808b379f3ce086ff68fa5959997946187fe8923e84100653b2b109007390969875b3 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-0.1.18.tar.gz) = edbe88d113e967b2d3f345e74e8c4409b013fb8474fe70a8813a1aba5ea8b4deb61a3bb8c4cd4b4d1a9dc9e67216e518ee5bf832a25188e95173317533d7bf69 +SHA512 (pcs-0.11.7.tar.gz) = cbe81acb14680948cfe642930012c896e617d976b33ebbb5c202f85d02ec1c0e22f901e73766628926caef2d5568fc6c36d7f9cf4091714f207911b7d4d1c1ef