diff --git a/0003-fix-pcp-pidstat-bug.patch b/0003-fix-pcp-pidstat-bug.patch new file mode 100644 index 0000000..1b214a7 --- /dev/null +++ b/0003-fix-pcp-pidstat-bug.patch @@ -0,0 +1,12 @@ +diff --git a/src/pmlogconf/tools/pidstat b/src/pmlogconf/tools/pidstat +index b3cfbce..c040a60 100644 +--- a/src/pmlogconf/tools/pidstat ++++ b/src/pmlogconf/tools/pidstat +@@ -1,6 +1,6 @@ + #pmlogconf-setup 2.0 + ident metrics used by the pcp-pidstat(1) command +-probe proc.psinfo.rss values ? available : exclude ++force include + + proc.nprocs + proc.psinfo.pid diff --git a/pcp.spec b/pcp.spec index afdab4d..b9f96e1 100644 --- a/pcp.spec +++ b/pcp.spec @@ -9,7 +9,7 @@ Name: pcp Version: 4.1.3 Summary: System-level performance monitoring and performance management -Release: 12 +Release: 13 License: GPLv2+ and LGPLv2.1+ and CC-BY URL: https://pcp.io Source0: https://dl.bintray.com/pcp/source/pcp-4.1.3.tar.gz @@ -22,6 +22,7 @@ Patch0001: 0001-Fix-collectl2pcp-option.patch Patch6000: CVE-2019-3695-CVE-2019-3696.patch Patch9000: 9000-fix-new-function-not-found-when-Install.patch Patch9001: 0002-fix-some-pcp-pidstat-bugs.patch +Patch9002: 0003-fix-pcp-pidstat-bug.patch BuildRequires: gcc gcc-c++ procps autoconf bison flex nss-devel rpm-devel avahi-devel xz-devel zlib-devel BuildRequires: python2-devel python3-devel ncurses-devel readline-devel cyrus-sasl-devel papi-devel libpfm-devel >= 4 @@ -868,6 +869,7 @@ This package installs selinux support files for PCP. %patch6000 -p1 %patch9000 -p1 %patch9001 -p1 +%patch9002 -p1 %build @@ -2223,7 +2225,10 @@ fi %config(noreplace) /etc/pcp/pmrep/* %changelog -* Fri Sep 18 2020 Guoshuai Sun -4.1.3-12 +* Tue Sep 22 2020 zhangjiapeng - 4.1.3-13 +- fix pcp pidstat bug -a option + +* Fri Sep 18 2020 Guoshuai Sun - 4.1.3-12 - Fix some bugs in pcp-pidstat,include -U option error,-? need an arg, And del unused -h/--host options