From fd874d5a6fd4f36242ba9d12e44d9f229b7ef3bc Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Fri, 4 Jun 2021 11:04:40 +1000 Subject: [PATCH] Update to latest community sources --- pcp.spec | 71 +++++++++-------------------------- redhat-bugzilla-1950263.patch | 33 ---------------- sources | 2 +- 3 files changed, 18 insertions(+), 88 deletions(-) delete mode 100644 redhat-bugzilla-1950263.patch diff --git a/pcp.spec b/pcp.spec index 424f5d2..b7e9791 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,6 +1,6 @@ Name: pcp -Version: 5.3.0 -Release: 4%{?dist} +Version: 5.3.1 +Release: 1%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2+ and CC-BY URL: https://pcp.io @@ -8,8 +8,6 @@ URL: https://pcp.io %global artifactory https://performancecopilot.jfrog.io/artifactory Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz -Patch000: redhat-bugzilla-1950263.patch - %if 0%{?fedora} >= 26 || 0%{?rhel} > 7 %global __python2 python2 %else @@ -44,12 +42,7 @@ Patch000: redhat-bugzilla-1950263.patch %endif %endif -# libvarlink and pmdapodman -%if 0%{?fedora} >= 28 || 0%{?rhel} > 7 %global disable_podman 0 -%else -%global disable_podman 1 -%endif # libchan, libhdr_histogram and pmdastatsd %if 0%{?fedora} >= 29 || 0%{?rhel} > 7 @@ -137,13 +130,6 @@ Patch000: redhat-bugzilla-1950263.patch %global disable_nutcracker 1 %endif -# support for pmdarpm -%if 0%{?rhel} == 0 || 0%{?rhel} > 5 -%global disable_rpm 0 -%else -%global disable_rpm 1 -%endif - # Qt development and runtime environment missing components before el6 %if 0%{?rhel} == 0 || 0%{?rhel} > 5 %global disable_qt 0 @@ -201,6 +187,10 @@ Conflicts: librapi < 0.16 Obsoletes: pcp-pmda-kvm < 4.1.1 Provides: pcp-pmda-kvm = %{version}-%{release} +# RPM PMDA retired completely +Obsoletes: pcp-pmda-rpm < 5.3.2 +Obsoletes: pcp-pmda-rpm-debuginfo < 5.3.2 + # PCP REST APIs are now provided by pmproxy Obsoletes: pcp-webapi-debuginfo < 5.0.0 Obsoletes: pcp-webapi < 5.0.0 @@ -225,7 +215,6 @@ BuildRequires: make BuildRequires: gcc gcc-c++ BuildRequires: procps autoconf bison flex BuildRequires: nss-devel -BuildRequires: rpm-devel BuildRequires: avahi-devel BuildRequires: xz-devel BuildRequires: zlib-devel @@ -243,9 +232,6 @@ BuildRequires: python3-setuptools BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: cyrus-sasl-devel -%if !%{disable_podman} -BuildRequires: libvarlink-devel -%endif %if !%{disable_statsd} # ragel unavailable on RHEL8 %if 0%{?rhel} == 0 @@ -292,8 +278,6 @@ Requires: pcp-libs = %{version}-%{release} Requires: pcp-selinux = %{version}-%{release} %endif -Requires: pcp-libs = %{version}-%{release} - %global _confdir %{_sysconfdir}/pcp %global _logsdir %{_localstatedir}/log/pcp %global _pmnsdir %{_localstatedir}/lib/pcp/pmns @@ -549,9 +533,6 @@ Requires: pcp-pmda-snmp %if !%{disable_json} Requires: pcp-pmda-json %endif -%if !%{disable_rpm} -Requires: pcp-pmda-rpm -%endif Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog %if !%{disable_python2} || !%{disable_python3} Requires: pcp-system-tools @@ -893,12 +874,10 @@ License: GPLv2+ Summary: Performance Co-Pilot (PCP) metrics for podman containers URL: https://pcp.io Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} -Requires: libvarlink -BuildRequires: libvarlink-devel %description pmda-podman This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting podman container and pod statistics through libvarlink. +collecting podman container and pod statistics via the podman REST API. %endif %if !%{disable_statsd} @@ -1956,21 +1935,6 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the room temperature. # end pcp-pmda-roomtemp -%if !%{disable_rpm} -# -# pcp-pmda-rpm -# -%package pmda-rpm -License: GPLv2+ -Summary: Performance Co-Pilot (PCP) metrics for the RPM package manager -URL: https://pcp.io -Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release} -%description pmda-rpm -This package contains the PCP Performance Metrics Domain Agent (PMDA) for -collecting metrics about the installed RPM packages. -%endif -# end pcp-pmda-rpm - # # pcp-pmda-sendmail # @@ -2249,7 +2213,6 @@ updated policy package. %prep %setup -q -%patch000 -p1 %build # fix up build version @@ -2291,9 +2254,11 @@ sed -i -e '/platformsz.h/d' $DIST_MANIFEST %if %{disable_mssql} # remove pmdamssql on platforms lacking MSODBC driver packages. +rm -fr $RPM_BUILD_ROOT/%{_confdir}/mssql +rm -fr $RPM_BUILD_ROOT/%{_confdir}/pmieconf/mssql +rm -fr $RPM_BUILD_ROOT/%{_ieconfdir}/mssql rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/mssql rm -fr $RPM_BUILD_ROOT/%{_pmdasexecdir}/mssql -rm -fr $RPM_BUILD_ROOT/%{_confdir}/mssql %endif %if !%{disable_qt} @@ -2361,8 +2326,10 @@ grep -E 'pcp\/(examples|demos)|(etc/pcp|pcp/pmdas)\/(sample|simple|trivial|txmon # Note: /etc/pcp.{conf,env,sh} are %%config but not noreplace # and are treated specially below. cat >confpath.list <pcp-pmda-memcache-files basic_manifest | keep '(etc/pcp|pmdas)/mailq(/|$)' >pcp-pmda-mailq-files basic_manifest | keep '(etc/pcp|pmdas)/mic(/|$)' >pcp-pmda-mic-files basic_manifest | keep '(etc/pcp|pmdas)/mounts(/|$)' >pcp-pmda-mounts-files -basic_manifest | keep '(etc/pcp|pmdas)/mssql(/|$)' >pcp-pmda-mssql-files +basic_manifest | keep '(etc/pcp|pmdas|pmieconf)/mssql(/|$)' >pcp-pmda-mssql-files basic_manifest | keep '(etc/pcp|pmdas)/mysql(/|$)' >pcp-pmda-mysql-files basic_manifest | keep '(etc/pcp|pmdas)/named(/|$)' >pcp-pmda-named-files basic_manifest | keep '(etc/pcp|pmdas)/netfilter(/|$)' >pcp-pmda-netfilter-files @@ -2663,11 +2630,6 @@ getent passwd pcp >/dev/null || \ useradd -c "Performance Co-Pilot" -g pcp -d %{_localstatedir}/lib/pcp -M -r -s /sbin/nologin pcp exit 0 -%if !%{disable_rpm} -%preun pmda-rpm -%{pmda_remove "$1" "rpm"} -%endif - %if !%{disable_systemd} %preun pmda-systemd %{pmda_remove "$1" "systemd"} @@ -3248,9 +3210,6 @@ PCP_LOG_DIR=%{_logsdir} %files pmda-roomtemp -f pcp-pmda-roomtemp-files.rpm -%if !%{disable_rpm} -%files pmda-rpm -f pcp-pmda-rpm-files.rpm -%endif %files pmda-sendmail -f pcp-pmda-sendmail-files.rpm %files pmda-shping -f pcp-pmda-shping-files.rpm @@ -3311,6 +3270,10 @@ PCP_LOG_DIR=%{_logsdir} %files zeroconf -f pcp-zeroconf-files.rpm %changelog +* Fri Jun 04 2021 Nathan Scott - 5.3.1-1 +- Really fix selinux AVCs for pmdakvm on debugfs (BZ 1929259) +- Update to latest PCP sources. + * Fri May 21 2021 Jitka Plesnikova - 5.3.0-4 - Perl 5.34 rebuild diff --git a/redhat-bugzilla-1950263.patch b/redhat-bugzilla-1950263.patch deleted file mode 100644 index 649d8c4..0000000 --- a/redhat-bugzilla-1950263.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 6528e1b09ad948a8bf82e03ad2f10c1a296078af -Author: Nathan Scott -Date: Tue Apr 20 11:02:26 2021 +1000 - - qa: specify PCP libraries only on libpcp_web link lines - - Tweaks the changes from commit c9bd0cc4e9b so that testsuite - sources linking with libpcp_web don't pull in 3rd party libs - (which may not be installed) like uv, ssl, crypto. - - Resolves Red Hat BZ #1950263 - -diff --git a/qa/src/GNUlocaldefs b/qa/src/GNUlocaldefs -index 3b5873c25..13fc09831 100644 ---- a/qa/src/GNUlocaldefs -+++ b/qa/src/GNUlocaldefs -@@ -538,13 +538,13 @@ check_pmiend_fdleak: check_pmiend_fdleak.c - - httpfetch: httpfetch.c - rm -f $@ -- $(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) $(PCP_WEBLIB) -+ $(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda -lpcp_web -lpcp_mmv - json_test: json_test.c - rm -f $@ -- $(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) $(PCP_WEBLIB) -+ $(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda -lpcp_web -lpcp_mmv - sha1int2ext: sha1int2ext.o - rm -f $@ -- $(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) $(PCP_WEBLIB) -+ $(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda -lpcp_web -lpcp_mmv - - # --- need libpcp_fault - # diff --git a/sources b/sources index 7714851..8d95bc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pcp-5.3.0.src.tar.gz) = d3f61315adb7d112357736537941690f4ceb11cd6158accb8973af542ca673bdc5ed7281d93b0bf88f6af01cc85d2e075261123576dae370c036ff8d493d8b1c +SHA512 (pcp-5.3.1.src.tar.gz) = c669d08cff66bba0cd747d2e0ca37f967497945cf1913358e7523c5f9877d68d0ffa810d960a42c168f3f75d52ec08b71ed350f23bad64b181223c6c8874c697