Merge commits from 8.5 into 9.0-beta branch.

Resolves: rhbz#1957575

pcp.spec

@@ -1,6 +1,6 @@
 Name:    pcp
 Version: 5.3.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
 URL:     https://pcp.io
@@ -12,6 +12,7 @@ Patch000: redhat-bugzilla-1947989.patch
 Patch001: redhat-bugzilla-1974266.patch
 Patch002: redhat-bugzilla-1975069.patch
 Patch003: redhat-bugzilla-1879350.patch
+Patch004: redhat-bugzilla-1962019.patch
 
 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
 %global __python2 python2
@@ -2225,6 +2226,7 @@ updated policy package.
 %patch001 -p1
 %patch002 -p1
 %patch003 -p1
+%patch004 -p1
 
 %build
 # fix up build version
@@ -3282,6 +3284,10 @@ PCP_LOG_DIR=%{_logsdir}
 %files zeroconf -f pcp-zeroconf-files.rpm
 
 %changelog
+* Mon Aug 30 2021 Nathan Scott <nathans@redhat.com> - 5.3.1-6
+- Fix pmdapodman initialization and selinux policy
+- Related: rhbz#1957575
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.3.1-5
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688

redhat-bugzilla-1879350.patch

@@ -29,32 +29,6 @@ Date:   Thu Jun 24 12:42:54 2021 +1000
     
     Resolves: RHBZ#1879350
 
-diff --git a/build/rpm/pcp.spec.in b/build/rpm/pcp.spec.in
-index 7d55cc582..09a5040d5 100755
---- a/build/rpm/pcp.spec.in
-+++ b/build/rpm/pcp.spec.in
-@@ -2234,7 +2234,7 @@ basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|pcp2csv' \
-    -e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free|pcp-htop' \
-    -e 'pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat' \
-    -e 'pcp-numastat|pcp-pidstat|pcp-shping|pcp-tapestat' \
--   -e 'pcp-uptime|pcp-verify' | \
-+   -e 'pcp-uptime|pcp-verify|pcp-ss' | \
-    cull 'selinux|pmlogconf|pmieconf|pmrepconf' >pcp-system-tools-files
- basic_manifest | keep 'sar2pcp' >pcp-import-sar2pcp-files
- basic_manifest | keep 'iostat2pcp' >pcp-import-iostat2pcp-files
-diff --git a/build/rpm/redhat.spec b/build/rpm/redhat.spec
-index a437b15c8..f85a6d53a 100644
---- a/build/rpm/redhat.spec
-+++ b/build/rpm/redhat.spec
-@@ -2375,7 +2375,7 @@ basic_manifest | grep -E -e 'pmiostat|pmrep|dstat|pcp2csv' \
-    -e 'pcp-atop|pcp-dmcache|pcp-dstat|pcp-free|pcp-htop' \
-    -e 'pcp-ipcs|pcp-iostat|pcp-lvmcache|pcp-mpstat' \
-    -e 'pcp-numastat|pcp-pidstat|pcp-shping|pcp-tapestat' \
--   -e 'pcp-uptime|pcp-verify' | \
-+   -e 'pcp-uptime|pcp-verify|pcp-ss' | \
-    cull 'selinux|pmlogconf|pmieconf|pmrepconf' >pcp-system-tools-files
- 
- basic_manifest | keep 'sar2pcp' >pcp-import-sar2pcp-files
 diff --git a/qa/1633 b/qa/1633
 new file mode 100755
 index 000000000..8ce2fc3ba