diff --git a/.gitignore b/.gitignore
index 713b8b6..30b46f7 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.11.6-63ebd.tar.gz
+SOURCES/pcs-0.10.11.22-9d83b.tar.gz
SOURCES/pcs-web-ui-0.1.10.tar.gz
SOURCES/pcs-web-ui-node-modules-0.1.10.tar.xz
SOURCES/pyagentx-0.4.pcs.2.tar.gz
diff --git a/.pcs.metadata b/.pcs.metadata
index 9fd9178..143438c 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
-e60fe9528fa32eeb07beaabd3b8f42cbbb3545be SOURCES/pcs-0.10.11.6-63ebd.tar.gz
+52a13e75fcbc4cc8d69bdb26bf1b281649415e9d SOURCES/pcs-0.10.11.22-9d83b.tar.gz
86002e7752f3db1aa5b98d29166c7bf9bbc6c2b5 SOURCES/pcs-web-ui-0.1.10.tar.gz
14a0e8c5245dc34e8cc80663073e354c81c9e06c SOURCES/pcs-web-ui-node-modules-0.1.10.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 aba74e4..a02f9a9 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 2ec560d8c1791bfae924e4e8ebf7f8b1afcdeed5 Mon Sep 17 00:00:00 2001
+From 652e3fd4bcd895d6863ca9c867473558164d83d2 Mon Sep 17 00:00:00 2001
From: Ivan Devat <idevat@redhat.com>
Date: Tue, 20 Nov 2018 15:03:56 +0100
Subject: [PATCH] do not support cluster setup with udp(u) transport
@@ -10,10 +10,10 @@ 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 1695d75c..80d165fc 100644
+index 785c3d4f..9200f32a 100644
--- a/pcs/pcs.8.in
+++ b/pcs/pcs.8.in
-@@ -429,6 +429,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
+@@ -428,6 +428,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
Transports udp and udpu:
.br
@@ -23,10 +23,10 @@ index 1695d75c..80d165fc 100644
.br
Transport options are: ip_version, netmtu
diff --git a/pcs/usage.py b/pcs/usage.py
-index 66e097f1..783d926d 100644
+index 8d8ce7fa..70fcf4b7 100644
--- a/pcs/usage.py
+++ b/pcs/usage.py
-@@ -872,6 +872,7 @@ Commands:
+@@ -870,6 +870,7 @@ Commands:
hash=sha256. To disable encryption, set cipher=none and hash=none.
Transports udp and udpu:
diff --git a/SPECS/pcs.spec b/SPECS/pcs.spec
index 34296f9..9f65d7e 100644
--- a/SPECS/pcs.spec
+++ b/SPECS/pcs.spec
@@ -1,6 +1,6 @@
Name: pcs
Version: 0.10.11
-Release: 1%{?dist}
+Release: 2%{?dist}
# https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
# https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
# GPLv2: pcs
@@ -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}.6-63ebd
+%global version_or_commit %{version}.22-9d83b
%global pcs_source_name %{name}-%{version_or_commit}
@@ -430,16 +430,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/json-%{version_rubyg
rm -rf $RPM_BUILD_ROOT%{_libdir}/%{rubygem_bundle_dir}/gems/thin-%{version_rubygem_thin}/ext
%check
-# In the building environment LC_CTYPE is set to C which causes tests to fail
-# due to python prints a warning about it to stderr. The following environment
-# variable disables the warning.
-# On the live system either UTF8 locale is set or the warning is emmited
-# which breaks pcs. That is the correct behavior since with wrong locales it
-# would be probably broken anyway.
-# The main concern here is to make the tests pass.
-# See https://fedoraproject.org/wiki/Changes/python3_c.utf-8_locale for details.
-export PYTHONCOERCECLOCALE=0
-
run_all_tests(){
#run pcs tests
@@ -451,7 +441,6 @@ run_all_tests(){
# TODO: Investigate the issue
%{__python3} pcs_test/suite --tier0 -v --vanilla --all-but \
- pcs_test.tier0.lib.commands.test_resource_agent.DescribeAgentUtf8.test_describe \
pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_get_not_locked \
pcs_test.tier0.daemon.app.test_app_remote.SyncConfigMutualExclusive.test_post_not_locked \
@@ -576,6 +565,11 @@ remove_all_tests
%license pyagentx_LICENSE.txt
%changelog
+* Mon Nov 22 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.11-2
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Removed 'export PYTHONCOERCECLOCALE=0'
+- Resolves: rhbz#1384485 rhbz#1936833 rhbz#1968088 rhbz#1990784 rhbz#2012128
+
* Mon Nov 01 2021 Miroslav Lisik <mlisik@redhat.com> - 0.10.11-1
- Rebased to latest upstream sources (see CHANGELOG.md)
- Updated pcs-web-ui