diff --git a/.gitignore b/.gitignore index 8a3aace..cc712ed 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ 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-0.10.8.181-47e9.tar.gz +SOURCES/pcs-0.10.8.202-ea961.tar.gz SOURCES/pcs-web-ui-0.1.6.tar.gz SOURCES/pcs-web-ui-node-modules-0.1.6.tar.xz SOURCES/pyagentx-0.4.pcs.2.tar.gz diff --git a/.pcs.metadata b/.pcs.metadata index 46ea0d8..4646271 100644 --- a/.pcs.metadata +++ b/.pcs.metadata @@ -9,7 +9,7 @@ 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 -cda150aa3e2e5b5c84ec4f462914e167c6a2526c SOURCES/pcs-0.10.8.181-47e9.tar.gz +aa19762a0c66442e8889fd9e3ea051e9a629a36b SOURCES/pcs-0.10.8.202-ea961.tar.gz 0d5a8c5f3c2888e19de1f7180401bbfcfd423e24 SOURCES/pcs-web-ui-0.1.6.tar.gz 3d401b7048e51cb097c3b55c77492e76dde1d443 SOURCES/pcs-web-ui-node-modules-0.1.6.tar.xz 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz 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 112e1d0..a794881 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,7 +1,7 @@ -From 34df297266fb33d2cc062f2a5a584183a450d763 Mon Sep 17 00:00:00 2001 +From 0d8882eb046f6c788c22358d717f49d6e1824405 Mon Sep 17 00:00:00 2001 From: Ivan Devat Date: Tue, 20 Nov 2018 15:03:56 +0100 -Subject: [PATCH 2/2] do not support cluster setup with udp(u) transport +Subject: [PATCH] do not support cluster setup with udp(u) transport --- pcs/pcs.8.in | 2 ++ @@ -10,10 +10,10 @@ Subject: [PATCH 2/2] 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 205fdc4e..dfa7f1ea 100644 +index e2a3d1ca..e92d5a93 100644 --- a/pcs/pcs.8.in +++ b/pcs/pcs.8.in -@@ -420,6 +420,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable +@@ -426,6 +426,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable Transports udp and udpu: .br @@ -23,10 +23,10 @@ index 205fdc4e..dfa7f1ea 100644 .br Transport options are: ip_version, netmtu diff --git a/pcs/usage.py b/pcs/usage.py -index cec99ef2..30515ebb 100644 +index dd92f701..abb316d9 100644 --- a/pcs/usage.py +++ b/pcs/usage.py -@@ -853,6 +853,7 @@ Commands: +@@ -863,6 +863,7 @@ Commands: hash=sha256. To disable encryption, set cipher=none and hash=none. Transports udp and udpu: diff --git a/SOURCES/fix-wrong-name-for-library-command.patch b/SOURCES/fix-wrong-name-for-library-command.patch deleted file mode 100644 index f98d9a8..0000000 --- a/SOURCES/fix-wrong-name-for-library-command.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 79570d1d344de985e40602d373eebcf6e94b83d9 Mon Sep 17 00:00:00 2001 -From: Ivan Devat -Date: Thu, 10 Jun 2021 14:52:15 +0200 -Subject: [PATCH 1/2] fix wrong name for library command - ---- - pcs/cli/common/lib_wrapper.py | 8 ++++---- - pcs/cli/constraint_colocation/command.py | 2 +- - pcs/cli/constraint_order/command.py | 4 +++- - pcs/cli/constraint_ticket/command.py | 4 ++-- - pcs_test/tier0/cli/common/test_lib_wrapper.py | 6 +++--- - pcs_test/tier0/cli/constraint_ticket/test_command.py | 8 ++++---- - 6 files changed, 17 insertions(+), 15 deletions(-) - -diff --git a/pcs/cli/common/lib_wrapper.py b/pcs/cli/common/lib_wrapper.py -index d9a6bd26..c41ce875 100644 ---- a/pcs/cli/common/lib_wrapper.py -+++ b/pcs/cli/common/lib_wrapper.py -@@ -230,7 +230,7 @@ def load_module(env, middleware_factory, name): - env, - middleware.build(middleware_factory.cib), - { -- "set": constraint_colocation.create_with_set, -+ "create_with_set": constraint_colocation.create_with_set, - "show": constraint_colocation.show, - }, - ) -@@ -240,7 +240,7 @@ def load_module(env, middleware_factory, name): - env, - middleware.build(middleware_factory.cib), - { -- "set": constraint_order.create_with_set, -+ "create_with_set": constraint_order.create_with_set, - "show": constraint_order.show, - }, - ) -@@ -250,9 +250,9 @@ def load_module(env, middleware_factory, name): - env, - middleware.build(middleware_factory.cib), - { -- "set": constraint_ticket.create_with_set, -+ "create_with_set": constraint_ticket.create_with_set, - "show": constraint_ticket.show, -- "add": constraint_ticket.create, -+ "create": constraint_ticket.create, - "remove": constraint_ticket.remove, - }, - ) -diff --git a/pcs/cli/constraint_colocation/command.py b/pcs/cli/constraint_colocation/command.py -index f5cf91ab..10539aa6 100644 ---- a/pcs/cli/constraint_colocation/command.py -+++ b/pcs/cli/constraint_colocation/command.py -@@ -18,7 +18,7 @@ def create_with_set(lib, argv, modifiers): - """ - modifiers.ensure_only_supported("-f", "--force") - command.create_with_set( -- lib.constraint_colocation.set, -+ lib.constraint_colocation.create_with_set, - argv, - modifiers, - ) -diff --git a/pcs/cli/constraint_order/command.py b/pcs/cli/constraint_order/command.py -index 04a49c8e..7251a4a7 100644 ---- a/pcs/cli/constraint_order/command.py -+++ b/pcs/cli/constraint_order/command.py -@@ -17,7 +17,9 @@ def create_with_set(lib, argv, modifiers): - * -f - CIB file - """ - modifiers.ensure_only_supported("--force", "-f") -- command.create_with_set(lib.constraint_order.set, argv, modifiers) -+ command.create_with_set( -+ lib.constraint_order.create_with_set, argv, modifiers -+ ) - - - def show(lib, argv, modifiers): -diff --git a/pcs/cli/constraint_ticket/command.py b/pcs/cli/constraint_ticket/command.py -index 7823981e..b4cd2bcd 100644 ---- a/pcs/cli/constraint_ticket/command.py -+++ b/pcs/cli/constraint_ticket/command.py -@@ -20,7 +20,7 @@ def create_with_set(lib, argv, modifiers): - """ - modifiers.ensure_only_supported("--force", "-f") - command.create_with_set( -- lib.constraint_ticket.set, -+ lib.constraint_ticket.create_with_set, - argv, - modifiers, - ) -@@ -50,7 +50,7 @@ def add(lib, argv, modifiers): - if resource_role: - options["rsc-role"] = resource_role - -- lib.constraint_ticket.add( -+ lib.constraint_ticket.create( - ticket, - resource_id, - options, -diff --git a/pcs_test/tier0/cli/common/test_lib_wrapper.py b/pcs_test/tier0/cli/common/test_lib_wrapper.py -index 3a8188c6..33538685 100644 ---- a/pcs_test/tier0/cli/common/test_lib_wrapper.py -+++ b/pcs_test/tier0/cli/common/test_lib_wrapper.py -@@ -25,8 +25,8 @@ class LibraryWrapperTest(TestCase): - mock_middleware_factory.cib = dummy_middleware - mock_middleware_factory.corosync_conf_existing = dummy_middleware - mock_env = mock.MagicMock() -- Library(mock_env, mock_middleware_factory).constraint_order.set( -- "first", second="third" -- ) -+ Library( -+ mock_env, mock_middleware_factory -+ ).constraint_order.create_with_set("first", second="third") - - mock_order_set.assert_called_once_with(lib_env, "first", second="third") -diff --git a/pcs_test/tier0/cli/constraint_ticket/test_command.py b/pcs_test/tier0/cli/constraint_ticket/test_command.py -index 118bfa22..ca4835c3 100644 ---- a/pcs_test/tier0/cli/constraint_ticket/test_command.py -+++ b/pcs_test/tier0/cli/constraint_ticket/test_command.py -@@ -24,12 +24,12 @@ class AddTest(TestCase): - ) - lib = mock.MagicMock() - lib.constraint_ticket = mock.MagicMock() -- lib.constraint_ticket.add = mock.MagicMock() -+ lib.constraint_ticket.create = mock.MagicMock() - - command.add(lib, ["argv"], _modifiers()) - - mock_parse_add.assert_called_once_with(["argv"]) -- lib.constraint_ticket.add.assert_called_once_with( -+ lib.constraint_ticket.create.assert_called_once_with( - "ticket", - "resource_id", - {"loss-policy": "fence"}, -@@ -60,12 +60,12 @@ class AddTest(TestCase): - ) - lib = mock.MagicMock() - lib.constraint_ticket = mock.MagicMock() -- lib.constraint_ticket.add = mock.MagicMock() -+ lib.constraint_ticket.create = mock.MagicMock() - - command.add(lib, ["argv"], _modifiers()) - - mock_parse_add.assert_called_once_with(["argv"]) -- lib.constraint_ticket.add.assert_called_once_with( -+ lib.constraint_ticket.create.assert_called_once_with( - "ticket", - "resource_id", - {"loss-policy": "fence", "rsc-role": "resource_role"}, --- -2.31.1 - diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec index e6d6dbc..e76abf8 100644 --- a/SPECS/pcs.spec +++ b/SPECS/pcs.spec @@ -1,6 +1,6 @@ Name: pcs Version: 0.10.8 -Release: 2%{?dist} +Release: 3%{?dist} # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/ # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs @@ -12,7 +12,7 @@ Release: 2%{?dist} # (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). +License: GPLv2 and ASL 2.0 and MIT and BSD and (GPLv2 or Ruby) and (BSD or Ruby) and (ASL 2.0 or BSD) URL: https://github.com/ClusterLabs/pcs Group: System Environment/Base Summary: Pacemaker Configuration System @@ -20,7 +20,7 @@ Summary: Pacemaker Configuration System ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 # %%global version_or_commit %%{version} -%global version_or_commit %{version}.181-47e9 +%global version_or_commit %{version}.202-ea961 %global pcs_source_name %{name}-%{version_or_commit} @@ -116,7 +116,6 @@ Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_modules_v # Z-streams are exception here: they can come from upstream but should be # applied at the end to keep z-stream changes as straightforward as possible. # Patch1: bzNUMBER-01-name.patch -Patch1: fix-wrong-name-for-library-command.patch # Downstream patches do not come from upstream. They adapt pcs for specific # RHEL needs. @@ -246,7 +245,7 @@ Summary: Pacemaker cluster SNMP agent # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses # GPLv2: pcs # BSD-2-Clause: pyagentx -License: GPLv2 and BSD-2-Clause. +License: GPLv2 and BSD-2-Clause URL: https://github.com/ClusterLabs/pcs # tar for unpacking pyagetx source tar ball @@ -303,7 +302,6 @@ update_times_patch(){ update_times ${patch_file_name} `diffstat -p1 -l ${patch_file_name}` } -update_times_patch %{PATCH1} update_times_patch %{PATCH101} cp -f %SOURCE1 %{pcsd_public_dir}/images @@ -349,7 +347,7 @@ cp -f %SOURCE45 rpm/ %define debug_package %{nil} ./autogen.sh -%{configure} --enable-local-build --enable-use-local-cache-only PYTHON=%{__python3} +%{configure} --enable-local-build --enable-use-local-cache-only --enable-individual-bundling PYTHON=%{__python3} make all %install @@ -567,6 +565,11 @@ remove_all_tests %license pyagentx_LICENSE.txt %changelog +* Thu Jul 08 2021 Miroslav Lisik - 0.10.8-3 +- Rebased to latest upstream sources (see CHANGELOG.md) +- Gating changes +- Resolves: rhbz#1678273 rhbz#1690419 rhbz#1750240 rhbz#1759995 rhbz#1872378 rhbz#1909901 rhbz#1935594 + * Thu Jun 10 2021 Miroslav Lisik - 0.10.8-2 - Rebased to latest upstream sources (see CHANGELOG.md) - Updated pcs-web-ui