Resolves: rhbz#1283805 rhbz#1910644 rhbz#1910645 rhbz#1985981 rhbz#1991957 rhbz#1996067

- Rebased to latest upstream sources (see CHANGELOG.md)
- Updated pcs web ui

.gitignore

@@ -140,3 +140,6 @@
 /pcs-web-ui-node-modules-0.1.6-fips-fix.tar.xz
 /pcs-0.10.8.210-9862.tar.gz
 /pcs-0.10.9.tar.gz
+/pcs-0.11.0.alpha.1.tar.gz
+/pcs-web-ui-0.1.7.tar.gz
+/pcs-web-ui-node-modules-0.1.7.tar.xz

do-not-support-cluster-setup-with-udp-u-transport.patch

@@ -1,20 +1,18 @@
-From 359e786e6f5036a581db9786352325bd1cd0bfef Mon Sep 17 00:00:00 2001
+From 1d6644d5d91db4607474f50e4226a0ab8e4f231d Mon Sep 17 00:00:00 2001
 From: Ivan Devat <idevat@redhat.com>
 Date: Tue, 20 Nov 2018 15:03:56 +0100
-Subject: [PATCH 2/2] do not support cluster setup with udp(u) transport in
+Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9
- RHEL9
 
 ---
  pcs/pcs.8.in | 2 ++
  pcs/usage.py | 1 +
- pcsd/public/css/style.css | 3 +++
+ 2 files changed, 3 insertions(+)
- 3 files changed, 6 insertions(+)
 
 diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
-index 0428f81c..d49f51e4 100644
+index 4e3a3204..eb6f593f 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
+@@ -443,6 +443,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
  
  Transports udp and udpu:
  .br
@@ -24,10 +22,10 @@ index 0428f81c..d49f51e4 100644
  .br
  Transport options are: ip_version, netmtu
 diff --git a/pcs/usage.py b/pcs/usage.py
-index 38e21ed9..ff81d607 100644
+index 3bdf35ba..0ad83f16 100644
 --- a/pcs/usage.py
 +++ b/pcs/usage.py
-@@ -872,6 +872,7 @@ Commands:
+@@ -897,6 +897,7 @@ Commands:
              hash=sha256. To disable encryption, set cipher=none and hash=none.
  
          Transports udp and udpu:
@@ -35,20 +33,6 @@ index 38e21ed9..ff81d607 100644
          These transports are limited to one address per node. They do not
          support traffic encryption nor compression.
          Transport options are:
