diff --git a/0001-Install-libraries-without-exec-permission.patch b/0001-Install-libraries-without-exec-permission.patch index 987f4ed..fa45a6a 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(-) -Index: pcp-5.3.7/src/genpmda/genpmda +Index: pcp-6.2.0/src/genpmda/genpmda =================================================================== ---- pcp-5.3.7.orig/src/genpmda/genpmda -+++ pcp-5.3.7/src/genpmda/genpmda +--- pcp-6.2.0.orig/src/genpmda/genpmda ++++ pcp-6.2.0/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: pcp-5.3.7/src/genpmda/genpmda \$(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-5.3.7/src/libpcp/src/GNUmakefile +Index: pcp-6.2.0/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 +--- pcp-6.2.0.orig/src/libpcp/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp/src/GNUmakefile +@@ -142,7 +142,7 @@ endif install : default ifneq ($(LIBTARGET),) @@ -71,7 +71,7 @@ Index: pcp-5.3.7/src/libpcp/src/GNUmakefile $(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG) endif ifneq ($(SYMTARGET),) -@@ -147,7 +147,7 @@ ifneq ($(SYMTARGET),) +@@ -151,7 +151,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -80,11 +80,11 @@ Index: pcp-5.3.7/src/libpcp/src/GNUmakefile endif $(XFILES): -Index: pcp-5.3.7/src/libpcp_fault/src/GNUmakefile +Index: pcp-6.2.0/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 +--- pcp-6.2.0.orig/src/libpcp_fault/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp_fault/src/GNUmakefile +@@ -147,7 +147,7 @@ derive_parser.y: derive_parser.y.in fix_ install : default ifneq ($(LIBTARGET),) @@ -93,7 +93,7 @@ Index: pcp-5.3.7/src/libpcp_fault/src/GNUmakefile endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ -@@ -163,7 +163,7 @@ ifneq ($(SYMTARGET),) +@@ -155,7 +155,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -102,10 +102,10 @@ Index: pcp-5.3.7/src/libpcp_fault/src/GNUmakefile endif $(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h $(PCP_INC_DIR)/fault.h -Index: pcp-5.3.7/src/libpcp_gui/src/GNUmakefile +Index: pcp-6.2.0/src/libpcp_gui/src/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/libpcp_gui/src/GNUmakefile -+++ pcp-5.3.7/src/libpcp_gui/src/GNUmakefile +--- pcp-6.2.0.orig/src/libpcp_gui/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp_gui/src/GNUmakefile @@ -54,7 +54,7 @@ include $(BUILDRULES) install: default @@ -124,10 +124,10 @@ Index: pcp-5.3.7/src/libpcp_gui/src/GNUmakefile endif default_pcp: default -Index: pcp-5.3.7/src/libpcp_import/src/GNUmakefile +Index: pcp-6.2.0/src/libpcp_import/src/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/libpcp_import/src/GNUmakefile -+++ pcp-5.3.7/src/libpcp_import/src/GNUmakefile +--- pcp-6.2.0.orig/src/libpcp_import/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp_import/src/GNUmakefile @@ -54,7 +54,7 @@ include $(BUILDRULES) install: default @@ -146,10 +146,10 @@ Index: pcp-5.3.7/src/libpcp_import/src/GNUmakefile endif default_pcp: default -Index: pcp-5.3.7/src/libpcp_mmv/src/GNUmakefile +Index: pcp-6.2.0/src/libpcp_mmv/src/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/libpcp_mmv/src/GNUmakefile -+++ pcp-5.3.7/src/libpcp_mmv/src/GNUmakefile +--- pcp-6.2.0.orig/src/libpcp_mmv/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp_mmv/src/GNUmakefile @@ -47,7 +47,7 @@ include $(BUILDRULES) install: default @@ -168,11 +168,11 @@ Index: pcp-5.3.7/src/libpcp_mmv/src/GNUmakefile endif default_pcp: default -Index: pcp-5.3.7/src/libpcp_pmcd/src/GNUmakefile +Index: pcp-6.2.0/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) +--- pcp-6.2.0.orig/src/libpcp_pmcd/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp_pmcd/src/GNUmakefile +@@ -69,7 +69,7 @@ include $(BUILDRULES) install : default ifeq "$(TARGET_OS)" "mingw" @@ -181,10 +181,10 @@ Index: pcp-5.3.7/src/libpcp_pmcd/src/GNUmakefile endif ifeq "$(ENABLE_PROBES)" "true" -Index: pcp-5.3.7/src/libpcp_pmda/src/GNUmakefile +Index: pcp-6.2.0/src/libpcp_pmda/src/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/libpcp_pmda/src/GNUmakefile -+++ pcp-5.3.7/src/libpcp_pmda/src/GNUmakefile +--- pcp-6.2.0.orig/src/libpcp_pmda/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp_pmda/src/GNUmakefile @@ -64,7 +64,7 @@ include $(BUILDRULES) install: default @@ -203,10 +203,10 @@ Index: pcp-5.3.7/src/libpcp_pmda/src/GNUmakefile endif $(XFILES): -Index: pcp-5.3.7/src/libpcp_trace/src/GNUmakefile +Index: pcp-6.2.0/src/libpcp_trace/src/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/libpcp_trace/src/GNUmakefile -+++ pcp-5.3.7/src/libpcp_trace/src/GNUmakefile +--- pcp-6.2.0.orig/src/libpcp_trace/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp_trace/src/GNUmakefile @@ -56,13 +56,13 @@ include $(BUILDRULES) install : default @@ -223,11 +223,11 @@ Index: pcp-5.3.7/src/libpcp_trace/src/GNUmakefile endif default_pcp : default -Index: pcp-5.3.7/src/libpcp_web/src/GNUmakefile +Index: pcp-6.2.0/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 +--- pcp-6.2.0.orig/src/libpcp_web/src/GNUmakefile ++++ pcp-6.2.0/src/libpcp_web/src/GNUmakefile +@@ -111,7 +111,7 @@ endif install: default $(INSTALL) -m 644 -t $(REWRITEVARDIR)/pmproxy_fixups.conf logrewrite.conf $(REWRITEDIR)/pmproxy_fixups.conf ifneq ($(LIBTARGET),) @@ -236,7 +236,7 @@ Index: pcp-5.3.7/src/libpcp_web/src/GNUmakefile endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ -@@ -115,7 +115,7 @@ ifneq ($(SYMTARGET),) +@@ -119,7 +119,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -245,10 +245,10 @@ Index: pcp-5.3.7/src/libpcp_web/src/GNUmakefile endif $(XFILES): -Index: pcp-5.3.7/src/pmdas/cifs/GNUmakefile +Index: pcp-6.2.0/src/pmdas/cifs/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/cifs/GNUmakefile -+++ pcp-5.3.7/src/pmdas/cifs/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/cifs/GNUmakefile ++++ pcp-6.2.0/src/pmdas/cifs/GNUmakefile @@ -44,8 +44,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -260,10 +260,10 @@ Index: pcp-5.3.7/src/pmdas/cifs/GNUmakefile @$(INSTALL_MAN) else build-me: -Index: pcp-5.3.7/src/pmdas/docker/GNUmakefile +Index: pcp-6.2.0/src/pmdas/docker/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/docker/GNUmakefile -+++ pcp-5.3.7/src/pmdas/docker/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/docker/GNUmakefile ++++ pcp-6.2.0/src/pmdas/docker/GNUmakefile @@ -45,8 +45,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) install_pcp install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -275,10 +275,10 @@ Index: pcp-5.3.7/src/pmdas/docker/GNUmakefile @$(INSTALL_MAN) else build-me: -Index: pcp-5.3.7/src/pmdas/hacluster/GNUmakefile +Index: pcp-6.2.0/src/pmdas/hacluster/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/hacluster/GNUmakefile -+++ pcp-5.3.7/src/pmdas/hacluster/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/hacluster/GNUmakefile ++++ pcp-6.2.0/src/pmdas/hacluster/GNUmakefile @@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -290,10 +290,10 @@ Index: pcp-5.3.7/src/pmdas/hacluster/GNUmakefile @$(INSTALL_MAN) else build-me: -Index: pcp-5.3.7/src/pmdas/jbd2/GNUmakefile +Index: pcp-6.2.0/src/pmdas/jbd2/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/jbd2/GNUmakefile -+++ pcp-5.3.7/src/pmdas/jbd2/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/jbd2/GNUmakefile ++++ pcp-6.2.0/src/pmdas/jbd2/GNUmakefile @@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -305,11 +305,11 @@ Index: pcp-5.3.7/src/pmdas/jbd2/GNUmakefile $(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-5.3.7/src/pmdas/kvm/GNUmakefile +Index: pcp-6.2.0/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 +--- pcp-6.2.0.orig/src/pmdas/kvm/GNUmakefile ++++ pcp-6.2.0/src/pmdas/kvm/GNUmakefile +@@ -57,10 +57,10 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) $(INSTALL) -m 755 -d $(PMDATMPDIR) @@ -320,12 +320,12 @@ Index: pcp-5.3.7/src/pmdas/kvm/GNUmakefile - $(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_kvm root_kvm $(PCP_PMNSADM_DIR)/root_kvm + $(INSTALL) -m 644 -t $(REWRITEVARDIR)/kvm_fixups.conf kvm_fixups.conf $(REWRITEDIR)/kvm_fixups.conf @$(INSTALL_MAN) - else -Index: pcp-5.3.7/src/pmdas/linux/GNUmakefile +Index: pcp-6.2.0/src/pmdas/linux/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/linux/GNUmakefile -+++ pcp-5.3.7/src/pmdas/linux/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/linux/GNUmakefile ++++ pcp-6.2.0/src/pmdas/linux/GNUmakefile @@ -89,11 +89,11 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -340,10 +340,10 @@ Index: pcp-5.3.7/src/pmdas/linux/GNUmakefile $(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-5.3.7/src/pmdas/linux_proc/GNUmakefile +Index: pcp-6.2.0/src/pmdas/linux_proc/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/linux_proc/GNUmakefile -+++ pcp-5.3.7/src/pmdas/linux_proc/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/linux_proc/GNUmakefile ++++ pcp-6.2.0/src/pmdas/linux_proc/GNUmakefile @@ -73,10 +73,10 @@ build-me: root_proc $(LIBTARGET) $(CMDTA install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -357,10 +357,10 @@ Index: pcp-5.3.7/src/pmdas/linux_proc/GNUmakefile $(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-5.3.7/src/pmdas/linux_xfs/GNUmakefile +Index: pcp-6.2.0/src/pmdas/linux_xfs/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/linux_xfs/GNUmakefile -+++ pcp-5.3.7/src/pmdas/linux_xfs/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/linux_xfs/GNUmakefile ++++ pcp-6.2.0/src/pmdas/linux_xfs/GNUmakefile @@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -372,25 +372,10 @@ Index: pcp-5.3.7/src/pmdas/linux_xfs/GNUmakefile $(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_perdev_buffer.conf $(REWRITEDIR) @$(INSTALL_MAN) -Index: pcp-5.3.7/src/pmdas/linux_zfs/GNUmakefile +Index: pcp-6.2.0/src/pmdas/nvidia/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) -- $(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 -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 +--- pcp-6.2.0.orig/src/pmdas/nvidia/GNUmakefile ++++ pcp-6.2.0/src/pmdas/nvidia/GNUmakefile @@ -37,9 +37,8 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -403,10 +388,10 @@ Index: pcp-5.3.7/src/pmdas/nvidia/GNUmakefile $(OBJECTS): domain.h -Index: pcp-5.3.7/src/pmdas/pmcd/src/GNUmakefile +Index: pcp-6.2.0/src/pmdas/pmcd/src/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/pmcd/src/GNUmakefile -+++ pcp-5.3.7/src/pmdas/pmcd/src/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/pmcd/src/GNUmakefile ++++ pcp-6.2.0/src/pmdas/pmcd/src/GNUmakefile @@ -59,7 +59,7 @@ default: $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -416,25 +401,10 @@ Index: pcp-5.3.7/src/pmdas/pmcd/src/GNUmakefile include $(BUILDRULES) -Index: pcp-5.3.7/src/pmdas/podman/GNUmakefile +Index: pcp-6.2.0/src/pmdas/smart/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) -- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_podman $(PMDAADMDIR) -- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR) -+ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_podman $(LIBTARGET) $(PMDAADMDIR) -+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR) - $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_podman root_podman $(PCP_PMNSADM_DIR)/root_podman - @$(INSTALL_MAN) - else -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 +--- pcp-6.2.0.orig/src/pmdas/smart/GNUmakefile ++++ pcp-6.2.0/src/pmdas/smart/GNUmakefile @@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -446,10 +416,10 @@ Index: pcp-5.3.7/src/pmdas/smart/GNUmakefile @$(INSTALL_MAN) else build-me: -Index: pcp-5.3.7/src/pmdas/statsd/src/GNUmakefile +Index: pcp-6.2.0/src/pmdas/statsd/src/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/pmdas/statsd/src/GNUmakefile -+++ pcp-5.3.7/src/pmdas/statsd/src/GNUmakefile +--- pcp-6.2.0.orig/src/pmdas/statsd/src/GNUmakefile ++++ pcp-6.2.0/src/pmdas/statsd/src/GNUmakefile @@ -68,8 +68,8 @@ build-me: $(RAGELTARGET).o $(CMDTARGET) install: default $(INSTALL) -m 755 -d $(PMDAADMDIR) @@ -461,10 +431,10 @@ Index: pcp-5.3.7/src/pmdas/statsd/src/GNUmakefile CFILES += $(RFILES) -Index: pcp-5.3.7/src/zabbix-agent/src/GNUmakefile +Index: pcp-6.2.0/src/zabbix-agent/src/GNUmakefile =================================================================== ---- pcp-5.3.7.orig/src/zabbix-agent/src/GNUmakefile -+++ pcp-5.3.7/src/zabbix-agent/src/GNUmakefile +--- pcp-6.2.0.orig/src/zabbix-agent/src/GNUmakefile ++++ pcp-6.2.0/src/zabbix-agent/src/GNUmakefile @@ -43,7 +43,7 @@ install: default $(INSTALL) -m 755 -d $(ZABBIX_DIR) $(INSTALL) -m 755 -d $(MODULE_DIR) diff --git a/0002-Remove-CPAN-rpaths.patch b/0002-Remove-CPAN-rpaths.patch index ea46a98..664a640 100644 --- a/0002-Remove-CPAN-rpaths.patch +++ b/0002-Remove-CPAN-rpaths.patch @@ -10,10 +10,10 @@ Acked-by: David Disseldorp src/perl/PMDA/Makefile.PL | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/src/perl/LogImport/Makefile.PL b/src/perl/LogImport/Makefile.PL -index a254f5ad5..2ec42f51a 100644 ---- a/src/perl/LogImport/Makefile.PL -+++ b/src/perl/LogImport/Makefile.PL +Index: pcp-6.2.0/src/perl/LogImport/Makefile.PL +=================================================================== +--- pcp-6.2.0.orig/src/perl/LogImport/Makefile.PL ++++ pcp-6.2.0/src/perl/LogImport/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "LogImport.o", @@ -22,11 +22,11 @@ index a254f5ad5..2ec42f51a 100644 + $libs = ["-lpcp_import -lpcp"]; } 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 7a6787ded..1e4cea031 100644 ---- a/src/perl/MMV/Makefile.PL -+++ b/src/perl/MMV/Makefile.PL + $lddlflags = "-bundle -undefined dynamic_lookup"; +Index: pcp-6.2.0/src/perl/MMV/Makefile.PL +=================================================================== +--- pcp-6.2.0.orig/src/perl/MMV/Makefile.PL ++++ pcp-6.2.0/src/perl/MMV/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "MMV.o"; @@ -35,11 +35,11 @@ index 7a6787ded..1e4cea031 100644 + $libs = ["-lpcp_mmv -lpcp"]; } 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 d5c44615a..e2260c4b5 100644 ---- a/src/perl/PMDA/Makefile.PL -+++ b/src/perl/PMDA/Makefile.PL + $lddlflags = "-bundle -undefined dynamic_lookup"; +Index: pcp-6.2.0/src/perl/PMDA/Makefile.PL +=================================================================== +--- pcp-6.2.0.orig/src/perl/PMDA/Makefile.PL ++++ pcp-6.2.0/src/perl/PMDA/Makefile.PL @@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { else { $ldfrom = "local.o PMDA.o"; @@ -48,7 +48,4 @@ index d5c44615a..e2260c4b5 100644 + $libs = ["-lpcp_pmda -lpcp"]; } if ($ENV{TARGET_OS} eq "darwin") { - # standard ones, minus -arch ppc --- -2.35.3 - + $lddlflags = "-bundle -undefined dynamic_lookup"; diff --git a/0003-Remove-runlevel-4-from-init-scripts.patch b/0003-Remove-runlevel-4-from-init-scripts.patch index 0b4f89c..aef6973 100644 --- a/0003-Remove-runlevel-4-from-init-scripts.patch +++ b/0003-Remove-runlevel-4-from-init-scripts.patch @@ -12,10 +12,10 @@ Acked-by: David Disseldorp src/pmproxy/rc_pmproxy | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) -diff --git a/src/pmcd/rc_pcp b/src/pmcd/rc_pcp -index 228cf58fc..e1b05a51e 100644 ---- a/src/pmcd/rc_pcp -+++ b/src/pmcd/rc_pcp +Index: pcp-6.2.0/src/pmcd/rc_pcp +=================================================================== +--- pcp-6.2.0.orig/src/pmcd/rc_pcp ++++ pcp-6.2.0/src/pmcd/rc_pcp @@ -31,12 +31,12 @@ # e.g. SuSE, where chkconfig is a perl script. ### BEGIN INIT INFO @@ -35,10 +35,10 @@ index 228cf58fc..e1b05a51e 100644 # Short-Description: Legacy control for PCP daemons # 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 37571e82c..f0dc662df 100644 ---- a/src/pmcd/rc_pmcd -+++ b/src/pmcd/rc_pmcd +Index: pcp-6.2.0/src/pmcd/rc_pmcd +=================================================================== +--- pcp-6.2.0.orig/src/pmcd/rc_pmcd ++++ pcp-6.2.0/src/pmcd/rc_pmcd @@ -27,7 +27,7 @@ # Should-Start: $network $remote_fs $syslog $time # Required-Stop: $local_fs @@ -48,45 +48,3 @@ index 37571e82c..f0dc662df 100644 # Default-Stop: 0 1 6 # 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 983e3d575..545c35749 100644 ---- a/src/pmie/rc_pmie -+++ b/src/pmie/rc_pmie -@@ -25,7 +25,7 @@ - # Should-Start: $local_fs $network $syslog $time $pmcd - # Required-Stop: $remote_fs - # Should-Stop: $local_fs $network $syslog $pmcd --# Default-Start: 2 3 4 5 -+# Default-Start: 2 3 5 - # Default-Stop: 0 1 6 - # 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 81aeb51a2..b64750b32 100644 ---- a/src/pmlogger/rc_pmlogger -+++ b/src/pmlogger/rc_pmlogger -@@ -27,7 +27,7 @@ - # Should-Start: $network $remote_fs $syslog $time $pmcd - # Required-Stop: $local_fs - # Should-Stop: $network $remote_fs $syslog $pmcd --# Default-Start: 2 3 4 5 -+# Default-Start: 2 3 5 - # Default-Stop: 0 1 6 - # 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 1ee71595d..7a732f72c 100644 ---- a/src/pmproxy/rc_pmproxy -+++ b/src/pmproxy/rc_pmproxy -@@ -27,7 +27,7 @@ - # Should-Start: $local_fs $network $syslog $time $pmcd - # Required-Stop: $remote_fs - # Should-Stop: $local_fs $network $syslog $pmcd --# Default-Start: 2 3 4 5 -+# Default-Start: 2 3 5 - # Default-Stop: 0 1 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.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 2a28880..4eea013 100644 --- a/0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch +++ b/0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch @@ -44,11 +44,11 @@ References: bsc#1186511 src/pmlogger/pmlogger_daily_report.service.in | 4 ++-- 14 files changed, 54 insertions(+), 16 deletions(-) -Index: pcp-5.3.7/src/include/builddefs.in +Index: pcp-6.2.0/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@ +--- pcp-6.2.0.orig/src/include/builddefs.in ++++ pcp-6.2.0/src/include/builddefs.in +@@ -908,6 +908,9 @@ PCP_GROUP_INSTALL = @pcp_group_install@ # systemd service type for logutil scripts SD_SERVICE_TYPE=@sd_service_type@ diff --git a/0011-disable-redis-proxying-by-default.patch b/0011-disable-redis-proxying-by-default.patch new file mode 100644 index 0000000..ba353f7 --- /dev/null +++ b/0011-disable-redis-proxying-by-default.patch @@ -0,0 +1,29 @@ +From 3bde240a2acc85e63e2f7813330713dd9b59386e Mon Sep 17 00:00:00 2001 +From: Nathan Scott +Date: Wed, 27 Mar 2024 14:51:28 +1100 +Subject: [PATCH] pmproxy: disable Redis protocol proxying by default + +If a redis-server has been locked down in terms of connections, +we want to prevent pmproxy from being allowed to send arbitrary +RESP commands to it. + +This protocol proxying doesn't affect PCP functionality at all, +its more of a developer/sysadmin convenience when Redis used in +cluster mode (relatively uncommon compared to localhost mode). +--- + src/pmproxy/pmproxy.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pmproxy/pmproxy.conf b/src/pmproxy/pmproxy.conf +index e54891792e..4cbc1c96af 100644 +--- a/src/pmproxy/pmproxy.conf ++++ b/src/pmproxy/pmproxy.conf +@@ -29,7 +29,7 @@ pcp.enabled = true + http.enabled = true + + # support Redis protocol proxying +-redis.enabled = true ++redis.enabled = false + + # support SSL/TLS protocol wrapping + secure.enabled = true diff --git a/pcp-5.3.7.tar.gz b/pcp-5.3.7.tar.gz deleted file mode 100644 index 4fcfb8f..0000000 --- a/pcp-5.3.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd4914d65321462a6dd8212f40de18482e7cd778d83b837a9b3ff7ca68b95856 -size 43519639 diff --git a/pcp-6.2.0.tar.gz b/pcp-6.2.0.tar.gz new file mode 100644 index 0000000..3e79f94 --- /dev/null +++ b/pcp-6.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e5d502837d8afe4768c55878dd3aceec44e6b0fa80699eea7022fb9b5c7a032 +size 50340524 diff --git a/pcp.changes b/pcp.changes index 1da8c26..b226eba 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,505 @@ +------------------------------------------------------------------- +Wed Apr 3 14:49:06 UTC 2024 - Martin Schreiner + +- Add fix for bsc#1222121: + * 0011-disable-redis-proxying-by-default.patch + +------------------------------------------------------------------- +Mon Apr 1 01:21:44 UTC 2024 - Martin Schreiner + +- Upgrade to 6.2.0 (bsc#1217826): + * Changes from pcp-6.2.0: + - Client tools and utilities: + pmlogger: default to creating version 3 PCP archives + pmie, pmlogger, pmcd, pmproxy: init script hardening to + run less as root:root, more as pcp:pcp and more safely + pcp-reboot-init: new systemd service for $PCP_RC_DIR setup + pcp2arrow: new, export metrics to parquet format for pandas + pcp-atop: deterministic process sort when handling NULLs + pcp-atop: update to v2.10.0 upstream code + pcp-htop: update to latest upstream fixes + pcp-geolocate: function with older versions of python + pcp-meminfo: resolve possible 'broken pipe' diagnostics + pcp-ss: fix handling of listening state sockets to match ss + pcp-ss: fix the UDP UNCONN vs LISTEN state handling + - PMDA additions, enhancements and bug fixes: + pmdaproc: improvements for process accounting metrics + pmdalinux: add pgpromote* and pgdemote* memory metrics + pmdalinux: add metric sysfs.module.zswap.max_pool_percent + pmdalinux: add new SNMP metric network.ip.outtransmits + pmdasummary: send state change 0 (no change) back to pmcd + pmdapostgresql: support the psycopg3 python module as well + pmdaopenmetrics: kepler support - live metrics and logging + - Server-side utilities and log management scripts: + pmlogrewrite, pmlogredact: fix for missing data volumes + pmcd: cosmetic change to avoid pipe2 name clash + runaspcp: new helper utility for unprivileged rc scripts + pmnsmerge: be more defensive in qsort comparison routine + pmlogsize: fix qsort comparison function handling of equality + - libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings: + libpcp: pmOpenLog refactor for handling previous log files + libpcp: new __pmCleanMapDir routine to aid log culling + libpcp & pmcd: READY-NOT-READY hardening + libpcp: avoid possible thread issues (coverity) + libpcp: refactor pmDupContext for thread safety + libpcp_import: add guard in pmiPutMark to prevent SIGSEGV + - Build, infrastructure and packaging updates: + build: changes to re-enable builds for FreeBSD 12, 13, 14 + build: add diffutils rpm dep as pmdaproc script uses diff + build: add main.yml for building and publishing container + build: resolve compiler warnings in various tools/libraries + packaging: use tmpfiles.d method to create PCP_RUN_DIR + build: packaging changes for openSUSE 15.5 and 15.6 + debian: do not ship empty directory /usr/lib/pkgconfig + build: el10 systemd-presets for pmcd/pmie/pmlogger enabling + build: drop rpm dep on bpftool as local version used only + build: change perl YAML::XS::LibYAML module to YAML::XS + - Security Enhanced Linux: + selinux: policy improvements for CentOS/RHEL 7 and 8 + - Documentation: + docs: Fedora 39 found some tbl(1)/troff(1) issues, fix + docs: add an explicit code-of-conduct for PCP + docs: pmns(5) note that metric names must only contain ASCII + docs: update the BPF README to describe bpftool reality + * Changes from pcp-6.1.1: + - Client tools and utilities: + pmie: add -o/--format to control output format with archives + pcp-geolocate: automatic latitude and longitude metric labels + pcp-atop: fix segv encountered on a multi-node NUMA system + pcp-atop: add last level cache support using pmdaresctrl + pcp-htop: updated with latest fixes from htop.dev + pcp-netstat: without time options report one sample only + pcp-netstat: add machine header info + pcp-meminfo: without time options report one sample only + pcp-meminfo: add machine header info + pcp-buddyinfo: resolve a key issue when using python v2 + pcp-zoneinfo: ensure determinism in pcp-zoneinfo output + pcp-zoneinfo: fix failure with older PCP metric instances + - PMDA additions, enhancements and bug fixes: + pmdaresctrl: new PMDA for x86_64 last level cache metrics + pmdafarm: new Seagate Field Access Reliability Metrics PMDA + pmdadarwin: updated for changes in NFS stats management + pmdalinux: new mem.util metrics from recent kernel versions + pmdalinux: new networking metrics relating to MPTcpExt + pmdasockets: allow sockets with duplicate sources to exist + pmdabpftrace: rework exit/wait handling to avoid errors + pmdahaproxy: fixed connect script handling of string quoting + pmdastatsd: fixed metadata for a couple of metrics + pmdalinux: fixed semantics for mem.vmstat.nr_free_cma metric + pmdadenki: simplification and refactoring of metrics + pmdagfs2: correct permissions of several installed files + pmdakvm: fixed semantics for kvm.largepages metric + - Server-side utilities and log management scripts: + pmproxy: add support for HTTP compression + pmlogger: rework heuristic for Latest folio creation + pmlogctl: fix incorrect rewriting of PCP_ARCHIVE_DIR + pmlogredact: add latitude and longitude labels to redacted set + pmlogrewrite: resolve a small memory leak + pmlogrewrite: use PM_CTXFLAG_METADATA_ONLY for speed + pmcd: add $PMCD_CREDS_TIMEOUT as an alternative to -q + - libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings: + libpcp: new PM_CTXFLAG_METADATA_ONLY flag for pmNewContext + libpcp: fix a couple of derived metric bugs + libpcp_web: implement config override by canonical env vars + - Misc build, infrastructure and packaging updates: + build: new CI build to keep PCP for MacOS up-to-date + build: several fixes to tools when compiling with clang + build: install pmlog[redact,reduce,rewrite] on default PATH + build: default to using a path-prefixed PCP_PYTHON_PROG + build: update the Fedora container to f38 + build: drop of i386/i686 architectures from Fedora builds + build: enable build of pmdalibvirt on CentOS 7 platform + build: enable Qt6 in Fedora and post-RHEL-9 rpm spec files + build: add pyodbc rpm dep for pcp-pmda-mssql in RHEL 9 + - Security Enhanced Linux: + selinux: allow pmproxy use the io_uring API + selinux: policy fixes for recent AVCs on RHEL 7.9 + selinux: add netlink_kobject_uevent_socket getattr (bpftrace) + - Documentation: + man pages: change all to map font CW -> CR for latest groff + man: note pmseries Redis timeseries load order limitation + * Changes from pcp-6.1.0: + - pmlogredact: new command for archive anonymisation + - pcp-atop: new bar graph visualisation mode + - pcp-atop: update to atoptool.nl 2.9.1 sources + - pcp-htop: support dynamic screens (user-configurable tabs) + - pcp-htop: update to latest upstream source + - pcp-htop: default screens for filesystems, disks and cgroups + - pcp-htop: non-default screens for several libbpf modules + - pcp-htop: fix mishandling of some process argument shading + - pcp-buddyinfo: new tool reporting Linux buddyinfo stats + - pcp-meminfo: new tool reporting Linux kernel memory stats + - pcp-netstat: new tool reporting networking statistics + - pcp-slabinfo: new tool reporting Linux slabinfo kernel stats + - pcp-zoneinfo: new tool reporting Linux zoneinfo kernel stats + - pmsleep,pmpause: add -w where option for systemd annotation + - pmieconf: move test_action from primary into a separate group + - pmieconf: update webhook action for better EDA integration + - pmlogconf: remove latency-inducing fsync on config write + - pmlogconf: updates for new metrics used in pcp-atop + - pmdalinux: add three new /proc/vmstat pscan/pgsteal metrics + - pmdalinux: fix bug when lsb-release is only /etc/*-release file + - pmdabpf: add -q/--tryload command line option + - pmdaopenmetrics: reduce transient instance logs, improve labels + - libpcp: improved SSL error reporting + - selinux: add policy updates for pmproxy (io_uring,ipc_lock) + - build: support for Qt6, drop remaining Qt4 configure-support + - build: updated licence strings in spec files to follow SPDX + - build: default to using a path-prefixed PCP_PYTHON_PROG + - build: fix several makefile clean targets for deb packagers + - build: configure.ac update to autoconf 2.71 + - build: add tarball upload to release workflow + - docs: pmie updates to explain action behaviour with archives + - docs: retire "archive log" phrase from man pages and books + - docs: transition Artifactory (no free service) to Packagecloud + * Changes from pcp-6.0.5: + - pmie: ensure pmie.log.YYYYMMDD is owned by pcp:pcp + - pcp2json: extend pcp2json with an option to send HTTP POSTs + - pmlogger: fix pidfile update; pmlogger.pid is for primary only + - pmdumptext: fix scaling when -i command line option is used + - pmlogextract: improve resilience in corner-case conditions + - pmdasmart: additional NVME power state metrics + - pmdasmart: additional NVME disk information metrics + - pmdasmart: update help with proper description of DC status + - pmdasmart: filter out zram devices when probing for devices + - pmdahacluster: handle pacemaker 2.1.5 crm_mon output changes + - pmcd: improve debugging flags and diagnostics in general + - libpcp_pmda: refactor and improve library diagnostics + - selinux: updates to policy for pmlogger and pmlogger_daily + - build: switch rpm spec files to SPDX license identifiers + - build, qa: numerous updates to improve PCP on OpenBSD + - build: switch from registry.centos.org to quay.io for el6/el7 + - ci: add centos6 back into the fold as its on quay.io now + - ci: add Debian 12, drop Ubuntu 16 and Fedora 35 + * Changes from pcp-6.0.4: + - pmcd: propogate a new PMCD_HOSTNAME_CHANGE flag to clients + - pmdumplog: support preferred alternate name pmlogdump + - pmlogger: changes to accommodate PMCD_HOSTNAME_CHANGE + - pmlogger_janitor: new script called from pmlogger_check + - pmlogger: add -d directory argument for alternate naming schemes + - pmlogrewrite: fix remaining corner case for indom renumbering + - pmie: changes to accommodate PMCD_HOSTNAME_CHANGE + - pmie: catching SIGUSR1 triggers a pending task dump + - pmie_{check,daily}: change pmie.log handling regime + - pmieconf: add support for a webhook action to pmieconf + - pmieconf: add a wall rule action for adm group members + - pmieconf: add support for an action testing rule + - pmieconf: use correct pmieconf percent type for thermal throttle + - pmieconf: add minimum pct conjunction to entropy for small poolsizes + - pminfo: use -b to batch pmDesc retrievals as well as pmResult + - pmstat: fix corner case handling of automatic pmcd reconnect + - pcp2influxdb: add requests.post timeout to avoid hangs + - pcp-dstat: fixes CSV output to show all (not visible) plugins + - pcp-htop: support File Descriptor Meter + - pcp-htop: sync latest fixes from upstream htop + - pcp-mpstat: fixed broken pipe issue + - pcp-ps: fix exception handling for process name + - rc scripts: ensure pmcd.conf not rewritten unnecessarily + - pmdalinux: add a couple of new /proc/net/snmp ICMP metrics + - pmdalinux: add new network.tcp.tcpplbrehash metric + - pmdaproc: add new proc.smaps.pss_dirty metric + - pmdarabbitmq: add timeout handling to http requests + - pmdastatsd: stats and blocklisted metric names alignment + - libpcp: new pmAddDerivedText API for derived metric help text + - libpcp: check level parameter on entry to pmLookupText + - libpcp: new PMAPI error code addition for bad API arguments + - libpcp: allow derived metrics semantics of 'similar' indoms + - selinux: add missing context information on farm services + - build: fix a number of Debian sub-package dependency issues + * Changes from pcp-6.0.3: + - build: fix Debian postinst script handling of missing systemctl + - pmdaproc: support per-cgroup IRQ PSI metrics in recent kernels + - pmdalinux: support for system wide IRQ PSI metrics in recent kernels + - pmlogrewrite: improved handling of unused instance domains + * Changes from pcp-6.0.2: + - Client tools and utilities: + pcp-atop: update to latest upstream atoptool.nl sources + pcp-atop: cgroup, NUMA memory and NUMA CPU support + pcp-htop: update to latest upstream htop.dev sources + pcp-dstat: fix handling of --swap with -f (full) option + pcp-dstat: fix columns for --net-packets + pcp-mpstat: fix handling of log-once summary metric values + pcp-mpstat: improve error handling for the current values + pcp-ps: added capabilities to show N samples with archives + pcp-ps: fix handling of the -o option + pcp-ps: fix broken pipe errors when piping to head(1) + pcp-ps: fix process "START" column calculation and rounding + pcp-pidstat: fix broken pipe errors when piping to head(1) + pmdumplog: extend -x so -xxx reports timestamps in Epoch format + pmlogger: refactor getting FQDN for local host + - PMDA additions, enhancements and bug fixes: + pmdabpf: set config default for biosnoop module to disabled + pmdabpf: port forward to latest vendored libbpf-tools code + pmdalinux: boolean metric network.interface.virtual from sysfs + pmdalinux: more careful slabinfo 32/64 bit type multiplication + pmdalinux: add NUMA external fragmentation metric via sysfs + pmdalinux: fix pmid numbering issue with hinv.map.scsi_id + pmdanfsclient: fix srcport handling for RDMA and UDP mounts + pmdaopenmetrics: validate all names before using them for metrics + pmdaoverhead: new PMDA to measure overhead for groups of processes + pmdastatsd: static metric memory leak fix + pmdastatsd: ragel parser refactor and fix + - Server-side utilities and log management scripts: + pmieconf: new pmie rule checking file descriptor limits + - libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings: + libpcp: fix buffer issue for user/group name lookups + libpcp_web: improve error handling in pmseries AST parser + - Misc build, infrastructure and packaging updates: + configure.ac: fixes for improved C99 compatibility + configure.ac: use QTDIR search path only when given + MacOS: build: fix shared library builds on modern Macs + OpenBSD: build updates for clang, Qt and openssl + libbpf: updated minimium version to 0.8.0, ARM and PPC support + Qt: update minimum required versions for libqwt + Drop no-longer-used pmlogger_daily_report systemd rpm spec code + Determine clang version without optional llvm-config utility + Another attempt to get the man/man-db/mandoc stuff sorted + - Security Enhanced Linux: + Policy updates for pmdastatsd + - Documentation and QA infrastructure: + Add help text for some OpenBSD kernel instance domains + Provide more detailed explanation for default PMLOGGER_INTERVAL + pmdaChildren(3): clarify the memory allocation scheme + pcp-ps(1) man page fixes. + * Changes from pcp-6.0.1: + - Security Enhanced Linux: + selinux: rework policy to use optional_policy + selinux: rework policy to use an independent policy + selinux: new cluster_exec_t policy handling for pmdahacluster(1) + selinux: retire those parts of the build affecting CentOS 6 + - PMDA additions, enhancements and bug fixes: + pmdabpf: set perf_buffer__poll timeout to 0 for optimal sampling + pmdabpf: add CO-RE biosnoop + pmdabpf: no BPF debug messages unless debugging (-Ddev0) + pmdalinux: add "squashfs" to the list of ignored filesystem types + pmdasnmp: install agent specific configuration file to PMDATMPDIR + pmdakvm: initialise perf_event interface only if/when needed + - Client tools and utilities: + pcp-ps: initial version of a PCP implementation of ps(1) + pcp-dstat: add --nomissed command line option for large systems + pmfind, libpcp_web: MMV and shutdown memory management fixes + pmlogreduce: fix corner-case in temporal index generation + pmlogcheck: tighten some pmlogcheck pass0 checks + pmseries: fix sampling when start < first sample or series has gaps + shell completion: improve pmrep/zsh instance completion in live mode + shell tools: convert fgrep and egrep over to grep -F and -E + - Server-side utilities and log management scripts: + pmlogger_daily_report: no longer needs any systemd support now + pmlogger_daily.sh: fix pmlogger_daily_report test for zeroconf + - libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings: + libpcp_web: fix race conditions affecting pmproxy + libpcp_web: allow scalar operands in pmseries expressions + libpcp_web: add pmseries float multiplication + - Misc build, infrastructure and packaging updates: + build: add PCP archive analysis container + build: updates to fix Windows platform builds + build: update configure.ac to allow builds on Mac M1 (arm64) + build: make openSUSE spec file builds work again + containers: remove /build directory + debian: use deb-systemd-helper if available + build: fix libpcp check-statics regexp error with objects in subdirs + build: podman PMDA no longer has deps, make it unconditional + build: don't package and install pmrep xtract-names helper + build: updates to hiredis code for pmseries and pmproxy + build: updates to hiredis-cluster code for pmseries and pmproxy + build: fix Makepkgs handling of argument parameters + build: use vendored github.com/libbpf/bpftool/libbpf and update + build: use vendored github.com/iovisor/bcc/libbpf-tools + build: use vendored git.code.sf.net/p/qwt and update + build: fix bpf PMDA inclusion check + build: fix windows default pmcd.conf entry, dup path component + build: rework Python3 and Python2 configure.ac logic + packaging: fix rpm systemd-sysusers on f37 and rawhide + - Documentation and QA infrastructure: + docs: small typo fixes relating to secure connections + docs: fix sheet2pcp(1) man page quoting in examples + pmdasample: additional metrics for testing cases + * Changes from pcp-6.0.0: + - Major changes: + 1. Add version 3 PCP archive support: instance domain change-deltas, + Y2038-safe timestamps, nanosecond-precision timestamps, arbitrary + timezones support, 64-bit file offsets used throughout for larger + (beyond 2GB) individual volumes. + ** Opt-in using the /etc/pcp.conf PCP_ARCHIVE_VERSION setting. ** + ** Version 2 archives remain the default (for next few years). ** + 2. Switch to using OpenSSL only throughout PCP (dropped NSS/NSPR); + this impacts on libpcp, PMAPI clients and PMCD use of encryption; + these are now configured and used consistently with pmproxy HTTPS + support and redis-server, which were both already using OpenSSL. + 3. New nanosecond precision timestamp PMAPI calls for PCP library + interfaces that make use of timestamps. These are all optional, + and full backward compatibility is preserved for existing tools. + - Client tools and utilities: + pcp2elasticsearch: implement authentication support + pcp-dstat: implement support for the top-alike plugins + pcp-dstat: add plugin configuration for ZFS metrics + pcp-dstat: battery charge remaining config using denki metrics + pcp-htop: update to latest stable upstream release + pcp-htop: initial support for screen tabs in the user interface + pcp-pidstat: correct operation of the -p ALL|SELF options + pmlogger: small changes for handling derived metrics better + pmlogger, import: support configurable default archive version + pcp2xxx: ignore pmrep-specific options + pmlogger: extra hardening, backtrace symbol improvements + pmlogger: add -V (output archive version) command line option + pmseries: add sum(), avg() and stdev() functions + pmseries: add nth_percentile() and topk() functions + pmseries: add max_inst() and max_sample() functions + pmseries: add min_inst() and min_sample() functions + pmseries: be more defensive during shutdown error paths + pmseries: fix assumption that any 40-character string is a SID + pmseries: allow reporting values from SIDs (not just queries) + sheet2pcp: add -V (output archive version) command line option + ganglia2pcp: add -V (output archive version) command line option + iostat2pcp: add -V (output archive version) command line option + - PMDA additions, enhancements and bug fixes: + pmdaapache: do time_t manipulation with sufficient space + pmdabcc: sync bcc PMDA modules with upstream bcc tools + pmdabpf: adds CO-RE (Compile Once - Run Everywhere) modules + (exitsnoop, oomkill, bashreadline, mountsnoop, vfsstat, + opensnoop, fsslower, statsnoop, tcpconnlat, tcpconnect) + pmdabpf: support x86, arm and powerpc + pmdabpf: fixed persistence of indom and cluster identifiers + pmdabpf: rework setrlimit() logic for some small memory hosts + pmdabpftrace: move example autostart scripts to /usr/share + pmdabpftrace: update biolatency example script for kernel 5.16+ + pmdadenki: fix battery detection for non-intel systems + pmdadenki: add support for multiple active batteries + pmdadenki: support the -D option for debugging + pmdadenki: improve labels associated with metrics + pmdadenki: add battery capacity metric + pmdadenki: add separate indom help text + pmdalinux: add new MpTcpExt metrics from latest Linux 5.x kernels + pmdalinux: updates for latest /proc/net/netstat kernel changes + pmdalinux: improve network metrics help text + pmdalinux: fix of tty metrics on s390x platform + pmdamailq: update to ensure Y2038-safe time_t handling + pmdammv: use highest available timestamp resolution + pmdaopenvswitch: additional interface and coverage stats + pmdapostfix: harden against a not-yet-running postfix + pmdaproc: fix psargs string for processes with very large PIDs + pmdaproc: fix cgroup cpu metrics refresh structures + pmdasockets: prevent string overwrite of ss_stats_t fields + pmdasockets: add checking to the pmStore filter strings + pmdastatsd: fix detection of failure memory allocation + - Server-side utilities and log management scripts: + pmproxy: allow request parameters to be sent in the request body + pmproxy: fix race on teardown of pcp protocol proxy clients + pmproxy: improve error checking, check uv_pipe_bind result + pmproxy: harden logging interfaces, racing with startup + pmieconf: add several pmie rules for Open vSwitch metrics + pmlogrewrite: subtle change in semantics for error checking + pmlogreduce: allow sub-second values for -t option + pmlogreduce: temporal index, add entries after 100k of data volume + pmlogcheck: beef up pass 0 to check metadata record types + pmlogconf: fix reprobing with interactive changes + pmlogmv: fallback to copy for cross-mount case when link fails + pmlogmv: add -c (paranoid checksum) option + pmlogger_farm: add default configuration file for farm loggers + pmlogger_check: increase PMLOGGER_REQUEST_TIMEOUT from 2 to 10 secs + pmlogger_daily: callbacks for extra daily log processing tasks + pmlogger_daily, pmlogger_check: additional systemd-driven changes + pmlogger_daily: move redirection of stdout+stderr earlier in script + pmlogger_daily: abandom use of fmt(1) - not portable - uses awk now + pmlogger_daily_report.sh: some major efficiency improvements + pmlogger_daily_report: re-enabled for rpm and deb builds + pmie_check: avoid leaving lock file and temp dir behind + pm{log,ie}ctl: handle embedded shell syntax in control lines + pm{log,ie}ctl: add -C args option to pass "args" to pm{logger,ie}_check + systemd units: pmlogger and pmie farm conditional use of type=exec + rc-pmcd: reorder the systemd paths attempted in migrate_pid_cgroup + dbpmda: fix an overlapping copy and add error handling + - libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings: + libpcp_archive: new library for apps that write PCP archives + libpcp: optimize indom handling in fetchgroup code + libpcp: drop time_t abuse in getdate.y, use safe sizes + libpcp: add __pmDumpPDUTrace() and circular trace buffer + libpcp: add PM_ERR_FEATURE, PM_ERR_TLS error codes + libpcp: refactor __pmDumpStack(), improve direct calling tools + libpcp_qmc: require Qt5.6 as the minimum version for builds + libpcp_qmc: resolve the Qt::endl warning more cleanly + libpcp_web: stop Redis initialization if Redis version tool old + libpcp_web: honour config settings that disable redis completely + libpcp_web: fix memory leaks in discovery, query parsing and APIs + libpcp_web: honor exclude.metrics setting in pmseries --load + libpcp_web: run pmFetchArchive(3) in a worker thread + libpcp_web: fix race condition tearing down load baton + libpcp_pmda: ensure indom cache write handles time_t safely + libpcp_import: add interface for setting output log version + libpcp_import: interfaces for samples with high-resolution timestamps + python api: updates to allow building from outside git repo + python api: allow tools using pmconfig module to ignore options + python api: add python wrappers for highres PMAPI routines + python api: correct refcounting on pmParseMetricSpec source buffer + - Security Enhanced Linux: + selinux: additional policy rules, esp glusterd_log_t + selinux: bcc PMDA policy to exec private memfd ctypes/libffi objects + selinux: make use of syslogd_var_run_t map rule conditional + selinux: policy updates needed for the pmdasockets metrics + selinux: fine-tune netlink_tcpdiag_socket policy for all platforms + - Misc build, infrastructure and packaging updates: + build: latest distros supported (ubuntu 22.04, fedora 37, rhel9, etc) + build: reproducible debian build efforts + build: use standard dpkg buildflags variables. + build: add BuildRequires: python*-pymongo to mongodb PMDA + build: detect libbpf version for the BPF PMDA + build: do not transform symlink targets when generating the source tarball + build: update artifactory deploy script, add recalculate_metadata subtask + build: update configure script for python2 retirement in rhel9 + build: convert libpcp check-statics to using readelf if available + build: updates to libpcp check-statics for OpenBSD + build: fix configure detection of backtrace() and associated hooks + build: fixed source dependencies within libpcp_web makefile + build: add rpm conflicts lines on postgresql-pgpool-II + build: remove pmclient reliance on libpcp.h for timed sleep + build: remove mmvdump reliance on libpcp.h for mmap wrapper + build: make perl truly conditional in the PCP build + build: drop no-longer-needed NSS/NSPR package deps + build: resolve ostree non-writable /var for pmieconf + packaging: update rpm specs to solve systemd warnings + container: bump base image version + Makepkgs: fix for Debian build (and Qt packaging failure in CI) + vendor: switch to git-subtree for iovisor/bcc libbpf-tools code + - Documentation and QA infrastructure: + docs: update notes about sar2pcp, iostat2pcp in pcpcompat(1) + docs: add section to pcpcompat(1) about python2 + docs: add fix for readthedocs compilation error + docs: updates to the Quick Guide documents + docs: clatifications to pmrep et al: man pages + docs: improve pmproxy timeseries and pmseries load documentation + docs: further improvements and fixes to the INSTALL doc + docs: add pmlogger(1) -V, describe $PCP_ARCHIVE_VERSION in pcp.conf. + docs: small fixes to the pcp-pidstat man page + docs: fix webapi documentation typo around polltimeout + pylint: numerous issues resolved, tracking latest versions + qa: regression tests for bpftrace PMDA: check probes + qa: pmdabcc pylint fixups + qa: rework Redis PING-PONG checks + qa/check: run tests under timeout(1) control if possible + qa-summary: allow unified reporting from CI and QA Farm + qa/admin/show-me-all & qa/show-me: changes for CI integration + qa/check: add support for "triaged" tests + ci: send report to Slack when QA workflow is triggered manually + ci: add required packages to enable bpf PMDA on CentOS Stream 9 + ci: run CodeQL daily and for each PR + ci: run full QA on pull requests, save history + ci: unset XDG_RUNTIME_DIR when invoking podman +- Refresh patches: + * 0001-Install-libraries-without-exec-permission.patch + * 0002-Remove-CPAN-rpaths.patch + * 0003-Remove-runlevel-4-from-init-scripts.patch + * 0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch +- Change dependency from openssl-devel >= 1.1.1 to openssl-devel >= 1.0.2p. + Required for SLE-12, builds just fine. +- Disable 'pmda-infiniband' subpackage for SLE-12. + Required so it builds cleanly. +- Introduce pmda-resctrl package, disabled for architectures other + than x86_64. +- Change the architecture for various subpackages to 'noarch' as they + contain no binaries, this lowers rpmlint's badness score + substantially. +- Disable 'pmda-mssql', as it fails to build. + ------------------------------------------------------------------- Thu Feb 29 14:50:14 UTC 2024 - Dominique Leuenberger diff --git a/pcp.spec b/pcp.spec index 8e6344e..cba9210 100644 --- a/pcp.spec +++ b/pcp.spec @@ -16,7 +16,6 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates %endif @@ -67,7 +66,7 @@ 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.3.7 +Version: 6.2.0 Release: 0 %global buildversion 1 @@ -89,6 +88,8 @@ Patch5: 0005-SUSE-fy-pmsnap-control-path.patch Patch6: 0006-pmsnap-control-var-www-srv-www.patch # PATCH-FIX-UPSTREAM, ddiss@suse.de Patch10: 0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch +# PATCH-FIX-UPSTREAM (bsc#1222121), martin.schreiner@suse.com +Patch11: 0011-disable-redis-proxying-by-default.patch %if 0%{?fedora} || 0%{?rhel} %global disable_selinux 0 @@ -171,7 +172,7 @@ Patch10: 0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch # No mssql ODBC driver on non-x86 platforms %ifarch x86_64 %if !%{disable_python3} -%global disable_mssql 0 +%global disable_mssql 1 %else %global disable_mssql 1 %endif @@ -179,6 +180,12 @@ Patch10: 0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch %global disable_mssql 1 %endif +%ifarch x86_64 +%global disable_resctrl 0 +%else +%global disable_resctrl 1 +%endif + # support for pmdanutcracker (perl deps missing on rhel) %if 0%{?rhel} == 0 %global disable_nutcracker 0 @@ -194,15 +201,20 @@ Patch10: 0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch %endif # Qt development and runtime environment missing components before el6 -%if 0%{?rhel} == 0 || 0%{?rhel} > 5 +%if 0%{?rhel} && 0%{?rhel} <= 5 +%global disable_qt 1 +%else +%if 0%{?suse_version} < 1500 +%global disable_qt 1 +%else %global disable_qt 0 +%endif +%endif + # We need qt5 for fedora and openSUSE / SLE factory %if 0%{?fedora} != 0 || 0%{?suse_version} > 1320 %global default_qt 5 %endif -%else -%global disable_qt 1 -%endif # systemd services and pmdasystemd %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 || 0%{?suse_version} @@ -326,7 +338,7 @@ BuildRequires: systemtap-sdt-devel %if !%{disable_libuv} BuildRequires: libuv-devel >= 1.0 %endif -BuildRequires: openssl-devel >= 1.1.1 +BuildRequires: openssl-devel >= 1.0.2p BuildRequires: perl-ExtUtils-MakeMaker %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -401,11 +413,14 @@ Provides: pcp-pmda-nvidia = %{version} %if 0%{?suse_version} %global _pixmapdir %{_datadir}/pixmaps %global _booksdir %{_docdir}/pcp-doc +%if 0%{?suse_version} >= 1500 +%global _hicolordir %{_datadir}/icons/hicolor +%endif %else %global _pixmapdir %{_datadir}/pcp-gui/pixmaps %global _booksdir %{_datadir}/doc/pcp-doc -%endif %global _hicolordir %{_datadir}/icons/hicolor +%endif %if 0%{?fedora} >= 20 || 0%{?rhel} >= 8 || 0%{?suse_version} # FIXME: PCP defaults to using %%{_datadir}/doc/pcp-doc @@ -426,7 +441,10 @@ Provides: pcp-pmda-nvidia = %{version} %ifarch s390 s390x %global disable_infiniband 1 %else - +# we never want Infiniband on versions earlier than SLE-15 +%if 0%{?suse_version} != 0 && 0%{?suse_version} < 1500 +%global disable_infiniband 1 +%else # we never want Infiniband on RHEL5 or earlier %if 0%{?rhel} != 0 && 0%{?rhel} < 6 %global disable_infiniband 1 @@ -434,6 +452,7 @@ Provides: pcp-pmda-nvidia = %{version} %global disable_infiniband 0 %endif %endif +%endif %if !%{disable_infiniband} %global _with_ib --with-infiniband=yes @@ -540,12 +559,13 @@ applications to easily retrieve and process any subset of that data. - - # # pcp-conf # %package conf +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot run-time configuration License: %{license_lgplv21plus} Group: %{lib_gr} @@ -561,8 +581,6 @@ Performance Co-Pilot (PCP) run-time configuration - - # # pcp-libs # @@ -653,8 +671,6 @@ Performance Co-Pilot (PCP) headers for development. - - # # pcp-devel # @@ -678,8 +694,6 @@ Performance Co-Pilot (PCP) documentation and tools for development. - - # # pcp-testsuite # @@ -708,8 +722,6 @@ Quality assurance test suite for Performance Co-Pilot (PCP). - - # # perl-PCP-PMDA. This is the PCP agent perl binding. # @@ -735,8 +747,6 @@ an application, etc. - - # # perl-PCP-MMV # @@ -764,7 +774,6 @@ and analysis with pmchart, pmie, pmlogger and other PCP tools. - # # perl-PCP-LogImport # @@ -789,7 +798,6 @@ they can be replayed with standard PCP monitoring tools. - # # perl-PCP-LogSummary # @@ -817,11 +825,13 @@ exporting this data into third-party tools (e.g. spreadsheets). - # # pcp-import-sar2pcp # %package import-sar2pcp +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot archive tools for importing sar data License: %{license_lgplv2plus} Group: %{pcp_gr} @@ -842,11 +852,13 @@ into standard PCP archive logs for replay with any PCP monitoring tool. - # # pcp-import-iostat2pcp # %package import-iostat2pcp +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot archive tools for importing iostat data License: %{license_lgplv2plus} Group: %{pcp_gr} @@ -886,6 +898,9 @@ into standard PCP archive logs for replay with any PCP monitoring tool. # pcp-import-mrtg2pcp # %package import-mrtg2pcp +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot archive tools for importing MTRG data License: %{license_lgplv2plus} Group: %{pcp_gr} @@ -905,11 +920,13 @@ into standard PCP archive logs for replay with any PCP monitoring tool. - # # pcp-import-ganglia2pcp # %package import-ganglia2pcp +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot archive tools for importing ganglia data License: %{license_lgplv2plus} Group: %{pcp_gr} @@ -929,7 +946,6 @@ into standard PCP archive logs for replay with any PCP monitoring tool. - # # pcp-import-collectl2pcp # @@ -972,6 +988,9 @@ Zabbix via the Zabbix agent - see zbxpcp(3) for further details. # pcp-export-pcp2elasticsearch # %package export-pcp2elasticsearch +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot tools for exporting PCP metrics to ElasticSearch License: %{license_gplv2plus} Group: %{pcp_gr} @@ -992,11 +1011,13 @@ See https://www.elastic.co/community for further details. - # # pcp-export-pcp2graphite # %package export-pcp2graphite +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot tools for exporting PCP metrics to Graphite License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1016,10 +1037,12 @@ to graphite (http://graphite.readthedocs.org). - # pcp-export-pcp2influxdb # %package export-pcp2influxdb +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot tools for exporting PCP metrics to InfluxDB License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1041,11 +1064,13 @@ to InfluxDB (https://influxdata.com/time-series-platform/influxdb). - # # pcp-export-pcp2json # %package export-pcp2json +%if !%{disable_noarch} +BuildArch: noarch +%endif URL: https://pcp.io Summary: Performance Co-Pilot tools for exporting PCP metrics in JSON format License: %{license_gplv2plus} @@ -1063,11 +1088,13 @@ in JSON format. - # # pcp-export-pcp2spark # %package export-pcp2spark +%if !%{disable_noarch} +BuildArch: noarch +%endif URL: https://pcp.io Summary: Performance Co-Pilot tools for exporting PCP metrics to Apache Spark License: %{license_gplv2plus} @@ -1103,6 +1130,9 @@ in Excel spreadsheet format. # pcp-export-pcp2xml # %package export-pcp2xml +%if !%{disable_noarch} +BuildArch: noarch +%endif URL: https://pcp.io Summary: Performance Co-Pilot tools for exporting PCP metrics in XML format License: %{license_gplv2plus} @@ -1120,11 +1150,13 @@ in XML format. - # # pcp-export-pcp2zabbix # %package export-pcp2zabbix +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot tools for exporting PCP metrics to Zabbix License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1208,6 +1240,9 @@ but can also be configured to monitor remote GUIDs such as IB switches. # pcp-pmda-activemq # %package pmda-activemq +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for ActiveMQ License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1218,15 +1253,14 @@ Requires: perl(LWP::UserAgent) %description pmda-activemq This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the ActiveMQ message broker. + + + + + + + #end pcp-pmda-activemq - - - - - - - - # # pcp-pmda-bind2 # @@ -1243,19 +1277,21 @@ Requires: perl(XML::LibXML) %description pmda-bind2 This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from BIND (Berkeley Internet Name Domain). + + + + + + + #end pcp-pmda-bind2 - - - - - - - - # # pcp-pmda-redis # %package pmda-redis +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Redis License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1272,6 +1308,9 @@ collecting metrics from Redis servers (redis.io). # pcp-pmda-nutcracker # %package pmda-nutcracker +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for NutCracker (TwemCache) License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1290,6 +1329,9 @@ collecting metrics from NutCracker (TwemCache). # pcp-pmda-bonding # %package pmda-bonding +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Bonded network interfaces License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1300,19 +1342,20 @@ Supplements: pcp %description pmda-bonding This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about bonded network interfaces. + + + + + + #end pcp-pmda-bonding - - - - - - - - # # pcp-pmda-dbping # %package pmda-dbping +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Database responsiveness License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1323,19 +1366,21 @@ Supplements: pcp %description pmda-dbping This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Database response times and Availablility. + + + + + + + #end pcp-pmda-dbping - - - - - - - - # # pcp-pmda-ds389 # %package pmda-ds389 +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Servers License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1350,19 +1395,20 @@ Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-ds389 This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about a 389 Directory Server. + + + + + + #end pcp-pmda-ds389 - - - - - - - - # # pcp-pmda-ds389log # %package pmda-ds389log +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Server Loggers License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1373,19 +1419,20 @@ Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-ds389log This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from a 389 Directory Server log. + + + + + + #end pcp-pmda-ds389log - - - - - - - - # # pcp-pmda-gpfs # %package pmda-gpfs +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for GPFS Filesystem License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1395,19 +1442,20 @@ Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-gpfs This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the GPFS filesystem. + + + + + + #end pcp-pmda-gpfs - - - - - - - - # # pcp-pmda-gpsd # %package pmda-gpsd +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for a GPS Daemon License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1418,15 +1466,13 @@ Supplements: pcp %description pmda-gpsd This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about a GPS Daemon. + + + + + + #end pcp-pmda-gpsd - - - - - - - - # # pcp-pmda-docker # @@ -1439,19 +1485,20 @@ URL: https://pcp.io %description pmda-docker This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics using the Docker daemon REST API. + + + + + + #end pcp-pmda-docker - - - - - - - - # # pcp-pmda-lustre # %package pmda-lustre +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1461,15 +1508,14 @@ Requires: perl-PCP-PMDA = %{version}-%{release} %description pmda-lustre This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Lustre Filesystem. + + + + + + + #end pcp-pmda-lustre - - - - - - - - # # pcp-pmda-lustrecomm # @@ -1487,19 +1533,21 @@ Supplements: pcp %description pmda-lustrecomm This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Lustre Filesystem Comms. + + + + + + + #end pcp-pmda-lustrecomm - - - - - - - - # # pcp-pmda-memcache # %package pmda-memcache +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Memcached License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1510,19 +1558,21 @@ Supplements: pcp %description pmda-memcache This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Memcached. + + + + + + + #end pcp-pmda-memcache - - - - - - - - # # pcp-pmda-mysql # %package pmda-mysql +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for MySQL License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1537,19 +1587,21 @@ Supplements: pcp %description pmda-mysql This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the MySQL database. + + + + + + + #end pcp-pmda-mysql - - - - - - - - # # pcp-pmda-named # %package pmda-named +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Named License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1560,18 +1612,20 @@ Supplements: pcp %description pmda-named This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Named nameserver. + + + + + + + #end pcp-pmda-named - - - - - - - - # pcp-pmda-netfilter # %package pmda-netfilter +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Netfilter framework License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1582,19 +1636,21 @@ Supplements: pcp %description pmda-netfilter This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Netfilter packet filtering framework. + + + + + + + #end pcp-pmda-netfilter - - - - - - - - # # pcp-pmda-news # %package pmda-news +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Usenet News License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1605,19 +1661,21 @@ Supplements: pcp %description pmda-news This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Usenet News. + + + + + + + #end pcp-pmda-news - - - - - - - - # # pcp-pmda-nginx # %package pmda-nginx +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for the Nginx Webserver License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1629,19 +1687,21 @@ BuildRequires: perl(LWP::UserAgent) %description pmda-nginx This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Nginx Webserver. + + + + + + + #end pcp-pmda-nginx - - - - - - - - # # pcp-pmda-oracle # %package pmda-oracle +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for the Oracle database License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1653,19 +1713,21 @@ BuildRequires: perl(DBI) %description pmda-oracle This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Oracle database. + + + + + + + #end pcp-pmda-oracle - - - - - - - - # # pcp-pmda-pdns # %package pmda-pdns +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for PowerDNS License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1676,19 +1738,21 @@ Supplements: pcp %description pmda-pdns This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the PowerDNS. + + + + + + + #end pcp-pmda-pdns - - - - - - - - # # pcp-pmda-postfix # %package pmda-postfix +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for the Postfix (MTA) License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1706,47 +1770,61 @@ BuildRequires: postfix Requires: postfix-doc BuildRequires: postfix-doc %endif +%if 0%{?suse_version} >= 1500 Supplements: (pcp and postfix) +%else +Supplements: pcp +Supplements: postfix +%endif %description pmda-postfix This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Postfix (MTA). + + + + + + + #end pcp-pmda-postfix - - - - - - - - # # pcp-pmda-rsyslog # %package pmda-rsyslog +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Rsyslog License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +%if 0%{?suse_version} >= 1500 Supplements: (pcp and rsyslog) +%else +Supplements: pcp +Supplements: rsyslog +%endif %description pmda-rsyslog This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Rsyslog. + + + + + + + #end pcp-pmda-rsyslog - - - - - - - - # # pcp-pmda-samba # %package pmda-samba +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Samba License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1757,19 +1835,21 @@ Supplements: pcp %description pmda-samba This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Samba. + + + + + + + #end pcp-pmda-samba - - - - - - - - # # pcp-pmda-slurm # %package pmda-slurm +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for NFS Clients License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1786,6 +1866,9 @@ collecting metrics from the SLURM Workload Manager. # pcp-pmda-snmp # %package pmda-snmp +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Simple Network Management Protocol License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1817,15 +1900,14 @@ Supplements: pcp %description pmda-vmware This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics for VMware. + + + + + + + #end pcp-pmda-vmware - - - - - - - - # # pcp-pmda-zimbra # @@ -1840,15 +1922,14 @@ Supplements: pcp %description pmda-zimbra This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Zimbra. + + + + + + + #end pcp-pmda-zimbra - - - - - - - - # # pcp-pmda-dm # @@ -1871,6 +1952,9 @@ collecting metrics about the Device Mapper Cache and Thin Client. # pcp-pmda-gluster # %package pmda-gluster +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for the Gluster filesystem License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1880,19 +1964,21 @@ Requires: python3-pcp %description pmda-gluster This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the gluster filesystem. + + + + + + + # end pcp-pmda-gluster - - - - - - - - # # pcp-pmda-nfsclient # %package pmda-nfsclient +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for NFS Clients License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1927,6 +2013,9 @@ collecting metrics about the PostgreSQL database. # pcp-pmda-zswap # %package pmda-zswap +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for compressed swap License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1936,19 +2025,21 @@ Requires: python3-pcp %description pmda-zswap This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about compressed swap. + + + + + + + # end pcp-pmda-zswap - - - - - - - - # # pcp-pmda-unbound # %package pmda-unbound +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for the Unbound DNS Resolver License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1958,19 +2049,21 @@ Requires: python3-pcp %description pmda-unbound This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Unbound DNS Resolver. + + + + + + + # end pcp-pmda-unbound - - - - - - - - # # pcp-pmda-mic # %package pmda-mic +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Intel MIC cards License: %{license_gplv2plus} Group: %{pcp_gr} @@ -1980,19 +2073,21 @@ Requires: python3-pcp %description pmda-mic This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Intel MIC cards. + + + + + + + # end pcp-pmda-mic - - - - - - - - # # pcp-pmda-haproxy # %package pmda-haproxy +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for HAProxy License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2035,6 +2130,9 @@ and hypervisor machines. # pcp-pmda-elasticsearch # %package pmda-elasticsearch +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2044,19 +2142,21 @@ Requires: python3-pcp %description pmda-elasticsearch This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Elasticsearch. + + + + + + + #end pcp-pmda-elasticsearch - - - - - - - - # # pcp-pmda-openvswitch # %package pmda-openvswitch +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for Open vSwitch License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2066,19 +2166,21 @@ Requires: python3-pcp %description pmda-openvswitch This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from Open vSwitch. + + + + + + + #end pcp-pmda-openvswitch - - - - - - - - # # pcp-pmda-rabbitmq # %package pmda-rabbitmq +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for RabbitMQ queues License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2095,6 +2197,9 @@ collecting metrics about RabbitMQ message queues. # pcp-pmda-lio # %package pmda-lio +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for the LIO subsystem License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2121,6 +2226,9 @@ target. # pcp-pmda-openmetrics # %package pmda-openmetrics +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics from OpenMetrics endpoints License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2134,19 +2242,21 @@ Provides: pcp-pmda-prometheus = %{version} %description pmda-openmetrics This package contains the PCP Performance Metrics Domain Agent (PMDA) for extracting metrics from OpenMetrics (https://openmetrics.io/) endpoints. + + + + + + + #end pcp-pmda-openmetrics - - - - - - - - # # pcp-pmda-lmsensors # %package pmda-lmsensors +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for hardware sensors License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2159,19 +2269,21 @@ Provides: pcp-pmda-lmsensors-debuginfo = %{version} %description pmda-lmsensors This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Linux hardware monitoring sensors. + + + + + + + # end pcp-pmda-lmsensors - - - - - - - - # # pcp-pmda-netcheck # %package pmda-netcheck +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for simple network checks License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2208,11 +2320,34 @@ collecting metrics from Microsoft SQL Server. # end pcp-pmda-mssql %endif +%if !%{disable_resctrl} +# +# pcp-pmda-resctrl +# +%package pmda-resctrl +Summary: Performance Co-Pilot (PCP) metrics for the /sys/fs/resctrl interface +License: %{license_gplv2plus} +Group: %{pcp_gr} +URL: https://pcp.io +%if !0%{?suse_version} +Requires: %{lib_pkg} = %{version}-%{release} +%endif + +%description pmda-resctrl +This package contains the PCP Performance Metrics Domain Agent (PMDA) +which exposes performance metrics values from the /sys/fs/resctrl +interface to provide information on the last level cache. +# end pcp-pmda-resctrl +%endif + %if !%{disable_json} # # pcp-pmda-json # %package pmda-json +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) metrics for JSON data License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2246,15 +2381,14 @@ Supplements: pcp %description pmda-apache This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Apache webserver. + + + + + + + # end pcp-pmda-apache - - - - - - - - # # pcp-pmda-bash # @@ -2271,15 +2405,14 @@ Supplements: pcp %description pmda-bash This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Bash shell. + + + + + + + # end pcp-pmda-bash - - - - - - - - # # pcp-pmda-cifs # @@ -2295,15 +2428,14 @@ Requires: %{lib_pkg} = %{version}-%{release} %description pmda-cifs This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Common Internet Filesytem. + + + + + + + # end pcp-pmda-cifs - - - - - - - - # # pcp-pmda-cisco # @@ -2320,15 +2452,14 @@ Supplements: pcp %description pmda-cisco This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Cisco routers. + + + + + + + # end pcp-pmda-cisco - - - - - - - - # # pcp-pmda-gfs2 # @@ -2344,15 +2475,14 @@ Requires: %{lib_pkg} = %{version}-%{release} %description pmda-gfs2 This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Global Filesystem v2. + + + + + + + # end pcp-pmda-gfs2 - - - - - - - - # # pcp-pmda-logger # @@ -2370,15 +2500,14 @@ Supplements: pcp This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from a specified set of log files (or pipes). The PMDA supports both sampled and event-style metrics. + + + + + + + # end pcp-pmda-logger - - - - - - - - # # pcp-pmda-mailq # @@ -2395,15 +2524,14 @@ Supplements: pcp %description pmda-mailq This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about email queues managed by sendmail. + + + + + + + # end pcp-pmda-mailq - - - - - - - - # # pcp-pmda-mounts # @@ -2420,15 +2548,14 @@ Supplements: pcp %description pmda-mounts This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about filesystem mounts. + + + + + + + # end pcp-pmda-mounts - - - - - - - - # # pcp-pmda-nvidia-gpu # @@ -2444,15 +2571,14 @@ Requires: %{lib_pkg} = %{version}-%{release} %description pmda-nvidia-gpu This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Nvidia GPUs. + + + + + + + # end pcp-pmda-nvidia-gpu - - - - - - - - # # pcp-pmda-roomtemp # @@ -2509,15 +2635,14 @@ Supplements: pcp %description pmda-sendmail This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Sendmail traffic. + + + + + + + # end pcp-pmda-sendmail - - - - - - - - # # pcp-pmda-shping # @@ -2535,15 +2660,14 @@ Supplements: pcp This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about quality of service and response time measurements of arbitrary shell commands. + + + + + + + # end pcp-pmda-shping - - - - - - - - # # pcp-pmda-smart # @@ -2558,15 +2682,14 @@ Requires: %{lib_pkg} = %{version}-%{release} This package contains the PCP Performance Metric Domain Agent (PMDA) for collecting metrics of disk S.M.A.R.T values making use of data from the smartmontools package. + + + + + + + #end pcp-pmda-smart - - - - - - - - # # pcp-pmda-sockets # @@ -2581,15 +2704,14 @@ 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 # @@ -2603,15 +2725,14 @@ 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 # @@ -2666,15 +2787,14 @@ Supplements: pcp %description pmda-trace This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about trace performance data in applications. + + + + + + + # end pcp-pmda-trace - - - - - - - - # # pcp-pmda-weblog # @@ -2699,11 +2819,13 @@ collecting metrics about web server logs. - # end pcp-pmda-weblog # end C pmdas %package zeroconf +%if !%{disable_noarch} +BuildArch: noarch +%endif Summary: Performance Co-Pilot (PCP) Zeroconf Package License: %{license_gplv2plus} Group: %{pcp_gr} @@ -2845,7 +2967,6 @@ updated policy package. %prep %autosetup -p1 - %build autoconf %define _lto_cflags %{nil} @@ -2873,7 +2994,7 @@ PCP_CFLAGS="%{optflags}" CFLAGS="%{optflags}" CCFLAGS="%{optflags}" CXXFLAGS="%{ %{?_with_snmp} \ %{?_with_nutcracker} \ %{?_with_python2} -PCP_CFLAGS="%{optflags}" CFLAGS="%{optflags}" CCFLAGS="%{optflags}" CXXFLAGS="%{optflags}" make default_pcp +PCP_CFLAGS="%{optflags}" CFLAGS="%{optflags} -std=c99" CCFLAGS="%{optflags}" CXXFLAGS="%{optflags}" make default_pcp ############################################################################### @@ -2893,6 +3014,13 @@ rm -f %{buildroot}/%{_libdir}/*.a # Make all shared libraries executable find %{buildroot}/%{_libdir} -name "*.so*" -exec chmod a+x {} \; +# Fix all #!/usr/bin/env shebangs +find %{buildroot}/%{_bindir} -type f -exec sed -i -E 's@#!/usr/bin/env ([a-zA-Z0-9]+)@#!/usr/bin/\1@g' {} \; +find %{buildroot}/%{_usr}/lib -type f -exec sed -i -E 's@#!/usr/bin/env ([a-zA-Z0-9]+)@#!/usr/bin/\1@g' {} \; +find %{buildroot}/%{_libdir} -type f -exec sed -i -E 's@#!/usr/bin/env ([a-zA-Z0-9]+)@#!/usr/bin/\1@g' {} \; +find %{buildroot}/%{_datadir} -type f -exec sed -i -E 's@#!/usr/bin/env ([a-zA-Z0-9]+)@#!/usr/bin/\1@g' {} \; +find %{buildroot}/%{_libexecdir}/pcp -type f -exec sed -i -E 's@#!/usr/bin/env ([a-zA-Z0-9]+)@#!/usr/bin/\1@g' {} \; + %if %{disable_sheet2pcp} # remove sheet2pcp until BZ 830923 and BZ 754678 are resolved. rm -f %{buildroot}/%{_bindir}/sheet2pcp %{buildroot}/%{_mandir}/man1/sheet2pcp.1* @@ -2986,7 +3114,7 @@ ln -sf /sbin/service %{buildroot}/%{_sbindir}/rcpmproxy # SUSE requires use of %%fillup_and_insserv mkdir -p %{buildroot}/%{_fillupdir} -for f in pmlogger pmproxy pmcd pmie_timers pmlogger_timers pmfind; do +for f in pmlogger pmproxy pmcd pmie_timers pmlogger_timers pmlogger_farm pmfind; do mv %{buildroot}/%{_sysconfdir}/sysconfig/${f} \ %{buildroot}/%{_fillupdir}/sysconfig.${f} done @@ -3061,7 +3189,7 @@ ls -1 %{buildroot}/%{_libexecdir}/pcp/bin |\ grep -E -v 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' |\ grep -E -v 'numastat|shping|tapestat|uptime|verify|selinux-setup' |\ %endif - grep -E -v 'pmlogger_daily_report' |\ + grep -E -v 'pmlogger_daily' |\ grep -E -v 'pmsnap' |\ sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >base_exec.list echo %{_libexecdir}/pcp/lib >>base_exec.list @@ -3142,7 +3270,7 @@ exit 0 %if 0%{?suse_version} && !%{disable_systemd} %pre zeroconf -%service_add_pre pmlogger_daily_report.timer +%service_add_pre pmlogger_daily.timer %endif %pre @@ -3156,7 +3284,7 @@ exit 0 %if 0%{?suse_version} && !%{disable_systemd} %preun zeroconf -%service_del_preun pmlogger_daily_report.timer +%service_del_preun pmlogger_daily.timer %endif %preun @@ -3194,7 +3322,7 @@ fi %post zeroconf %if 0%{?suse_version} %if !%{disable_systemd} -%service_add_post pmlogger_daily_report.timer +%service_add_post pmlogger_daily.timer %endif %else %if !%{disable_systemd} @@ -3203,7 +3331,7 @@ fi systemctl restart pmie >/dev/null 2>&1 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 >/dev/null 2>&1 systemctl enable pmie >/dev/null 2>&1 %else /sbin/chkconfig --add pmcd >/dev/null 2>&1 @@ -3244,6 +3372,7 @@ PCP_LOG_DIR=%{_logsdir} %{fillup_and_insserv pmproxy} %{fillup_and_insserv pmie_timers} %{fillup_and_insserv pmlogger_timers} +%{fillup_and_insserv pmlogger_farm} %endif %else %if !%{disable_systemd} @@ -3299,7 +3428,7 @@ PCP_LOG_DIR=%{_logsdir} %if 0%{?suse_version} && !%{disable_systemd} %postun zeroconf -%service_del_postun pmlogger_daily_report.timer +%service_del_postun pmlogger_daily.timer %endif %if 0%{?suse_version} @@ -3339,22 +3468,16 @@ PCP_LOG_DIR=%{_logsdir} %{_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 @@ -3380,22 +3503,16 @@ PCP_LOG_DIR=%{_logsdir} %{_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 @@ -3415,7 +3532,7 @@ PCP_LOG_DIR=%{_logsdir} %dir %{_libexecdir}/pcp/bin %dir %{_localstatedir}/lib/pcp %dir %{_localstatedir}/lib/pcp/config -%if 0%{?suse_version} +%if %{disable_qt} # part of pcp-gui %exclude %{_localstatedir}/lib/pcp/config/pmafm/pcp-gui %endif @@ -3437,6 +3554,82 @@ PCP_LOG_DIR=%{_logsdir} %{_datadir}/pcp/lib/rc-proc.sh.minimal %{_datadir}/pcp/lib/unlockpmns +### 6.2.0 BEGIN +%config %{_sysusersdir}/pcp-testsuite.conf +%config %{_sysusersdir}/pcp.conf +%config %{_tmpfilesdir}/pcp-reboot-init.conf +%config(noreplace) %{_sysconfdir}/pcp/indom.conf +%config(noreplace) %{_sysconfdir}/pcp/overhead/conf.d/default.conf +%config(noreplace) %{_sysconfdir}/pcp/overhead/examples/sample.conf +%config(noreplace) %{_sysconfdir}/pcp/tls.conf +%{_libdir}/libpcp_archive.so +%{_libdir}/libpcp_archive.so.1 +%{_libdir}/pkgconfig/libpcp_archive.pc +%{_libexecdir}/pcp/bin/pmlogger_daily_report +%{_libexecdir}/pcp/pmdas/denki/pmns +%{_libexecdir}/pcp/pmdas/farm/Install +%{_libexecdir}/pcp/pmdas/farm/Remove +%{_libexecdir}/pcp/pmdas/farm/domain.h +%{_libexecdir}/pcp/pmdas/farm/help +%{_libexecdir}/pcp/pmdas/farm/pmda_farm.so +%{_libexecdir}/pcp/pmdas/farm/pmdafarm +%{_libexecdir}/pcp/pmdas/farm/pmns +%{_libexecdir}/pcp/pmdas/farm/root +%{_libexecdir}/pcp/pmdas/overhead/Install +%{_libexecdir}/pcp/pmdas/overhead/README +%{_libexecdir}/pcp/pmdas/overhead/Remove +%{_libexecdir}/pcp/pmdas/overhead/domain.h +%{_libexecdir}/pcp/pmdas/overhead/pmdaoverhead +%{_libexecdir}/pcp/pmdas/overhead/pmns +%{_libexecdir}/pcp/pmdas/overhead/root +%{_libexecdir}/pcp/pmdas/podman/pmns +%{_localstatedir}/lib/pcp/config/pmlogredact/network +%{_localstatedir}/lib/pcp/config/pmlogredact/usernames +%{_localstatedir}/lib/pcp/pmdas/denki/pmns +%{_localstatedir}/lib/pcp/pmdas/farm/Install +%{_localstatedir}/lib/pcp/pmdas/farm/Remove +%{_localstatedir}/lib/pcp/pmdas/farm/domain.h +%{_localstatedir}/lib/pcp/pmdas/farm/help +%{_localstatedir}/lib/pcp/pmdas/farm/pmda_farm.so +%{_localstatedir}/lib/pcp/pmdas/farm/pmdafarm +%{_localstatedir}/lib/pcp/pmdas/farm/pmns +%{_localstatedir}/lib/pcp/pmdas/farm/root +%{_localstatedir}/lib/pcp/pmdas/overhead/Install +%{_localstatedir}/lib/pcp/pmdas/overhead/README +%{_localstatedir}/lib/pcp/pmdas/overhead/Remove +%{_localstatedir}/lib/pcp/pmdas/overhead/default.conf +%{_localstatedir}/lib/pcp/pmdas/overhead/domain.h +%{_localstatedir}/lib/pcp/pmdas/overhead/pmdaoverhead +%{_localstatedir}/lib/pcp/pmdas/overhead/pmns +%{_localstatedir}/lib/pcp/pmdas/overhead/root +%{_localstatedir}/lib/pcp/pmdas/overhead/sample.conf +%{_localstatedir}/lib/pcp/pmdas/podman/pmns +%{_sysconfdir}/pcp/pmlogredact/network +%{_sysconfdir}/pcp/pmlogredact/usernames +%{_unitdir}/pcp-geolocate.service +%{_unitdir}/pcp-reboot-init.service +%{_usr}/share/pcp/htop/screens/biosnoop +%{_usr}/share/pcp/htop/screens/cgroups +%{_usr}/share/pcp/htop/screens/cgroupsio +%{_usr}/share/pcp/htop/screens/cgroupsmem +%{_usr}/share/pcp/htop/screens/devices +%{_usr}/share/pcp/htop/screens/execsnoop +%{_usr}/share/pcp/htop/screens/exitsnoop +%{_usr}/share/pcp/htop/screens/filesystems +%{_usr}/share/pcp/htop/screens/opensnoop + +%dir %{_libexecdir}/pcp/pmdas/farm +%dir %{_libexecdir}/pcp/pmdas/overhead +%dir %{_localstatedir}/lib/pcp/config/pmlogredact +%dir %{_localstatedir}/lib/pcp/pmdas/farm +%dir %{_localstatedir}/lib/pcp/pmdas/overhead +%dir %{_sysconfdir}/pcp/overhead +%dir %{_sysconfdir}/pcp/overhead/conf.d +%dir %{_sysconfdir}/pcp/overhead/examples +%dir %{_sysconfdir}/pcp/pmlogredact +%dir %{_usr}/share/pcp/htop/screens +### 6.2.0 END + %dir %attr(0775,pcp,pcp) %{_logsdir} %attr(0775,pcp,pcp) %{_logsdir}/pmcd %attr(0775,pcp,pcp) %{_logsdir}/pmlogger @@ -3468,8 +3661,6 @@ PCP_LOG_DIR=%{_logsdir} %else %{_unitdir}/pmlogger_check.service %{_unitdir}/pmlogger_check.timer -%{_unitdir}/pmlogger_daily.service -%{_unitdir}/pmlogger_daily.timer %{_unitdir}/pmie_check.service %{_unitdir}/pmie_check.timer %{_unitdir}/pmie_daily.service @@ -3483,6 +3674,7 @@ PCP_LOG_DIR=%{_logsdir} %{_fillupdir}/sysconfig.pmcd %{_fillupdir}/sysconfig.pmie_timers %{_fillupdir}/sysconfig.pmlogger_timers +%{_fillupdir}/sysconfig.pmlogger_farm %else %config(noreplace) %{_sysconfdir}/sysconfig/pmlogger %config(noreplace) %{_sysconfdir}/sysconfig/pmproxy @@ -3490,6 +3682,7 @@ PCP_LOG_DIR=%{_logsdir} %config(noreplace) %{_sysconfdir}/sysconfig/pmcd %config(noreplace) %{_sysconfdir}/sysconfig/pmie_timers %config(noreplace) %{_sysconfdir}/sysconfig/pmlogger_timers +%config(noreplace) %{_sysconfdir}/sysconfig/pmlogger_farm %endif %dir %{_sysconfdir}/sasl2 %config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf @@ -3513,7 +3706,6 @@ PCP_LOG_DIR=%{_logsdir} %dir %{_confdir}/pmlogger/control.d %config(noreplace) %{_confdir}/pmlogger/control %config(noreplace) %{_confdir}/pmlogger/control.d/local -%dir %attr(0775,pcp,pcp) %{_confdir}/nssdb %dir %{_confdir}/discover %config(noreplace) %{_confdir}/discover/pcp-kube-pods.conf %if !%{disable_libuv} @@ -3545,11 +3737,11 @@ PCP_LOG_DIR=%{_logsdir} %endif %files zeroconf -%{_libexecdir}/pcp/bin/pmlogger_daily_report +%{_libexecdir}/pcp/bin/pmlogger_daily %if !%{disable_systemd} -# systemd services for pmlogger_daily_report to replace the cron script -%{_unitdir}/pmlogger_daily_report.service -%{_unitdir}/pmlogger_daily_report.timer +# systemd services for pmlogger_daily to replace the cron script +%{_unitdir}/pmlogger_daily.service +%{_unitdir}/pmlogger_daily.timer %else %config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report %endif @@ -3940,6 +4132,29 @@ PCP_LOG_DIR=%{_logsdir} %config(noreplace) %{_confdir}/mssql %endif +%if !%{disable_resctrl} +%files pmda-resctrl +%{_libexecdir}/pcp/pmdas/resctrl/Install +%{_libexecdir}/pcp/pmdas/resctrl/Remove +%{_libexecdir}/pcp/pmdas/resctrl/domain.h +%{_libexecdir}/pcp/pmdas/resctrl/help +%{_libexecdir}/pcp/pmdas/resctrl/pmda_resctrl.so +%{_libexecdir}/pcp/pmdas/resctrl/pmdaresctrl +%{_libexecdir}/pcp/pmdas/resctrl/pmns +%{_libexecdir}/pcp/pmdas/resctrl/root +%{_localstatedir}/lib/pcp/pmdas/resctrl/Install +%{_localstatedir}/lib/pcp/pmdas/resctrl/Remove +%{_localstatedir}/lib/pcp/pmdas/resctrl/domain.h +%{_localstatedir}/lib/pcp/pmdas/resctrl/help +%{_localstatedir}/lib/pcp/pmdas/resctrl/pmda_resctrl.so +%{_localstatedir}/lib/pcp/pmdas/resctrl/pmdaresctrl +%{_localstatedir}/lib/pcp/pmdas/resctrl/pmns +%{_localstatedir}/lib/pcp/pmdas/resctrl/root +%{_unitdir}/sys-fs-resctrl.mount +%dir %{_libexecdir}/pcp/pmdas/resctrl +%dir %{_localstatedir}/lib/pcp/pmdas/resctrl +%endif + %if !%{disable_json} %files pmda-json %{_pmdasdir}/json