import pcs-0.11.1-4.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
a234b1c966
commit
3aa874a013
|
|
@ -6,9 +6,9 @@ SOURCES/eventmachine-1.2.7.gem
|
|||
SOURCES/ffi-1.13.1.gem
|
||||
SOURCES/mustermann-1.1.1.gem
|
||||
SOURCES/open4-1.3.4-1.gem
|
||||
SOURCES/pcs-0.11.1.alpha.1.tar.gz
|
||||
SOURCES/pcs-web-ui-0.1.9.tar.gz
|
||||
SOURCES/pcs-web-ui-node-modules-0.1.9.tar.xz
|
||||
SOURCES/pcs-0.11.1.alpha.1.33-e5970.tar.gz
|
||||
SOURCES/pcs-web-ui-0.1.10.tar.gz
|
||||
SOURCES/pcs-web-ui-node-modules-0.1.10.tar.xz
|
||||
SOURCES/pyagentx-0.4.pcs.2.tar.gz
|
||||
SOURCES/rack-2.2.3.gem
|
||||
SOURCES/rack-protection-2.0.8.1.gem
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ e28c1e78d1a6e34e80f4933b494f1e0501939dd3 SOURCES/daemons-1.3.1.gem
|
|||
cfa25e7a3760c3ec16723cb8263d9b7a52d0eadf SOURCES/ffi-1.13.1.gem
|
||||
50a4e37904485810cb05e27d75c9783e5a8f3402 SOURCES/mustermann-1.1.1.gem
|
||||
41a7fe9f8e3e02da5ae76c821b89c5b376a97746 SOURCES/open4-1.3.4-1.gem
|
||||
ce3598a2d60895cf66487dc0b6715acfc284c769 SOURCES/pcs-0.11.1.alpha.1.tar.gz
|
||||
c7effa066c968a3e5f01cfbfe8cedeb22664cef5 SOURCES/pcs-web-ui-0.1.9.tar.gz
|
||||
81b6170592cdea9272699d7ec48f3624d2f36269 SOURCES/pcs-web-ui-node-modules-0.1.9.tar.xz
|
||||
77c5ef61c3a3f4511910d99d76033591988db011 SOURCES/pcs-0.11.1.alpha.1.33-e5970.tar.gz
|
||||
86002e7752f3db1aa5b98d29166c7bf9bbc6c2b5 SOURCES/pcs-web-ui-0.1.10.tar.gz
|
||||
14a0e8c5245dc34e8cc80663073e354c81c9e06c SOURCES/pcs-web-ui-node-modules-0.1.10.tar.xz
|
||||
3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz
|
||||
345b7169d4d2d62176a225510399963bad62b68f SOURCES/rack-2.2.3.gem
|
||||
1f046e23baca8beece3b38c60382f44aa2b2cb41 SOURCES/rack-protection-2.0.8.1.gem
|
||||
|
|
|
|||
|
|
@ -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 <idevat@redhat.com>
|
||||
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:
|
||||
|
|
|
|||
|
|
@ -1,24 +1,79 @@
|
|||
From 2bf9e3cbcd27405bcea019de6026d6d8400ac1a3 Mon Sep 17 00:00:00 2001
|
||||
From e42084ac211638354fc052c5a24631570a23fe71 Mon Sep 17 00:00:00 2001
|
||||
From: Miroslav Lisik <mlisik@redhat.com>
|
||||
Date: Thu, 26 Aug 2021 16:46:05 +0200
|
||||
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 0a049fc2..8c31cbb3 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
|
||||
|
||||
|
|
|
|||
|
|
@ -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 <mlisik@redhat.com>
|
||||
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
|
||||
|
||||
|
|
|
|||
3261
SOURCES/update.patch
3261
SOURCES/update.patch
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
|||
Name: pcs
|
||||
Version: 0.11.1
|
||||
Release: 3%{?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.9
|
||||
%global ui_modules_version 0.1.9
|
||||
%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,13 @@ 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: update.patch
|
||||
Patch4: fix-changelog.patch
|
||||
Patch3: fix-changelog.patch
|
||||
|
||||
# ui patches: >200
|
||||
# Patch201: bzNUMBER-01-name.patch
|
||||
|
||||
# git for patches
|
||||
BuildRequires: git-core
|
||||
|
|
@ -241,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
|
||||
|
|
@ -282,16 +283,20 @@ 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}
|
||||
update_times_patch %{PATCH4}
|
||||
|
||||
# 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
|
||||
# -----------------------------------------------------
|
||||
|
|
@ -331,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 BUILD_USE_EXISTING_NODE_MODULES=true
|
||||
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/
|
||||
|
|
@ -531,14 +537,11 @@ run_all_tests
|
|||
%license pyagentx_LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Mon Sep 06 2021 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-3
|
||||
- Fixed pcs web ui - adapt to backend changes
|
||||
- Resolves: rhbz#1999690
|
||||
|
||||
* Thu Sep 02 2021 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-2
|
||||
- Fixed pcs web ui - data are not wiped out when user logout
|
||||
- Fixed stop requesting legacy output of remote/status
|
||||
- Resolves: rhbz#1999104 rhbz#1999690
|
||||
* Tue Nov 02 2021 Miroslav Lisik <mlisik@redhat.com> - 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 <mlisik@redhat.com> - 0.11.1-1
|
||||
- Rebased to latest upstream sources (see CHANGELOG.md)
|
||||
|
|
|
|||
Loading…
Reference in New Issue