Resolves: rhbz#1465829 rhbz#2163440 rhbz#2168155
- Rebased to the latest upstream sources (see CHANGELOG.md) - Updated bundled rubygems: puma, tilt
This commit is contained in:
Michal Pospisil
parent
aa4f1fd980
commit
ddf1de3c5d
3
.gitignore
vendored
3
.gitignore
vendored
@ -204,3 +204,6 @@
|
||||
/sinatra-3.0.6.gem
|
||||
/tilt-2.1.0.gem
|
||||
/pcs-3e479bdb68dc900523a743e7dcb759b501385555.tar.gz
|
||||
/tilt-2.2.0.gem
|
||||
/puma-6.3.0.gem
|
||||
/pcs-0.11.6.tar.gz
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 9d8c64aac8f6883cfdf270de935e4366cc17775f Mon Sep 17 00:00:00 2001
|
||||
From 948eb79f2f4057ac8143242b29e8c164ee4516ed 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
|
||||
@ -9,10 +9,10 @@ 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 4e735f33..fc2938a4 100644
|
||||
index 2baf0009..9b2f7388 100644
|
||||
--- a/pcs/pcs.8.in
|
||||
+++ b/pcs/pcs.8.in
|
||||
@@ -459,6 +459,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
|
||||
@@ -479,6 +479,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
|
||||
|
||||
Transports udp and udpu:
|
||||
.br
|
||||
@ -22,10 +22,10 @@ index 4e735f33..fc2938a4 100644
|
||||
.br
|
||||
Transport options are: ip_version, netmtu
|
||||
diff --git a/pcs/usage.py b/pcs/usage.py
|
||||
index 70306824..17598011 100644
|
||||
index df149e5b..c915b513 100644
|
||||
--- a/pcs/usage.py
|
||||
+++ b/pcs/usage.py
|
||||
@@ -1456,6 +1456,7 @@ Commands:
|
||||
@@ -1486,6 +1486,7 @@ Commands:
|
||||
hash=sha256. To disable encryption, set cipher=none and hash=none.
|
||||
|
||||
Transports udp and udpu:
|
||||
@ -34,5 +34,5 @@ index 70306824..17598011 100644
|
||||
support traffic encryption nor compression.
|
||||
Transport options are:
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
||||
19
pcs.spec
19
pcs.spec
@ -1,6 +1,6 @@
|
||||
Name: pcs
|
||||
Version: 0.11.5
|
||||
Release: 2%{?dist}
|
||||
Version: 0.11.6
|
||||
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 3e479bdb68dc900523a743e7dcb759b501385555
|
||||
%global version_or_commit %{version}
|
||||
# %%global version_or_commit 3e479bdb68dc900523a743e7dcb759b501385555
|
||||
%global pcs_source_name %{name}-%{version_or_commit}
|
||||
|
||||
# ui_commit can be determined by hash, tag or branch
|
||||
@ -39,13 +39,13 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
|
||||
%global version_rubygem_ffi 1.15.5
|
||||
%global version_rubygem_mustermann 3.0.0
|
||||
%global version_rubygem_nio4r 2.5.9
|
||||
%global version_rubygem_puma 6.2.2
|
||||
%global version_rubygem_puma 6.3.0
|
||||
%global version_rubygem_rack 2.2.7
|
||||
%global version_rubygem_rack_protection 3.0.6
|
||||
%global version_rubygem_rack_test 2.1.0
|
||||
%global version_rubygem_ruby2_keywords 0.0.5
|
||||
%global version_rubygem_sinatra 3.0.6
|
||||
%global version_rubygem_tilt 2.1.0
|
||||
%global version_rubygem_tilt 2.2.0
|
||||
|
||||
%global required_pacemaker_version 2.1.0
|
||||
|
||||
@ -101,7 +101,6 @@ 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: bz2210855-01-fix-resource-move-regression.patch
|
||||
|
||||
# ui patches: >200
|
||||
# Patch201: bzNUMBER-01-name.patch
|
||||
@ -292,7 +291,6 @@ update_times_patch(){
|
||||
%autopatch -p1 -M 200
|
||||
# update_times_patch %%{PATCH0}
|
||||
update_times_patch %{PATCH0}
|
||||
update_times_patch %{PATCH1}
|
||||
|
||||
# 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
|
||||
@ -529,6 +527,11 @@ run_all_tests
|
||||
%license pyagentx_LICENSE.txt
|
||||
|
||||
%changelog
|
||||
* Tue Jun 20 2023 Michal Pospisil <mpospisi@redhat.com> - 0.11.6-1
|
||||
- Rebased to the latest upstream sources (see CHANGELOG.md)
|
||||
- Updated bundled rubygems: puma, tilt
|
||||
- Resolves: rhbz#1465829 rhbz#2163440 rhbz#2168155
|
||||
|
||||
* Wed May 31 2023 Michal Pospisil <mpospisi@redhat.com> - 0.11.5-2
|
||||
- Fixed a regression causing crash in `pcs resource move` command (broken since pcs-0.11.5)
|
||||
- Resolves: rhbz#2210855
|
||||
|
||||
6
sources
6
sources
@ -8,12 +8,12 @@ SHA512 (pcs-web-ui-0.1.17.tar.gz) = a5dd551c47040d9c9a2f714a83b835aaf5cca8d5dd05
|
||||
SHA512 (pcs-web-ui-node-modules-0.1.17.tar.xz) = 51f47be3b28a378542ebe862a333e8883bbcf4e40a2aea685986b9d17db91dab01cb3b58c9ffba56f335bedfe0a9477ebb1ff93824228ed5348f864afad5b98d
|
||||
SHA512 (dacite-1.8.1.tar.gz) = 4b40c0bdcf5490bcc77de9e7f04b7267642bcfd41e4168607a5457f38abe3ad4b3041d8a23cb43af76de14eabee45f900ad5ddf7af8f70a2be4850bccc2d3af1
|
||||
SHA512 (nio4r-2.5.9.gem) = d1c52896f186d19eb089a94d74ccadb427e64c204af149aa83a5a4dda3f0edd1bd2bae94afd21fcd58e3c2b9e2c17278a18717c0905de80e45540d13eeefd9e5
|
||||
SHA512 (puma-6.2.2.gem) = fb40ffc165a448132bd89c739d512a642ce370c72b320455b01db9600d4d85397fc9f2e84157e58f2c44c83725630725c264b7a24a9c9a61f5461d67a6e536ea
|
||||
SHA512 (backports-3.24.1.gem) = b2eeb76ebf8ddfc7e349e125c6b9cffcabe3d184533579dbf2abb5f663ce85f4a6f8b01b67be4030c98f4782c63511046a1a1efa4d573a9aeb700dcbb9f9f566
|
||||
SHA512 (rack-2.2.7.gem) = 81df6b9bbc417f0ddcfe4d3278c3b244ff355d876e6c982b8fdd648d37652034aa11a16baa02d152c8d110c3d2b19c96b81b38f680cb274e5155978d0c21f8be
|
||||
SHA512 (rack-protection-3.0.6.gem) = 4763a0439a3d99cfd799325004c7e6cb46783b3fcd77ea0df08caa6b5cdfc95c6ec96791d79261a0d7df26eb0b084e7ead2cceb05b589617159e948b3172e564
|
||||
SHA512 (rack-test-2.1.0.gem) = e349ce61c3d787e0a772980db697e92212d4d9592ce33f55516d1f85fba55cbe666496c76392679b057786d6dab603d74b83e7bb773ab54940343e36dbf05d6f
|
||||
SHA512 (sinatra-3.0.6.gem) = 3eabaca09d7528fada3c24200014de67678b01a7d1bfe1141f0bad977ebd22eb0e57d286b1e445c2b2d657bcf4b9ff7d2dd06ad3d3b7376c30043dc9961f2856
|
||||
SHA512 (tilt-2.1.0.gem) = 3449c7baa5d5ffc98dd537cc6dae94e3f0f7fd0cd57ad0ea9fdd12090e4b0dcbd555d7a90fb4c774754d73d2675a0ee9c803c66a74b8e9e60f674bfcd9ccc0c9
|
||||
SHA512 (pcs-3e479bdb68dc900523a743e7dcb759b501385555.tar.gz) = 2097c29f9263d01b1d14aa5482616fcb71ddffd5e0993bf96fddef40780ac921e7f9104dcc31235be04c78f18b5b81857748c03870462237e7dbe39ae17658cc
|
||||
SHA512 (tornado-6.3.2.tar.gz) = dc0ad9b4c0b5597970fd43a577bb9a0883523125cf4e9780f9338431aab1014cb6fc0dda4f3deb3050df657b5acf277cc146ec2195b91154299109ff07482a5c
|
||||
SHA512 (tilt-2.2.0.gem) = fd3e01dc58d2a1fb884c9212e6fd3291dcc710b906d23fc86af93d29f1bb2a94edbd5819d8fa91e6184fc2359392a9eb7cbdcdbebd215dacc857a1586500dfc6
|
||||
SHA512 (puma-6.3.0.gem) = a4bbc965f19a8795e87f7f2cacaf5b63167284f31207dcfb6df6a61d0d1e585d782f0e2fc4155327124163875e2f9fed98eed24d497bc5f79dfbf0be3f16a564
|
||||
SHA512 (pcs-0.11.6.tar.gz) = 0a1508d71c17952c3d40c40147cfa05643c34fcdd162603dd6d6c02fd4c6add1e691e3412636875fc6a75f7c533e6867328acc44713752b59d237f866c90f050
|
||||
|
||||
Loading…
Reference in New Issue
Block a user