From 99a7100938f8b125a1ae8cb17ca6017765828a6adaeed794f4d5d7c57cb50900 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 28 Nov 2023 13:29:05 +0000 Subject: [PATCH] Accepting request 1129284 from home:mschreiner:branches:Base:System - This version *does not* break API or ABI compatibility with the previous 5.2.5 release. - Remove 0009-remove-rundir-install.patch. Obsoleted. - Remove 0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch. Obsoleted. - Various minor changes/improvements to the RPM spec file. - Upgrade to 5.3.7. This is the latest release in the 5.X series. OBS-URL: https://build.opensuse.org/request/show/1129284 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=125 --- ...ll-libraries-without-exec-permission.patch | 297 +++++-------- 0009-remove-rundir-install.patch | 29 -- ...logutil-and-pmieutil-scripts-from-ty.patch | 273 +----------- ...emove-Wants-pmcd-from-pmlogger-and-p.patch | 43 -- pcp-5.2.5.tar.bz2 | 3 - pcp-5.3.7.tar.gz | 3 + pcp.changes | 64 +++ pcp.spec | 400 +++++++++++++++--- 8 files changed, 529 insertions(+), 583 deletions(-) delete mode 100644 0009-remove-rundir-install.patch delete mode 100644 0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch delete mode 100644 pcp-5.2.5.tar.bz2 create mode 100644 pcp-5.3.7.tar.gz diff --git a/0001-Install-libraries-without-exec-permission.patch b/0001-Install-libraries-without-exec-permission.patch index 43bf010..987f4ed 100644 --- a/0001-Install-libraries-without-exec-permission.patch +++ b/0001-Install-libraries-without-exec-permission.patch @@ -36,10 +36,10 @@ Signed-off-by: David Disseldorp src/zabbix-agent/src/GNUmakefile | 2 +- 29 files changed, 55 insertions(+), 56 deletions(-) -diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda -index 5e5c110d1..9670b7461 100755 ---- a/src/genpmda/genpmda -+++ b/src/genpmda/genpmda +Index: pcp-5.3.7/src/genpmda/genpmda +=================================================================== +--- pcp-5.3.7.orig/src/genpmda/genpmda ++++ pcp-5.3.7/src/genpmda/genpmda @@ -899,7 +899,7 @@ install: default \$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas \$(INSTALL) -m 755 -d \$(PMDADIR) @@ -58,11 +58,11 @@ index 5e5c110d1..9670b7461 100755 \$(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 -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 +Index: pcp-5.3.7/src/libpcp/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp/src/GNUmakefile +@@ -138,7 +138,7 @@ endif install : default ifneq ($(LIBTARGET),) @@ -71,7 +71,7 @@ index c58277980..b8d98872e 100644 $(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG) endif ifneq ($(SYMTARGET),) -@@ -134,7 +134,7 @@ ifneq ($(SYMTARGET),) +@@ -147,7 +147,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -79,12 +79,12 @@ index c58277980..b8d98872e 100644 + $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET) endif - $(EXT_FILES): -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 + $(XFILES): +Index: pcp-5.3.7/src/libpcp_fault/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp_fault/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp_fault/src/GNUmakefile +@@ -155,7 +155,7 @@ endif install : default ifneq ($(LIBTARGET),) @@ -93,7 +93,7 @@ index 229092783..ee37c2aa6 100644 endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ -@@ -158,7 +158,7 @@ ifneq ($(SYMTARGET),) +@@ -163,7 +163,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -102,10 +102,10 @@ index 229092783..ee37c2aa6 100644 endif $(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h $(PCP_INC_DIR)/fault.h -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 +Index: pcp-5.3.7/src/libpcp_gui/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp_gui/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp_gui/src/GNUmakefile @@ -54,7 +54,7 @@ include $(BUILDRULES) install: default @@ -124,10 +124,10 @@ index b45028ca4..9099e4d1e 100644 endif default_pcp: default -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 +Index: pcp-5.3.7/src/libpcp_import/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp_import/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp_import/src/GNUmakefile @@ -54,7 +54,7 @@ include $(BUILDRULES) install: default @@ -146,10 +146,10 @@ index 0536ded93..b1bd3b3d7 100644 endif default_pcp: default -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 +Index: pcp-5.3.7/src/libpcp_mmv/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp_mmv/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp_mmv/src/GNUmakefile @@ -47,7 +47,7 @@ include $(BUILDRULES) install: default @@ -168,10 +168,10 @@ index e0a0b4c5a..9481bf4f5 100644 endif default_pcp: default -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 +Index: pcp-5.3.7/src/libpcp_pmcd/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp_pmcd/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp_pmcd/src/GNUmakefile @@ -73,7 +73,7 @@ include $(BUILDRULES) install : default @@ -181,10 +181,10 @@ index e550dde1a..d53c05565 100644 endif ifeq "$(ENABLE_PROBES)" "true" -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 +Index: pcp-5.3.7/src/libpcp_pmda/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp_pmda/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp_pmda/src/GNUmakefile @@ -64,7 +64,7 @@ include $(BUILDRULES) install: default @@ -203,10 +203,10 @@ index 021cec3f9..83042edcc 100644 endif $(XFILES): -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 +Index: pcp-5.3.7/src/libpcp_trace/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp_trace/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp_trace/src/GNUmakefile @@ -56,13 +56,13 @@ include $(BUILDRULES) install : default @@ -223,20 +223,20 @@ index 10738d631..6f11d0660 100644 endif default_pcp : default -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 - +Index: pcp-5.3.7/src/libpcp_web/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/libpcp_web/src/GNUmakefile ++++ pcp-5.3.7/src/libpcp_web/src/GNUmakefile +@@ -107,7 +107,7 @@ endif install: default + $(INSTALL) -m 644 -t $(REWRITEVARDIR)/pmproxy_fixups.conf logrewrite.conf $(REWRITEDIR)/pmproxy_fixups.conf ifneq ($(LIBTARGET),) - $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) + $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET) endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ -@@ -92,7 +92,7 @@ ifneq ($(SYMTARGET),) +@@ -115,7 +115,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -245,10 +245,10 @@ index 5eb0dc9ac..d675c12e9 100644 endif $(XFILES): -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 +Index: pcp-5.3.7/src/pmdas/cifs/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/cifs/GNUmakefile ++++ pcp-5.3.7/src/pmdas/cifs/GNUmakefile @@ -44,8 +44,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -260,25 +260,10 @@ index 27b154511..d1ab2c8d0 100644 @$(INSTALL_MAN) else build-me: -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) - $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(PMDAADMDIR) -- $(INSTALL) -m 644 -t $(PMDATMPDIR) root $(PMNSFILES) $(PMDAADMDIR) -- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR) -+ $(INSTALL) -m 644 -t $(PMDATMPDIR) root $(PMNSFILES) $(LIBTARGET) $(PMDAADMDIR) -+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR) - $(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) -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 +Index: pcp-5.3.7/src/pmdas/docker/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/docker/GNUmakefile ++++ pcp-5.3.7/src/pmdas/docker/GNUmakefile @@ -45,8 +45,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) install_pcp install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -290,10 +275,10 @@ index 3bca9ab6d..50350581d 100644 @$(INSTALL_MAN) else build-me: -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 +Index: pcp-5.3.7/src/pmdas/hacluster/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/hacluster/GNUmakefile ++++ pcp-5.3.7/src/pmdas/hacluster/GNUmakefile @@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -305,11 +290,11 @@ index b9caf514a..2ec7577a9 100644 @$(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) +Index: pcp-5.3.7/src/pmdas/jbd2/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/jbd2/GNUmakefile ++++ pcp-5.3.7/src/pmdas/jbd2/GNUmakefile +@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) $(INSTALL) -m 755 -d $(PMDATMPDIR) @@ -320,11 +305,11 @@ index 9a313bc63..386000fff 100644 $(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) -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) +Index: pcp-5.3.7/src/pmdas/kvm/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/kvm/GNUmakefile ++++ pcp-5.3.7/src/pmdas/kvm/GNUmakefile +@@ -55,10 +55,10 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) $(INSTALL) -m 755 -d $(PMDATMPDIR) @@ -337,11 +322,11 @@ index c21b095ae..8ce3b2470 100644 $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_kvm root_kvm $(PCP_PMNSADM_DIR)/root_kvm @$(INSTALL_MAN) else -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) +Index: pcp-5.3.7/src/pmdas/linux/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/linux/GNUmakefile ++++ pcp-5.3.7/src/pmdas/linux/GNUmakefile +@@ -89,11 +89,11 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) $(INSTALL) -m 755 -d $(PMDATMPDIR) @@ -355,11 +340,11 @@ index c2efc5f7d..13195bbdf 100644 $(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) +Index: pcp-5.3.7/src/pmdas/linux_proc/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/linux_proc/GNUmakefile ++++ pcp-5.3.7/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) @@ -372,26 +357,11 @@ index 86f38857d..8e5746075 100644 $(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) +Index: pcp-5.3.7/src/pmdas/linux_xfs/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/linux_xfs/GNUmakefile ++++ pcp-5.3.7/src/pmdas/linux_xfs/GNUmakefile +@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) $(INSTALL) -m 755 -d $(PMDATMPDIR) @@ -400,13 +370,13 @@ index e91b02b94..9b75677e3 100644 + $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_xfs $(LIBTARGET) $(PMDAADMDIR) + $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR) $(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) -m 644 -t $(REWRITEVARDIR) linux_xfs_migrate.conf linux_xfs_perdev_buffer.conf $(REWRITEDIR) @$(INSTALL_MAN) -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) +Index: pcp-5.3.7/src/pmdas/linux_zfs/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/linux_zfs/GNUmakefile ++++ pcp-5.3.7/src/pmdas/linux_zfs/GNUmakefile +@@ -49,8 +49,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) $(INSTALL) -m 755 -d $(PMDATMPDIR) @@ -417,10 +387,10 @@ index cf877efe3..ec04126dc 100644 $(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 +Index: pcp-5.3.7/src/pmdas/nvidia/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/nvidia/GNUmakefile ++++ pcp-5.3.7/src/pmdas/nvidia/GNUmakefile @@ -37,9 +37,8 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -433,10 +403,10 @@ index 2a1fa6a90..b02d431ea 100644 $(OBJECTS): domain.h -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 +Index: pcp-5.3.7/src/pmdas/pmcd/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/pmcd/src/GNUmakefile ++++ pcp-5.3.7/src/pmdas/pmcd/src/GNUmakefile @@ -59,7 +59,7 @@ default: $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -446,11 +416,11 @@ index c128d6d59..63fdd07e0 100644 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) +Index: pcp-5.3.7/src/pmdas/podman/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/podman/GNUmakefile ++++ pcp-5.3.7/src/pmdas/podman/GNUmakefile +@@ -54,8 +54,8 @@ build-me: $(JSONSL_XFILES) $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) $(INSTALL) -m 755 -d $(PMDATMPDIR) @@ -461,40 +431,10 @@ index 0d28a67bf..a5f921ed1 100644 $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_podman root_podman $(PCP_PMNSADM_DIR)/root_podman @$(INSTALL_MAN) else -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) - $(INSTALL) -m 755 -d $(PMDATMPDIR) -- $(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(PMDAADMDIR) -- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(LIBTARGET) $(SCRIPTS) $(PMDAADMDIR) -+ $(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(LIBTARGET) $(PMDAADMDIR) -+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR) - $(INSTALL) -m 644 -t $(REWRITEVARDIR)/rpm_migrate.conf migrate.conf $(REWRITEDIR)/rpm_migrate.conf - @$(INSTALL_MAN) - else -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 +Index: pcp-5.3.7/src/pmdas/smart/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/smart/GNUmakefile ++++ pcp-5.3.7/src/pmdas/smart/GNUmakefile @@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -506,11 +446,11 @@ index a852cc4ac..26dd4c8f9 100644 @$(INSTALL_MAN) else build-me: -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) +Index: pcp-5.3.7/src/pmdas/statsd/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/pmdas/statsd/src/GNUmakefile ++++ pcp-5.3.7/src/pmdas/statsd/src/GNUmakefile +@@ -68,8 +68,8 @@ build-me: $(RAGELTARGET).o $(CMDTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) $(INSTALL) -m 755 -d $(PMDATMPDIR) @@ -521,10 +461,10 @@ index 1567fe273..1dbcd4700 100644 CFILES += $(RFILES) -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 +Index: pcp-5.3.7/src/zabbix-agent/src/GNUmakefile +=================================================================== +--- pcp-5.3.7.orig/src/zabbix-agent/src/GNUmakefile ++++ pcp-5.3.7/src/zabbix-agent/src/GNUmakefile @@ -43,7 +43,7 @@ install: default $(INSTALL) -m 755 -d $(ZABBIX_DIR) $(INSTALL) -m 755 -d $(MODULE_DIR) @@ -534,6 +474,3 @@ index 25c630197..fb41d303b 100644 $(INSTALL) -S $(AGENT_DIR)/$(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET) $(INSTALL) -m 755 -d $(CONFIG_DIR) $(INSTALL) -m 644 $(LIBCONFIG) $(CONFIG_DIR)/$(LIBCONFIG) --- -2.35.3 - diff --git a/0009-remove-rundir-install.patch b/0009-remove-rundir-install.patch deleted file mode 100644 index ef5886d..0000000 --- a/0009-remove-rundir-install.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41afafe153da87753aa91d5669c2ddbd0b720afb Mon Sep 17 00:00:00 2001 -From: David Disseldorp -Date: Mon, 16 May 2022 17:50:09 +0200 -Subject: [PATCH] build: remove rundir install - -Signed-off-by: David Disseldorp ---- - 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 - $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR) --ifeq "$(findstring $(PACKAGE_DISTRIBUTION), debian)" "" -+ifeq (, $(filter debian suse, $(PACKAGE_DISTRIBUTION))) - # PCP_RUN_DIR usually -> /var/run which may be a temporary filesystem -- # and Debian's lintian complains about packages including /var/run/xxx -+ # and lint checks may complain about packages including /var/run/xxx - # 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 - diff --git a/0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch b/0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch index 44e7743..2a28880 100644 --- a/0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch +++ b/0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch @@ -44,73 +44,13 @@ References: bsc#1186511 src/pmlogger/pmlogger_daily_report.service.in | 4 ++-- 14 files changed, 54 insertions(+), 16 deletions(-) -diff --git a/configure b/configure -index cc44637a5..51bd43fe9 100755 ---- a/configure -+++ b/configure -@@ -882,6 +882,7 @@ PACKAGE_BUILD - PACKAGE_REVISION - PACKAGE_MINOR - PACKAGE_MAJOR -+sd_service_type - enable_systemd - pcp_systemdunit_dir - SYSTEMD_SYSTEMUNITDIR -@@ -5933,9 +5934,21 @@ fi - done - - $have_sd_daemon || echo WARNING: using systemd, but header systemd/sd-daemon.h not installed -+ -+fi -+ -+sd_service_type="simple" -+if $enable_systemd -+then -+ systemd_version=`systemd-analyze --version | $AWK '/^systemd/ {print $2}'` -+ if test "$systemd_version" -ge 239 -+ then -+ sd_service_type="exec" -+ fi - fi - - -+ - . ./VERSION.pcp - PACKAGE_VERSION=${PACKAGE_MAJOR}.${PACKAGE_MINOR}.${PACKAGE_REVISION} - -diff --git a/configure.ac b/configure.ac -index 9e1c04c8b..ea5967a77 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -789,7 +789,21 @@ then - dnl is being used - AC_CHECK_HEADERS([systemd/sd-daemon.h], [have_sd_daemon=true], [have_sd_daemon=false]) - $have_sd_daemon || echo WARNING: using systemd, but header systemd/sd-daemon.h not installed -+ -+fi -+ -+sd_service_type="simple" -+if $enable_systemd -+then -+ dnl if systemd version is 239 or newer, use type=exec for logutil scripts -+ dnl else fallback to type=simple (e.g. on centos7 and some other platforms) -+ systemd_version=`systemd-analyze --version | $AWK '/^systemd/ {print $2}'` -+ if test "$systemd_version" -ge 239 -+ then -+ sd_service_type="exec" -+ fi - fi -+AC_SUBST(sd_service_type) - - dnl NB: No AC_PREFIX_DEFAULT is needed, as the default configure invocation - dnl targets a build for non-system directories such as /usr/local. -diff --git a/src/include/builddefs.in b/src/include/builddefs.in -index 02ecb4142..c5bc2d955 100644 ---- a/src/include/builddefs.in -+++ b/src/include/builddefs.in -@@ -918,6 +918,9 @@ PCP_GROUP = @pcp_group@ - PCP_USER_INSTALL = @pcp_user_install@ - PCP_GROUP_INSTALL = @pcp_group_install@ +Index: pcp-5.3.7/src/include/builddefs.in +=================================================================== +--- pcp-5.3.7.orig/src/include/builddefs.in ++++ pcp-5.3.7/src/include/builddefs.in +@@ -944,6 +944,9 @@ PCP_GROUP_INSTALL = @pcp_group_install@ + # systemd service type for logutil scripts + SD_SERVICE_TYPE=@sd_service_type@ +# systemd service type for logutil scripts +SD_SERVICE_TYPE=@sd_service_type@ @@ -118,202 +58,3 @@ index 02ecb4142..c5bc2d955 100644 PCPLIB = -lpcp PCPLIB_EXTRAS = $(LIB_FOR_MATH) $(LIB_FOR_PTHREADS) $(LIB_FOR_DLOPEN) $(LIB_FOR_RT) ifneq "$(PCPLIB)" "$(LIB_FOR_BASENAME)" -diff --git a/src/pmfind/GNUmakefile b/src/pmfind/GNUmakefile -index 7271b4869..d23e894c6 100644 ---- a/src/pmfind/GNUmakefile -+++ b/src/pmfind/GNUmakefile -@@ -65,6 +65,7 @@ pmfind.service : pmfind.service.in - -e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \ - -e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \ - -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \ -+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \ - # END - - crontab: crontab.in -diff --git a/src/pmfind/pmfind.service.in b/src/pmfind/pmfind.service.in -index 8ecd4fea6..2eb7eeafc 100644 ---- a/src/pmfind/pmfind.service.in -+++ b/src/pmfind/pmfind.service.in -@@ -6,8 +6,8 @@ After=pmie_check.timer pmlogger_check.timer - BindsTo=pmfind.timer - - [Service] --Type=oneshot --KillMode=none -+Type=@SD_SERVICE_TYPE@ -+Restart=no - TimeoutSec=60 - Environment="PMFIND_CHECK_PARAMS=-C -q" - EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmfind -diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile -index cd1d36e1d..cf381b444 100644 ---- a/src/pmie/GNUmakefile -+++ b/src/pmie/GNUmakefile -@@ -82,6 +82,7 @@ pmie_check.service : pmie_check.service.in - -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \ - -e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \ - -e 's;@PCP_USER@;'$(PCP_USER)';' \ -+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \ - # END - - pmie_daily.service : pmie_daily.service.in -@@ -92,6 +93,7 @@ pmie_daily.service : pmie_daily.service.in - -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \ - -e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \ - -e 's;@PCP_USER@;'$(PCP_USER)';' \ -+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \ - # END - - crontab: crontab.in -diff --git a/src/pmie/pmie_check.service.in b/src/pmie/pmie_check.service.in -index 00b55408a..29418df23 100644 ---- a/src/pmie/pmie_check.service.in -+++ b/src/pmie/pmie_check.service.in -@@ -5,8 +5,8 @@ ConditionPathExists=!@CRONTAB_PATH@ - PartOf=pmie.service - - [Service] --Type=oneshot --KillMode=none -+Type=@SD_SERVICE_TYPE@ -+Restart=no - TimeoutStartSec=25m - Environment="PMIE_CHECK_PARAMS=-C" - EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmie_timers -diff --git a/src/pmie/pmie_daily.service.in b/src/pmie/pmie_daily.service.in -index fc52fd792..e93446ce8 100644 ---- a/src/pmie/pmie_daily.service.in -+++ b/src/pmie/pmie_daily.service.in -@@ -4,8 +4,8 @@ Documentation=man:pmie_daily(1) - ConditionPathExists=!@CRONTAB_PATH@ - - [Service] --Type=oneshot --KillMode=none -+Type=@SD_SERVICE_TYPE@ -+Restart=no - Environment="PMIE_DAILY_PARAMS=-X xz -x 3" - EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmie_timers - ExecStart=@PCP_BINADM_DIR@/pmie_daily $PMIE_DAILY_PARAMS -diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile -index 92694f430..931d64fdf 100644 ---- a/src/pmlogger/GNUmakefile -+++ b/src/pmlogger/GNUmakefile -@@ -101,6 +101,7 @@ pmlogger_daily.service : pmlogger_daily.service.in - -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \ - -e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \ - -e 's;@PCP_USER@;'$(PCP_USER)';' \ -+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \ - # END - - pmlogger_daily-poll.service : pmlogger_daily-poll.service.in -@@ -111,6 +112,7 @@ pmlogger_daily-poll.service : pmlogger_daily-poll.service.in - -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \ - -e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \ - -e 's;@PCP_USER@;'$(PCP_USER)';' \ -+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \ - # END - - pmlogger_check.service : pmlogger_check.service.in -@@ -121,6 +123,7 @@ pmlogger_check.service : pmlogger_check.service.in - -e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \ - -e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \ - -e 's;@PCP_USER@;'$(PCP_USER)';' \ -+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \ - # END - - pmlogger_daily_report.service : pmlogger_daily_report.service.in -@@ -132,6 +135,7 @@ pmlogger_daily_report.service : pmlogger_daily_report.service.in - -e 's;@PCP_SA_DIR@;'$(PCP_SA_DIR)';' \ - -e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \ - -e 's;@PCP_USER@;'$(PCP_USER)';' \ -+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \ - # END - - pmlogger_daily_report-poll.service : pmlogger_daily_report-poll.service.in -@@ -143,6 +147,7 @@ pmlogger_daily_report-poll.service : pmlogger_daily_report-poll.service.in - -e 's;@PCP_SA_DIR@;'$(PCP_SA_DIR)';' \ - -e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \ - -e 's;@PCP_USER@;'$(PCP_USER)';' \ -+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \ - # END - - crontab : crontab.in -diff --git a/src/pmlogger/pmlogger_check.service.in b/src/pmlogger/pmlogger_check.service.in -index fe0f347e1..ddcee72a5 100644 ---- a/src/pmlogger/pmlogger_check.service.in -+++ b/src/pmlogger/pmlogger_check.service.in -@@ -4,8 +4,8 @@ Documentation=man:pmlogger_check(1) - ConditionPathExists=!@CRONTAB_PATH@ - - [Service] --Type=oneshot --KillMode=none -+Type=@SD_SERVICE_TYPE@ -+Restart=no - TimeoutStartSec=25m - Environment="PMLOGGER_CHECK_PARAMS=-C --skip-primary" - EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers -diff --git a/src/pmlogger/pmlogger_daily-poll.service.in b/src/pmlogger/pmlogger_daily-poll.service.in -index 69c1738f8..29c4e62c0 100644 ---- a/src/pmlogger/pmlogger_daily-poll.service.in -+++ b/src/pmlogger/pmlogger_daily-poll.service.in -@@ -4,8 +4,8 @@ Documentation=man:pmlogger_daily(1) - ConditionPathExists=!@CRONTAB_PATH@ - - [Service] --Type=oneshot --KillMode=none -+Type=@SD_SERVICE_TYPE@ -+Restart=no - Environment="PMLOGGER_DAILY_POLL_PARAMS=-p" - EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers - ExecStart=@PCP_BINADM_DIR@/pmlogger_daily $PMLOGGER_DAILY_POLL_PARAMS -diff --git a/src/pmlogger/pmlogger_daily.service.in b/src/pmlogger/pmlogger_daily.service.in -index 44b79e6a5..8a07f5caa 100644 ---- a/src/pmlogger/pmlogger_daily.service.in -+++ b/src/pmlogger/pmlogger_daily.service.in -@@ -4,8 +4,8 @@ Documentation=man:pmlogger_daily(1) - ConditionPathExists=!@CRONTAB_PATH@ - - [Service] --Type=oneshot --KillMode=none -+Type=@SD_SERVICE_TYPE@ -+Restart=no - TimeoutStartSec=1h - Environment="PMLOGGER_DAILY_PARAMS=-E" - EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers -diff --git a/src/pmlogger/pmlogger_daily_report-poll.service.in b/src/pmlogger/pmlogger_daily_report-poll.service.in -index 67a986ff2..2b186648e 100644 ---- a/src/pmlogger/pmlogger_daily_report-poll.service.in -+++ b/src/pmlogger/pmlogger_daily_report-poll.service.in -@@ -4,8 +4,8 @@ Documentation=man:pmlogger_daily_report(1) - ConditionPathExists=!@CRONTAB_DAILY_REPORT_PATH@ - - [Service] --Type=oneshot --KillMode=none -+Type=@SD_SERVICE_TYPE@ -+Restart=no - Environment="PMLOGGER_DAILY_REPORT_POLL_PARAMS=-o @PCP_SA_DIR@ -p" - EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers - ExecStart=@PCP_BINADM_DIR@/pmlogger_daily_report $PMLOGGER_DAILY_REPORT_POLL_PARAMS -diff --git a/src/pmlogger/pmlogger_daily_report.service.in b/src/pmlogger/pmlogger_daily_report.service.in -index d09489882..5937e129a 100644 ---- a/src/pmlogger/pmlogger_daily_report.service.in -+++ b/src/pmlogger/pmlogger_daily_report.service.in -@@ -4,8 +4,8 @@ Documentation=man:pmlogger_daily_report(1) - ConditionPathExists=!@CRONTAB_DAILY_REPORT_PATH@ - - [Service] --Type=oneshot --KillMode=none -+Type=@SD_SERVICE_TYPE@ -+Restart=no - TimeoutSec=120 - Environment="PMLOGGER_DAILY_REPORT_PARAMS=-o @PCP_SA_DIR@" - EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers --- -2.35.3 - diff --git a/0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch b/0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch deleted file mode 100644 index e5568e0..0000000 --- a/0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch +++ /dev/null @@ -1,43 +0,0 @@ -From de7cd4d7f6d8525d781f3a9dba3b0b5b654e6272 Mon Sep 17 00:00:00 2001 -From: Nathan Scott -Date: Mon, 22 Feb 2021 11:32:05 +1100 -Subject: [PATCH] Revert "systemd: remove Wants=pmcd from pmlogger and pmie" - -This reverts commit e01ab96c813fa31e685ac864031d145f63162088 -(for now). - -Resolves Red Hat BZs 1929556 and 1930284. - -(cherry picked from commit 30ee6b4d6b00b745cb8e44ee6c9ea0a9377398c6) ---- - src/pmie/pmie.service.in | 1 + - src/pmlogger/pmlogger.service.in | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/pmie/pmie.service.in b/src/pmie/pmie.service.in -index 75696de40..d234c8a5e 100644 ---- a/src/pmie/pmie.service.in -+++ b/src/pmie/pmie.service.in -@@ -4,6 +4,7 @@ Documentation=man:pmie(1) - After=network-online.target pmcd.service - Before=pmie_check.timer pmie_daily.timer - BindsTo=pmie_check.timer pmie_daily.timer -+Wants=pmcd.service - - [Service] - Type=notify -diff --git a/src/pmlogger/pmlogger.service.in b/src/pmlogger/pmlogger.service.in -index f5f374e53..b6273d1a0 100644 ---- a/src/pmlogger/pmlogger.service.in -+++ b/src/pmlogger/pmlogger.service.in -@@ -4,6 +4,7 @@ Documentation=man:pmlogger(1) - After=network-online.target pmcd.service - Before=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer - BindsTo=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer -+Wants=pmcd.service - - [Service] - Type=notify --- -2.35.3 - diff --git a/pcp-5.2.5.tar.bz2 b/pcp-5.2.5.tar.bz2 deleted file mode 100644 index 85ff697..0000000 --- a/pcp-5.2.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f32267da03267ae42d18a2dad9420ebc453af5c459daeb8e4e3323d54efa3a1 -size 34371458 diff --git a/pcp-5.3.7.tar.gz b/pcp-5.3.7.tar.gz new file mode 100644 index 0000000..4fcfb8f --- /dev/null +++ b/pcp-5.3.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd4914d65321462a6dd8212f40de18482e7cd778d83b837a9b3ff7ca68b95856 +size 43519639 diff --git a/pcp.changes b/pcp.changes index 563d36e..bc8c8fa 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Tue Nov 28 00:33:12 UTC 2023 - Martin Schreiner + +- This version *does not* break API or ABI compatibility with the + previous 5.2.5 release. +- Remove 0009-remove-rundir-install.patch. Obsoleted. +- Remove 0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch. + Obsoleted. +- Various minor changes/improvements to the RPM spec file. +- Upgrade to 5.3.7. This is the latest release in the 5.X series. + Changes from 5.3.7: + - Client tools and utilities: + pcp2elasticsearch: implement authentication support + pcp-ss: fixed incorrect client-side filtering + pcp-ss: fixed reporting of IPv6 sockets in LISTEN state + pmrep: 'iostat-multipath-wwid' for multipath disk monitoring + - PMDA additions, enhancements and bug fixes: + pmdalinux: add disk.wwid.* aggregated multipath metrics + pmdalinux: add new MPTCP metrics from latest Linux kernel versions + pmdalinux: fix up TTY metrics on s390x platform + pmdalinux: add network.tcp.tcploss metric + pmdamssql: fix config file logic, python string handling + pmdadenki: fix crash in labels callback with multiple instances + pmdasockets: changed default filter in sockets PMDA to "state all" + - Server-side utilities and log management scripts: + pmlogconf: correctly handle metric state transitions on (re-)probe + pmie systemd: add missing systemd configuration and shell code + - libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings: + libpcp_web: resolve a number of small memory leaks + - Security Enhanced Linux: + selinux: use interface calls instead of a simple rule + selinux: add several more obscure missing selinux rules + selinux: additional debugfs policy requirement for pmdakvm + selinux: resolve an AVC observed on el8 with pmdashping + - Misc build, infrastructure and packaging updates: + rpms: switch to conditional selinux dependency for containers + debs: reproducible build updates + - Documentation and QA infrastructure: + docs: add section to pcpcompat(1) about python2 + docs: update notes about sar2pcp, iostat2pcp in pcpcompat(1) + docs: improve pmproxy --timeseries and pmseries --load documentation + CI: disable cppcheck for pcp-atop temporarily due to a cppcheck bug + + Changes from 5.3.6: + https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L468 + + Changes from 5.3.5: + https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L497 + + Changes from 5.3.4: + https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L557 + + Changes from 5.3.3: + https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L606 + + Changes from 5.3.2: + https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L665 + + Changes from 5.3.1: + https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L753 + + Changes from 5.3.0: + https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L854 + ------------------------------------------------------------------- Fri Nov 17 15:55:08 UTC 2023 - Dominique Leuenberger diff --git a/pcp.spec b/pcp.spec index 1e01365..a802105 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,7 +1,7 @@ # # spec file for package pcp # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,17 +61,18 @@ %global libpcp_trace_sover 2 %global libpcp_import_sover 1 %global libpcp_web_sover 1 +%global libpcp_fault_sover 3 Summary: System-level performance monitoring and performance management License: %{license_gplv2plus} AND %{license_lgplv2plus} AND %{license_cc_by} Group: %{pcp_gr} Name: pcp -Version: 5.2.5 +Version: 5.3.7 Release: 0 %global buildversion 1 URL: https://pcp.io -Source0: pcp-%{version}.tar.bz2 +Source0: https://github.com/performancecopilot/pcp/archive/refs/tags/%{version}.tar.gz#/pcp-%{version}.tar.gz %if 0%{?suse_version} Source2: pcp-rpmlintrc %endif @@ -87,11 +88,7 @@ Patch5: 0005-SUSE-fy-pmsnap-control-path.patch # PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch6: 0006-pmsnap-control-var-www-srv-www.patch # PATCH-FIX-UPSTREAM, ddiss@suse.de -Patch9: 0009-remove-rundir-install.patch -# PATCH-FIX-UPSTREAM, ddiss@suse.de Patch10: 0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch -# PATCH-FIX-UPSTREAM, ddiss@suse.de -Patch11: 0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch %if 0%{?fedora} || 0%{?rhel} %global disable_selinux 0 @@ -275,12 +272,15 @@ Provides: pcp-pmda-kvm = %{version} # PCP REST APIs are now provided by pmproxy Obsoletes: pcp-webapi < 5.0.0 -Obsoletes: pcp-webapi-debuginfo < 5.0.0 Provides: pcp-webapi = %{version} +Obsoletes: pcp-webapi-debuginfo < 5.0.0 +Provides: pcp-webapi-debuginfo = %{version} # PCP discovery service now provided by pmfind Obsoletes: pcp-manager < 5.2.0 +Provides: pcp-manager = %{version} Obsoletes: pcp-manager-debuginfo < 5.2.0 +Provides: pcp-manager-debuginfo = %{version} BuildRequires: autoconf BuildRequires: avahi-devel @@ -357,10 +357,6 @@ BuildRequires: qt5-qtsvg-devel Requires: pcp-selinux = %{version}-%{release} %endif -# for set_permissions -%if 0%{?suse_version} >= 1131 -PreReq: permissions -%endif Requires: bash %if %{disable_systemd} Requires: cron @@ -382,6 +378,7 @@ Requires: initscripts Requires: %{lib_pkg} = %{version}-%{release} Obsoletes: pcp-pmda-nvidia < %{version} +Provides: pcp-pmda-nvidia = %{version} %global _confdir %{_sysconfdir}/pcp %global _logsdir %{_localstatedir}/log/pcp @@ -536,6 +533,9 @@ applications to easily retrieve and process any subset of that data. + + + # # pcp-conf # @@ -552,6 +552,9 @@ Performance Co-Pilot (PCP) run-time configuration + + + # # pcp-libs # @@ -624,10 +627,14 @@ Group: %{lib_devel_gr} URL: https://pcp.io Requires: %{lib_pkg} = %{version}-%{release} Requires: libpcp_gui%{libpcp_gui_sover} = %{version} +Requires: libpcp_import%{libpcp_import_sover} = %{version}-%{release} +Requires: libpcp_mmv%{libpcp_mmv_sover} = %{version}-%{release} +Requires: libpcp_trace%{libpcp_trace_sover} = %{version}-%{release} +Requires: libpcp_web%{libpcp_web_sover} = %{version}-%{release} Conflicts: %{lib_devel_pkg_conflict} %if (0%{?suse_version} > 0) -Provides: pcp-devel = %{version} Obsoletes: pcp-devel < %{version} +Provides: pcp-devel = %{version} %endif %description -n %{lib_devel_pkg} @@ -635,6 +642,9 @@ Performance Co-Pilot (PCP) headers for development. + + + # # pcp-devel # @@ -647,6 +657,7 @@ URL: https://pcp.io Requires: %{lib_devel_pkg} = %{version}-%{release} Requires: %{lib_pkg} = %{version}-%{release} Requires: pcp = %{version}-%{release} +Requires: pcp = %{version}-%{release} %endif %description devel @@ -654,6 +665,9 @@ Performance Co-Pilot (PCP) documentation and tools for development. + + + # # pcp-testsuite # @@ -668,13 +682,17 @@ Requires: %{lib_pkg} = %{version}-%{release} %endif Requires: pcp = %{version}-%{release} Requires: pcp-devel = %{version}-%{release} -Obsoletes: pcp-gui-testsuite +Obsoletes: pcp-gui-testsuite < %{version} +Provides: pcp-gui-testsuite = %{version} %description testsuite Quality assurance test suite for Performance Co-Pilot (PCP). + + + # # perl-PCP-PMDA. This is the PCP agent perl binding. # @@ -697,6 +715,9 @@ an application, etc. + + + # # perl-PCP-MMV # @@ -720,6 +741,9 @@ and analysis with pmchart, pmie, pmlogger and other PCP tools. + + + # # perl-PCP-LogImport # @@ -740,6 +764,9 @@ they can be replayed with standard PCP monitoring tools. + + + # # perl-PCP-LogSummary # @@ -763,6 +790,9 @@ exporting this data into third-party tools (e.g. spreadsheets). + + + # # pcp-import-sar2pcp # @@ -783,6 +813,9 @@ into standard PCP archive logs for replay with any PCP monitoring tool. + + + # # pcp-import-iostat2pcp # @@ -841,6 +874,9 @@ into standard PCP archive logs for replay with any PCP monitoring tool. + + + # # pcp-import-ganglia2pcp # @@ -860,6 +896,9 @@ into standard PCP archive logs for replay with any PCP monitoring tool. + + + # # pcp-import-collectl2pcp # @@ -918,6 +957,9 @@ See https://www.elastic.co/community for further details. + + + # # pcp-export-pcp2graphite # @@ -937,6 +979,9 @@ to graphite (http://graphite.readthedocs.org). + + + # pcp-export-pcp2influxdb # %package export-pcp2influxdb @@ -957,6 +1002,9 @@ to InfluxDB (https://influxdata.com/time-series-platform/influxdb). + + + # # pcp-export-pcp2json # @@ -974,6 +1022,9 @@ in JSON format. + + + # # pcp-export-pcp2spark # @@ -1026,6 +1077,9 @@ in XML format. + + + # # pcp-export-pcp2zabbix # @@ -1077,7 +1131,9 @@ Requires: libpfm >= 4.4 %endif BuildRequires: libpfm-devel >= 4.4 Obsoletes: pcp-pmda-papi < 5.0.0 +Provides: pcp-pmda-papi = %{version} Obsoletes: pcp-pmda-papi-debuginfo < 5.0.0 +Provides: pcp-pmda-papi-debuginfo = %{version} %description pmda-perfevent This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1125,6 +1181,9 @@ collecting metrics about the ActiveMQ message broker. + + + # # pcp-pmda-bind2 # @@ -1145,6 +1204,9 @@ collecting metrics from BIND (Berkeley Internet Name Domain). + + + # # pcp-pmda-redis # @@ -1197,6 +1259,9 @@ collecting metrics about bonded network interfaces. + + + # # pcp-pmda-dbping # @@ -1215,6 +1280,9 @@ collecting metrics about the Database response times and Availablility. + + + # # pcp-pmda-ds389 # @@ -1237,6 +1305,9 @@ collecting metrics about a 389 Directory Server. + + + # # pcp-pmda-ds389log # @@ -1255,6 +1326,9 @@ collecting metrics from a 389 Directory Server log. + + + # # pcp-pmda-gpfs # @@ -1272,6 +1346,9 @@ collecting metrics about the GPFS filesystem. + + + # # pcp-pmda-gpsd # @@ -1290,6 +1367,9 @@ collecting metrics about a GPS Daemon. + + + # # pcp-pmda-docker # @@ -1306,6 +1386,9 @@ collecting metrics using the Docker daemon REST API. + + + # # pcp-pmda-lustre # @@ -1323,6 +1406,9 @@ collecting metrics about the Lustre Filesystem. + + + # # pcp-pmda-lustrecomm # @@ -1344,6 +1430,9 @@ collecting metrics about the Lustre Filesystem Comms. + + + # # pcp-pmda-memcache # @@ -1362,6 +1451,9 @@ collecting metrics about Memcached. + + + # # pcp-pmda-mysql # @@ -1384,6 +1476,9 @@ collecting metrics about the MySQL database. + + + # # pcp-pmda-named # @@ -1402,6 +1497,9 @@ collecting metrics about the Named nameserver. + + + # pcp-pmda-netfilter # %package pmda-netfilter @@ -1419,6 +1517,9 @@ collecting metrics about the Netfilter packet filtering framework. + + + # # pcp-pmda-news # @@ -1437,6 +1538,9 @@ collecting metrics about Usenet News. + + + # # pcp-pmda-nginx # @@ -1456,6 +1560,9 @@ collecting metrics about the Nginx Webserver. + + + # # pcp-pmda-oracle # @@ -1475,6 +1582,9 @@ collecting metrics about the Oracle database. + + + # # pcp-pmda-pdns # @@ -1493,6 +1603,9 @@ collecting metrics about the PowerDNS. + + + # # pcp-pmda-postfix # @@ -1523,6 +1636,9 @@ collecting metrics about the Postfix (MTA). + + + # # pcp-pmda-rsyslog # @@ -1541,6 +1657,9 @@ collecting metrics about Rsyslog. + + + # # pcp-pmda-samba # @@ -1559,6 +1678,9 @@ collecting metrics about Samba. + + + # # pcp-pmda-slurm # @@ -1614,6 +1736,9 @@ collecting metrics for VMware. + + + # # pcp-pmda-zimbra # @@ -1632,6 +1757,9 @@ collecting metrics about Zimbra. + + + # # pcp-pmda-dm # @@ -1648,7 +1776,6 @@ Requires: %{lib_pkg} = %{version}-%{release} This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Device Mapper Cache and Thin Client. - # end pcp-pmda-dm %if !%{disable_python3} # @@ -1668,6 +1795,9 @@ collecting metrics about the gluster filesystem. + + + # # pcp-pmda-nfsclient # @@ -1719,6 +1849,9 @@ collecting metrics about compressed swap. + + + # # pcp-pmda-unbound # @@ -1736,6 +1869,9 @@ collecting metrics about the Unbound DNS Resolver. + + + # # pcp-pmda-mic # @@ -1753,6 +1889,9 @@ collecting metrics about Intel MIC cards. + + + # # pcp-pmda-haproxy # @@ -1812,6 +1951,9 @@ collecting metrics about Elasticsearch. + + + # # pcp-pmda-openvswitch # @@ -1829,6 +1971,9 @@ collecting metrics from Open vSwitch. + + + # # pcp-pmda-rabbitmq # @@ -1892,6 +2037,9 @@ extracting metrics from OpenMetrics (https://openmetrics.io/) endpoints. + + + # # pcp-pmda-lmsensors # @@ -1902,7 +2050,8 @@ Group: %{pcp_gr} URL: https://pcp.io Requires: python3-pcp # rewritten in python, so there is no longer a debuginfo package -Obsoletes: pcp-pmda-lmsensors-debuginfo +Obsoletes: pcp-pmda-lmsensors-debuginfo < %{version} +Provides: pcp-pmda-lmsensors-debuginfo = %{version} %description pmda-lmsensors This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1911,6 +2060,9 @@ collecting metrics about the Linux hardware monitoring sensors. + + + # # pcp-pmda-netcheck # @@ -1993,6 +2145,9 @@ collecting metrics about the Apache webserver. + + + # # pcp-pmda-bash # @@ -2013,6 +2168,9 @@ collecting metrics about the Bash shell. + + + # # pcp-pmda-cifs # @@ -2032,6 +2190,9 @@ collecting metrics about the Common Internet Filesytem. + + + # # pcp-pmda-cisco # @@ -2052,6 +2213,9 @@ collecting metrics about Cisco routers. + + + # # pcp-pmda-gfs2 # @@ -2071,6 +2235,9 @@ collecting metrics about the Global Filesystem v2. + + + # # pcp-pmda-logger # @@ -2092,6 +2259,9 @@ supports both sampled and event-style metrics. + + + # # pcp-pmda-mailq # @@ -2112,6 +2282,9 @@ collecting metrics about email queues managed by sendmail. + + + # # pcp-pmda-mounts # @@ -2132,6 +2305,9 @@ collecting metrics about filesystem mounts. + + + # # pcp-pmda-nvidia-gpu # @@ -2151,6 +2327,9 @@ collecting metrics about Nvidia GPUs. + + + # # pcp-pmda-roomtemp # @@ -2211,6 +2390,9 @@ collecting metrics about Sendmail traffic. + + + # # pcp-pmda-shping # @@ -2232,6 +2414,9 @@ arbitrary shell commands. + + + # # pcp-pmda-smart # @@ -2250,6 +2435,9 @@ smartmontools package. + + + # # pcp-pmda-sockets # @@ -2268,6 +2456,9 @@ collecting per-socket statistics, making use of utilities such as 'ss'. + + + # # pcp-pmda-hacluster # @@ -2285,6 +2476,9 @@ collecting metrics about linux High Availability (HA) Clusters. + + + # # pcp-pmda-summary # @@ -2343,6 +2537,9 @@ collecting metrics about trace performance data in applications. + + + # # pcp-pmda-weblog # @@ -2361,6 +2558,11 @@ Supplements: pcp This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about web server logs. + + + + + # end pcp-pmda-weblog # end C pmdas @@ -2510,9 +2712,7 @@ updated policy package. %patch3 -p1 %patch5 -p1 %patch6 -p1 -%patch9 -p1 %patch10 -p1 -%patch11 -p1 autoconf @@ -2559,6 +2759,9 @@ PCP_GUI='pmchart|pmconfirm|pmdumptext|pmmessage|pmquery|pmsnap|pmtime' # Fix stuff we do/don't want to ship rm -f %{buildroot}/%{_libdir}/*.a +# Make all shared libraries executable +find %{buildroot}/%{_libdir} -name "*.so*" -exec chmod a+x {} \; + %if %{disable_sheet2pcp} # remove sheet2pcp until BZ 830923 and BZ 754678 are resolved. rm -f %{buildroot}/%{_bindir}/sheet2pcp %{buildroot}/%{_mandir}/man1/sheet2pcp.1* @@ -2780,6 +2983,8 @@ echo %{_tmpfilesdir}/pcp.conf >> base.list # all devel pcp package files except those split out into sub packages ls -1 %{buildroot}/%{_mandir}/man3 |\ sed -e 's#^#'%{_mandir}'\/man3\/#' | grep -v '3pm' >>pcp-doc.list + +# populate devel.list %if 0%{?suse_version} ls -1 %{buildroot}/%{_docdir}/pcp/demos |\ sed -e 's#^#'%{_docdir}'\/pcp\/demos\/#' | grep -E -v tutorials >> devel.list @@ -2787,9 +2992,11 @@ sed -e 's#^#'%{_docdir}'\/pcp\/demos\/#' | grep -E -v tutorials >> devel.list ls -1 %{buildroot}/%{_datadir}/pcp/demos |\ sed -e 's#^#'%{_datadir}'\/pcp\/demos\/#' | grep -E -v tutorials >> devel.list %endif + ls -1 %{buildroot}/%{_bindir} |\ grep -E 'pmdbg|pmclient|pmerr|genpmda' |\ sed -e 's#^#'%{_bindir}'\/#' >>devel.list + for pmda in sample simple trivial txmon; do echo %{_libexecdir}/pcp/pmdas/$pmda >>devel.list done @@ -2804,12 +3011,12 @@ exit 0 %if 0%{?suse_version} && !%{disable_systemd} %pre zeroconf -%service_add_pre pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%service_add_pre pmlogger_daily_report.timer %endif %pre %if 0%{?suse_version} && !%{disable_systemd} -%service_add_pre pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer +%service_add_pre pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer %endif getent group pcp >/dev/null || groupadd -r pcp getent passwd pcp >/dev/null || \ @@ -2818,7 +3025,7 @@ exit 0 %if 0%{?suse_version} && !%{disable_systemd} %preun zeroconf -%service_del_preun pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%service_del_preun pmlogger_daily_report.timer %endif %preun @@ -2856,7 +3063,7 @@ fi %post zeroconf %if 0%{?suse_version} %if !%{disable_systemd} -%service_add_post pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%service_add_post pmlogger_daily_report.timer %endif %else %if !%{disable_systemd} @@ -2866,7 +3073,6 @@ fi systemctl enable pmcd >/dev/null 2>&1 systemctl enable pmlogger >/dev/null 2>&1 systemctl enable pmlogger_daily_report >/dev/null 2>&1 - systemctl enable pmlogger_daily_report-poll >/dev/null 2>&1 systemctl enable pmie >/dev/null 2>&1 %else /sbin/chkconfig --add pmcd >/dev/null 2>&1 @@ -2899,7 +3105,7 @@ PCP_LOG_DIR=%{_logsdir} %{fillup_only -n pmcd} %{fillup_only -n pmlogger} %{fillup_only -n pmproxy} -%service_add_post pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer +%service_add_post pmcd pmlogger pmie pmproxy pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer %else %{fillup_and_insserv pmcd} %{fillup_and_insserv pmlogger} @@ -2962,14 +3168,14 @@ PCP_LOG_DIR=%{_logsdir} %if 0%{?suse_version} && !%{disable_systemd} %postun zeroconf -%service_del_postun pmlogger_daily_report.timer pmlogger_daily_report-poll.timer +%service_del_postun pmlogger_daily_report.timer %endif %if 0%{?suse_version} %postun /sbin/ldconfig %if !%{disable_systemd} -%service_del_postun pmcd pmlogger pmproxy pmie pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer pmlogger_daily-poll.timer +%service_del_postun pmcd pmlogger pmproxy pmie pmie_check.timer pmie_daily.timer pmlogger_daily.timer pmlogger_check.timer %else %{?restart_on_update:%{restart_on_update pcp pmproxy pmie}} %{?insserv_cleanup:%{insserv_cleanup}} @@ -2989,6 +3195,87 @@ PCP_LOG_DIR=%{_logsdir} %exclude %{_testsdir} %endif +%config(noreplace) %{_sysconfdir}/pcp/sockets/filter.conf +%config(noreplace) %{_sysconfdir}/pcp/kvm/kvm.conf +%{_prefix}/lib/systemd/system/pmie_farm.service +%{_prefix}/lib/systemd/system/pmie_farm_check.service +%{_prefix}/lib/systemd/system/pmie_farm_check.timer +%{_prefix}/lib/systemd/system/pmlogger_farm.service +%{_prefix}/lib/systemd/system/pmlogger_farm_check.service +%{_prefix}/lib/systemd/system/pmlogger_farm_check.timer +%{_libexecdir}/pcp/pmdas/denki/Install +%{_libexecdir}/pcp/pmdas/denki/README +%{_libexecdir}/pcp/pmdas/denki/Remove +%{_libexecdir}/pcp/pmdas/denki/domain.h +%{_libexecdir}/pcp/pmdas/denki/help +%{_libexecdir}/pcp/pmdas/denki/help.dir +%{_libexecdir}/pcp/pmdas/denki/help.pag +%{_libexecdir}/pcp/pmdas/denki/pmda_denki.so +%{_libexecdir}/pcp/pmdas/denki/pmdadenki +%{_libexecdir}/pcp/pmdas/denki/root +%{_libexecdir}/pcp/pmdas/denki/root_denki +%{_libexecdir}/pcp/pmdas/podman/Install +%{_libexecdir}/pcp/pmdas/podman/Remove +%{_libexecdir}/pcp/pmdas/podman/domain.h +%{_libexecdir}/pcp/pmdas/podman/help +%{_libexecdir}/pcp/pmdas/podman/help.dir +%{_libexecdir}/pcp/pmdas/podman/help.pag +%{_libexecdir}/pcp/pmdas/podman/pmda_podman.so +%{_libexecdir}/pcp/pmdas/podman/pmdapodman +%{_libexecdir}/pcp/pmdas/podman/root +%{_libexecdir}/pcp/pmdas/podman/root_podman +%{_datadir}/pcp/htop/columns/container +%{_datadir}/pcp/htop/columns/delayacct +%{_datadir}/pcp/htop/columns/fdcount +%{_datadir}/pcp/htop/columns/guest +%{_datadir}/pcp/htop/columns/memory +%{_datadir}/pcp/htop/columns/sched +%{_datadir}/pcp/htop/columns/swap +%{_datadir}/pcp/htop/columns/tcp +%{_datadir}/pcp/htop/columns/udp +%{_datadir}/pcp/htop/columns/wchan +%{_datadir}/pcp/htop/meters/entropy +%{_datadir}/pcp/htop/meters/freespace +%{_datadir}/pcp/htop/meters/ipc +%{_datadir}/pcp/htop/meters/locks +%{_datadir}/pcp/htop/meters/memcache +%{_datadir}/pcp/htop/meters/mysql +%{_datadir}/pcp/htop/meters/postfix +%{_datadir}/pcp/htop/meters/redis +%{_datadir}/pcp/htop/meters/tcp +%{_datadir}/pcp/zeroconf/pmlogger +%{_localstatedir}/lib/pcp/pmdas/denki/Install +%{_localstatedir}/lib/pcp/pmdas/denki/README +%{_localstatedir}/lib/pcp/pmdas/denki/Remove +%{_localstatedir}/lib/pcp/pmdas/denki/domain.h +%{_localstatedir}/lib/pcp/pmdas/denki/help +%{_localstatedir}/lib/pcp/pmdas/denki/help.dir +%{_localstatedir}/lib/pcp/pmdas/denki/help.pag +%{_localstatedir}/lib/pcp/pmdas/denki/pmda_denki.so +%{_localstatedir}/lib/pcp/pmdas/denki/pmdadenki +%{_localstatedir}/lib/pcp/pmdas/denki/root +%{_localstatedir}/lib/pcp/pmdas/denki/root_denki +%{_localstatedir}/lib/pcp/pmdas/podman/Install +%{_localstatedir}/lib/pcp/pmdas/podman/Remove +%{_localstatedir}/lib/pcp/pmdas/podman/domain.h +%{_localstatedir}/lib/pcp/pmdas/podman/help +%{_localstatedir}/lib/pcp/pmdas/podman/help.dir +%{_localstatedir}/lib/pcp/pmdas/podman/help.pag +%{_localstatedir}/lib/pcp/pmdas/podman/pmda_podman.so +%{_localstatedir}/lib/pcp/pmdas/podman/pmdapodman +%{_localstatedir}/lib/pcp/pmdas/podman/root +%{_localstatedir}/lib/pcp/pmdas/podman/root_podman + +%dir %{_sysconfdir}/pcp/sockets +%dir %{_libexecdir}/pcp/pmdas/denki +%dir %{_libexecdir}/pcp/pmdas/podman +%dir %{_datadir}/pcp/htop +%dir %{_datadir}/pcp/htop/columns +%dir %{_datadir}/pcp/htop/meters +%dir %{_datadir}/pcp/zeroconf +%dir %{_localstatedir}/lib/pcp/pmdas/denki +%dir %{_localstatedir}/lib/pcp/pmdas/podman + %dir %{_confdir} %dir %{_pmdasdir} %dir %{_pmdasexecdir} @@ -3008,7 +3295,6 @@ PCP_LOG_DIR=%{_logsdir} %dir %attr(0775,pcp,pcp) %{_tempsdir}/pmie %dir %attr(0775,pcp,pcp) %{_tempsdir}/pmlogger %dir %attr(0775,pcp,pcp) %{_tempsdir}/pmproxy -%dir %attr(0700,root,root) %{_tempsdir}/pmcd %dir %{_datadir}/pcp/lib %{_datadir}/pcp/lib/ReplacePmnsSubtree @@ -3053,8 +3339,6 @@ PCP_LOG_DIR=%{_logsdir} %{_unitdir}/pmlogger_check.timer %{_unitdir}/pmlogger_daily.service %{_unitdir}/pmlogger_daily.timer -%{_unitdir}/pmlogger_daily-poll.service -%{_unitdir}/pmlogger_daily-poll.timer %{_unitdir}/pmie_check.service %{_unitdir}/pmie_check.timer %{_unitdir}/pmie_daily.service @@ -3117,7 +3401,7 @@ PCP_LOG_DIR=%{_logsdir} %exclude %{_confdir}/pmlogconf/zeroconf %exclude %{_confdir}/pmieconf/zeroconf %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmlogger -%{_localstatedir}/lib/pcp/config/pmlogger/* +%attr(0644,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmlogger/* %dir %{_logconfdir} %{_localstatedir}/lib/pcp/config/pmlogrewrite %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmda @@ -3135,36 +3419,35 @@ PCP_LOG_DIR=%{_logsdir} # systemd services for pmlogger_daily_report to replace the cron script %{_unitdir}/pmlogger_daily_report.service %{_unitdir}/pmlogger_daily_report.timer -%{_unitdir}/pmlogger_daily_report-poll.service -%{_unitdir}/pmlogger_daily_report-poll.timer %else %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report %endif +%config(noreplace) %{_confdir}/pmieconf/zeroconf +%config(noreplace) %{_confdir}/pmlogconf/zeroconf %config(noreplace) %{_ieconfdir}/zeroconf %config(noreplace) %{_logconfdir}/zeroconf -%config(noreplace) %{_confdir}/pmlogconf/zeroconf -%config(noreplace) %{_confdir}/pmieconf/zeroconf #additional pmlogger config files %files conf -%dir %{_includedir}/pcp -%{_includedir}/pcp/builddefs -%{_includedir}/pcp/buildrules +%config %{_confdir}/derived/* +%config %{_localstatedir}/lib/pcp/config/derived/* %config %{_sysconfdir}/pcp.conf %dir %{_confdir}/derived -%config %{_confdir}/derived/* +%dir %{_includedir}/pcp %dir %{_localstatedir}/lib/pcp/config/derived -%config %{_localstatedir}/lib/pcp/config/derived/* +%{_includedir}/pcp/builddefs +%{_includedir}/pcp/buildrules %files -n %{lib_pkg} %{_libdir}/libpcp.so.%{libpcp_pmda_sover} %{_libdir}/libpcp_pmda.so.%{libpcp_pmda_sover} +%{_libdir}/libpcp_fault.so.%{libpcp_fault_sover} %if !0%{?suse_version} %{_libdir}/libpcp_gui.so.%{libpcp_gui_sover} +%{_libdir}/libpcp_import.so.%{libpcp_import_sover} %{_libdir}/libpcp_mmv.so.%{libpcp_mmv_sover} %{_libdir}/libpcp_trace.so.%{libpcp_trace_sover} -%{_libdir}/libpcp_import.so.%{libpcp_import_sover} %{_libdir}/libpcp_web.so.%{libpcp_web_sover} %else @@ -3189,6 +3472,7 @@ PCP_LOG_DIR=%{_logsdir} %{_libdir}/libpcp_gui.so %{_libdir}/libpcp_mmv.so %{_libdir}/libpcp_pmda.so +%{_libdir}/libpcp_fault.so %{_libdir}/libpcp_trace.so %{_libdir}/libpcp_import.so %{_libdir}/libpcp_web.so @@ -3249,8 +3533,9 @@ PCP_LOG_DIR=%{_logsdir} %files pmda-perfevent %{_pmdasdir}/perfevent %{_pmdasexecdir}/perfevent -%{_confdir}/perfevent +%dir %{_confdir}/perfevent %config(noreplace) %{_pmdasdir}/perfevent/perfevent.conf +%config(noreplace) %{_confdir}/perfevent/perfevent.conf %endif %if !%{disable_infiniband} @@ -3267,11 +3552,6 @@ PCP_LOG_DIR=%{_logsdir} %{_pmdasdir}/bonding %{_pmdasexecdir}/bonding -%files pmda-bind2 -%{_pmdasdir}/bind2 -%{_pmdasexecdir}/bind2 -%{_confdir}/bind2 - %files pmda-dbping %{_pmdasdir}/dbping %{_pmdasexecdir}/dbping @@ -3285,18 +3565,20 @@ PCP_LOG_DIR=%{_logsdir} %{_pmdasexecdir}/ds389 %files pmda-elasticsearch +%dir %{_confdir}/elasticsearch +%config(noreplace) %{_confdir}/elasticsearch/elasticsearch.conf %{_pmdasdir}/elasticsearch %{_pmdasexecdir}/elasticsearch -%{_confdir}/elasticsearch %files pmda-openvswitch %{_pmdasdir}/openvswitch %{_pmdasexecdir}/openvswitch %files pmda-rabbitmq +%dir %{_confdir}/rabbitmq +%config(noreplace) %{_confdir}/rabbitmq/rabbitmq.conf %{_pmdasdir}/rabbitmq %{_pmdasexecdir}/rabbitmq -%{_confdir}/rabbitmq %files pmda-gpfs %{_pmdasdir}/gpfs @@ -3388,9 +3670,10 @@ PCP_LOG_DIR=%{_logsdir} %endif %files pmda-redis +%dir %{_confdir}/redis +%config(noreplace) %{_confdir}/redis/redis.conf %{_pmdasdir}/redis %{_pmdasexecdir}/redis -%{_confdir}/redis %files pmda-rsyslog %{_pmdasdir}/rsyslog @@ -3402,19 +3685,16 @@ PCP_LOG_DIR=%{_logsdir} %if !%{disable_snmp} %files pmda-snmp +%dir %{_confdir}/snmp +%config(noreplace) %{_confdir}/snmp/snmp.conf %{_pmdasdir}/snmp %{_pmdasexecdir}/snmp -%{_confdir}/snmp %endif %files pmda-slurm %{_pmdasdir}/slurm %{_pmdasexecdir}/slurm -%files pmda-vmware -%{_pmdasdir}/vmware -%{_pmdasexecdir}/vmware - %files pmda-zimbra %{_pmdasdir}/zimbra %{_pmdasexecdir}/zimbra @@ -3457,9 +3737,10 @@ PCP_LOG_DIR=%{_logsdir} %{_pmdasexecdir}/mic %files pmda-haproxy +%dir %{_confdir}/haproxy +%config(noreplace) %{_confdir}/haproxy/haproxy.conf %{_pmdasdir}/haproxy %{_pmdasexecdir}/haproxy -%{_confdir}/haproxy %if !%{disable_libvirt} %files pmda-libvirt @@ -3507,9 +3788,10 @@ PCP_LOG_DIR=%{_logsdir} %{_pmdasexecdir}/lmsensors %files pmda-netcheck +%dir %{_confdir}/netcheck +%config(noreplace) %{_confdir}/netcheck/netcheck.conf %{_pmdasdir}/netcheck %{_pmdasexecdir}/netcheck -%{_confdir}/netcheck %endif # !%%{disable_python3} @@ -3575,12 +3857,6 @@ PCP_LOG_DIR=%{_logsdir} %{_pmdasdir}/roomtemp %{_pmdasexecdir}/roomtemp -%if !%{disable_rpm} -%files pmda-rpm -%{_pmdasdir}/rpm -%{_pmdasexecdir}/rpm -%endif - %files pmda-sendmail %{_pmdasdir}/sendmail %{_pmdasexecdir}/sendmail