From 688acbe96ca6119d2af4d9dd10d8fedfebc76914 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sat, 26 Nov 2022 10:11:17 +0000 Subject: [PATCH] import pcs-0.10.15-1.el8 --- .gitignore | 4 +- .pcs.metadata | 4 +- ...t-cluster-setup-with-udp-u-transport.patch | 11 ++--- SPECS/pcs.spec | 44 +++++++++++-------- 4 files changed, 36 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index ca16e5b..b302c27 100644 --- a/.gitignore +++ b/.gitignore @@ -9,11 +9,11 @@ SOURCES/ffi-1.15.5.gem SOURCES/json-2.6.2.gem SOURCES/mustermann-2.0.2.gem SOURCES/open4-1.3.4-1.gem -SOURCES/pcs-0.10.14.27-cb2fb.tar.gz +SOURCES/pcs-0.10.15.tar.gz SOURCES/pcs-web-ui-0.1.13.tar.gz SOURCES/pcs-web-ui-node-modules-0.1.13.tar.xz SOURCES/pyagentx-0.4.pcs.2.tar.gz -SOURCES/python-dateutil-2.8.1.tar.gz +SOURCES/python-dateutil-2.8.2.tar.gz SOURCES/rack-2.2.4.gem SOURCES/rack-protection-2.2.2.gem SOURCES/rack-test-2.0.2.gem diff --git a/.pcs.metadata b/.pcs.metadata index 191b526..de726ea 100644 --- a/.pcs.metadata +++ b/.pcs.metadata @@ -9,11 +9,11 @@ 86c10824191e8f351da3fe0a0b6db94a813ada3a SOURCES/json-2.6.2.gem f5f804366823c1126791dfefd98dd0539563785c SOURCES/mustermann-2.0.2.gem 41a7fe9f8e3e02da5ae76c821b89c5b376a97746 SOURCES/open4-1.3.4-1.gem -bb87f540c48b929b4ebd7a7ed75d0dce1264f15d SOURCES/pcs-0.10.14.27-cb2fb.tar.gz +00e234824e85afca99df9043dd6eb47490b220c4 SOURCES/pcs-0.10.15.tar.gz f7455776936492ce7b241f9801d6bbc946b0461a SOURCES/pcs-web-ui-0.1.13.tar.gz bd18d97d611233914828719c97b4d98d079913d2 SOURCES/pcs-web-ui-node-modules-0.1.13.tar.xz 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz -bd26127e57f83a10f656b62c46524c15aeb844dd SOURCES/python-dateutil-2.8.1.tar.gz +c2ba10c775b7a52a4b57cac4d4110a0c0f812a82 SOURCES/python-dateutil-2.8.2.tar.gz d884e586767313f8fcf8c863b5220831a95fccb8 SOURCES/rack-2.2.4.gem 4bebd27a0af0a30dbeba4c5a1b82e05f3418f6be SOURCES/rack-protection-2.2.2.gem 3c669527ecbcb9f915a83983ec89320c356e1fe3 SOURCES/rack-test-2.0.2.gem diff --git a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch index 5124197..0ec8df4 100644 --- a/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch +++ b/SOURCES/do-not-support-cluster-setup-with-udp-u-transport.patch @@ -1,4 +1,4 @@ -From fb43e90eba67e00827efcbc5feba4528fb57e350 Mon Sep 17 00:00:00 2001 +From 4470259655fa10cb5908fee00653483e7056f1a7 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 6a00db89..97394e96 100644 +index d1a6dcf2..cd00f8ac 100644 --- a/pcs/pcs.8.in +++ b/pcs/pcs.8.in @@ -436,6 +436,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable @@ -23,10 +23,10 @@ index 6a00db89..97394e96 100644 .br Transport options are: ip_version, netmtu diff --git a/pcs/usage.py b/pcs/usage.py -index e76bf8e5..2e721dbd 100644 +index c3174d82..0a6ffcb6 100644 --- a/pcs/usage.py +++ b/pcs/usage.py -@@ -1002,6 +1002,7 @@ Commands: +@@ -1004,6 +1004,7 @@ Commands: hash=sha256. To disable encryption, set cipher=none and hash=none. Transports udp and udpu: @@ -49,4 +49,5 @@ index 2f26e831..a7702ac4 100644 #csetup-transport-options.knet .without-knet { -- -2.37.3 +2.38.1 + diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec index f8df7cb..61eef10 100644 --- a/SPECS/pcs.spec +++ b/SPECS/pcs.spec @@ -1,26 +1,26 @@ Name: pcs -Version: 0.10.14 -Release: 6%{?dist} +Version: 0.10.15 +Release: 1%{?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: dataclasses, tornado -# ASL 2.0 or BSD: dateutil +# GPL-2.0-only: pcs +# Apache-2.0: dataclasses, tornado +# Apache-2.0 or BSD-3-Clause: dateutil # MIT: backports, dacite, daemons, ember, ethon, handlebars, jquery, jquery-ui, # mustermann, rack, rack-protection, rack-test, sinatra, tilt -# GPLv2 or Ruby: eventmachne, json -# (GPLv2 or Ruby) and BSD: thin -# BSD or Ruby: open4, ruby2_keywords -# BSD and MIT: ffi -License: GPLv2 and ASL 2.0 and MIT and BSD and (GPLv2 or Ruby) and (BSD or Ruby) and (ASL 2.0 or BSD) +# GPL-2.0-only or Ruby: eventmachine, json +# (GPL-2.0-only or Ruby) and BSD: thin +# BSD-2-Clause or Ruby: open4, ruby2_keywords +# BSD-3-Clause and MIT: ffi +License: GPL-2.0-only AND Apache-2.0 AND MIT AND BSD-3-Clause AND (GPL-2.0-only OR Ruby) AND (BSD-2-Clause OR Ruby) AND (Apache-2.0 OR BSD-3-Clause) URL: https://github.com/ClusterLabs/pcs Group: System Environment/Base Summary: Pacemaker Configuration System #building only for architectures with pacemaker and corosync available ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 -# %%global version_or_commit %%{version} -%global version_or_commit %{version}.27-cb2fb +%global version_or_commit %{version} +# %%global version_or_commit %%{version}.27-cb2fb %global pcs_source_name %{name}-%{version_or_commit} @@ -32,10 +32,9 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %global pcs_snmp_pkg_name pcs-snmp %global pyagentx_version 0.4.pcs.2 -%global tornado_version 6.1.0 %global dataclasses_version 0.8 %global dacite_version 1.6.0 -%global dateutil_version 2.8.1 +%global dateutil_version 2.8.2 %global version_rubygem_backports 3.23.0 %global version_rubygem_daemons 1.4.1 %global version_rubygem_ethon 0.15.0 @@ -59,6 +58,10 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %global jquery_ui_version 1.12.1 %global jquery_version 3.6.0 +# DO NOT UPDATE +# Tornado 6.2 requires Python 3.7+ +%global tornado_version 6.1.0 + %global pcs_bundled_dir pcs_bundled %global pcsd_public_dir pcsd/public %global rubygem_bundle_dir pcsd/vendor/bundle @@ -86,7 +89,7 @@ Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/p Source42: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}/tornado-%{tornado_version}.tar.gz Source43: https://github.com/ericvsmith/dataclasses/archive/%{dataclasses_version}/dataclasses-%{dataclasses_version}.tar.gz Source44: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacite-%{dacite_version}.tar.gz -Source45: https://github.com/dateutil/dateutil/archive/%{dateutil_version}/python-dateutil-%{dateutil_version}.tar.gz +Source45: https://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-%{dateutil_version}.tar.gz Source81: https://rubygems.org/downloads/backports-%{version_rubygem_backports}.gem Source82: https://rubygems.org/downloads/ethon-%{version_rubygem_ethon}.gem @@ -248,9 +251,9 @@ easily view, modify and create pacemaker based clusters. Group: System Environment/Base Summary: Pacemaker cluster SNMP agent # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses -# GPLv2: pcs +# GPL-2.0-only: pcs # BSD-2-Clause: pyagentx -License: GPLv2 and BSD-2-Clause +License: GPL-2.0-only and BSD-2-Clause URL: https://github.com/ClusterLabs/pcs # tar for unpacking pyagetx source tar ball @@ -359,7 +362,7 @@ cp -f %SOURCE45 rpm/ %define debug_package %{nil} ./autogen.sh -%{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling 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 @@ -567,6 +570,11 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Wed Nov 23 2022 Michal Pospisil - 0.10.15-1 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Updated Python bundled dependency dateutil +- Resolves: rhbz#2112002 rhbz#2112263 rhbz#2112291 rhbz#2132582 + * Tue Oct 25 2022 Miroslav Lisik - 0.10.14-6 - Rebased to latest upstream sources (see CHANGELOG.md) - Updated rubygem bundled packages: mustermann, rack, rack-protection, rack-test, sinatra, tilt