diff --git a/.gitignore b/.gitignore index e25b1f3..4d3a5d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,17 @@ SOURCES/HAM-logo.png SOURCES/backports-3.17.2.gem -SOURCES/dacite-1.5.0.tar.gz +SOURCES/dacite-1.6.0.tar.gz SOURCES/daemons-1.3.1.gem -SOURCES/dataclasses-0.6.tar.gz +SOURCES/dataclasses-0.8.tar.gz SOURCES/ethon-0.12.0.gem SOURCES/eventmachine-1.2.7.gem SOURCES/ffi-1.13.1.gem SOURCES/json-2.3.0.gem SOURCES/mustermann-1.1.1.gem SOURCES/open4-1.3.4-1.gem -SOURCES/pcs-244ef24984089bed0406b1d69e48298183092402.tar.gz -SOURCES/pcs-web-ui-0.1.4.tar.gz -SOURCES/pcs-web-ui-node-modules-0.1.3.tar.xz +SOURCES/pcs-0.10.8.tar.gz +SOURCES/pcs-web-ui-0.1.5.tar.gz +SOURCES/pcs-web-ui-node-modules-0.1.5.tar.xz SOURCES/pyagentx-0.4.pcs.2.tar.gz SOURCES/python-dateutil-2.8.1.tar.gz SOURCES/rack-2.2.3.gem diff --git a/.pcs.metadata b/.pcs.metadata index 6854681..1b31355 100644 --- a/.pcs.metadata +++ b/.pcs.metadata @@ -1,17 +1,17 @@ 679a4ce22a33ffd4d704261a17c00cff98d9499a SOURCES/HAM-logo.png 28b63a742124da6c9575a1c5e7d7331ef93600b2 SOURCES/backports-3.17.2.gem -c14ee49221d8e1b09364b5f248bc3da12484f675 SOURCES/dacite-1.5.0.tar.gz +31546c37fbdc6270d5097687619e9c0db6f1c05c SOURCES/dacite-1.6.0.tar.gz e28c1e78d1a6e34e80f4933b494f1e0501939dd3 SOURCES/daemons-1.3.1.gem -81079b734108084eea0ae1c05a1cab0e806a3a1d SOURCES/dataclasses-0.6.tar.gz +8b7598273d2ae6dad2b88466aefac55071a41926 SOURCES/dataclasses-0.8.tar.gz 921ef1be44583a7644ee7f20fe5f26f21d018a04 SOURCES/ethon-0.12.0.gem 7a5b2896e210fac9759c786ee4510f265f75b481 SOURCES/eventmachine-1.2.7.gem cfa25e7a3760c3ec16723cb8263d9b7a52d0eadf SOURCES/ffi-1.13.1.gem 0230e8c5a37f1543982e5b04be503dd5f9004b47 SOURCES/json-2.3.0.gem 50a4e37904485810cb05e27d75c9783e5a8f3402 SOURCES/mustermann-1.1.1.gem 41a7fe9f8e3e02da5ae76c821b89c5b376a97746 SOURCES/open4-1.3.4-1.gem -927c1c300e155f514b1da9c878a69764287ac9ef SOURCES/pcs-244ef24984089bed0406b1d69e48298183092402.tar.gz -d67de4d5cefd9ba3cde45c7ec4a5d1e9b1e6032a SOURCES/pcs-web-ui-0.1.4.tar.gz -3e09042e3dc32c992451ba4c0454f2879f0d3f40 SOURCES/pcs-web-ui-node-modules-0.1.3.tar.xz +0e6b705715023ec5224ca05e977b8888f2a1b1e6 SOURCES/pcs-0.10.8.tar.gz +f23b14786b1911d498612bf0e90f344bcc4915c3 SOURCES/pcs-web-ui-0.1.5.tar.gz +57beab1c4bed96d7f9fc35261e96f78babb06980 SOURCES/pcs-web-ui-node-modules-0.1.5.tar.xz 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz bd26127e57f83a10f656b62c46524c15aeb844dd SOURCES/python-dateutil-2.8.1.tar.gz 345b7169d4d2d62176a225510399963bad62b68f SOURCES/rack-2.2.3.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 7b3e856..a0a7aab 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 478ddfd37c04f7d77b6116998e469c7c2610058f Mon Sep 17 00:00:00 2001 +From ab9fd9f223e805247319ac5a7318c15417197a0a 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 b/pcs/pcs.8 -index e8055eb8..7a6c1a04 100644 +index edfdd039..8caf087f 100644 --- a/pcs/pcs.8 +++ b/pcs/pcs.8 @@ -424,6 +424,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable @@ -23,7 +23,7 @@ index e8055eb8..7a6c1a04 100644 .br Transport options are: ip_version, netmtu diff --git a/pcs/usage.py b/pcs/usage.py -index 7b63e4b6..0819136c 100644 +index baedb347..f576eaf2 100644 --- a/pcs/usage.py +++ b/pcs/usage.py @@ -852,6 +852,7 @@ Commands: diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec index 24352c8..9725456 100644 --- a/SPECS/pcs.spec +++ b/SPECS/pcs.spec @@ -1,6 +1,6 @@ Name: pcs -Version: 0.10.7 -Release: 3%{?dist} +Version: 0.10.8 +Release: 1%{?dist} # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs @@ -19,22 +19,22 @@ 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 244ef24984089bed0406b1d69e48298183092402 +%global version_or_commit %{version} +# %%global version_or_commit 508b3999eb02b4901e83b8e780af8422b522ad30 %global pcs_source_name %{name}-%{version_or_commit} # ui_commit can be determined by hash, tag or branch -%global ui_commit 0.1.4 -%global ui_modules_version 0.1.3 +%global ui_commit 0.1.5 +%global ui_modules_version 0.1.5 %global ui_src_name pcs-web-ui-%{ui_commit} %global pcs_snmp_pkg_name pcs-snmp %global pyagentx_version 0.4.pcs.2 %global tornado_version 6.1.0 -%global dataclasses_version 0.6 -%global dacite_version 1.5.0 +%global dataclasses_version 0.8 +%global dacite_version 1.6.0 %global dateutil_version 2.8.1 %global version_rubygem_backports 3.17.2 %global version_rubygem_daemons 1.3.1 @@ -644,6 +644,12 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Mon Feb 01 2021 Miroslav Lisik - 0.10.8-1 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Updated pcs-web-ui +- Updated python bundled dependencies: dacite, dataclasses +- Resolves: rhbz#1457314 rhbz#1619818 rhbz#1667066 rhbz#1762816 rhbz#1794062 rhbz#1845470 rhbz#1856397 rhbz#1877762 rhbz#1917286 + * Thu Dec 17 2020 Miroslav Lisik - 0.10.7-3 - Rebased to latest upstream sources (see CHANGELOG.md) - Add BuildRequires: make