From 417d59d575c06fa1b26a047bf8bc9fa668b32eed Mon Sep 17 00:00:00 2001 From: Miroslav Lisik Date: Tue, 2 Nov 2021 14:26:17 +0100 Subject: [PATCH] Resolves: rhbz#1811072 rhbz#1945305 rhbz#1997019 rhbz#2012129 - Rebased to latest upstream sources (see CHANGELOG.md) - Updated pcs web ui - Enabled wui patching --- .gitignore | 3 + ...t-cluster-setup-with-udp-u-transport.patch | 11 +-- fix-changelog.patch | 79 ++++++++++++++++--- fix-version.patch | 28 ++++--- pcs.spec | 46 +++++++---- sources | 6 +- tests/tests.yml | 4 +- 7 files changed, 130 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index e3aada0..8934d96 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,6 @@ /pcs-web-ui-0.1.7.tar.gz /pcs-web-ui-node-modules-0.1.7.tar.xz /pcs-0.11.1.alpha.1.tar.gz +/pcs-0.11.1.alpha.1.33-e5970.tar.gz +/pcs-web-ui-0.1.10.tar.gz +/pcs-web-ui-node-modules-0.1.10.tar.xz 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 c486138..4e402c2 100644 --- a/do-not-support-cluster-setup-with-udp-u-transport.patch +++ b/do-not-support-cluster-setup-with-udp-u-transport.patch @@ -1,7 +1,8 @@ -From e5413e1afa3114673867bc6b3037434bb4109ce9 Mon Sep 17 00:00:00 2001 +From 8dfec4b31078f1a645958aa0002a9f5467152dab 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 +Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport in + RHEL9 --- pcs/pcs.8.in | 2 ++ @@ -9,7 +10,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 77201a90..b311bee3 100644 +index 60d0ae71..cafa421c 100644 --- a/pcs/pcs.8.in +++ b/pcs/pcs.8.in @@ -451,6 +451,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable @@ -22,10 +23,10 @@ index 77201a90..b311bee3 100644 .br Transport options are: ip_version, netmtu diff --git a/pcs/usage.py b/pcs/usage.py -index ccab8f93..055556c8 100644 +index f55e817e..911e85bd 100644 --- a/pcs/usage.py +++ b/pcs/usage.py -@@ -903,6 +903,7 @@ Commands: +@@ -899,6 +899,7 @@ Commands: hash=sha256. To disable encryption, set cipher=none and hash=none. Transports udp and udpu: diff --git a/fix-changelog.patch b/fix-changelog.patch index 121ce4a..36671db 100644 --- a/fix-changelog.patch +++ b/fix-changelog.patch @@ -1,24 +1,79 @@ -From c32bb75975a1c8452dd03a9b2a873d81c904baa9 Mon Sep 17 00:00:00 2001 +From e42084ac211638354fc052c5a24631570a23fe71 Mon Sep 17 00:00:00 2001 From: Miroslav Lisik -Date: Thu, 26 Aug 2021 16:46:05 +0200 -Subject: [PATCH] fix changelog +Date: Tue, 2 Nov 2021 14:13:47 +0100 +Subject: [PATCH 2/2] fix changelog --- - CHANGELOG.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + CHANGELOG.md | 28 +++++++++------------------- + 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md -index 0a049fc..8c31cbb 100644 +index f9a633c3..860bd05b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md -@@ -1,6 +1,6 @@ - # Change Log - --## [0.11.1.alpha.1] - 2021-08-26 -+## [Unreleased] +@@ -3,15 +3,11 @@ + ## [Unreleased] ### Added - - Explicit confirmation is now required to prevent accidental destroying ++- Explicit confirmation is now required to prevent accidental destroying ++ of the cluster with `pcs cluster destroy` ([rhbz#1283805]) + - Add add/remove cli syntax for command `pcs stonith update-scsi-devices` + ([rhbz#1992668]) + +- +-### Changed +-- Deprecation warnings use a "Deprecation Warning:" prefix instead of +- "Warning:" on the command line +- +- + ### Fixed + - Do not unfence newly added devices on fenced cluster nodes ([rhbz#1991654]) + - Fix displaying fencing levels with regular expression targets ([rhbz#1533090]) +@@ -19,19 +15,6 @@ + - Do not show warning that no stonith device was detected and stonith-enabled + is not false when a stonith device is in a group ([ghpull#370]) + +-[ghpull#370]: https://github.com/ClusterLabs/pcs/pull/370 +-[rhbz#1533090]: https://bugzilla.redhat.com/show_bug.cgi?id=1533090 +-[rhbz#1811072]: https://bugzilla.redhat.com/show_bug.cgi?id=1811072 +-[rhbz#1991654]: https://bugzilla.redhat.com/show_bug.cgi?id=1991654 +-[rhbz#1992668]: https://bugzilla.redhat.com/show_bug.cgi?id=1992668 +- +- +-## [0.11.1.alpha.1] - 2021-08-26 +- +-### Added +-- Explicit confirmation is now required to prevent accidental destroying +- of the cluster with `pcs cluster destroy` ([rhbz#1283805]) +- + ### Changed + - Pcs no longer depends on python3-distro package + - 'pcs status xml' now prints cluster status in the new format provided by +@@ -41,6 +24,8 @@ + - Make roles `Promoted` and `Unpromoted` default ([rhbz#1885293]) + - Make auto-deleting constraint default for `pcs resource move` command + ([rhbz#1996062]) ++- Deprecation warnings use a "Deprecation Warning:" prefix instead of ++ "Warning:" on the command line + + ### Removed + - Deprecated obsolete commands `pcs config import-cman` and `pcs config export +@@ -54,10 +39,15 @@ + - Option `--master` is deprecated and has been replaced by option `--promoted` + ([rhbz#1885293]) + ++[ghpull#370]: https://github.com/ClusterLabs/pcs/pull/370 + [rhbz#1283805]: https://bugzilla.redhat.com/show_bug.cgi?id=1283805 ++[rhbz#1533090]: https://bugzilla.redhat.com/show_bug.cgi?id=1533090 ++[rhbz#1811072]: https://bugzilla.redhat.com/show_bug.cgi?id=1811072 + [rhbz#1881064]: https://bugzilla.redhat.com/show_bug.cgi?id=1881064 + [rhbz#1885293]: https://bugzilla.redhat.com/show_bug.cgi?id=1885293 + [rhbz#1985981]: https://bugzilla.redhat.com/show_bug.cgi?id=1985981 ++[rhbz#1991654]: https://bugzilla.redhat.com/show_bug.cgi?id=1991654 ++[rhbz#1992668]: https://bugzilla.redhat.com/show_bug.cgi?id=1992668 + [rhbz#1996062]: https://bugzilla.redhat.com/show_bug.cgi?id=1996062 + + -- 2.31.1 diff --git a/fix-version.patch b/fix-version.patch index c45474e..1400c5a 100644 --- a/fix-version.patch +++ b/fix-version.patch @@ -1,19 +1,27 @@ -From aef3d9f6f4e8c0119497f1ff29439c1e96cb6c04 Mon Sep 17 00:00:00 2001 +From 41e5767f13ce6ff082727a332fc7ce5245f91ac7 Mon Sep 17 00:00:00 2001 From: Miroslav Lisik -Date: Thu, 26 Aug 2021 16:36:19 +0200 +Date: Tue, 2 Nov 2021 13:13:47 +0100 Subject: [PATCH] fix version --- - .gitarchivever | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + .tarball-version | 2 +- + .version | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/.gitarchivever b/.gitarchivever -index d9441fc..3c5bc79 100644 ---- a/.gitarchivever -+++ b/.gitarchivever +diff --git a/.tarball-version b/.tarball-version +index 6ae7995..002e5eb 100644 +--- a/.tarball-version ++++ b/.tarball-version @@ -1 +1 @@ --ref names: (HEAD -> master, tag: v0.11.1.alpha.1) -+ref names: (HEAD -> master, tag: v0.11.1) +-0.11.1.alpha.1.33-e5970 ++0.11.1.33-e5970 +diff --git a/.version b/.version +index 6ae7995..002e5eb 100644 +--- a/.version ++++ b/.version +@@ -1 +1 @@ +-0.11.1.alpha.1.33-e5970 ++0.11.1.33-e5970 -- 2.31.1 diff --git a/pcs.spec b/pcs.spec index a6d2812..1af6cd7 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,6 +1,6 @@ Name: pcs Version: 0.11.1 -Release: 1%{?dist} +Release: 4%{?dist} # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs @@ -21,11 +21,11 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %global version_or_commit %{version} # %%global version_or_commit %%{version}.210-9862 -%global pcs_source_name %{name}-%{version_or_commit}.alpha.1 +%global pcs_source_name %{name}-%{version_or_commit}.alpha.1.33-e5970 # ui_commit can be determined by hash, tag or branch -%global ui_commit 0.1.7 -%global ui_modules_version 0.1.7 +%global ui_commit 0.1.10 +%global ui_modules_version 0.1.10 %global ui_src_name pcs-web-ui-%{ui_commit} %global pcs_snmp_pkg_name pcs-snmp @@ -108,10 +108,14 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_comm # Downstream patches do not come from upstream. They adapt pcs for specific # RHEL needs. +# pcs patches: <= 200 Patch1: fix-version.patch Patch2: do-not-support-cluster-setup-with-udp-u-transport.patch Patch3: fix-changelog.patch +# ui patches: >200 +# Patch201: bzNUMBER-01-name.patch + # git for patches BuildRequires: git-core #printf from coreutils is used in makefile @@ -240,8 +244,6 @@ Provides: bundled(pyagentx) = %{pyagentx_version} SNMP agent that provides information about pacemaker cluster to the master agent (snmpd) %prep -%autosetup -p1 -S git -n %{pcs_source_name} - # -- following is inspired by python-simplejon.el5 -- # Update timestamps on the files touched by a patch, to avoid non-equal # .pyc/.pyo files across the multilib peers within a build @@ -281,16 +283,21 @@ update_times_patch(){ update_times ${patch_file_name} `diffstat -p1 -l ${patch_file_name}` } -# update_times_patch %%{PATCH1} +# documentation for setup/autosetup/autopatch: +# * http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html +# * https://rpm-software-management.github.io/rpm/manual/autosetup.html +# patch web-ui sources +%autosetup -D -T -b 100 -a 101 -S git -n %{ui_src_name} -N +%autopatch -p1 -m 201 +# update_times_patch %%{PATCH201} + +# patch pcs sources +%autosetup -S git -n %{pcs_source_name} -N +%autopatch -p1 -M 200 update_times_patch %{PATCH1} update_times_patch %{PATCH2} update_times_patch %{PATCH3} -# prepare dirs/files necessary for building web ui -# inside SOURCE100 is only directory %%{ui_src_name} -tar -xzf %SOURCE100 -C %{pcsd_public_dir} -tar -xf %SOURCE101 -C %{pcsd_public_dir}/%{ui_src_name} - # prepare dirs/files necessary for building all bundles # ----------------------------------------------------- # 1) rubygems sources @@ -329,16 +336,17 @@ cp -f %SOURCE44 rpm/ %{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3} make all +# build pcs-web-ui +make -C %{_builddir}/%{ui_src_name} build BUILD_USE_EXISTING_NODE_MODULES=true + %install rm -rf $RPM_BUILD_ROOT pwd %make_install -# build web ui and put it to pcsd -make -C %{pcsd_public_dir}/%{ui_src_name} build -mv %{pcsd_public_dir}/%{ui_src_name}/build ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui -rm -r %{pcsd_public_dir}/%{ui_src_name} +# install pcs-web-ui +cp -r %{_builddir}/%{ui_src_name}/build ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui # symlink favicon into pcsd directories mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/images/ @@ -529,6 +537,12 @@ run_all_tests %license pyagentx_LICENSE.txt %changelog +* Tue Nov 02 2021 Miroslav Lisik - 0.11.1-4 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Updated pcs web ui +- Enabled wui patching +- Resolves: rhbz#1811072 rhbz#1945305 rhbz#1997019 rhbz#2012129 + * Thu Aug 26 2021 Miroslav Lisik - 0.11.1-1 - Rebased to latest upstream sources (see CHANGELOG.md) - Resolves: rhbz#1283805 rhbz#1910644 rhbz#1910645 rhbz#1956703 rhbz#1956706 rhbz#1985981 rhbz#1991957 rhbz#1996062 rhbz#1996067 diff --git a/sources b/sources index 66d16ad..43b5a13 100644 --- a/sources +++ b/sources @@ -17,6 +17,6 @@ SHA512 (tornado-6.1.0.tar.gz) = bd161a1c30f40f983d608297bca113735cb4baad255de713 SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da SHA512 (webrick-1.7.0.gem) = 5f242b50300046fe7c22ecd1640a73e5815e05a72bedfebe6bc39c24c92bd61abdd180860de0d194c0eebbc640b507b6892de181d3b577c5372ace0ca6faf2a3 SHA512 (rexml-3.2.5.gem) = 1e3838d4a5befa76137fb8fea6a20195490645aa2b1c5d14d1eeca6c093d7f64eb405f07fd07b00fcafa9606dc78f9f0a488012338f81414623feb6e8cb83931 -SHA512 (pcs-web-ui-0.1.7.tar.gz) = 1640615bb840aee89bf7c46ee2ac6d223b7810fa2efbd22fbdf9fe0af9d2b937301874497eca7c6d152bb8a5addced4383ecef8ff69be7ca91a36bce46abec43 -SHA512 (pcs-web-ui-node-modules-0.1.7.tar.xz) = 58680eb1851c399ca74c438b396b683e2bf123e2a2b4f942448a8071df3019d577fc6dfc8bfd0d6c41f9ce9a9c21c2f613e7cccd8be46b3a0dc45bc96fedc720 -SHA512 (pcs-0.11.1.alpha.1.tar.gz) = c4d67d1b3ca6d617558db9919f6d3df32e50d04d4b443854607f3145a26592debdec435debedde9e5bfbcb44c4255af9c33dc9df802bb0ceffc61a82a1e3a8ce +SHA512 (pcs-0.11.1.alpha.1.33-e5970.tar.gz) = 14c20874c80dc8cbc16aabc8689f2df949facbdf4441c81f1dcb597cae734c212ff1472ce19666885a6b1cd481194dca9164e9600946d94b7933e70d313d78f8 +SHA512 (pcs-web-ui-0.1.10.tar.gz) = af6f4338cdf82877f5ba66ce81c0e9c78613227c85e4e5fbd2f5f0518765e7ddaa3b6138b7d2c95605557e9e9a0f9ef947b6cff3e5023ada6ec4d8f7869b507f +SHA512 (pcs-web-ui-node-modules-0.1.10.tar.xz) = d27257c2121c33fd3419bbb261d5e15aa35cc3e89e29a5e46b54dc196849cb20dab2503a8f7158df68f08187c7c5caa07ca07e794676e94cad02086de3571bd7 diff --git a/tests/tests.yml b/tests/tests.yml index 881c867..57aa560 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -53,9 +53,11 @@ - prepare-source: dir: ./ run: rpmbuild -bp {{tenv_workdir}}/*.spec --nodeps --define "_sourcedir {{tenv_workdir}}" --define "_builddir {{tenv_workdir}}/source" + # pcs-web-ui sources are deleted because there are conflicts during move of sources + # pcs-web-ui sources aren't needed during testing - flatten-source: dir: ./ - run: shopt -s dotglob; mv {{tenv_workdir}}/source/*/* {{tenv_workdir}}/source + run: rm -rf {{tenv_workdir}}/source/pcs-web-ui-*; shopt -s dotglob; mv {{tenv_workdir}}/source/*/* {{tenv_workdir}}/source - build_sources: dir: ./source run: "export PYTHONPATH=/usr/lib64/pcs/pcs_bundled/packages/; export GEM_HOME=/usr/lib64/pcsd/vendor/bundle/; ./autogen.sh && ./configure"