-diff --git a/pcsd/public/css/style.css b/pcsd/public/css/style.css
-index 2f26e831..a7702ac4 100644
---- a/pcsd/public/css/style.css
-+++ b/pcsd/public/css/style.css
-@@ -949,6 +949,9 @@ table.args-table td.reg {
-   width: 6ch;
-   text-align: right;
- }
-+#csetup-transport .transport-types {
-+  display: none;
-+}
- #csetup-transport-options.udp .knet-only,
- #csetup-transport-options.knet .without-knet
- {
 -- 
 2.31.1
 

pcs.spec

@@ -1,6 +1,6 @@
 Name: pcs
-Version: 0.10.9
+Version: 0.11.0.alpha.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPLv2: pcs
@@ -24,8 +24,8 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %global pcs_source_name %{name}-%{version_or_commit}
 
 # ui_commit can be determined by hash, tag or branch
-%global ui_commit 0.1.6
+%global ui_commit 0.1.7
-%global ui_modules_version 0.1.6-fips-fix
+%global ui_modules_version 0.1.7
 %global ui_src_name pcs-web-ui-%{ui_commit}
 
 %global pcs_snmp_pkg_name  pcs-snmp
@@ -50,12 +50,6 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %global version_rubygem_tilt  2.0.10
 %global version_rubygem_webrick  1.7.0
 
-# javascript bundled libraries for old web-ui
-%global ember_version 1.4.0
-%global handlebars_version 1.2.1
-%global jquery_ui_version 1.12.1
-%global jquery_version 3.6.0
-
 %global pcs_bundled_dir pcs_bundled
 %global pcsd_public_dir pcsd/public
 %global rubygem_bundle_dir pcsd/vendor/bundle
@@ -77,7 +71,6 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %global __python %{__python3}
 
 Source0: %{url}/archive/%{version_or_commit}/%{pcs_source_name}.tar.gz
-Source1: HAM-logo.png
 
 Source41: https://github.com/ondrejmular/pyagentx/archive/v%{pyagentx_version}/pyagentx-%{pyagentx_version}.tar.gz
 Source42: https://github.com/tornadoweb/tornado/archive/v%{tornado_version}/tornado-%{tornado_version}.tar.gz
@@ -111,7 +104,6 @@ Source101: https://github.com/idevat/pcs-web-ui/releases/download/%{ui_commit}/p
 # 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: bz1881064-01-remove-clufter-commands.patch
 
 # Downstream patches do not come from upstream. They adapt pcs for specific
 # RHEL needs.
@@ -151,17 +143,11 @@ BuildRequires: rubygem-test-unit
 BuildRequires: diffstat
 # for post, preun and postun macros
 BuildRequires: systemd
-# pcsd fonts and font management tools for creating symlinks to fonts
-BuildRequires: fontconfig
-BuildRequires: liberation-sans-fonts
 BuildRequires: make
-BuildRequires: overpass-fonts
 # Red Hat logo for creating symlink of favicon
 BuildRequires: redhat-logos
-
 # for building web ui
 BuildRequires: npm
-
 # cluster stack packages for pkg-config
 BuildRequires: booth
 BuildRequires: corosync-qdevice-devel
@@ -200,9 +186,6 @@ Requires(postun): systemd
 # pam is used for authentication inside daemon (python ctypes)
 # more details: https://bugzilla.redhat.com/show_bug.cgi?id=1717113
 Requires: pam
-# pcsd fonts
-Requires: liberation-sans-fonts
-Requires: overpass-fonts
 # favicon Red Hat logo
 Requires: redhat-logos
 # needs logrotate for /etc/logrotate.d/pcsd
@@ -227,12 +210,6 @@ Provides: bundled(thin) = %{version_rubygem_thin}
 Provides: bundled(tilt) = %{version_rubygem_tilt}
 Provides: bundled(webrick) = %{version_rubygem_webrick}
 
-# javascript bundled libraries for old web-ui
-Provides: bundled(ember) = %{ember_version}
-Provides: bundled(handlebars) = %{handlebars_version}
-Provides: bundled(jquery) = %{jquery_version}
-Provides: bundled(jquery-ui) = %{jquery_ui_version}
-
 %description
 pcs is a corosync and pacemaker configuration tool.  It permits users to
 easily view, modify and create pacemaker based clusters.
@@ -301,10 +278,9 @@ update_times_patch(){
   update_times ${patch_file_name} `diffstat -p1 -l ${patch_file_name}`
 }
 
-update_times_patch %{PATCH1}
+# update_times_patch %%{PATCH1}
 update_times_patch %{PATCH101}
 
-cp -f %SOURCE1 %{pcsd_public_dir}/images
 # prepare dirs/files necessary for building web ui
 # inside SOURCE100 is only directory %%{ui_src_name}
 tar -xzf %SOURCE100 -C %{pcsd_public_dir}
@@ -359,6 +335,10 @@ make -C %{pcsd_public_dir}/%{ui_src_name} build
 mv %{pcsd_public_dir}/%{ui_src_name}/build  ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/ui
 rm -r %{pcsd_public_dir}/%{ui_src_name}
 
+# symlink favicon into pcsd directories
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/images/
+ln -fs /etc/favicon.png ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/images/favicon.png
+
 # prepare license files
 # some rubygems do not have a license file (ruby2_keywords, thin)
 mv %{rubygem_bundle_dir}/gems/backports-%{version_rubygem_backports}/LICENSE.txt backports_LICENSE.txt
@@ -379,10 +359,6 @@ mv %{rubygem_bundle_dir}/gems/sinatra-%{version_rubygem_sinatra}/LICENSE sinatra
 mv %{rubygem_bundle_dir}/gems/tilt-%{version_rubygem_tilt}/COPYING tilt_COPYING
 mv %{rubygem_bundle_dir}/gems/webrick-%{version_rubygem_webrick}/LICENSE.txt webrick_LICENSE.txt
 
-# symlink favicon into pcsd directories
-ln -fs /etc/favicon.png ${RPM_BUILD_ROOT}%{_libdir}/%{pcsd_public_dir}/images/favicon.png
-
-
 cp %{pcs_bundled_dir}/src/pyagentx-*/LICENSE.txt pyagentx_LICENSE.txt
 cp %{pcs_bundled_dir}/src/pyagentx-*/CONTRIBUTORS.txt pyagentx_CONTRIBUTORS.txt
 cp %{pcs_bundled_dir}/src/pyagentx-*/README.md pyagentx_README.md
@@ -451,13 +427,7 @@ run_all_tests(){
   return $test_result_ruby
 }
 
-remove_all_tests() {
-  # remove javascript testing files
-  rm -r -v $RPM_BUILD_ROOT%{_libdir}/%{pcsd_public_dir}/js/dev
-}
-
 run_all_tests
-remove_all_tests
 
 %posttrans
 # Make sure the new version of the daemon is runnning.
@@ -554,6 +524,11 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Tue Aug 24 2021 Miroslav Lisik <mlisik@redhat.com> - 0.11.0.alpha.1-1
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Updated pcs web ui
+- Resolves: rhbz#1283805 rhbz#1910644 rhbz#1910645 rhbz#1985981 rhbz#1991957 rhbz#1996067
+
 * Thu Aug 19 2021 DJ Delorie <dj@redhat.com> - 0.10.9-2
 - Rebuilt for libffi 3.4.2 SONAME transition.
   Related: rhbz#1891914

sources

@@ -1,6 +1,5 @@
 SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a
 SHA512 (open4-1.3.4-1.gem) = 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb
-SHA512 (pcs-web-ui-0.1.6.tar.gz) = d5361155e943330d489fbc69442777a0c45d6fec12894a6b2158e0ad583d2fd2307a13615d39a770352c4c37473919b5e13c8d13e84cd4b778ac719de51c6c20
 SHA512 (daemons-1.3.1.gem) = eede065019b5e251e5b7d0959251c8591ec8c38ada6861a1c41cf85959666a4865efc69178f63bf2acfc1e993c8222d581ac5d689be439744ee3cef0ca6f5138
 SHA512 (eventmachine-1.2.7.gem) = fdbcf9fc933e2414e70f8f48153e9ba6ed7a0029cdf49cdcb4ab72ab26683e727a36c099f017f20681f9c361179461743e501278ca9bd5612e693e26867cc516
 SHA512 (thin-1.7.2.gem) = e9e0ad3dab77a1c6f3e413ce7ed1598da0db5fa62355a1fbbc73153d2fd810d82d5bf2e6a434429912eb885c263c674364a5dec7d878960e2dbef37ccbe1472b
@@ -18,5 +17,6 @@ SHA512 (tornado-6.1.0.tar.gz) = bd161a1c30f40f983d608297bca113735cb4baad255de713
 SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da
 SHA512 (webrick-1.7.0.gem) = 5f242b50300046fe7c22ecd1640a73e5815e05a72bedfebe6bc39c24c92bd61abdd180860de0d194c0eebbc640b507b6892de181d3b577c5372ace0ca6faf2a3
 SHA512 (rexml-3.2.5.gem) = 1e3838d4a5befa76137fb8fea6a20195490645aa2b1c5d14d1eeca6c093d7f64eb405f07fd07b00fcafa9606dc78f9f0a488012338f81414623feb6e8cb83931
-SHA512 (pcs-web-ui-node-modules-0.1.6-fips-fix.tar.xz) = a209c3acac3a992627c146c75e9ebdbc735b38ba8f98935377694b8c13e4318ee5059c75833962cf188fc963ecefe68a6762daf7b4499c54538b1493cc0d712e
+SHA512 (pcs-0.11.0.alpha.1.tar.gz) = 68d329798c7054051d09e444b28d350321f24b2b94f49833549e30fdee12f874a66dbf61f62011b8be23c78907023e784190be53f1b7dc3dfc960a92447b0035
-SHA512 (pcs-0.10.9.tar.gz) = ced62db86f42427474b0ae97009f09bed0d0f4bae5ab1188fc58aace0b598863ac80ab443a8555b5d414f8332422144a3e1ef810ef46b9b3e1a5c8b2ef09985e
+SHA512 (pcs-web-ui-0.1.7.tar.gz) = 1640615bb840aee89bf7c46ee2ac6d223b7810fa2efbd22fbdf9fe0af9d2b937301874497eca7c6d152bb8a5addced4383ecef8ff69be7ca91a36bce46abec43
+SHA512 (pcs-web-ui-node-modules-0.1.7.tar.xz) = 58680eb1851c399ca74c438b396b683e2bf123e2a2b4f942448a8071df3019d577fc6dfc8bfd0d6c41f9ce9a9c21c2f613e7cccd8be46b3a0dc45bc96fedc720

tests/tests.yml

@@ -37,7 +37,6 @@
     - fence-agents-ipmilan
     - fence-agents-scsi
     - fence-virt
-    - fontconfig
     - openssl
     - pcs
     - pcs-snmp