From 17e0ebd1056c56a3cff286c0c9b1c34affb5bf7b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 29 2019 12:53:40 +0000 Subject: import pcs-0.9.165-6.el7_6.2 --- diff --git a/SOURCES/fix-crashes-in-pcs-cluster-auth.patch b/SOURCES/fix-crashes-in-pcs-cluster-auth.patch new file mode 100644 index 0000000..7e4d47c --- /dev/null +++ b/SOURCES/fix-crashes-in-pcs-cluster-auth.patch @@ -0,0 +1,26 @@ +From 949efde392e33171e411e86799e530f330b5a791 Mon Sep 17 00:00:00 2001 +From: Tomas Jelinek +Date: Fri, 21 Jun 2019 12:38:07 +0200 +Subject: [PATCH] fix crashes in 'pcs cluster auth' + +--- + pcsd/cfgsync.rb | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/pcsd/cfgsync.rb b/pcsd/cfgsync.rb +index 44e6d853..58857ed5 100644 +--- a/pcsd/cfgsync.rb ++++ b/pcsd/cfgsync.rb +@@ -852,7 +852,8 @@ module Cfgsync + fetcher = ConfigFetcher.new( + PCSAuth.getSuperuserAuth(), [config_new.class], nodes, cluster_name + ) +- fetched_tokens, _ = fetcher.fetch_all()[config_new.class.name] ++ fetched_configs, _node_connected = fetcher.fetch_all() ++ fetched_tokens = fetched_configs[config_new.class.name] + config_new = Cfgsync::merge_tokens_files( + config, fetched_tokens, new_tokens, new_ports + ) +-- +2.21.0 + diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec index d74a0bc..f1c7427 100644 --- a/SPECS/pcs.spec +++ b/SPECS/pcs.spec @@ -1,12 +1,12 @@ Name: pcs Version: 0.9.165 -Release: 6%{?dist}.1 +Release: 6%{?dist}.2 License: GPLv2 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 %{arm} +ExclusiveArch: i686 x86_64 s390x ppc64le aarch64 %global pcs_snmp_pkg_name pcs-snmp %global pyagentx_version 0.4.pcs.1 @@ -35,7 +35,6 @@ Source23: https://rubygems.org/downloads/ffi-1.9.25.gem Source31: https://github.com/testing-cabal/mock/archive/1.0.1.tar.gz#/mock-1.0.1.tar.gz Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}.tar.gz#/pyagentx-%{pyagentx_version}.tar.gz -Source99: favicon.ico Patch1: bz1462248-01-fix-error-for-an-inaccessible-resource-in-a-bundle.patch Patch2: bz1572886-01-fix-syntax-multiple-except.-as-parenthes.-tuple.patch @@ -56,6 +55,7 @@ Patch102: show-only-warning-when-crm_mon-xml-is-invalid.patch Patch103: cache-tokens-read-from-pcsd.patch Patch104: fix-logging-in-pcsd.patch Patch105: lower-load-created-by-config-files-syncing-in-pcsd.patch +Patch106: fix-crashes-in-pcs-cluster-auth.patch # git for patches BuildRequires: git @@ -188,6 +188,7 @@ UpdateTimestamps -p1 %{PATCH99} UpdateTimestamps -p1 %{PATCH100} UpdateTimestamps -p1 %{PATCH101} UpdateTimestamps -p1 %{PATCH102} +UpdateTimestamps -p1 %{PATCH106} cp -f %SOURCE1 pcsd/public/images @@ -217,7 +218,6 @@ mv %{bundled_lib_dir}/pyagentx-%{pyagentx_version} %{pyagentx_dir} cp %{pyagentx_dir}/LICENSE.txt pyagentx_LICENSE.txt cp %{pyagentx_dir}/CONTRIBUTORS.txt pyagentx_CONTRIBUTORS.txt cp %{pyagentx_dir}/README.md pyagentx_README.md -cp -f %{SOURCE99} pcsd/public %build @@ -535,6 +535,10 @@ run_all_tests %doc pyagentx_README.md %changelog +* Tue Jun 25 2019 Ivan Devat - 0.9.165-6.el7_6.2 +- Fixed crashes in the `pcs cluster auth` command +- Resolves: rhbz#1721235 + * Thu Feb 28 2019 Ivan Devat - 0.9.165-6.el7_6.1 - `pcs` no longer spawns unnecessary processes for reading node tokens - Fixed a bug causing most of the messages not being logged into pcsd.log