From 7591091ec79a7fdbe500edd3b52180237598b8a1 Mon Sep 17 00:00:00 2001 From: Michal Pospisil Date: Tue, 14 Nov 2023 17:32:20 +0100 Subject: [PATCH] pcs-0.10.17-5 - Rebased to the latest upstream sources (see CHANGELOG.md) Resolves: RHEL-7584, RHEL-7668, RHEL-7729, RHEL-7731, RHEL-7732, RHEL-7741, RHEL-7742, RHEL-7743, RHEL-7745, RHEL-8467 - Tightened permissions of bundled rubygems to be 755 or stricter Resolves: RHEL-7715 --- .gitignore | 6 ++++ ...t-cluster-setup-with-udp-u-transport.patch | 8 ++--- pcs.spec | 31 +++++++++++-------- sources | 12 +++---- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index abc5505..616809b 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,9 @@ /tilt-2.2.0.gem /puma-6.3.0.gem /pcs-0.10.17.tar.gz +/ffi-1.16.3.gem +/puma-6.4.0.gem +/rack-2.2.8.gem +/rexml-3.2.6.gem +/tilt-2.3.0.gem +/pcs-bfeff6d16605a7274e7b99bb751e98856e8eae1f.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 6d8cdfc..4c2f1fa 100644 --- a/do-not-support-cluster-setup-with-udp-u-transport.patch +++ b/do-not-support-cluster-setup-with-udp-u-transport.patch @@ -1,4 +1,4 @@ -From 31d18e79bd780614a8d3a6590dc9022094743da5 Mon Sep 17 00:00:00 2001 +From bc1db4cec21452a99f1bc07be01704ad11fd58b2 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 @@ -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 4d8f1bae..b30d420c 100644 +index 8712f7b9..ed751933 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 4d8f1bae..b30d420c 100644 .br Transport options are: ip_version, netmtu diff --git a/pcs/usage.py b/pcs/usage.py -index dee8639f..9bb7afb8 100644 +index 79be6970..a5d02212 100644 --- a/pcs/usage.py +++ b/pcs/usage.py -@@ -1036,6 +1036,7 @@ Commands: +@@ -1038,6 +1038,7 @@ Commands: hash=sha256. To disable encryption, set cipher=none and hash=none. Transports udp and udpu: diff --git a/pcs.spec b/pcs.spec index c2272ac..6a9398e 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,6 +1,6 @@ Name: pcs Version: 0.10.17 -Release: 4%{?dist} +Release: 5%{?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 @@ -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 bfeff6d16605a7274e7b99bb751e98856e8eae1f %global pcs_source_name %{name}-%{version_or_commit} # ui_commit can be determined by hash, tag or branch @@ -38,19 +38,19 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %global dateutil_version 2.8.2 %global version_rubygem_backports 3.24.1 %global version_rubygem_ethon 0.16.0 -%global version_rubygem_ffi 1.15.5 +%global version_rubygem_ffi 1.16.3 %global version_rubygem_json 2.6.3 %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.3.0 -%global version_rubygem_rack 2.2.7 +%global version_rubygem_puma 6.4.0 +%global version_rubygem_rack 2.2.8 %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_rexml 3.2.6 %global version_rubygem_ruby2_keywords 0.0.5 %global version_rubygem_sinatra 2.2.4 -%global version_rubygem_tilt 2.2.0 +%global version_rubygem_tilt 2.3.0 # javascript bundled libraries for old web-ui %global ember_version 1.4.0 @@ -122,8 +122,6 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_modu # pcs patches: <= 200 # Patch1: bzNUMBER-01-name.patch Patch1: do-not-support-cluster-setup-with-udp-u-transport.patch -Patch2: bz2218841-01-fix-displaying-duplicate-records-in-property-command.patch -Patch3: bz2219388-01-use-a-filter-when-extracting-a-config-backup-tarball.patch # ui patches: >200 # Patch201: bzNUMBER-01-name.patch @@ -323,8 +321,6 @@ update_times_patch(){ %autopatch -p1 -M 200 # update_times_patch %%{PATCH1} update_times_patch %{PATCH1} -update_times_patch %{PATCH2} -update_times_patch %{PATCH3} # 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 @@ -374,7 +370,10 @@ cp -f %SOURCE45 rpm/ %define debug_package %{nil} ./autogen.sh -%{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling --enable-booth-enable-authfile-set --enable-booth-enable-authfile-unset PYTHON=%{__python3} ruby_CFLAGS="%{optflags}" ruby_LIBS="%{build_ldflags}" +%{configure} --enable-local-build --enable-use-local-cache-only \ + --enable-individual-bundling \ + --enable-booth-enable-authfile-set --enable-booth-enable-authfile-unset \ + PYTHON=%{__python3} ruby_CFLAGS="%{optflags}" ruby_LIBS="%{build_ldflags}" make all # build pcs-web-ui @@ -588,6 +587,12 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Tue Nov 14 2023 Michal Pospisil - 0.10.17-5 +- Rebased to the latest upstream sources (see CHANGELOG.md) + Resolves: RHEL-7584, RHEL-7668, RHEL-7729, RHEL-7731, RHEL-7732, RHEL-7741, RHEL-7742, RHEL-7743, RHEL-7745, RHEL-8467 +- Tightened permissions of bundled rubygems to be 755 or stricter + Resolves: RHEL-7715 + * Mon Nov 6 2023 Michal Pospisil - 0.10.17-4 - No changes, fixed an error in the new quality control process - Resolves: RHEL-15218 diff --git a/sources b/sources index 902dd05..f27fb04 100644 --- a/sources +++ b/sources @@ -1,6 +1,5 @@ SHA512 (dataclasses-0.8.tar.gz) = 3369f5a9b1243f0af9e05dcfa8534801137ab05c62416360e6d36eee2df23b828f4a0d777aad706b7eb16ee71b879390abf4e402def2930f4fc4ccb41a6bbd88 SHA512 (ethon-0.16.0.gem) = 3b31affcee0d5a5be05b5497d4a8d13515f8393f54579a3a9c8de49f78d3f065bb92659434b023f0a8bf8e0cccfbc94b617695b93c4d3f744cccd1eff2e68905 -SHA512 (ffi-1.15.5.gem) = 074df34edffc7038ab08199350a97b32280d61ea15dd85d459b008bd3363ec5403b4e533621c8e460e5288f01fec944bff9b149851b819e85bab75ad2362227c SHA512 (json-2.6.3.gem) = 10795b67403b03bf0780f9a34f3f1dd59cb797380bc28e8176890502b18fc064ad775b1472856400a1f75a75346fab1e9f63f799b6685d10363495c6a36b6911 SHA512 (mustermann-2.0.2.gem) = ed72ec2e376e160cd315cdd8fb0693993b02d6898167dc6f158049bd8e0a6ad4f98e604108992e5787067ea951be793d2a7e6e47df2d582907868300aaa74e5a SHA512 (open4-1.3.4-1.gem) = 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb @@ -9,15 +8,16 @@ SHA512 (pcs-web-ui-node-modules-0.1.13.tar.xz) = 5e56644d6a4444856e5b15d0717aad9 SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a SHA512 (python-dateutil-2.8.2.tar.gz) = 6538858e4a3e2d1de1bf25b6d8b25e3a8d20bf60fb85e32d07ac491c90ce193e268bb5641371b8a79fb0f033a184bac9896b3bc643c1aca9ee9c6478286ac20c SHA512 (rack-protection-2.2.4.gem) = 0b965f651f9bc9e6daeec86cce8cdc87a503e8b14afb84bdb2c6dd130cf82ce6d3f5d23c1ed8b85afb76858ade992b60340130923c14b4a2b1bf1aeabaec9267 -SHA512 (rexml-3.2.5.gem) = 1e3838d4a5befa76137fb8fea6a20195490645aa2b1c5d14d1eeca6c093d7f64eb405f07fd07b00fcafa9606dc78f9f0a488012338f81414623feb6e8cb83931 SHA512 (ruby2_keywords-0.0.5.gem) = f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f SHA512 (sinatra-2.2.4.gem) = 629d39c8dc333a0b9e2c56775d7d447437d98afaf28cef44d217de8b2328493861657c9658ec6cb3875fc33ce8ff25d9973bbcaf682ceaadb266320b4441b44b SHA512 (tornado-6.1.0.tar.gz) = bd161a1c30f40f983d608297bca113735cb4baad255de71302a5b4d35be8c02afbc9820728efa912e62e1cbbfad8f92360261a69e0c8759f9e6cb477fbca31c7 SHA512 (backports-3.24.1.gem) = b2eeb76ebf8ddfc7e349e125c6b9cffcabe3d184533579dbf2abb5f663ce85f4a6f8b01b67be4030c98f4782c63511046a1a1efa4d573a9aeb700dcbb9f9f566 SHA512 (nio4r-2.5.9.gem) = d1c52896f186d19eb089a94d74ccadb427e64c204af149aa83a5a4dda3f0edd1bd2bae94afd21fcd58e3c2b9e2c17278a18717c0905de80e45540d13eeefd9e5 -SHA512 (rack-2.2.7.gem) = 81df6b9bbc417f0ddcfe4d3278c3b244ff355d876e6c982b8fdd648d37652034aa11a16baa02d152c8d110c3d2b19c96b81b38f680cb274e5155978d0c21f8be SHA512 (rack-test-2.1.0.gem) = e349ce61c3d787e0a772980db697e92212d4d9592ce33f55516d1f85fba55cbe666496c76392679b057786d6dab603d74b83e7bb773ab54940343e36dbf05d6f SHA512 (dacite-1.8.1.tar.gz) = 4b40c0bdcf5490bcc77de9e7f04b7267642bcfd41e4168607a5457f38abe3ad4b3041d8a23cb43af76de14eabee45f900ad5ddf7af8f70a2be4850bccc2d3af1 -SHA512 (tilt-2.2.0.gem) = fd3e01dc58d2a1fb884c9212e6fd3291dcc710b906d23fc86af93d29f1bb2a94edbd5819d8fa91e6184fc2359392a9eb7cbdcdbebd215dacc857a1586500dfc6 -SHA512 (puma-6.3.0.gem) = a4bbc965f19a8795e87f7f2cacaf5b63167284f31207dcfb6df6a61d0d1e585d782f0e2fc4155327124163875e2f9fed98eed24d497bc5f79dfbf0be3f16a564 -SHA512 (pcs-0.10.17.tar.gz) = 5a70dc28c9762f7bdf40332b432324529537d7a946992e7b350d53c95c2b0a771acd0b6ec639779cc3aabf72969b2f68a04d1170a266d359192b86487d60e564 +SHA512 (ffi-1.16.3.gem) = b3d823a03055412a85ae3dbc10c3b50615614f0b66830e144ca47610b1f93f588ff693a95d364b4f686968b79bba91f9f9fa60b932479c6bf9ceb10e15575b98 +SHA512 (puma-6.4.0.gem) = 3f481bd2bd34ed0d66d86f61d7522a48b4d8bfd36b807a1c47bb3b640bc6050a72f4f710fd4fad16260b560f98050e34faad044a54cb759c7ffe8371c3548c18 +SHA512 (rack-2.2.8.gem) = 8d12f6ce307f0474529218086c25d9f043b7787c65fab919bf9d706c00b3d61e2460e2fef02134e6e76b721b97cc86d80fa1a22d8adda89b19fc29b21694c15d +SHA512 (rexml-3.2.6.gem) = 6e4539f6de381be6a90e236cee7ef65622e18c88e4c4f3ee0b2c7501623b92bba046c22cd4de5f50a3067527fbe90a57f28fb4a5206754e957368a5d330b5458 +SHA512 (tilt-2.3.0.gem) = 78a3de34e3d096e40cb245807bad07cc3ebfa192986addbd228c25153166808b379f3ce086ff68fa5959997946187fe8923e84100653b2b109007390969875b3 +SHA512 (pcs-bfeff6d16605a7274e7b99bb751e98856e8eae1f.tar.gz) = 3a715edb6b88ef0701d84201892d48362bdf195a5113ecdac522612b9ea2b11bb2a85de17b6cb62379ebd2d733ef88b547eab81d0b4b201822b3d44627a83dc9