Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pcp for openSUSE:Factory checked in
at 2022-05-30 12:42:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcp (Old)
and /work/SRC/openSUSE:Factory/.pcp.new.2254 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcp"
Mon May 30 12:42:22 2022 rev:65 rq:979724 version:5.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2022-05-19 22:49:04.706316312
+0200
+++ /work/SRC/openSUSE:Factory/.pcp.new.2254/pcp.changes 2022-05-30
12:42:51.072302757 +0200
@@ -1,0 +2,93 @@
+Mon May 16 14:22:19 UTC 2022 - David Disseldorp <dd...@suse.com>
+
+- Upgrade to 5.2.5
+- Client tools and utilities:
+ + pcp-dstat: correct the sample count logic, was off-by-one
+ + pcp-dstat: fix csv output with timestamps (no special chars)
+- PMDA additions, enhancements and bug fixes:
+ + pmdazfs: new Linux ZFS metrics
+ + pmdasockets: new Linux ss(1) metrics
+ + pmdahacluster: new HA metrics (Pacemaker, Corosync, DRBD and SBD)
+ + pmdabcc: netproc module: count kernel calls, not packets
+ + pmdalinux: add hinv.cpu.thermal_throttle metrics
+ + pmdalinux: add missing help text for new metrics, drop dups
+- Server-side utilities and log management scripts:
+ + pmproxy: fix quoting of /series/metrics matched names
+ + pmlogger: fix permissions mismatch for pmlogger tmp dir
+ + pmlogger: fix incorrect reporting of pmcd state changes
+ + pmie_check: explicity set a umask appropriate for pmieconf
+ + pmlogger_check: explicity set a umask appropriate for pmlogconf
+ + pmlogger_check: skip .NeedRewrite processing with -K
+ + pmpost: increase timestamp resolution
+ + pmpost: fix NOTICES file ownership changes
+ + rc scripts: add optional logging
+ + systemd: remove Wants=pmcd from pmlogger and pmie
+- libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings
+ + libpcp: redo the interp.c time_caliper changes
+ + libpcp_web: add timer driven webgroup garbage collector
+ + libpcp_pmda: add new function pmdaCachePurgeCallback
+- Misc build, infrastructure and packaging updates:
+ + libpcp_web: fix minor memory leak on an error path (covscan)
+ + build: fixes to ensure PCP_TMPFILE_DIR not used during the build
+ drop upstream 0007-pmns-Make-drop-duplicate-if-else.patch
+ drop upstream 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch
+- Security Enhanced Linux:
+ + selinux: enable netcheck rawip_socket if icmp_socket unavailable
+ + selinux: additional rules needed for pmie/pmlogger in fedora
+- Documentation and QA infrastructure:
+ + docs: add pointers to readthedocs.io now that books live there
+ + pcp-dstat: optionally install a man page symlink for dstat
+ + docs: pmproxy(1) man page corrections and additions
+
+- Upgrade to 5.2.3
+- Client tools and utilities:
+ + pcp-htop: minimal version of htop with PCP backend platform
+ + pcp-atop: add per-process network statistics
+ + pcp-atop: result instance indexing performance optimization
+ + pcp-atop: always restore original state of process accounting
+ + pcp2elasticsearch: add guard around maximum long integer size
+ + pmlogsummary: fix indom lookup for dynamic instance domains
+ + pmseries: provide sum() and avg() query functions
+ + pmseries: persist canonical query expressions to Redis
+ + pmseries: fix HMSET calls when querying timeseries expression
+ + pmseries: fix for failing queries with disjuncted qualifiers
+ + pmseries: fix segfault in func call with globbed metric.name
+- Server-side utilities and log management scripts:
+ + pmproxy: support fabricated SIDs in /series/instances requests
+ + pmproxy: support fabricated SIDs in /series/metrics requests
+ + pmlogger_check: add pmlc connection timeout checking current volume
+ + pmlogctl,pmiectl: ignore saved control files after an upgrade
+ + pmlogconf: add missing mssql template header
+ + pmlogconf: add logger configuration files for the htop command
+ + pmieconf: add a rule to detect and report OOM kills
+ + pmieconf: cleanup old, no-longer-used tool integrations
+ + pmieconf: ensure all automated invocations use the -c switch
+ + pmieconf: fix default generated config file path
+ + pmie_check: remove a tempfile once finished with it
+- PMDA additions, enhancements and bug fixes:
+ + pmdaapache: fix buffer size to allow for multiple reads of the stream
+ + pmdabcc: added new netproc module with per-process network metrics
+ + pmdaproc: allow to use acct.control.enable_acct as reference counting
+ + pmdalinux: added network.all.* metrics for physical interfaces
+ + pmdalinux: fix case of waitio counters from /proc/stat going backwards
+ + pmdalinux: minor tweaks to use integer math over floating point
+ + dbpmda: send inst profile prior to instances level label requests
+- libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings
+ + libpcp: performance improvements for archives with dynamic indoms
+ + libpcp: send instance profile for instances level labels requests
+ + libpcp: make pmLookupName take a (const char **) namelist
+ + libpcp_web: set pmseries source to all-zeroes for expressions
+ + libpcp_web: handle fabricated SIDs in /series/values REST API
+ + python api: fix fetchgroup max_insts size with multiple indoms
+- Misc build, infrastructure and packaging updates:
+- Security Enhanced Linux:
+ + selinux: use matching autoconf guard for rawip_socket class
+- Documentation and QA infrastructure:
+ + docs: update pmdabpftrace man page and README
+ + docs: improvements in diagrams
+ + docs: theme_overrides.css added for readthedocs content
+ + docs: pmseries(1) chapter added in Users and Administrators Guide
+ + docs: add quotes to curl calls with * in pmwebapi query strings
+ + docs: update pmseries schema to describe expression keys
+
+-------------------------------------------------------------------
Old:
----
0007-pmns-Make-drop-duplicate-if-else.patch
0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch
pcp-5.2.2.tar.bz2
New:
----
pcp-5.2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcp.spec ++++++
--- /var/tmp/diff_new_pack.7EiXJ5/_old 2022-05-30 12:42:52.384304503 +0200
+++ /var/tmp/diff_new_pack.7EiXJ5/_new 2022-05-30 12:42:52.392304514 +0200
@@ -66,7 +66,7 @@
License: %{license_gplv2plus} AND %{license_lgplv2plus} AND
%{license_cc_by}
Group: %{pcp_gr}
Name: pcp
-Version: 5.2.2
+Version: 5.2.5
Release: 0
%global buildversion 1
@@ -87,10 +87,6 @@
# PATCH-FIX-OPENSUSE, kkae...@suse.de
Patch6: 0006-pmsnap-control-var-www-srv-www.patch
# PATCH-FIX-UPSTREAM, dd...@suse.de
-Patch7: 0007-pmns-Make-drop-duplicate-if-else.patch
-# PATCH-FIX-UPSTREAM, dd...@suse.de
-Patch8: 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch
-# PATCH-FIX-UPSTREAM, dd...@suse.de
Patch9: 0009-remove-rundir-install.patch
%if 0%{?fedora} || 0%{?rhel}
@@ -739,9 +735,9 @@
importing data in various 3rd party formats into PCP archives so
they can be replayed with standard PCP monitoring tools.
- #
+#
# perl-PCP-LogSummary
#
%package -n perl-PCP-LogSummary
@@ -2252,6 +2248,41 @@
#
+# pcp-pmda-sockets
+#
+%package pmda-sockets
+License: %{license_gplv2plus}
+Summary: Performance Co-Pilot (PCP) per-socket metrics
+URL: https://pcp.io
+Requires: %{lib_pkg} = %{version}-%{release}
+Requires: iproute
+Requires: pcp = %{version}-%{release}
+
+%description pmda-sockets
+This package contains the PCP Performance Metric Domain Agent (PMDA) for
+collecting per-socket statistics, making use of utilities such as 'ss'.
+#end pcp-pmda-sockets
+
+
+
+#
+# pcp-pmda-hacluster
+#
+%package pmda-hacluster
+License: %{license_gplv2plus}
+Summary: Performance Co-Pilot (PCP) metrics for High Availability
Clusters
+URL: https://pcp.io
+Requires: %{lib_pkg} = %{version}-%{release}
+Requires: pcp = %{version}-%{release}
+
+%description pmda-hacluster
+This package contains the PCP Performance Metrics Domain Agent (PMDA) for
+collecting metrics about linux High Availability (HA) Clusters.
+# end pcp-pmda-hacluster
+
+
+
+#
# pcp-pmda-summary
#
%package pmda-summary
@@ -2475,8 +2506,6 @@
%patch3 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
%patch9 -p1
autoconf
@@ -2606,7 +2635,6 @@
rm -f
%{buildroot}/%{_localstatedir}/lib/pcp/testsuite/perfevent/perfevent_coverage #
drop unreproducible file (boo#1040589)
%fdupes %{buildroot}%{_testsdir}
-
%if 0%{?suse_version}
mkdir -p %{buildroot}/%{_tempsdir}
@@ -2632,7 +2660,7 @@
%endif
# list of PMDAs in the base pcp package
-for pmda in jbd2 kvm linux mmv pipe pmcd proc root xfs; do
+for pmda in jbd2 kvm linux mmv pipe pmcd proc root xfs zfs; do
for alt in %{_pmdasdir} %{_pmdasexecdir} %{_confdir}; do
[ -d %{buildroot}/$alt/$pmda ] && echo $alt/$pmda >>base_pmdas.list
done
@@ -3570,6 +3598,14 @@
%{_pmdasdir}/smart
%{_pmdasexecdir}/smart
+%files pmda-sockets
+%{_pmdasdir}/sockets
+%{_pmdasexecdir}/sockets
+
+%files pmda-hacluster
+%{_pmdasdir}/hacluster
+%{_pmdasexecdir}/hacluster
+
%files pmda-summary
%{_pmdasdir}/summary
%{_pmdasexecdir}/summary
@@ -3643,8 +3679,6 @@
%dir %{_docdir}/pcp/demos/tutorials
%dir %{_datadir}/doc/pcp-doc
%{_datadir}/doc/pcp-doc/html
-%{_datadir}/doc/pcp-doc/pcp-programmers-guide.pdf
-%{_datadir}/doc/pcp-doc/pcp-users-and-administrators-guide.pdf
%endif
%if !%{disable_selinux}
++++++ 0001-Install-libraries-without-exec-permission.patch ++++++
--- /var/tmp/diff_new_pack.7EiXJ5/_old 2022-05-30 12:42:52.448304588 +0200
+++ /var/tmp/diff_new_pack.7EiXJ5/_new 2022-05-30 12:42:52.448304588 +0200
@@ -1,33 +1,45 @@
-From 550357486d093e60ddf8102cf3ff474c7fa1721d Mon Sep 17 00:00:00 2001
+From 1c78e9cae055e914a846a54a6a12acfc7525d64e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de>
-Date: Fri, 12 Dec 2014 15:43:00 +0100
-Subject: [PATCH 1/6] Install libraries without exec permission
+Date: Mon, 16 May 2022 17:31:55 +0200
+Subject: [PATCH] build: install libraries without exec permission
+Signed-off-by: David Disseldorp <dd...@suse.de>
---
- src/genpmda/genpmda | 4 ++--
- src/libpcp/src/GNUmakefile | 4 ++--
- src/libpcp_fault/src/GNUmakefile | 4 ++--
- src/libpcp_gui/src/GNUmakefile | 4 ++--
- src/libpcp_import/src/GNUmakefile | 4 ++--
- src/libpcp_mmv/src/GNUmakefile | 4 ++--
- src/libpcp_pmcd/src/GNUmakefile | 2 +-
- src/libpcp_pmda/src/GNUmakefile | 4 ++--
- src/libpcp_trace/src/GNUmakefile | 4 ++--
- src/pmdas/aix/GNUmakefile | 2 +-
- src/pmdas/darwin/GNUmakefile | 2 +-
- src/pmdas/freebsd/GNUmakefile | 2 +-
- src/pmdas/linux/GNUmakefile | 2 +-
- src/pmdas/linux_proc/GNUmakefile | 2 +-
- src/pmdas/lustrecomm/GNUmakefile | 2 +-
- src/pmdas/pmcd/src/GNUmakefile | 2 +-
- src/pmdas/sendmail/GNUmakefile | 2 +-
- src/pmdas/solaris/GNUmakefile | 2 +-
- 18 files changed, 26 insertions(+), 26 deletions(-)
+ src/genpmda/genpmda | 4 ++--
+ src/libpcp/src/GNUmakefile | 4 ++--
+ src/libpcp_fault/src/GNUmakefile | 4 ++--
+ src/libpcp_gui/src/GNUmakefile | 4 ++--
+ src/libpcp_import/src/GNUmakefile | 4 ++--
+ src/libpcp_mmv/src/GNUmakefile | 4 ++--
+ src/libpcp_pmcd/src/GNUmakefile | 2 +-
+ src/libpcp_pmda/src/GNUmakefile | 4 ++--
+ src/libpcp_trace/src/GNUmakefile | 4 ++--
+ src/libpcp_web/src/GNUmakefile | 4 ++--
+ src/pmdas/cifs/GNUmakefile | 4 ++--
+ src/pmdas/dm/GNUmakefile | 4 ++--
+ src/pmdas/docker/GNUmakefile | 4 ++--
+ src/pmdas/hacluster/GNUmakefile | 4 ++--
+ src/pmdas/jbd2/GNUmakefile | 4 ++--
+ src/pmdas/kvm/GNUmakefile | 4 ++--
+ src/pmdas/linux/GNUmakefile | 4 ++--
+ src/pmdas/linux_proc/GNUmakefile | 4 ++--
+ src/pmdas/linux_sockets/GNUmakefile | 4 ++--
+ src/pmdas/linux_xfs/GNUmakefile | 4 ++--
+ src/pmdas/linux_zfs/GNUmakefile | 4 ++--
+ src/pmdas/nvidia/GNUmakefile | 5 ++---
+ src/pmdas/pmcd/src/GNUmakefile | 2 +-
+ src/pmdas/podman/GNUmakefile | 4 ++--
+ src/pmdas/rpm/GNUmakefile | 4 ++--
+ src/pmdas/sendmail/GNUmakefile | 4 ++--
+ src/pmdas/smart/GNUmakefile | 4 ++--
+ src/pmdas/statsd/src/GNUmakefile | 4 ++--
+ src/zabbix-agent/src/GNUmakefile | 2 +-
+ 29 files changed, 55 insertions(+), 56 deletions(-)
-Index: pcp/src/genpmda/genpmda
-===================================================================
---- pcp.orig/src/genpmda/genpmda
-+++ pcp/src/genpmda/genpmda
+diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda
+index 5e5c110d1..9670b7461 100755
+--- a/src/genpmda/genpmda
++++ b/src/genpmda/genpmda
@@ -899,7 +899,7 @@ install: default
\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
\$(INSTALL) -m 755 -d \$(PMDADIR)
@@ -46,10 +58,10 @@
\$(INSTALL) -m 755 -f $oflag/Install \$(PMDADIR)/Install
\$(INSTALL) -m 755 -f $oflag/Remove \$(PMDADIR)/Remove
\$(INSTALL) -m 644 -f $oflag/Makefile.install \$(PMDADIR)/Makefile
-Index: pcp/src/libpcp/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp/src/GNUmakefile
-+++ pcp/src/libpcp/src/GNUmakefile
+diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile
+index c58277980..b8d98872e 100644
+--- a/src/libpcp/src/GNUmakefile
++++ b/src/libpcp/src/GNUmakefile
@@ -125,7 +125,7 @@ endif
install : default
@@ -68,10 +80,10 @@
endif
$(EXT_FILES):
-Index: pcp/src/libpcp_fault/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp_fault/src/GNUmakefile
-+++ pcp/src/libpcp_fault/src/GNUmakefile
+diff --git a/src/libpcp_fault/src/GNUmakefile
b/src/libpcp_fault/src/GNUmakefile
+index 229092783..ee37c2aa6 100644
+--- a/src/libpcp_fault/src/GNUmakefile
++++ b/src/libpcp_fault/src/GNUmakefile
@@ -150,7 +150,7 @@ endif
install : default
@@ -90,10 +102,10 @@
endif
$(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h
$(PCP_INC_DIR)/fault.h
-Index: pcp/src/libpcp_gui/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp_gui/src/GNUmakefile
-+++ pcp/src/libpcp_gui/src/GNUmakefile
+diff --git a/src/libpcp_gui/src/GNUmakefile b/src/libpcp_gui/src/GNUmakefile
+index b45028ca4..9099e4d1e 100644
+--- a/src/libpcp_gui/src/GNUmakefile
++++ b/src/libpcp_gui/src/GNUmakefile
@@ -54,7 +54,7 @@ include $(BUILDRULES)
install: default
@@ -112,10 +124,10 @@
endif
default_pcp: default
-Index: pcp/src/libpcp_import/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp_import/src/GNUmakefile
-+++ pcp/src/libpcp_import/src/GNUmakefile
+diff --git a/src/libpcp_import/src/GNUmakefile
b/src/libpcp_import/src/GNUmakefile
+index 0536ded93..b1bd3b3d7 100644
+--- a/src/libpcp_import/src/GNUmakefile
++++ b/src/libpcp_import/src/GNUmakefile
@@ -54,7 +54,7 @@ include $(BUILDRULES)
install: default
@@ -134,10 +146,10 @@
endif
default_pcp: default
-Index: pcp/src/libpcp_mmv/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp_mmv/src/GNUmakefile
-+++ pcp/src/libpcp_mmv/src/GNUmakefile
+diff --git a/src/libpcp_mmv/src/GNUmakefile b/src/libpcp_mmv/src/GNUmakefile
+index e0a0b4c5a..9481bf4f5 100644
+--- a/src/libpcp_mmv/src/GNUmakefile
++++ b/src/libpcp_mmv/src/GNUmakefile
@@ -47,7 +47,7 @@ include $(BUILDRULES)
install: default
@@ -156,10 +168,10 @@
endif
default_pcp: default
-Index: pcp/src/libpcp_pmcd/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp_pmcd/src/GNUmakefile
-+++ pcp/src/libpcp_pmcd/src/GNUmakefile
+diff --git a/src/libpcp_pmcd/src/GNUmakefile b/src/libpcp_pmcd/src/GNUmakefile
+index e550dde1a..d53c05565 100644
+--- a/src/libpcp_pmcd/src/GNUmakefile
++++ b/src/libpcp_pmcd/src/GNUmakefile
@@ -73,7 +73,7 @@ include $(BUILDRULES)
install : default
@@ -169,10 +181,10 @@
endif
ifeq "$(ENABLE_PROBES)" "true"
-Index: pcp/src/libpcp_pmda/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp_pmda/src/GNUmakefile
-+++ pcp/src/libpcp_pmda/src/GNUmakefile
+diff --git a/src/libpcp_pmda/src/GNUmakefile b/src/libpcp_pmda/src/GNUmakefile
+index 021cec3f9..83042edcc 100644
+--- a/src/libpcp_pmda/src/GNUmakefile
++++ b/src/libpcp_pmda/src/GNUmakefile
@@ -64,7 +64,7 @@ include $(BUILDRULES)
install: default
@@ -191,10 +203,10 @@
endif
$(XFILES):
-Index: pcp/src/libpcp_trace/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp_trace/src/GNUmakefile
-+++ pcp/src/libpcp_trace/src/GNUmakefile
+diff --git a/src/libpcp_trace/src/GNUmakefile
b/src/libpcp_trace/src/GNUmakefile
+index 10738d631..6f11d0660 100644
+--- a/src/libpcp_trace/src/GNUmakefile
++++ b/src/libpcp_trace/src/GNUmakefile
@@ -56,13 +56,13 @@ include $(BUILDRULES)
install : default
@@ -211,72 +223,10 @@
endif
default_pcp : default
-Index: pcp/src/pmdas/linux/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/linux/GNUmakefile
-+++ pcp/src/pmdas/linux/GNUmakefile
-@@ -89,10 +89,10 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
- install: default
- $(INSTALL) -m 755 -d $(PMDAADMDIR)
- $(INSTALL) -m 755 -d $(PMDATMPDIR)
-- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS)
$(PMDAADMDIR)
-+ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS)
$(LIBTARGET) $(PMDAADMDIR)
- $(INSTALL) -m 755 -d $(PMDACONFIG)
- $(INSTALL) -m 644 -t $(PMDATMPDIR)/samplebandwidth.conf bandwidth.conf
$(PMDACONFIG)/samplebandwidth.conf
-- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET)
$(PMDAADMDIR)
-+ $(INSTALL) -m 755 -t $(PMDATMPDIR)/$(CMDTARGET) $(CMDTARGET)
$(PMDAADMDIR)/$(CMDTARGET)
- $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_linux root_linux
$(PCP_PMNSADM_DIR)/root_linux
- $(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_fs_nfsd_fixups.conf
proc_fs_nfsd_fixups.conf $(REWRITEDIR)/linux_proc_fs_nfsd_fixups.conf
- $(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_net_snmp_migrate.conf
proc_net_snmp_migrate.conf $(REWRITEDIR)/linux_proc_net_snmp_migrate.conf
-Index: pcp/src/pmdas/linux_proc/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/linux_proc/GNUmakefile
-+++ pcp/src/pmdas/linux_proc/GNUmakefile
-@@ -73,10 +73,10 @@ build-me: root_proc $(LIBTARGET) $(CMDTA
- install: default
- $(INSTALL) -m 755 -d $(PMDAADMDIR)
- $(INSTALL) -m 755 -d $(PMDATMPDIR)
-- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root
root_proc $(PMDAADMDIR)
-+ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root
root_proc $(LIBTARGET) $(PMDAADMDIR)
- $(INSTALL) -m 755 -d $(PMDACONFIG)
- $(INSTALL) -m 644 -t $(PMDATMPDIR)/samplehotproc.conf
samplehotproc.conf $(PMDACONFIG)/samplehotproc.conf
-- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS)
$(PMDAADMDIR)
-+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
- $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_proc root_proc
$(PCP_PMNSADM_DIR)/root_proc
- $(INSTALL) -m 644 -t $(REWRITEVARDIR) $(LOGREWRITERS) $(REWRITEDIR)
- @$(INSTALL_MAN)
-Index: pcp/src/pmdas/pmcd/src/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/pmcd/src/GNUmakefile
-+++ pcp/src/pmdas/pmcd/src/GNUmakefile
-@@ -59,7 +59,7 @@ default: $(LIBTARGET)
- install: default
- $(INSTALL) -m 755 -d $(PMDAADMDIR)
- $(INSTALL) -m 755 -d $(PMDATMPDIR)
-- $(INSTALL) -m 755 -t $(PMDATMPDIR)/$(LIBTARGET) $(LIBTARGET)
$(PMDAADMDIR)/$(LIBTARGET)
-+ $(INSTALL) -m 644 -t $(PMDATMPDIR)/$(LIBTARGET) $(LIBTARGET)
$(PMDAADMDIR)/$(LIBTARGET)
-
- include $(BUILDRULES)
-
-Index: pcp/src/pmdas/sendmail/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/sendmail/GNUmakefile
-+++ pcp/src/pmdas/sendmail/GNUmakefile
-@@ -44,8 +44,8 @@ install install_pcp: default
- $(INSTALL) -m 755 -d $(PMDAADMDIR)
- $(INSTALL) -m 755 -d $(PMDATMPDIR)
- $(INSTALL) -m 755 -t $(PMDATMPDIR)/pmda$(IAM)$(EXECSUFFIX) $(CMDTARGET)
$(PMDAADMDIR)/pmda$(IAM)$(EXECSUFFIX)
-- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(SCRIPTS) $(PMDAADMDIR)
-- $(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) pmns help root domain.h
$(PMDAADMDIR)
-+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(SCRIPTS) $(PMDAADMDIR)
-+ $(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) pmns help root domain.h
$(LIBTARGET) $(PMDAADMDIR)
- $(INSTALL) -m 644 -t $(PMCHARTVARDIR)/Sendmail Sendmail.pmchart
$(PMCHARTDIR)/Sendmail
-
- $(CMDTARGET): $(OBJECTS)
-Index: pcp/src/libpcp_web/src/GNUmakefile
-===================================================================
---- pcp.orig/src/libpcp_web/src/GNUmakefile
-+++ pcp/src/libpcp_web/src/GNUmakefile
+diff --git a/src/libpcp_web/src/GNUmakefile b/src/libpcp_web/src/GNUmakefile
+index 5eb0dc9ac..d675c12e9 100644
+--- a/src/libpcp_web/src/GNUmakefile
++++ b/src/libpcp_web/src/GNUmakefile
@@ -84,7 +84,7 @@ endif
install: default
@@ -295,10 +245,10 @@
endif
$(XFILES):
-Index: pcp/src/pmdas/cifs/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/cifs/GNUmakefile
-+++ pcp/src/pmdas/cifs/GNUmakefile
+diff --git a/src/pmdas/cifs/GNUmakefile b/src/pmdas/cifs/GNUmakefile
+index 27b154511..d1ab2c8d0 100644
+--- a/src/pmdas/cifs/GNUmakefile
++++ b/src/pmdas/cifs/GNUmakefile
@@ -44,8 +44,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@@ -310,10 +260,10 @@
@$(INSTALL_MAN)
else
build-me:
-Index: pcp/src/pmdas/dm/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/dm/GNUmakefile
-+++ pcp/src/pmdas/dm/GNUmakefile
+diff --git a/src/pmdas/dm/GNUmakefile b/src/pmdas/dm/GNUmakefile
+index 1e8695c97..af915a971 100644
+--- a/src/pmdas/dm/GNUmakefile
++++ b/src/pmdas/dm/GNUmakefile
@@ -56,8 +56,8 @@ install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@@ -325,10 +275,10 @@
$(INSTALL) -m 644 -t $(PMIEVARDIR)/data_high_util
dmthin.data_high_util.pmie $(PMIEDIR)/data_high_util
$(INSTALL) -m 644 -t $(PMIEVARDIR)/metadata_high_util
dmthin.metadata_high_util.pmie $(PMIEDIR)/metadata_high_util
@$(INSTALL_MAN)
-Index: pcp/src/pmdas/docker/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/docker/GNUmakefile
-+++ pcp/src/pmdas/docker/GNUmakefile
+diff --git a/src/pmdas/docker/GNUmakefile b/src/pmdas/docker/GNUmakefile
+index 3bca9ab6d..50350581d 100644
+--- a/src/pmdas/docker/GNUmakefile
++++ b/src/pmdas/docker/GNUmakefile
@@ -45,8 +45,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install_pcp install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@@ -340,11 +290,26 @@
@$(INSTALL_MAN)
else
build-me:
-Index: pcp/src/pmdas/jbd2/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/jbd2/GNUmakefile
-+++ pcp/src/pmdas/jbd2/GNUmakefile
-@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
+diff --git a/src/pmdas/hacluster/GNUmakefile b/src/pmdas/hacluster/GNUmakefile
+index b9caf514a..2ec7577a9 100644
+--- a/src/pmdas/hacluster/GNUmakefile
++++ b/src/pmdas/hacluster/GNUmakefile
+@@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
+ install: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(PMDAADMDIR)
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS)
$(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(LIBTARGET)
$(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ @$(INSTALL_MAN)
+ else
+ build-me:
+diff --git a/src/pmdas/jbd2/GNUmakefile b/src/pmdas/jbd2/GNUmakefile
+index 9a313bc63..386000fff 100644
+--- a/src/pmdas/jbd2/GNUmakefile
++++ b/src/pmdas/jbd2/GNUmakefile
+@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(MYFILES)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@@ -355,11 +320,11 @@
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_jbd2 root_jbd2
$(PCP_PMNSADM_DIR)/root_jbd2
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/jbd2_kernel_ulong.conf
jbd2_kernel_ulong.conf $(REWRITEDIR)/jbd2_kernel_ulong.conf
@$(INSTALL_MAN)
-Index: pcp/src/pmdas/kvm/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/kvm/GNUmakefile
-+++ pcp/src/pmdas/kvm/GNUmakefile
-@@ -55,10 +55,10 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
+diff --git a/src/pmdas/kvm/GNUmakefile b/src/pmdas/kvm/GNUmakefile
+index c21b095ae..8ce3b2470 100644
+--- a/src/pmdas/kvm/GNUmakefile
++++ b/src/pmdas/kvm/GNUmakefile
+@@ -55,10 +55,10 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@@ -372,11 +337,61 @@
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_kvm root_kvm
$(PCP_PMNSADM_DIR)/root_kvm
@$(INSTALL_MAN)
else
-Index: pcp/src/pmdas/linux_xfs/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/linux_xfs/GNUmakefile
-+++ pcp/src/pmdas/linux_xfs/GNUmakefile
-@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
+diff --git a/src/pmdas/linux/GNUmakefile b/src/pmdas/linux/GNUmakefile
+index c2efc5f7d..13195bbdf 100644
+--- a/src/pmdas/linux/GNUmakefile
++++ b/src/pmdas/linux/GNUmakefile
+@@ -89,11 +89,11 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
$(CONFTARGETS)
+ install: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS)
$(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS)
$(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDACONFIG)
+ $(INSTALL) -m 644 interfaces.conf $(PMDACONFIG)/interfaces.conf
+ $(INSTALL) -m 644 -t $(PMDATMPDIR)/samplebandwidth.conf bandwidth.conf
$(PMDACONFIG)/samplebandwidth.conf
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET)
$(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR)/$(CMDTARGET) $(CMDTARGET)
$(PMDAADMDIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_linux root_linux
$(PCP_PMNSADM_DIR)/root_linux
+ $(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_fs_nfsd_fixups.conf
proc_fs_nfsd_fixups.conf $(REWRITEDIR)/linux_proc_fs_nfsd_fixups.conf
+ $(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_net_snmp_migrate.conf
proc_net_snmp_migrate.conf $(REWRITEDIR)/linux_proc_net_snmp_migrate.conf
+diff --git a/src/pmdas/linux_proc/GNUmakefile
b/src/pmdas/linux_proc/GNUmakefile
+index 86f38857d..8e5746075 100644
+--- a/src/pmdas/linux_proc/GNUmakefile
++++ b/src/pmdas/linux_proc/GNUmakefile
+@@ -73,10 +73,10 @@ build-me: root_proc $(LIBTARGET) $(CMDTARGET)
$(HELPTARGETS) $(LOGREWRITERS)
+ install: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root
root_proc $(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root
root_proc $(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDACONFIG)
+ $(INSTALL) -m 644 -t $(PMDATMPDIR)/samplehotproc.conf
samplehotproc.conf $(PMDACONFIG)/samplehotproc.conf
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS)
$(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_proc root_proc
$(PCP_PMNSADM_DIR)/root_proc
+ $(INSTALL) -m 644 -t $(REWRITEVARDIR) $(LOGREWRITERS) $(REWRITEDIR)
+ @$(INSTALL_MAN)
+diff --git a/src/pmdas/linux_sockets/GNUmakefile
b/src/pmdas/linux_sockets/GNUmakefile
+index 34897f2e9..b69561693 100644
+--- a/src/pmdas/linux_sockets/GNUmakefile
++++ b/src/pmdas/linux_sockets/GNUmakefile
+@@ -49,8 +49,8 @@ build-me: $(LIBTARGET) $(CMDTARGET)
+ install: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS)
$(PMDAADMDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(PMNSFILES)
$(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(PMNSFILES)
$(LIBTARGET) $(PMDAADMDIR)
+ @$(INSTALL_MAN)
+ else
+ build-me:
+diff --git a/src/pmdas/linux_xfs/GNUmakefile b/src/pmdas/linux_xfs/GNUmakefile
+index e91b02b94..9b75677e3 100644
+--- a/src/pmdas/linux_xfs/GNUmakefile
++++ b/src/pmdas/linux_xfs/GNUmakefile
+@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@@ -387,10 +402,25 @@
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_xfs root_xfs
$(PCP_PMNSADM_DIR)/root_xfs
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_xfs_migrate.conf
linux_xfs_migrate.conf $(REWRITEDIR)/linux_xfs_migrate.conf
@$(INSTALL_MAN)
-Index: pcp/src/pmdas/nvidia/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/nvidia/GNUmakefile
-+++ pcp/src/pmdas/nvidia/GNUmakefile
+diff --git a/src/pmdas/linux_zfs/GNUmakefile b/src/pmdas/linux_zfs/GNUmakefile
+index cf877efe3..ec04126dc 100644
+--- a/src/pmdas/linux_zfs/GNUmakefile
++++ b/src/pmdas/linux_zfs/GNUmakefile
+@@ -49,8 +49,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
+ install: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root
root_zfs $(PMDAADMDIR)
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS)
$(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root
root_zfs $(LIBTARGET) $(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_zfs root_zfs
$(PCP_PMNSADM_DIR)/root_zfs
+ @$(INSTALL_MAN)
+ else
+diff --git a/src/pmdas/nvidia/GNUmakefile b/src/pmdas/nvidia/GNUmakefile
+index 2a1fa6a90..b02d431ea 100644
+--- a/src/pmdas/nvidia/GNUmakefile
++++ b/src/pmdas/nvidia/GNUmakefile
@@ -37,9 +37,8 @@ include $(BUILDRULES)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@@ -403,11 +433,24 @@
$(OBJECTS): domain.h
-Index: pcp/src/pmdas/podman/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/podman/GNUmakefile
-+++ pcp/src/pmdas/podman/GNUmakefile
-@@ -48,8 +48,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
+diff --git a/src/pmdas/pmcd/src/GNUmakefile b/src/pmdas/pmcd/src/GNUmakefile
+index c128d6d59..63fdd07e0 100644
+--- a/src/pmdas/pmcd/src/GNUmakefile
++++ b/src/pmdas/pmcd/src/GNUmakefile
+@@ -59,7 +59,7 @@ default: $(LIBTARGET)
+ install: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+- $(INSTALL) -m 755 -t $(PMDATMPDIR)/$(LIBTARGET) $(LIBTARGET)
$(PMDAADMDIR)/$(LIBTARGET)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR)/$(LIBTARGET) $(LIBTARGET)
$(PMDAADMDIR)/$(LIBTARGET)
+
+ include $(BUILDRULES)
+
+diff --git a/src/pmdas/podman/GNUmakefile b/src/pmdas/podman/GNUmakefile
+index 0d28a67bf..a5f921ed1 100644
+--- a/src/pmdas/podman/GNUmakefile
++++ b/src/pmdas/podman/GNUmakefile
+@@ -48,8 +48,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@@ -418,10 +461,10 @@
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_podman root_podman
$(PCP_PMNSADM_DIR)/root_podman
@$(INSTALL_MAN)
else
-Index: pcp/src/pmdas/rpm/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/rpm/GNUmakefile
-+++ pcp/src/pmdas/rpm/GNUmakefile
+diff --git a/src/pmdas/rpm/GNUmakefile b/src/pmdas/rpm/GNUmakefile
+index 86bffd2ca..72459250e 100644
+--- a/src/pmdas/rpm/GNUmakefile
++++ b/src/pmdas/rpm/GNUmakefile
@@ -51,8 +51,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install_pcp install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@@ -433,10 +476,25 @@
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/rpm_migrate.conf migrate.conf
$(REWRITEDIR)/rpm_migrate.conf
@$(INSTALL_MAN)
else
-Index: pcp/src/pmdas/smart/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/smart/GNUmakefile
-+++ pcp/src/pmdas/smart/GNUmakefile
+diff --git a/src/pmdas/sendmail/GNUmakefile b/src/pmdas/sendmail/GNUmakefile
+index cd2da09cb..57c0555ce 100644
+--- a/src/pmdas/sendmail/GNUmakefile
++++ b/src/pmdas/sendmail/GNUmakefile
+@@ -44,8 +44,8 @@ install install_pcp: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+ $(INSTALL) -m 755 -t $(PMDATMPDIR)/pmda$(IAM)$(EXECSUFFIX) $(CMDTARGET)
$(PMDAADMDIR)/pmda$(IAM)$(EXECSUFFIX)
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(SCRIPTS) $(PMDAADMDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) pmns help root domain.h
$(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(SCRIPTS) $(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) pmns help root domain.h
$(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PMCHARTVARDIR)/Sendmail Sendmail.pmchart
$(PMCHARTDIR)/Sendmail
+
+ $(CMDTARGET): $(OBJECTS)
+diff --git a/src/pmdas/smart/GNUmakefile b/src/pmdas/smart/GNUmakefile
+index a852cc4ac..26dd4c8f9 100644
+--- a/src/pmdas/smart/GNUmakefile
++++ b/src/pmdas/smart/GNUmakefile
@@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@@ -448,11 +506,11 @@
@$(INSTALL_MAN)
else
build-me:
-Index: pcp/src/pmdas/statsd/src/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/statsd/src/GNUmakefile
-+++ pcp/src/pmdas/statsd/src/GNUmakefile
-@@ -68,8 +68,8 @@ build-me: $(RAGELTARGET).o $(CMDTARGET)
+diff --git a/src/pmdas/statsd/src/GNUmakefile
b/src/pmdas/statsd/src/GNUmakefile
+index 1567fe273..1dbcd4700 100644
+--- a/src/pmdas/statsd/src/GNUmakefile
++++ b/src/pmdas/statsd/src/GNUmakefile
+@@ -68,8 +68,8 @@ build-me: $(RAGELTARGET).o $(CMDTARGET) $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@@ -463,10 +521,10 @@
CFILES += $(RFILES)
-Index: pcp/src/zabbix-agent/src/GNUmakefile
-===================================================================
---- pcp.orig/src/zabbix-agent/src/GNUmakefile
-+++ pcp/src/zabbix-agent/src/GNUmakefile
+diff --git a/src/zabbix-agent/src/GNUmakefile
b/src/zabbix-agent/src/GNUmakefile
+index 25c630197..fb41d303b 100644
+--- a/src/zabbix-agent/src/GNUmakefile
++++ b/src/zabbix-agent/src/GNUmakefile
@@ -43,7 +43,7 @@ install: default
$(INSTALL) -m 755 -d $(ZABBIX_DIR)
$(INSTALL) -m 755 -d $(MODULE_DIR)
@@ -476,4 +534,7 @@
$(INSTALL) -S $(AGENT_DIR)/$(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET)
$(INSTALL) -m 755 -d $(CONFIG_DIR)
$(INSTALL) -m 644 $(LIBCONFIG) $(CONFIG_DIR)/$(LIBCONFIG)
+--
+2.35.3
+
++++++ 0002-Remove-CPAN-rpaths.patch ++++++
--- /var/tmp/diff_new_pack.7EiXJ5/_old 2022-05-30 12:42:52.460304604 +0200
+++ /var/tmp/diff_new_pack.7EiXJ5/_new 2022-05-30 12:42:52.464304610 +0200
@@ -1,8 +1,9 @@
-From 952ce8410406537e388a41e873941bbc427fd4d1 Mon Sep 17 00:00:00 2001
+From cc6ffae33eef2fd1b595dfda72defed17aae89c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de>
-Date: Fri, 12 Dec 2014 15:45:33 +0100
-Subject: [PATCH 2/6] Remove CPAN rpaths
+Date: Mon, 16 May 2022 17:32:55 +0200
+Subject: [PATCH] build: remove CPAN rpaths
+Acked-by: David Disseldorp <dd...@suse.de>
---
src/perl/LogImport/Makefile.PL | 2 +-
src/perl/MMV/Makefile.PL | 2 +-
@@ -10,7 +11,7 @@
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/perl/LogImport/Makefile.PL b/src/perl/LogImport/Makefile.PL
-index a254f5ad501f..2ec42f51a4eb 100644
+index a254f5ad5..2ec42f51a 100644
--- a/src/perl/LogImport/Makefile.PL
+++ b/src/perl/LogImport/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
@@ -23,7 +24,7 @@
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
diff --git a/src/perl/MMV/Makefile.PL b/src/perl/MMV/Makefile.PL
-index 7a6787deda4a..1e4cea0317d4 100644
+index 7a6787ded..1e4cea031 100644
--- a/src/perl/MMV/Makefile.PL
+++ b/src/perl/MMV/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
@@ -36,7 +37,7 @@
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
diff --git a/src/perl/PMDA/Makefile.PL b/src/perl/PMDA/Makefile.PL
-index d5c44615a651..e2260c4b5397 100644
+index d5c44615a..e2260c4b5 100644
--- a/src/perl/PMDA/Makefile.PL
+++ b/src/perl/PMDA/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
@@ -49,6 +50,6 @@
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
--
-2.18.0
+2.35.3
++++++ 0003-Remove-runlevel-4-from-init-scripts.patch ++++++
--- /var/tmp/diff_new_pack.7EiXJ5/_old 2022-05-30 12:42:52.472304620 +0200
+++ /var/tmp/diff_new_pack.7EiXJ5/_new 2022-05-30 12:42:52.476304625 +0200
@@ -1,8 +1,9 @@
-From 582c2e703b48f2c8aa6a7e574997a4650b8a67a2 Mon Sep 17 00:00:00 2001
+From e94401a3f0f6c68f695f0b4a6467cf13daa35024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de>
-Date: Fri, 12 Dec 2014 15:46:15 +0100
-Subject: [PATCH 3/6] Remove runlevel 4 from init scripts
+Date: Mon, 16 May 2022 17:34:15 +0200
+Subject: [PATCH] rc scripts: remove runlevel 4 from init scripts
+Acked-by: David Disseldorp <dd...@suse.de>
---
src/pmcd/rc_pcp | 12 ++++++------
src/pmcd/rc_pmcd | 2 +-
@@ -12,7 +13,7 @@
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/pmcd/rc_pcp b/src/pmcd/rc_pcp
-index fc58627acc4b..9acf3c6f7cca 100644
+index 228cf58fc..e1b05a51e 100644
--- a/src/pmcd/rc_pcp
+++ b/src/pmcd/rc_pcp
@@ -31,12 +31,12 @@
@@ -35,7 +36,7 @@
# Description: Legacy init script wrapper for the Performance Co-Pilot
(PCP) daemons
### END INIT INFO
diff --git a/src/pmcd/rc_pmcd b/src/pmcd/rc_pmcd
-index f42e435bdf3f..164526fac01a 100644
+index 37571e82c..f0dc662df 100644
--- a/src/pmcd/rc_pmcd
+++ b/src/pmcd/rc_pmcd
@@ -27,7 +27,7 @@
@@ -48,7 +49,7 @@
# Short-Description: Control pmcd (the collection daemon for PCP)
# Description: Configure and control pmcd (the collection daemon for
the Performance Co-Pilot)
diff --git a/src/pmie/rc_pmie b/src/pmie/rc_pmie
-index 013f2aab3eed..48c07c61081d 100644
+index 983e3d575..545c35749 100644
--- a/src/pmie/rc_pmie
+++ b/src/pmie/rc_pmie
@@ -25,7 +25,7 @@
@@ -61,7 +62,7 @@
# Short-Description: Control pmie (performance inference engine for PCP)
# Description: Configure and control pmie (the performance inference
engine for the Performance Co-Pilot)
diff --git a/src/pmlogger/rc_pmlogger b/src/pmlogger/rc_pmlogger
-index 390809a27255..b6038840f23e 100644
+index 81aeb51a2..b64750b32 100644
--- a/src/pmlogger/rc_pmlogger
+++ b/src/pmlogger/rc_pmlogger
@@ -27,7 +27,7 @@
@@ -74,7 +75,7 @@
# Short-Description: Control pmlogger (the performance metrics logger for PCP)
# Description: Configure and control pmlogger (the performance metrics
logger for the Performance Co-Pilot)
diff --git a/src/pmproxy/rc_pmproxy b/src/pmproxy/rc_pmproxy
-index 0bb38c005a7b..45ca18b9a5c1 100644
+index 1ee71595d..7a732f72c 100644
--- a/src/pmproxy/rc_pmproxy
+++ b/src/pmproxy/rc_pmproxy
@@ -27,7 +27,7 @@
@@ -87,6 +88,6 @@
# Short-Description: Control pmproxy (the pmcd proxy daemon for PCP)
# Description: Configure and control pmproxy (the pmcd proxy daemon for
the Performance Co-Pilot)
--
-2.18.0
+2.35.3
++++++ 0005-SUSE-fy-pmsnap-control-path.patch ++++++
--- /var/tmp/diff_new_pack.7EiXJ5/_old 2022-05-30 12:42:52.484304636 +0200
+++ /var/tmp/diff_new_pack.7EiXJ5/_new 2022-05-30 12:42:52.488304641 +0200
@@ -1,14 +1,15 @@
-From 99d131530bdad67ea92eeeff85181500b5c03768 Mon Sep 17 00:00:00 2001
+From 8f0a98dd4b8db4bd39a8df599b64391a78357775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de>
-Date: Mon, 23 Feb 2015 16:52:38 +0100
-Subject: [PATCH 5/6] SUSE-fy pmsnap control path
+Date: Mon, 16 May 2022 17:39:53 +0200
+Subject: [PATCH] pmsnap: SUSE-fy pmsnap control path
+Acked-by: David Disseldorp <dd...@suse.de>
---
src/pmsnap/pmsnap.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pmsnap/pmsnap.sh b/src/pmsnap/pmsnap.sh
-index 87434a5fbfb9..92be253313ea 100755
+index 95ac61b90..c1a32de07 100755
--- a/src/pmsnap/pmsnap.sh
+++ b/src/pmsnap/pmsnap.sh
@@ -26,7 +26,7 @@ prog=`basename $0`
@@ -30,6 +31,6 @@
then
echo "$prog: Error: cannot find control file \"$CONTROL\""
--
-2.18.0
+2.35.3
++++++ 0006-pmsnap-control-var-www-srv-www.patch ++++++
--- /var/tmp/diff_new_pack.7EiXJ5/_old 2022-05-30 12:42:52.496304652 +0200
+++ /var/tmp/diff_new_pack.7EiXJ5/_new 2022-05-30 12:42:52.500304657 +0200
@@ -1,14 +1,15 @@
-From ee16369892091cbd2eb68402209220591899ba3c Mon Sep 17 00:00:00 2001
+From bb38e1bb3e1fa92f9a5ab1466c0957276a0cc370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de>
-Date: Mon, 23 Feb 2015 16:54:20 +0100
-Subject: [PATCH 6/6] pmsnap/control: /var/www -> /srv/www
+Date: Mon, 16 May 2022 17:42:29 +0200
+Subject: [PATCH] pmsnap: /var/www -> /srv/www
+Acked-by: David Disseldorp <dd...@suse.de>
---
src/pmsnap/control | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pmsnap/control b/src/pmsnap/control
-index 54440b51bb1c..6cb13206fb1f 100644
+index 54440b51b..6cb13206f 100644
--- a/src/pmsnap/control
+++ b/src/pmsnap/control
@@ -67,5 +67,5 @@ $commonargs=''
@@ -20,6 +21,6 @@
+/srv/www/pcp/LOCALHOSTNAME.1hour.summary LOCALHOSTNAME/Latest Snap -O-0
-A 10min -t 2min -v 30
+/srv/www/pcp/LOCALHOSTNAME.12hour.summary LOCALHOSTNAME/Latest Snap -O-0
-A 1hour -t 30min -v 30
--
-2.18.0
+2.35.3
++++++ 0009-remove-rundir-install.patch ++++++
--- /var/tmp/diff_new_pack.7EiXJ5/_old 2022-05-30 12:42:52.508304668 +0200
+++ /var/tmp/diff_new_pack.7EiXJ5/_new 2022-05-30 12:42:52.512304673 +0200
@@ -1,7 +1,17 @@
-Index: pcp/GNUmakefile
-===================================================================
---- pcp.orig/GNUmakefile
-+++ pcp/GNUmakefile
+From 248b4bd1e3adc51bceebc932efbd71f86c2171cb Mon Sep 17 00:00:00 2001
+From: David Disseldorp <dd...@suse.de>
+Date: Mon, 16 May 2022 17:50:09 +0200
+Subject: [PATCH] build: remove rundir install
+
+Signed-off-by: David Disseldorp <dd...@suse.de>
+---
+ GNUmakefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/GNUmakefile b/GNUmakefile
+index 8b866eb77..0a67e9d27 100644
+--- a/GNUmakefile
++++ b/GNUmakefile
@@ -80,9 +80,9 @@ ifneq ($(TARGET_OS),mingw)
$(INSTALL) -m 1777 -d $(PCP_TMPFILE_DIR)
endif
@@ -14,4 +24,7 @@
# artifacts ... PCP_RUN_DIR is also conditionally created on the
# fly in each before use case, so the inclusion in the package is
# sometimes desirable, but not mandatory
+--
+2.35.3
+
++++++ _service ++++++
--- /var/tmp/diff_new_pack.7EiXJ5/_old 2022-05-30 12:42:52.532304700 +0200
+++ /var/tmp/diff_new_pack.7EiXJ5/_new 2022-05-30 12:42:52.532304700 +0200
@@ -3,7 +3,7 @@
<param name="scm">git</param>
<param
name="url">https://github.com/performancecopilot/pcp.git</param>
<param name="filename">pcp</param>
- <param name="revision">5.2.2</param>
+ <param name="revision">5.2.5</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param>
</service>
++++++ pcp-5.2.2.tar.bz2 -> pcp-5.2.5.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/pcp/pcp-5.2.2.tar.bz2
/work/SRC/openSUSE:Factory/.pcp.new.2254/pcp-5.2.5.tar.bz2 differ: char 11,
line 1
