Accepting request 1129609 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1129609
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcp?expand=0&rev=69
This commit is contained in:
Ana Guerrero 2023-11-29 20:18:40 +00:00 committed by Git OBS Bridge
commit c3ff84008e
8 changed files with 529 additions and 583 deletions

View File

@ -36,10 +36,10 @@ Signed-off-by: David Disseldorp <ddiss@suse.de>
src/zabbix-agent/src/GNUmakefile | 2 +-
29 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda
index 5e5c110d1..9670b7461 100755
--- a/src/genpmda/genpmda
+++ b/src/genpmda/genpmda
Index: pcp-5.3.7/src/genpmda/genpmda
===================================================================
--- pcp-5.3.7.orig/src/genpmda/genpmda
+++ pcp-5.3.7/src/genpmda/genpmda
@@ -899,7 +899,7 @@ install: default
\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
\$(INSTALL) -m 755 -d \$(PMDADIR)
@ -58,11 +58,11 @@ index 5e5c110d1..9670b7461 100755
\$(INSTALL) -m 755 -f $oflag/Install \$(PMDADIR)/Install
\$(INSTALL) -m 755 -f $oflag/Remove \$(PMDADIR)/Remove
\$(INSTALL) -m 644 -f $oflag/Makefile.install \$(PMDADIR)/Makefile
diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile
index c58277980..b8d98872e 100644
--- a/src/libpcp/src/GNUmakefile
+++ b/src/libpcp/src/GNUmakefile
@@ -125,7 +125,7 @@ endif
Index: pcp-5.3.7/src/libpcp/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp/src/GNUmakefile
@@ -138,7 +138,7 @@ endif
install : default
ifneq ($(LIBTARGET),)
@ -71,7 +71,7 @@ index c58277980..b8d98872e 100644
$(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG)
endif
ifneq ($(SYMTARGET),)
@@ -134,7 +134,7 @@ ifneq ($(SYMTARGET),)
@@ -147,7 +147,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@ -79,12 +79,12 @@ index c58277980..b8d98872e 100644
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
$(EXT_FILES):
diff --git a/src/libpcp_fault/src/GNUmakefile b/src/libpcp_fault/src/GNUmakefile
index 229092783..ee37c2aa6 100644
--- a/src/libpcp_fault/src/GNUmakefile
+++ b/src/libpcp_fault/src/GNUmakefile
@@ -150,7 +150,7 @@ endif
$(XFILES):
Index: pcp-5.3.7/src/libpcp_fault/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp_fault/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp_fault/src/GNUmakefile
@@ -155,7 +155,7 @@ endif
install : default
ifneq ($(LIBTARGET),)
@ -93,7 +93,7 @@ index 229092783..ee37c2aa6 100644
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -158,7 +158,7 @@ ifneq ($(SYMTARGET),)
@@ -163,7 +163,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@ -102,10 +102,10 @@ index 229092783..ee37c2aa6 100644
endif
$(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h $(PCP_INC_DIR)/fault.h
diff --git a/src/libpcp_gui/src/GNUmakefile b/src/libpcp_gui/src/GNUmakefile
index b45028ca4..9099e4d1e 100644
--- a/src/libpcp_gui/src/GNUmakefile
+++ b/src/libpcp_gui/src/GNUmakefile
Index: pcp-5.3.7/src/libpcp_gui/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp_gui/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp_gui/src/GNUmakefile
@@ -54,7 +54,7 @@ include $(BUILDRULES)
install: default
@ -124,10 +124,10 @@ index b45028ca4..9099e4d1e 100644
endif
default_pcp: default
diff --git a/src/libpcp_import/src/GNUmakefile b/src/libpcp_import/src/GNUmakefile
index 0536ded93..b1bd3b3d7 100644
--- a/src/libpcp_import/src/GNUmakefile
+++ b/src/libpcp_import/src/GNUmakefile
Index: pcp-5.3.7/src/libpcp_import/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp_import/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp_import/src/GNUmakefile
@@ -54,7 +54,7 @@ include $(BUILDRULES)
install: default
@ -146,10 +146,10 @@ index 0536ded93..b1bd3b3d7 100644
endif
default_pcp: default
diff --git a/src/libpcp_mmv/src/GNUmakefile b/src/libpcp_mmv/src/GNUmakefile
index e0a0b4c5a..9481bf4f5 100644
--- a/src/libpcp_mmv/src/GNUmakefile
+++ b/src/libpcp_mmv/src/GNUmakefile
Index: pcp-5.3.7/src/libpcp_mmv/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp_mmv/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp_mmv/src/GNUmakefile
@@ -47,7 +47,7 @@ include $(BUILDRULES)
install: default
@ -168,10 +168,10 @@ index e0a0b4c5a..9481bf4f5 100644
endif
default_pcp: default
diff --git a/src/libpcp_pmcd/src/GNUmakefile b/src/libpcp_pmcd/src/GNUmakefile
index e550dde1a..d53c05565 100644
--- a/src/libpcp_pmcd/src/GNUmakefile
+++ b/src/libpcp_pmcd/src/GNUmakefile
Index: pcp-5.3.7/src/libpcp_pmcd/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp_pmcd/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp_pmcd/src/GNUmakefile
@@ -73,7 +73,7 @@ include $(BUILDRULES)
install : default
@ -181,10 +181,10 @@ index e550dde1a..d53c05565 100644
endif
ifeq "$(ENABLE_PROBES)" "true"
diff --git a/src/libpcp_pmda/src/GNUmakefile b/src/libpcp_pmda/src/GNUmakefile
index 021cec3f9..83042edcc 100644
--- a/src/libpcp_pmda/src/GNUmakefile
+++ b/src/libpcp_pmda/src/GNUmakefile
Index: pcp-5.3.7/src/libpcp_pmda/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp_pmda/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp_pmda/src/GNUmakefile
@@ -64,7 +64,7 @@ include $(BUILDRULES)
install: default
@ -203,10 +203,10 @@ index 021cec3f9..83042edcc 100644
endif
$(XFILES):
diff --git a/src/libpcp_trace/src/GNUmakefile b/src/libpcp_trace/src/GNUmakefile
index 10738d631..6f11d0660 100644
--- a/src/libpcp_trace/src/GNUmakefile
+++ b/src/libpcp_trace/src/GNUmakefile
Index: pcp-5.3.7/src/libpcp_trace/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp_trace/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp_trace/src/GNUmakefile
@@ -56,13 +56,13 @@ include $(BUILDRULES)
install : default
@ -223,20 +223,20 @@ index 10738d631..6f11d0660 100644
endif
default_pcp : default
diff --git a/src/libpcp_web/src/GNUmakefile b/src/libpcp_web/src/GNUmakefile
index 5eb0dc9ac..d675c12e9 100644
--- a/src/libpcp_web/src/GNUmakefile
+++ b/src/libpcp_web/src/GNUmakefile
@@ -84,7 +84,7 @@ endif
Index: pcp-5.3.7/src/libpcp_web/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/libpcp_web/src/GNUmakefile
+++ pcp-5.3.7/src/libpcp_web/src/GNUmakefile
@@ -107,7 +107,7 @@ endif
install: default
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/pmproxy_fixups.conf logrewrite.conf $(REWRITEDIR)/pmproxy_fixups.conf
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -92,7 +92,7 @@ ifneq ($(SYMTARGET),)
@@ -115,7 +115,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@ -245,10 +245,10 @@ index 5eb0dc9ac..d675c12e9 100644
endif
$(XFILES):
diff --git a/src/pmdas/cifs/GNUmakefile b/src/pmdas/cifs/GNUmakefile
index 27b154511..d1ab2c8d0 100644
--- a/src/pmdas/cifs/GNUmakefile
+++ b/src/pmdas/cifs/GNUmakefile
Index: pcp-5.3.7/src/pmdas/cifs/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/cifs/GNUmakefile
+++ pcp-5.3.7/src/pmdas/cifs/GNUmakefile
@@ -44,8 +44,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@ -260,25 +260,10 @@ index 27b154511..d1ab2c8d0 100644
@$(INSTALL_MAN)
else
build-me:
diff --git a/src/pmdas/dm/GNUmakefile b/src/pmdas/dm/GNUmakefile
index 1e8695c97..af915a971 100644
--- a/src/pmdas/dm/GNUmakefile
+++ b/src/pmdas/dm/GNUmakefile
@@ -56,8 +56,8 @@ install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(PMDAADMDIR)
- $(INSTALL) -m 644 -t $(PMDATMPDIR) root $(PMNSFILES) $(PMDAADMDIR)
- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PMDATMPDIR) root $(PMNSFILES) $(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
$(INSTALL) -m 644 -t $(PMIEVARDIR)/data_high_util dmthin.data_high_util.pmie $(PMIEDIR)/data_high_util
$(INSTALL) -m 644 -t $(PMIEVARDIR)/metadata_high_util dmthin.metadata_high_util.pmie $(PMIEDIR)/metadata_high_util
@$(INSTALL_MAN)
diff --git a/src/pmdas/docker/GNUmakefile b/src/pmdas/docker/GNUmakefile
index 3bca9ab6d..50350581d 100644
--- a/src/pmdas/docker/GNUmakefile
+++ b/src/pmdas/docker/GNUmakefile
Index: pcp-5.3.7/src/pmdas/docker/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/docker/GNUmakefile
+++ pcp-5.3.7/src/pmdas/docker/GNUmakefile
@@ -45,8 +45,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install_pcp install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@ -290,10 +275,10 @@ index 3bca9ab6d..50350581d 100644
@$(INSTALL_MAN)
else
build-me:
diff --git a/src/pmdas/hacluster/GNUmakefile b/src/pmdas/hacluster/GNUmakefile
index b9caf514a..2ec7577a9 100644
--- a/src/pmdas/hacluster/GNUmakefile
+++ b/src/pmdas/hacluster/GNUmakefile
Index: pcp-5.3.7/src/pmdas/hacluster/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/hacluster/GNUmakefile
+++ pcp-5.3.7/src/pmdas/hacluster/GNUmakefile
@@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@ -305,11 +290,11 @@ index b9caf514a..2ec7577a9 100644
@$(INSTALL_MAN)
else
build-me:
diff --git a/src/pmdas/jbd2/GNUmakefile b/src/pmdas/jbd2/GNUmakefile
index 9a313bc63..386000fff 100644
--- a/src/pmdas/jbd2/GNUmakefile
+++ b/src/pmdas/jbd2/GNUmakefile
@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(MYFILES)
Index: pcp-5.3.7/src/pmdas/jbd2/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/jbd2/GNUmakefile
+++ pcp-5.3.7/src/pmdas/jbd2/GNUmakefile
@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@ -320,11 +305,11 @@ index 9a313bc63..386000fff 100644
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_jbd2 root_jbd2 $(PCP_PMNSADM_DIR)/root_jbd2
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/jbd2_kernel_ulong.conf jbd2_kernel_ulong.conf $(REWRITEDIR)/jbd2_kernel_ulong.conf
@$(INSTALL_MAN)
diff --git a/src/pmdas/kvm/GNUmakefile b/src/pmdas/kvm/GNUmakefile
index c21b095ae..8ce3b2470 100644
--- a/src/pmdas/kvm/GNUmakefile
+++ b/src/pmdas/kvm/GNUmakefile
@@ -55,10 +55,10 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
Index: pcp-5.3.7/src/pmdas/kvm/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/kvm/GNUmakefile
+++ pcp-5.3.7/src/pmdas/kvm/GNUmakefile
@@ -55,10 +55,10 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@ -337,11 +322,11 @@ index c21b095ae..8ce3b2470 100644
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_kvm root_kvm $(PCP_PMNSADM_DIR)/root_kvm
@$(INSTALL_MAN)
else
diff --git a/src/pmdas/linux/GNUmakefile b/src/pmdas/linux/GNUmakefile
index c2efc5f7d..13195bbdf 100644
--- a/src/pmdas/linux/GNUmakefile
+++ b/src/pmdas/linux/GNUmakefile
@@ -89,11 +89,11 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(CONFTARGETS)
Index: pcp-5.3.7/src/pmdas/linux/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/linux/GNUmakefile
+++ pcp-5.3.7/src/pmdas/linux/GNUmakefile
@@ -89,11 +89,11 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@ -355,11 +340,11 @@ index c2efc5f7d..13195bbdf 100644
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_linux root_linux $(PCP_PMNSADM_DIR)/root_linux
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_fs_nfsd_fixups.conf proc_fs_nfsd_fixups.conf $(REWRITEDIR)/linux_proc_fs_nfsd_fixups.conf
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_net_snmp_migrate.conf proc_net_snmp_migrate.conf $(REWRITEDIR)/linux_proc_net_snmp_migrate.conf
diff --git a/src/pmdas/linux_proc/GNUmakefile b/src/pmdas/linux_proc/GNUmakefile
index 86f38857d..8e5746075 100644
--- a/src/pmdas/linux_proc/GNUmakefile
+++ b/src/pmdas/linux_proc/GNUmakefile
@@ -73,10 +73,10 @@ build-me: root_proc $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(LOGREWRITERS)
Index: pcp-5.3.7/src/pmdas/linux_proc/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/linux_proc/GNUmakefile
+++ pcp-5.3.7/src/pmdas/linux_proc/GNUmakefile
@@ -73,10 +73,10 @@ build-me: root_proc $(LIBTARGET) $(CMDTA
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@ -372,26 +357,11 @@ index 86f38857d..8e5746075 100644
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_proc root_proc $(PCP_PMNSADM_DIR)/root_proc
$(INSTALL) -m 644 -t $(REWRITEVARDIR) $(LOGREWRITERS) $(REWRITEDIR)
@$(INSTALL_MAN)
diff --git a/src/pmdas/linux_sockets/GNUmakefile b/src/pmdas/linux_sockets/GNUmakefile
index 34897f2e9..b69561693 100644
--- a/src/pmdas/linux_sockets/GNUmakefile
+++ b/src/pmdas/linux_sockets/GNUmakefile
@@ -49,8 +49,8 @@ build-me: $(LIBTARGET) $(CMDTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(PMNSFILES) $(PMDAADMDIR)
+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(PMNSFILES) $(LIBTARGET) $(PMDAADMDIR)
@$(INSTALL_MAN)
else
build-me:
diff --git a/src/pmdas/linux_xfs/GNUmakefile b/src/pmdas/linux_xfs/GNUmakefile
index e91b02b94..9b75677e3 100644
--- a/src/pmdas/linux_xfs/GNUmakefile
+++ b/src/pmdas/linux_xfs/GNUmakefile
@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
Index: pcp-5.3.7/src/pmdas/linux_xfs/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/linux_xfs/GNUmakefile
+++ pcp-5.3.7/src/pmdas/linux_xfs/GNUmakefile
@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@ -400,13 +370,13 @@ index e91b02b94..9b75677e3 100644
+ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_xfs $(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_xfs root_xfs $(PCP_PMNSADM_DIR)/root_xfs
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_xfs_migrate.conf linux_xfs_migrate.conf $(REWRITEDIR)/linux_xfs_migrate.conf
$(INSTALL) -m 644 -t $(REWRITEVARDIR) linux_xfs_migrate.conf linux_xfs_perdev_buffer.conf $(REWRITEDIR)
@$(INSTALL_MAN)
diff --git a/src/pmdas/linux_zfs/GNUmakefile b/src/pmdas/linux_zfs/GNUmakefile
index cf877efe3..ec04126dc 100644
--- a/src/pmdas/linux_zfs/GNUmakefile
+++ b/src/pmdas/linux_zfs/GNUmakefile
@@ -49,8 +49,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
Index: pcp-5.3.7/src/pmdas/linux_zfs/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/linux_zfs/GNUmakefile
+++ pcp-5.3.7/src/pmdas/linux_zfs/GNUmakefile
@@ -49,8 +49,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@ -417,10 +387,10 @@ index cf877efe3..ec04126dc 100644
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_zfs root_zfs $(PCP_PMNSADM_DIR)/root_zfs
@$(INSTALL_MAN)
else
diff --git a/src/pmdas/nvidia/GNUmakefile b/src/pmdas/nvidia/GNUmakefile
index 2a1fa6a90..b02d431ea 100644
--- a/src/pmdas/nvidia/GNUmakefile
+++ b/src/pmdas/nvidia/GNUmakefile
Index: pcp-5.3.7/src/pmdas/nvidia/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/nvidia/GNUmakefile
+++ pcp-5.3.7/src/pmdas/nvidia/GNUmakefile
@@ -37,9 +37,8 @@ include $(BUILDRULES)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@ -433,10 +403,10 @@ index 2a1fa6a90..b02d431ea 100644
$(OBJECTS): domain.h
diff --git a/src/pmdas/pmcd/src/GNUmakefile b/src/pmdas/pmcd/src/GNUmakefile
index c128d6d59..63fdd07e0 100644
--- a/src/pmdas/pmcd/src/GNUmakefile
+++ b/src/pmdas/pmcd/src/GNUmakefile
Index: pcp-5.3.7/src/pmdas/pmcd/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/pmcd/src/GNUmakefile
+++ pcp-5.3.7/src/pmdas/pmcd/src/GNUmakefile
@@ -59,7 +59,7 @@ default: $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@ -446,11 +416,11 @@ index c128d6d59..63fdd07e0 100644
include $(BUILDRULES)
diff --git a/src/pmdas/podman/GNUmakefile b/src/pmdas/podman/GNUmakefile
index 0d28a67bf..a5f921ed1 100644
--- a/src/pmdas/podman/GNUmakefile
+++ b/src/pmdas/podman/GNUmakefile
@@ -48,8 +48,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS)
Index: pcp-5.3.7/src/pmdas/podman/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/podman/GNUmakefile
+++ pcp-5.3.7/src/pmdas/podman/GNUmakefile
@@ -54,8 +54,8 @@ build-me: $(JSONSL_XFILES) $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@ -461,40 +431,10 @@ index 0d28a67bf..a5f921ed1 100644
$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_podman root_podman $(PCP_PMNSADM_DIR)/root_podman
@$(INSTALL_MAN)
else
diff --git a/src/pmdas/rpm/GNUmakefile b/src/pmdas/rpm/GNUmakefile
index 86bffd2ca..72459250e 100644
--- a/src/pmdas/rpm/GNUmakefile
+++ b/src/pmdas/rpm/GNUmakefile
@@ -51,8 +51,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install_pcp install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
- $(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(PMDAADMDIR)
- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(LIBTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
$(INSTALL) -m 644 -t $(REWRITEVARDIR)/rpm_migrate.conf migrate.conf $(REWRITEDIR)/rpm_migrate.conf
@$(INSTALL_MAN)
else
diff --git a/src/pmdas/sendmail/GNUmakefile b/src/pmdas/sendmail/GNUmakefile
index cd2da09cb..57c0555ce 100644
--- a/src/pmdas/sendmail/GNUmakefile
+++ b/src/pmdas/sendmail/GNUmakefile
@@ -44,8 +44,8 @@ install install_pcp: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
$(INSTALL) -m 755 -t $(PMDATMPDIR)/pmda$(IAM)$(EXECSUFFIX) $(CMDTARGET) $(PMDAADMDIR)/pmda$(IAM)$(EXECSUFFIX)
- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(SCRIPTS) $(PMDAADMDIR)
- $(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) pmns help root domain.h $(PMDAADMDIR)
+ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(SCRIPTS) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) pmns help root domain.h $(LIBTARGET) $(PMDAADMDIR)
$(INSTALL) -m 644 -t $(PMCHARTVARDIR)/Sendmail Sendmail.pmchart $(PMCHARTDIR)/Sendmail
$(CMDTARGET): $(OBJECTS)
diff --git a/src/pmdas/smart/GNUmakefile b/src/pmdas/smart/GNUmakefile
index a852cc4ac..26dd4c8f9 100644
--- a/src/pmdas/smart/GNUmakefile
+++ b/src/pmdas/smart/GNUmakefile
Index: pcp-5.3.7/src/pmdas/smart/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/smart/GNUmakefile
+++ pcp-5.3.7/src/pmdas/smart/GNUmakefile
@@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
@ -506,11 +446,11 @@ index a852cc4ac..26dd4c8f9 100644
@$(INSTALL_MAN)
else
build-me:
diff --git a/src/pmdas/statsd/src/GNUmakefile b/src/pmdas/statsd/src/GNUmakefile
index 1567fe273..1dbcd4700 100644
--- a/src/pmdas/statsd/src/GNUmakefile
+++ b/src/pmdas/statsd/src/GNUmakefile
@@ -68,8 +68,8 @@ build-me: $(RAGELTARGET).o $(CMDTARGET) $(LIBTARGET)
Index: pcp-5.3.7/src/pmdas/statsd/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/pmdas/statsd/src/GNUmakefile
+++ pcp-5.3.7/src/pmdas/statsd/src/GNUmakefile
@@ -68,8 +68,8 @@ build-me: $(RAGELTARGET).o $(CMDTARGET)
install: default
$(INSTALL) -m 755 -d $(PMDAADMDIR)
$(INSTALL) -m 755 -d $(PMDATMPDIR)
@ -521,10 +461,10 @@ index 1567fe273..1dbcd4700 100644
CFILES += $(RFILES)
diff --git a/src/zabbix-agent/src/GNUmakefile b/src/zabbix-agent/src/GNUmakefile
index 25c630197..fb41d303b 100644
--- a/src/zabbix-agent/src/GNUmakefile
+++ b/src/zabbix-agent/src/GNUmakefile
Index: pcp-5.3.7/src/zabbix-agent/src/GNUmakefile
===================================================================
--- pcp-5.3.7.orig/src/zabbix-agent/src/GNUmakefile
+++ pcp-5.3.7/src/zabbix-agent/src/GNUmakefile
@@ -43,7 +43,7 @@ install: default
$(INSTALL) -m 755 -d $(ZABBIX_DIR)
$(INSTALL) -m 755 -d $(MODULE_DIR)
@ -534,6 +474,3 @@ index 25c630197..fb41d303b 100644
$(INSTALL) -S $(AGENT_DIR)/$(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET)
$(INSTALL) -m 755 -d $(CONFIG_DIR)
$(INSTALL) -m 644 $(LIBCONFIG) $(CONFIG_DIR)/$(LIBCONFIG)
--
2.35.3

View File

@ -1,29 +0,0 @@
From 41afafe153da87753aa91d5669c2ddbd0b720afb Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Mon, 16 May 2022 17:50:09 +0200
Subject: [PATCH] build: remove rundir install
Signed-off-by: David Disseldorp <ddiss@suse.de>
---
GNUmakefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 8b866eb77..0a67e9d27 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -80,9 +80,9 @@ ifneq ($(TARGET_OS),mingw)
$(INSTALL) -m 1777 -d $(PCP_TMPFILE_DIR)
endif
$(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR)
-ifeq "$(findstring $(PACKAGE_DISTRIBUTION), debian)" ""
+ifeq (, $(filter debian suse, $(PACKAGE_DISTRIBUTION)))
# PCP_RUN_DIR usually -> /var/run which may be a temporary filesystem
- # and Debian's lintian complains about packages including /var/run/xxx
+ # and lint checks may complain about packages including /var/run/xxx
# artifacts ... PCP_RUN_DIR is also conditionally created on the
# fly in each before use case, so the inclusion in the package is
# sometimes desirable, but not mandatory
--
2.35.3

View File

@ -44,73 +44,13 @@ References: bsc#1186511
src/pmlogger/pmlogger_daily_report.service.in | 4 ++--
14 files changed, 54 insertions(+), 16 deletions(-)
diff --git a/configure b/configure
index cc44637a5..51bd43fe9 100755
--- a/configure
+++ b/configure
@@ -882,6 +882,7 @@ PACKAGE_BUILD
PACKAGE_REVISION
PACKAGE_MINOR
PACKAGE_MAJOR
+sd_service_type
enable_systemd
pcp_systemdunit_dir
SYSTEMD_SYSTEMUNITDIR
@@ -5933,9 +5934,21 @@ fi
done
$have_sd_daemon || echo WARNING: using systemd, but header systemd/sd-daemon.h not installed
+
+fi
+
+sd_service_type="simple"
+if $enable_systemd
+then
+ systemd_version=`systemd-analyze --version | $AWK '/^systemd/ {print $2}'`
+ if test "$systemd_version" -ge 239
+ then
+ sd_service_type="exec"
+ fi
fi
+
. ./VERSION.pcp
PACKAGE_VERSION=${PACKAGE_MAJOR}.${PACKAGE_MINOR}.${PACKAGE_REVISION}
diff --git a/configure.ac b/configure.ac
index 9e1c04c8b..ea5967a77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -789,7 +789,21 @@ then
dnl is being used
AC_CHECK_HEADERS([systemd/sd-daemon.h], [have_sd_daemon=true], [have_sd_daemon=false])
$have_sd_daemon || echo WARNING: using systemd, but header systemd/sd-daemon.h not installed
+
+fi
+
+sd_service_type="simple"
+if $enable_systemd
+then
+ dnl if systemd version is 239 or newer, use type=exec for logutil scripts
+ dnl else fallback to type=simple (e.g. on centos7 and some other platforms)
+ systemd_version=`systemd-analyze --version | $AWK '/^systemd/ {print $2}'`
+ if test "$systemd_version" -ge 239
+ then
+ sd_service_type="exec"
+ fi
fi
+AC_SUBST(sd_service_type)
dnl NB: No AC_PREFIX_DEFAULT is needed, as the default configure invocation
dnl targets a build for non-system directories such as /usr/local.
diff --git a/src/include/builddefs.in b/src/include/builddefs.in
index 02ecb4142..c5bc2d955 100644
--- a/src/include/builddefs.in
+++ b/src/include/builddefs.in
@@ -918,6 +918,9 @@ PCP_GROUP = @pcp_group@
PCP_USER_INSTALL = @pcp_user_install@
PCP_GROUP_INSTALL = @pcp_group_install@
Index: pcp-5.3.7/src/include/builddefs.in
===================================================================
--- pcp-5.3.7.orig/src/include/builddefs.in
+++ pcp-5.3.7/src/include/builddefs.in
@@ -944,6 +944,9 @@ PCP_GROUP_INSTALL = @pcp_group_install@
# systemd service type for logutil scripts
SD_SERVICE_TYPE=@sd_service_type@
+# systemd service type for logutil scripts
+SD_SERVICE_TYPE=@sd_service_type@
@ -118,202 +58,3 @@ index 02ecb4142..c5bc2d955 100644
PCPLIB = -lpcp
PCPLIB_EXTRAS = $(LIB_FOR_MATH) $(LIB_FOR_PTHREADS) $(LIB_FOR_DLOPEN) $(LIB_FOR_RT)
ifneq "$(PCPLIB)" "$(LIB_FOR_BASENAME)"
diff --git a/src/pmfind/GNUmakefile b/src/pmfind/GNUmakefile
index 7271b4869..d23e894c6 100644
--- a/src/pmfind/GNUmakefile
+++ b/src/pmfind/GNUmakefile
@@ -65,6 +65,7 @@ pmfind.service : pmfind.service.in
-e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \
-e 's;@PCP_BINADM_DIR@;'$(PCP_BINADM_DIR)';' \
-e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
# END
crontab: crontab.in
diff --git a/src/pmfind/pmfind.service.in b/src/pmfind/pmfind.service.in
index 8ecd4fea6..2eb7eeafc 100644
--- a/src/pmfind/pmfind.service.in
+++ b/src/pmfind/pmfind.service.in
@@ -6,8 +6,8 @@ After=pmie_check.timer pmlogger_check.timer
BindsTo=pmfind.timer
[Service]
-Type=oneshot
-KillMode=none
+Type=@SD_SERVICE_TYPE@
+Restart=no
TimeoutSec=60
Environment="PMFIND_CHECK_PARAMS=-C -q"
EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmfind
diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile
index cd1d36e1d..cf381b444 100644
--- a/src/pmie/GNUmakefile
+++ b/src/pmie/GNUmakefile
@@ -82,6 +82,7 @@ pmie_check.service : pmie_check.service.in
-e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \
-e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
# END
pmie_daily.service : pmie_daily.service.in
@@ -92,6 +93,7 @@ pmie_daily.service : pmie_daily.service.in
-e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \
-e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
# END
crontab: crontab.in
diff --git a/src/pmie/pmie_check.service.in b/src/pmie/pmie_check.service.in
index 00b55408a..29418df23 100644
--- a/src/pmie/pmie_check.service.in
+++ b/src/pmie/pmie_check.service.in
@@ -5,8 +5,8 @@ ConditionPathExists=!@CRONTAB_PATH@
PartOf=pmie.service
[Service]
-Type=oneshot
-KillMode=none
+Type=@SD_SERVICE_TYPE@
+Restart=no
TimeoutStartSec=25m
Environment="PMIE_CHECK_PARAMS=-C"
EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmie_timers
diff --git a/src/pmie/pmie_daily.service.in b/src/pmie/pmie_daily.service.in
index fc52fd792..e93446ce8 100644
--- a/src/pmie/pmie_daily.service.in
+++ b/src/pmie/pmie_daily.service.in
@@ -4,8 +4,8 @@ Documentation=man:pmie_daily(1)
ConditionPathExists=!@CRONTAB_PATH@
[Service]
-Type=oneshot
-KillMode=none
+Type=@SD_SERVICE_TYPE@
+Restart=no
Environment="PMIE_DAILY_PARAMS=-X xz -x 3"
EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmie_timers
ExecStart=@PCP_BINADM_DIR@/pmie_daily $PMIE_DAILY_PARAMS
diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile
index 92694f430..931d64fdf 100644
--- a/src/pmlogger/GNUmakefile
+++ b/src/pmlogger/GNUmakefile
@@ -101,6 +101,7 @@ pmlogger_daily.service : pmlogger_daily.service.in
-e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \
-e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
# END
pmlogger_daily-poll.service : pmlogger_daily-poll.service.in
@@ -111,6 +112,7 @@ pmlogger_daily-poll.service : pmlogger_daily-poll.service.in
-e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \
-e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
# END
pmlogger_check.service : pmlogger_check.service.in
@@ -121,6 +123,7 @@ pmlogger_check.service : pmlogger_check.service.in
-e 's;@PCP_VAR_DIR@;'$(PCP_VAR_DIR)';' \
-e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \
-e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
# END
pmlogger_daily_report.service : pmlogger_daily_report.service.in
@@ -132,6 +135,7 @@ pmlogger_daily_report.service : pmlogger_daily_report.service.in
-e 's;@PCP_SA_DIR@;'$(PCP_SA_DIR)';' \
-e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \
-e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
# END
pmlogger_daily_report-poll.service : pmlogger_daily_report-poll.service.in
@@ -143,6 +147,7 @@ pmlogger_daily_report-poll.service : pmlogger_daily_report-poll.service.in
-e 's;@PCP_SA_DIR@;'$(PCP_SA_DIR)';' \
-e 's;@PCP_GROUP@;'$(PCP_GROUP)';' \
-e 's;@PCP_USER@;'$(PCP_USER)';' \
+ -e 's;@SD_SERVICE_TYPE@;'$(SD_SERVICE_TYPE)';' \
# END
crontab : crontab.in
diff --git a/src/pmlogger/pmlogger_check.service.in b/src/pmlogger/pmlogger_check.service.in
index fe0f347e1..ddcee72a5 100644
--- a/src/pmlogger/pmlogger_check.service.in
+++ b/src/pmlogger/pmlogger_check.service.in
@@ -4,8 +4,8 @@ Documentation=man:pmlogger_check(1)
ConditionPathExists=!@CRONTAB_PATH@
[Service]
-Type=oneshot
-KillMode=none
+Type=@SD_SERVICE_TYPE@
+Restart=no
TimeoutStartSec=25m
Environment="PMLOGGER_CHECK_PARAMS=-C --skip-primary"
EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers
diff --git a/src/pmlogger/pmlogger_daily-poll.service.in b/src/pmlogger/pmlogger_daily-poll.service.in
index 69c1738f8..29c4e62c0 100644
--- a/src/pmlogger/pmlogger_daily-poll.service.in
+++ b/src/pmlogger/pmlogger_daily-poll.service.in
@@ -4,8 +4,8 @@ Documentation=man:pmlogger_daily(1)
ConditionPathExists=!@CRONTAB_PATH@
[Service]
-Type=oneshot
-KillMode=none
+Type=@SD_SERVICE_TYPE@
+Restart=no
Environment="PMLOGGER_DAILY_POLL_PARAMS=-p"
EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers
ExecStart=@PCP_BINADM_DIR@/pmlogger_daily $PMLOGGER_DAILY_POLL_PARAMS
diff --git a/src/pmlogger/pmlogger_daily.service.in b/src/pmlogger/pmlogger_daily.service.in
index 44b79e6a5..8a07f5caa 100644
--- a/src/pmlogger/pmlogger_daily.service.in
+++ b/src/pmlogger/pmlogger_daily.service.in
@@ -4,8 +4,8 @@ Documentation=man:pmlogger_daily(1)
ConditionPathExists=!@CRONTAB_PATH@
[Service]
-Type=oneshot
-KillMode=none
+Type=@SD_SERVICE_TYPE@
+Restart=no
TimeoutStartSec=1h
Environment="PMLOGGER_DAILY_PARAMS=-E"
EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers
diff --git a/src/pmlogger/pmlogger_daily_report-poll.service.in b/src/pmlogger/pmlogger_daily_report-poll.service.in
index 67a986ff2..2b186648e 100644
--- a/src/pmlogger/pmlogger_daily_report-poll.service.in
+++ b/src/pmlogger/pmlogger_daily_report-poll.service.in
@@ -4,8 +4,8 @@ Documentation=man:pmlogger_daily_report(1)
ConditionPathExists=!@CRONTAB_DAILY_REPORT_PATH@
[Service]
-Type=oneshot
-KillMode=none
+Type=@SD_SERVICE_TYPE@
+Restart=no
Environment="PMLOGGER_DAILY_REPORT_POLL_PARAMS=-o @PCP_SA_DIR@ -p"
EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers
ExecStart=@PCP_BINADM_DIR@/pmlogger_daily_report $PMLOGGER_DAILY_REPORT_POLL_PARAMS
diff --git a/src/pmlogger/pmlogger_daily_report.service.in b/src/pmlogger/pmlogger_daily_report.service.in
index d09489882..5937e129a 100644
--- a/src/pmlogger/pmlogger_daily_report.service.in
+++ b/src/pmlogger/pmlogger_daily_report.service.in
@@ -4,8 +4,8 @@ Documentation=man:pmlogger_daily_report(1)
ConditionPathExists=!@CRONTAB_DAILY_REPORT_PATH@
[Service]
-Type=oneshot
-KillMode=none
+Type=@SD_SERVICE_TYPE@
+Restart=no
TimeoutSec=120
Environment="PMLOGGER_DAILY_REPORT_PARAMS=-o @PCP_SA_DIR@"
EnvironmentFile=-@PCP_SYSCONFIG_DIR@/pmlogger_timers
--
2.35.3

View File

@ -1,43 +0,0 @@
From de7cd4d7f6d8525d781f3a9dba3b0b5b654e6272 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Mon, 22 Feb 2021 11:32:05 +1100
Subject: [PATCH] Revert "systemd: remove Wants=pmcd from pmlogger and pmie"
This reverts commit e01ab96c813fa31e685ac864031d145f63162088
(for now).
Resolves Red Hat BZs 1929556 and 1930284.
(cherry picked from commit 30ee6b4d6b00b745cb8e44ee6c9ea0a9377398c6)
---
src/pmie/pmie.service.in | 1 +
src/pmlogger/pmlogger.service.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/pmie/pmie.service.in b/src/pmie/pmie.service.in
index 75696de40..d234c8a5e 100644
--- a/src/pmie/pmie.service.in
+++ b/src/pmie/pmie.service.in
@@ -4,6 +4,7 @@ Documentation=man:pmie(1)
After=network-online.target pmcd.service
Before=pmie_check.timer pmie_daily.timer
BindsTo=pmie_check.timer pmie_daily.timer
+Wants=pmcd.service
[Service]
Type=notify
diff --git a/src/pmlogger/pmlogger.service.in b/src/pmlogger/pmlogger.service.in
index f5f374e53..b6273d1a0 100644
--- a/src/pmlogger/pmlogger.service.in
+++ b/src/pmlogger/pmlogger.service.in
@@ -4,6 +4,7 @@ Documentation=man:pmlogger(1)
After=network-online.target pmcd.service
Before=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
BindsTo=pmlogger_check.timer pmlogger_daily.timer pmlogger_daily-poll.timer
+Wants=pmcd.service
[Service]
Type=notify
--
2.35.3

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5f32267da03267ae42d18a2dad9420ebc453af5c459daeb8e4e3323d54efa3a1
size 34371458

BIN
pcp-5.3.7.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -1,3 +1,67 @@
-------------------------------------------------------------------
Tue Nov 28 00:33:12 UTC 2023 - Martin Schreiner <martin.schreiner@suse.com>
- This version *does not* break API or ABI compatibility with the
previous 5.2.5 release.
- Remove 0009-remove-rundir-install.patch. Obsoleted.
- Remove 0011-Revert-systemd-remove-Wants-pmcd-from-pmlogger-and-p.patch.
Obsoleted.
- Various minor changes/improvements to the RPM spec file.
- Upgrade to 5.3.7. This is the latest release in the 5.X series.
Changes from 5.3.7:
- Client tools and utilities:
pcp2elasticsearch: implement authentication support
pcp-ss: fixed incorrect client-side filtering
pcp-ss: fixed reporting of IPv6 sockets in LISTEN state
pmrep: 'iostat-multipath-wwid' for multipath disk monitoring
- PMDA additions, enhancements and bug fixes:
pmdalinux: add disk.wwid.* aggregated multipath metrics
pmdalinux: add new MPTCP metrics from latest Linux kernel versions
pmdalinux: fix up TTY metrics on s390x platform
pmdalinux: add network.tcp.tcploss metric
pmdamssql: fix config file logic, python string handling
pmdadenki: fix crash in labels callback with multiple instances
pmdasockets: changed default filter in sockets PMDA to "state all"
- Server-side utilities and log management scripts:
pmlogconf: correctly handle metric state transitions on (re-)probe
pmie systemd: add missing systemd configuration and shell code
- libpcp, libpcp_pmda, libpcp_mmv, libpcp_web and language bindings:
libpcp_web: resolve a number of small memory leaks
- Security Enhanced Linux:
selinux: use interface calls instead of a simple rule
selinux: add several more obscure missing selinux rules
selinux: additional debugfs policy requirement for pmdakvm
selinux: resolve an AVC observed on el8 with pmdashping
- Misc build, infrastructure and packaging updates:
rpms: switch to conditional selinux dependency for containers
debs: reproducible build updates
- Documentation and QA infrastructure:
docs: add section to pcpcompat(1) about python2
docs: update notes about sar2pcp, iostat2pcp in pcpcompat(1)
docs: improve pmproxy --timeseries and pmseries --load documentation
CI: disable cppcheck for pcp-atop temporarily due to a cppcheck bug
Changes from 5.3.6:
https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L468
Changes from 5.3.5:
https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L497
Changes from 5.3.4:
https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L557
Changes from 5.3.3:
https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L606
Changes from 5.3.2:
https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L665
Changes from 5.3.1:
https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L753
Changes from 5.3.0:
https://github.com/performancecopilot/pcp/blob/f3fdd468d09c6e1158433210380a40389516a971/CHANGELOG#L854
-------------------------------------------------------------------
Fri Nov 17 15:55:08 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

400
pcp.spec

File diff suppressed because it is too large Load Diff