From efdeed060b3e5bd22f9eacc320fa02a28d301271 Mon Sep 17 00:00:00 2001 From: Miroslav Lisik Date: Thu, 2 Dec 2021 11:17:56 +0100 Subject: [PATCH] Resolves: rhbz#1990787 rhbz#1997019 rhbz#2012129 rhbz#2024542 rhbz#2027678 rhbz#2027679 - Rebased to latest upstream sources (see CHANGELOG.md) - Updated pcs web ui --- .gitignore | 3 + ...t-cluster-setup-with-udp-u-transport.patch | 13 +-- fix-changelog.patch | 107 ------------------ fix-version.patch | 27 ----- pcs.spec | 45 ++++---- sources | 6 +- 6 files changed, 36 insertions(+), 165 deletions(-) delete mode 100644 fix-changelog.patch delete mode 100644 fix-version.patch diff --git a/.gitignore b/.gitignore index c98eabd..596f7ea 100644 --- a/.gitignore +++ b/.gitignore @@ -148,3 +148,6 @@ /pcs-web-ui-0.1.10.tar.gz /pcs-web-ui-node-modules-0.1.10.tar.xz /pcs-0.11.1.alpha.1.45-6743f.tar.gz +/pcs-web-ui-0.1.11.tar.gz +/pcs-web-ui-node-modules-0.1.11.tar.xz +/pcs-0.11.1.tar.gz 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 1276071..fa1ead6 100644 --- a/do-not-support-cluster-setup-with-udp-u-transport.patch +++ b/do-not-support-cluster-setup-with-udp-u-transport.patch @@ -1,8 +1,7 @@ -From 259b7dad81d2fa41befa7d9c0a4d4e6dac0fac31 Mon Sep 17 00:00:00 2001 +From 49d9c698697b0dd49f53b60340705b4fd656e248 Mon Sep 17 00:00:00 2001 From: Ivan Devat Date: Tue, 20 Nov 2018 15:03:56 +0100 -Subject: [PATCH 1/2] do not support cluster setup with udp(u) transport in - RHEL9 +Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9 --- pcs/pcs.8.in | 2 ++ @@ -10,10 +9,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 8174769b..21273013 100644 +index 0bbee071..ba14251d 100644 --- a/pcs/pcs.8.in +++ b/pcs/pcs.8.in -@@ -449,6 +449,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable +@@ -457,6 +457,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable Transports udp and udpu: .br @@ -23,10 +22,10 @@ index 8174769b..21273013 100644 .br Transport options are: ip_version, netmtu diff --git a/pcs/usage.py b/pcs/usage.py -index b2177f91..7528f773 100644 +index bc885918..4e286f46 100644 --- a/pcs/usage.py +++ b/pcs/usage.py -@@ -896,6 +896,7 @@ Commands: +@@ -916,6 +916,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 deleted file mode 100644 index 98d7756..0000000 --- a/fix-changelog.patch +++ /dev/null @@ -1,107 +0,0 @@ -From d68f7fd6036c508ab76b1ad6f97abbfce588a362 Mon Sep 17 00:00:00 2001 -From: Miroslav Lisik -Date: Thu, 18 Nov 2021 13:32:06 +0100 -Subject: [PATCH 2/2] fix changelog - ---- - CHANGELOG.md | 60 +++++++++++++++++++++++----------------------------- - 1 file changed, 26 insertions(+), 34 deletions(-) - -diff --git a/CHANGELOG.md b/CHANGELOG.md -index a3a10db9..08395b5b 100644 ---- a/CHANGELOG.md -+++ b/CHANGELOG.md -@@ -2,13 +2,30 @@ - - ## [Unreleased] - -+### Removed -+- Deprecated obsolete commands `pcs config import-cman` and `pcs config export -+ pcs-commands|pcs-commands-verbose` have been removed ([rhbz#1881064]) -+- Unused and unmaintained pcsd urls: `/remote/config_backup`, -+ `/remote/node_available`, `/remote/resource_status` -+- Pcsd no longer provides data in format used by web UI in pcs 0.9.142 and older -+ - ### Added -+- 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]) - - Command `pcs resource move` is fully supported ([rhbz#1990787]) - - Support for OCF 1.1 resource and stonith agents ([rhbz#2018969]) - - ### Changed -+- Pcs no longer depends on python3-distro package -+- 'pcs status xml' now prints cluster status in the new format provided by -+ Pacemaker 2.1 ([rhbz#1985981]) -+- All errors, warning and progress related output is now printed to stderr -+ instead of stdout -+- 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 - -@@ -21,50 +38,25 @@ - - Misleading error message from `pcs quorum unblock` when `wait_for_all=0` - ([rhbz#1968088]) - -- --[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#1968088]: https://bugzilla.redhat.com/show_bug.cgi?id=1968088 --[rhbz#1990787]: https://bugzilla.redhat.com/show_bug.cgi?id=1990787 --[rhbz#1991654]: https://bugzilla.redhat.com/show_bug.cgi?id=1991654 --[rhbz#1992668]: https://bugzilla.redhat.com/show_bug.cgi?id=1992668 --[rhbz#2018969]: https://bugzilla.redhat.com/show_bug.cgi?id=2018969 -- -- --## [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 -- Pacemaker 2.1 ([rhbz#1985981]) --- All errors, warning and progress related output is now printed to stderr -- instead of stdout --- Make roles `Promoted` and `Unpromoted` default ([rhbz#1885293]) --- Make auto-deleting constraint default for `pcs resource move` command -- ([rhbz#1996062]) -- --### Removed --- Deprecated obsolete commands `pcs config import-cman` and `pcs config export -- pcs-commands|pcs-commands-verbose` have been removed ([rhbz#1881064]) --- Unused and unmaintained pcsd urls: `/remote/config_backup`, -- `/remote/node_available`, `/remote/resource_status` --- Pcsd no longer provides data in format used by web UI in pcs 0.9.142 and older -- - ### Deprecated - - Legacy role names `Master` and `Slave` ([rhbz#1885293]) - - 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#1968088]: https://bugzilla.redhat.com/show_bug.cgi?id=1968088 - [rhbz#1985981]: https://bugzilla.redhat.com/show_bug.cgi?id=1985981 -+[rhbz#1990787]: https://bugzilla.redhat.com/show_bug.cgi?id=1990787 -+[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 -+[rhbz#2018969]: https://bugzilla.redhat.com/show_bug.cgi?id=2018969 - - - ## [0.10.10] - 2021-08-19 --- -2.31.1 - diff --git a/fix-version.patch b/fix-version.patch deleted file mode 100644 index 4ba5edf..0000000 --- a/fix-version.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f138def9b9d2559658aef8c074f3fb22325a6cdf Mon Sep 17 00:00:00 2001 -From: Miroslav Lisik -Date: Thu, 18 Nov 2021 13:28:25 +0100 -Subject: [PATCH] fix version - ---- - .tarball-version | 2 +- - .version | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/.tarball-version b/.tarball-version -index 8da758a..0b59c34 100644 ---- a/.tarball-version -+++ b/.tarball-version -@@ -1 +1 @@ --0.11.1.alpha.1.45-6743f -+0.11.1.45-6743f -diff --git a/.version b/.version -index 8da758a..0b59c34 100644 ---- a/.version -+++ b/.version -@@ -1 +1 @@ --0.11.1.alpha.1.45-6743f -+0.11.1.45-6743f --- -2.31.1 - diff --git a/pcs.spec b/pcs.spec index b46b667..e2aa8b6 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,12 +1,12 @@ Name: pcs Version: 0.11.1 -Release: 5%{?dist} +Release: 6%{?dist} # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs # ASL 2.0: tornado -# MIT: backports, dacite, daemons, ember, ethon, handlebars, jquery, jquery-ui, -# mustermann, rack, rack-protection, rack-test, sinatra, tilt +# MIT: backports, dacite, daemons, ethon, mustermann, rack, rack-protection, +# rack-test, sinatra, tilt # GPLv2 or Ruby: eventmachne # (GPLv2 or Ruby) and BSD: thin # BSD or Ruby: open4, rexml, ruby2_keywords, webrick @@ -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.45-6743f +%global pcs_source_name %{name}-%{version_or_commit} # ui_commit can be determined by hash, tag or branch -%global ui_commit 0.1.10 -%global ui_modules_version 0.1.10 +%global ui_commit 0.1.11 +%global ui_modules_version 0.1.11 %global ui_src_name pcs-web-ui-%{ui_commit} %global pcs_snmp_pkg_name pcs-snmp @@ -50,6 +50,8 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %global version_rubygem_tilt 2.0.10 %global version_rubygem_webrick 1.7.0 +%global required_pacemaker_version 2.1.0 + %global pcs_bundled_dir pcs_bundled %global pcsd_public_dir pcsd/public %global rubygem_bundle_dir pcsd/vendor/bundle @@ -109,9 +111,7 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_comm # RHEL needs. # pcs patches: <= 200 -Patch1: fix-version.patch -Patch2: do-not-support-cluster-setup-with-udp-u-transport.patch -Patch3: fix-changelog.patch +Patch1: do-not-support-cluster-setup-with-udp-u-transport.patch # ui patches: >200 # Patch201: bzNUMBER-01-name.patch @@ -121,7 +121,7 @@ BuildRequires: git-core #printf from coreutils is used in makefile BuildRequires: coreutils # python for pcs -BuildRequires: python3 >= 3.6 +BuildRequires: python3 >= 3.9 BuildRequires: python3-cryptography BuildRequires: python3-dateutil >= 2.7.0 BuildRequires: python3-devel @@ -139,7 +139,7 @@ BuildRequires: python3-setuptools_scm BuildRequires: gcc BuildRequires: gcc-c++ # ruby and gems for pcsd -BuildRequires: ruby >= 2.2.0 +BuildRequires: ruby >= 2.5 BuildRequires: ruby-devel BuildRequires: rubygems BuildRequires: rubygem-bundler @@ -160,12 +160,12 @@ BuildRequires: booth BuildRequires: corosync-qdevice-devel BuildRequires: corosynclib-devel >= 3.0 BuildRequires: fence-agents-common -BuildRequires: pacemaker-libs-devel >= 2.0.0 +BuildRequires: pacemaker-libs-devel >= %{required_pacemaker_version} BuildRequires: resource-agents BuildRequires: sbd # python and libraries for pcs, setuptools for pcs entrypoint -Requires: python3 >= 3.6 +Requires: python3 >= 3.9 Requires: python3-cryptography Requires: python3-dateutil >= 2.7.0 Requires: python3-lxml @@ -174,18 +174,18 @@ Requires: python3-pycurl Requires: python3-pyparsing Requires: python3-cryptography # ruby and gems for pcsd -Requires: ruby >= 2.2.0 +Requires: ruby >= 2.5 Requires: rubygems Requires: rubygem-json # for killall Requires: psmisc # cluster stack and related packages -Requires: pcmk-cluster-manager >= 2.0.0 -Suggests: pacemaker -Requires: (corosync >= 2.99 if pacemaker) +Requires: pcmk-cluster-manager >= %{required_pacemaker_version} +Suggests: pacemaker >= %{required_pacemaker_version} +Requires: (corosync >= 3.0 if pacemaker) # pcs enables corosync encryption by default so we require libknet1-plugins-all Requires: (libknet1-plugins-all if corosync) -Requires: pacemaker-cli >= 2.0.0 +Requires: pacemaker-cli >= %{required_pacemaker_version} # for post, preun and postun macros Requires(post): systemd Requires(preun): systemd @@ -295,8 +295,6 @@ update_times_patch(){ %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 all bundles # ----------------------------------------------------- @@ -333,7 +331,7 @@ cp -f %SOURCE44 rpm/ %define debug_package %{nil} ./autogen.sh -%{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3} +%{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3} ruby_CFLAGS="%{optflags}" ruby_LIBS="%{build_ldflags}" make all # build pcs-web-ui @@ -537,6 +535,11 @@ run_all_tests %license pyagentx_LICENSE.txt %changelog +* Thu Dec 02 2021 Miroslav Lisik - 0.11.1-6 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Updated pcs web ui +- Resolves: rhbz#1990787 rhbz#1997019 rhbz#2012129 rhbz#2024542 rhbz#2027678 rhbz#2027679 + * Thu Nov 18 2021 Miroslav Lisik - 0.11.1-5 - Rebased to latest upstream sources (see CHANGELOG.md) - Resolves: rhbz#1990787 rhbz#2018969 rhbz#2019836 rhbz#2023752 rhbz#2012129 diff --git a/sources b/sources index d251c2a..d62a121 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.10.tar.gz) = af6f4338cdf82877f5ba66ce81c0e9c78613227c85e4e5fbd2f5f0518765e7ddaa3b6138b7d2c95605557e9e9a0f9ef947b6cff3e5023ada6ec4d8f7869b507f -SHA512 (pcs-web-ui-node-modules-0.1.10.tar.xz) = d27257c2121c33fd3419bbb261d5e15aa35cc3e89e29a5e46b54dc196849cb20dab2503a8f7158df68f08187c7c5caa07ca07e794676e94cad02086de3571bd7 -SHA512 (pcs-0.11.1.alpha.1.45-6743f.tar.gz) = e80b57b3dda0f89317202aff5fc14b7aaf9d2dafbb5a9ec604c193de0886e9076d53411c9ed81bf5baec3910e0b2d53d20ac2b1a61a87653c262940fe701d7bc +SHA512 (pcs-web-ui-node-modules-0.1.11.tar.xz) = 9d11d3549480a92f839b93427544f2aadc115ba4f9a0f0c672cc0d54a7a5813ced43e34dc81dfed4f77ded25664a3cccc4a85f33b3454c85d4369c8f98e71c9e +SHA512 (pcs-0.11.1.tar.gz) = 24fdcf027965c99534d1cd411d5517a1446f633d80a1ccb9dc6be95adda8a81f0ef74df94bb433296b3e9a90b8b96ab318c75473efdc53fe48446fd0d9c9f3da +SHA512 (pcs-web-ui-0.1.11.tar.gz) = f668bf29a8c4d5714e3d560779221672289d5bdfc6a1f68d124ec511c38053eab4526df258d29c25243413280ab1189709270a5ee51d9d3c42f556d3b5648d72