diff --git a/.gitignore b/.gitignore index 98f7bb0..6dae3c3 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ /thin-1.8.1.gem /pcs-0.10.14.tar.gz /pcs-0.10.14.27-cb2fb.tar.gz +/pcs-0.10.15.tar.gz +/python-dateutil-2.8.2.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 5124197..0ec8df4 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 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/pcs.spec b/pcs.spec index f8df7cb..61eef10 100644 --- a/pcs.spec +++ b/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 diff --git a/sources b/sources index 6522c96..4cf4542 100644 --- a/sources +++ b/sources @@ -1,9 +1,9 @@ SHA512 (HAM-logo.png) = bf4f865c5c9c3b3f91354411f68e4295bb80e69e4cbcb720652bde9ad726dc0aa2610b5ab3c8f17857caac30192f9a226009436cf6ffc0f62651146512bf92d2 SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da SHA512 (dataclasses-0.8.tar.gz) = 3369f5a9b1243f0af9e05dcfa8534801137ab05c62416360e6d36eee2df23b828f4a0d777aad706b7eb16ee71b879390abf4e402def2930f4fc4ccb41a6bbd88 -SHA512 (pcs-0.10.14.27-cb2fb.tar.gz) = 34b863338decc6b30f7c94f48fc08c73cad5cb7d8de7bf15ff05ae554238b95f9232dfaab690b74eb728c8e528604d4ef3d14d48f10576ae172f030ecdfdd3bd +SHA512 (pcs-0.10.15.tar.gz) = 749d4c4616ad04742d4ecabbdd08f30d7c3fec08ff97c1bc7a0118ad77b11310f143f43ebd4511fc45ffe316dc4ab7024f5ed73c6af6fa30f34d6a20b9afd455 SHA512 (pcs-web-ui-0.1.13.tar.gz) = e8ccb07467f0c5d959f8ba1d541615836e9c88dc5793b3dfd1bee14cf96c4107a90251026f26e5dd0cf3d9ceb285c4da4b25dd77f3f0971e0d2c7d15899bce88 SHA512 (pcs-web-ui-node-modules-0.1.13.tar.xz) = 5e56644d6a4444856e5b15d0717aad9f12249bf365af50a0509fe29c0945fc94b8b26cb1a71231836dcc6c310ba91f1921086012ade073ed6c05715e6ca44983 SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a -SHA512 (python-dateutil-2.8.1.tar.gz) = 337000216e0f8ce32d6363768444144183ab9268f69082f20858f2b3322b1c449e53b2f2b5dcb3645be22294659ce7838f74ace2fd7a7c4f2adc6cf806a9fa2c +SHA512 (python-dateutil-2.8.2.tar.gz) = 6538858e4a3e2d1de1bf25b6d8b25e3a8d20bf60fb85e32d07ac491c90ce193e268bb5641371b8a79fb0f033a184bac9896b3bc643c1aca9ee9c6478286ac20c SHA512 (tornado-6.1.0.tar.gz) = bd161a1c30f40f983d608297bca113735cb4baad255de71302a5b4d35be8c02afbc9820728efa912e62e1cbbfad8f92360261a69e0c8759f9e6cb477fbca31c7