Resolves: rhbz#2112259 rhbz#2163439 rhbz#2166289

- Rebased to the latest upstream sources (see CHANGELOG.md)
- Updated bundled rubygems: tilt, puma

.gitignore

@@ -29,3 +29,6 @@
 /tilt-2.1.0.gem
 /dacite-1.8.1.tar.gz
 /pcs-d5642c2ede0d6555603bc385dc35e581d2f0fddd.tar.gz
+/tilt-2.2.0.gem
+/puma-6.3.0.gem
+/pcs-0.10.17.tar.gz

do-not-support-cluster-setup-with-udp-u-transport.patch

@@ -1,4 +1,4 @@
-From fcedfd66c952d7565eb43748907467f40551ab5d Mon Sep 17 00:00:00 2001
+From 31d18e79bd780614a8d3a6590dc9022094743da5 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
@@ -10,7 +10,7 @@ Subject: [PATCH] do not support cluster setup with udp(u) transport
  3 files changed, 6 insertions(+)
 
 diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
-index a89f453c..3f4bf954 100644
+index 4d8f1bae..b30d420c 100644
 --- a/pcs/pcs.8.in
 +++ b/pcs/pcs.8.in
 @@ -438,6 +438,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
@@ -23,10 +23,10 @@ index a89f453c..3f4bf954 100644
  .br
  Transport options are: ip_version, netmtu
 diff --git a/pcs/usage.py b/pcs/usage.py
-index 78c4adb0..990a0c71 100644
+index dee8639f..9bb7afb8 100644
 --- a/pcs/usage.py
 +++ b/pcs/usage.py
-@@ -1026,6 +1026,7 @@ Commands:
+@@ -1036,6 +1036,7 @@ Commands:
              hash=sha256. To disable encryption, set cipher=none and hash=none.
  
          Transports udp and udpu:
@@ -49,5 +49,5 @@ index 2f26e831..a7702ac4 100644
  #csetup-transport-options.knet .without-knet
  {
 -- 
-2.40.1
+2.41.0
 

pcs.spec

@@ -1,5 +1,5 @@
 Name: pcs
-Version: 0.10.16
+Version: 0.10.17
 Release: 1%{?dist}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
@@ -21,8 +21,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 d5642c2ede0d6555603bc385dc35e581d2f0fddd
+%global version_or_commit %{version}
+# %%global version_or_commit d5642c2ede0d6555603bc385dc35e581d2f0fddd
 %global pcs_source_name %{name}-%{version_or_commit}
 
 # ui_commit can be determined by hash, tag or branch
@@ -43,14 +43,14 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %global version_rubygem_mustermann  2.0.2
 %global version_rubygem_nio4r 2.5.9
 %global version_rubygem_open4  1.3.4
-%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  2.2.4
 %global version_rubygem_rack_test  2.1.0
 %global version_rubygem_rexml  3.2.5
 %global version_rubygem_ruby2_keywords  0.0.5
 %global version_rubygem_sinatra  2.2.4
-%global version_rubygem_tilt  2.1.0
+%global version_rubygem_tilt  2.2.0
 
 # javascript bundled libraries for old web-ui
 %global ember_version 1.4.0
@@ -576,6 +576,11 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Mon Jun 19 2023 Michal Pospisil <mpospisi@redhat.com> - 0.10.17-1
+- Rebased to the latest upstream sources (see CHANGELOG.md)
+- Updated bundled rubygems: tilt, puma
+- Resolves: rhbz#2112259 rhbz#2163439 rhbz#2166289
+
 * Thu May 25 2023 Michal Pospisil <mpospisi@redhat.com> - 0.10.16-1
 - Rebased to the latest upstream sources (see CHANGELOG.md)
 - Updated bundled dependencies: dacite

sources

@@ -15,9 +15,9 @@ SHA512 (sinatra-2.2.4.gem) = 629d39c8dc333a0b9e2c56775d7d447437d98afaf28cef44d21
 SHA512 (tornado-6.1.0.tar.gz) = bd161a1c30f40f983d608297bca113735cb4baad255de71302a5b4d35be8c02afbc9820728efa912e62e1cbbfad8f92360261a69e0c8759f9e6cb477fbca31c7
 SHA512 (backports-3.24.1.gem) = b2eeb76ebf8ddfc7e349e125c6b9cffcabe3d184533579dbf2abb5f663ce85f4a6f8b01b67be4030c98f4782c63511046a1a1efa4d573a9aeb700dcbb9f9f566
 SHA512 (nio4r-2.5.9.gem) = d1c52896f186d19eb089a94d74ccadb427e64c204af149aa83a5a4dda3f0edd1bd2bae94afd21fcd58e3c2b9e2c17278a18717c0905de80e45540d13eeefd9e5
-SHA512 (puma-6.2.2.gem) = fb40ffc165a448132bd89c739d512a642ce370c72b320455b01db9600d4d85397fc9f2e84157e58f2c44c83725630725c264b7a24a9c9a61f5461d67a6e536ea
 SHA512 (rack-2.2.7.gem) = 81df6b9bbc417f0ddcfe4d3278c3b244ff355d876e6c982b8fdd648d37652034aa11a16baa02d152c8d110c3d2b19c96b81b38f680cb274e5155978d0c21f8be
 SHA512 (rack-test-2.1.0.gem) = e349ce61c3d787e0a772980db697e92212d4d9592ce33f55516d1f85fba55cbe666496c76392679b057786d6dab603d74b83e7bb773ab54940343e36dbf05d6f
-SHA512 (tilt-2.1.0.gem) = 3449c7baa5d5ffc98dd537cc6dae94e3f0f7fd0cd57ad0ea9fdd12090e4b0dcbd555d7a90fb4c774754d73d2675a0ee9c803c66a74b8e9e60f674bfcd9ccc0c9
 SHA512 (dacite-1.8.1.tar.gz) = 4b40c0bdcf5490bcc77de9e7f04b7267642bcfd41e4168607a5457f38abe3ad4b3041d8a23cb43af76de14eabee45f900ad5ddf7af8f70a2be4850bccc2d3af1
-SHA512 (pcs-d5642c2ede0d6555603bc385dc35e581d2f0fddd.tar.gz) = 7f061e839387e1a9d5948dcaba406fb0cda00db5a9fec136e02a4818bd89983dd6084121bfbdd6bbe17dcb56272fac4688a3dc006be60d62d00dbb020e8432e1
+SHA512 (tilt-2.2.0.gem) = fd3e01dc58d2a1fb884c9212e6fd3291dcc710b906d23fc86af93d29f1bb2a94edbd5819d8fa91e6184fc2359392a9eb7cbdcdbebd215dacc857a1586500dfc6
+SHA512 (puma-6.3.0.gem) = a4bbc965f19a8795e87f7f2cacaf5b63167284f31207dcfb6df6a61d0d1e585d782f0e2fc4155327124163875e2f9fed98eed24d497bc5f79dfbf0be3f16a564
+SHA512 (pcs-0.10.17.tar.gz) = 5a70dc28c9762f7bdf40332b432324529537d7a946992e7b350d53c95c2b0a771acd0b6ec639779cc3aabf72969b2f68a04d1170a266d359192b86487d60e564