Sync from SUSE:SLFO:Main pcp revision 41e8a992e9b9204f32cc5682ab9a14f3

.gitattributes

@@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text

0001-Install-libraries-without-exec-permission.patch

@@ -0,0 +1,476 @@
+From 1c78e9cae055e914a846a54a6a12acfc7525d64e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
+Date: Mon, 16 May 2022 17:31:55 +0200
+Subject: [PATCH] build: install libraries without exec permission
+
+Signed-off-by: David Disseldorp <ddiss@suse.de>
+---
+ src/genpmda/genpmda                 | 4 ++--
+ src/libpcp/src/GNUmakefile          | 4 ++--
+ src/libpcp_fault/src/GNUmakefile    | 4 ++--
+ src/libpcp_gui/src/GNUmakefile      | 4 ++--
+ src/libpcp_import/src/GNUmakefile   | 4 ++--
+ src/libpcp_mmv/src/GNUmakefile      | 4 ++--
+ src/libpcp_pmcd/src/GNUmakefile     | 2 +-
+ src/libpcp_pmda/src/GNUmakefile     | 4 ++--
+ src/libpcp_trace/src/GNUmakefile    | 4 ++--
+ src/libpcp_web/src/GNUmakefile      | 4 ++--
+ src/pmdas/cifs/GNUmakefile          | 4 ++--
+ src/pmdas/dm/GNUmakefile            | 4 ++--
+ src/pmdas/docker/GNUmakefile        | 4 ++--
+ src/pmdas/hacluster/GNUmakefile     | 4 ++--
+ src/pmdas/jbd2/GNUmakefile          | 4 ++--
+ src/pmdas/kvm/GNUmakefile           | 4 ++--
+ src/pmdas/linux/GNUmakefile         | 4 ++--
+ src/pmdas/linux_proc/GNUmakefile    | 4 ++--
+ src/pmdas/linux_sockets/GNUmakefile | 4 ++--
+ src/pmdas/linux_xfs/GNUmakefile     | 4 ++--
+ src/pmdas/linux_zfs/GNUmakefile     | 4 ++--
+ src/pmdas/nvidia/GNUmakefile        | 5 ++---
+ src/pmdas/pmcd/src/GNUmakefile      | 2 +-
+ src/pmdas/podman/GNUmakefile        | 4 ++--
+ src/pmdas/rpm/GNUmakefile           | 4 ++--
+ src/pmdas/sendmail/GNUmakefile      | 4 ++--
+ src/pmdas/smart/GNUmakefile         | 4 ++--
+ src/pmdas/statsd/src/GNUmakefile    | 4 ++--
+ src/zabbix-agent/src/GNUmakefile    | 2 +-
+ 29 files changed, 55 insertions(+), 56 deletions(-)
+
+Index: pcp-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)
+ 	\$(INSTALL) -m 755 \$(CMDTARGET) \$(PMDADIR)/\$(CMDTARGET)
+-	\$(INSTALL) -m 755 \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
++	\$(INSTALL) -m 644 \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
+ 	\$(INSTALL) -m 755 $oflag/Install \$(PMDADIR)/Install
+ 	\$(INSTALL) -m 755 $oflag/Remove \$(PMDADIR)/Remove
+ 	\$(INSTALL) -m 644 $oflag/Makefile.install \$(PMDADIR)/Makefile
+@@ -962,7 +962,7 @@ install: default
+ 	\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
+ 	\$(INSTALL) -m 755 -d \$(PMDADIR)
+ 	\$(INSTALL) -m 755 -f \$(CMDTARGET) \$(PMDADIR)/\$(CMDTARGET)
+-	\$(INSTALL) -m 755 -f \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
++	\$(INSTALL) -m 644 -f \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
+ 	\$(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
+===================================================================
+--- 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),)
+-	$(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
++	$(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ 	$(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG)
+ endif
+ ifneq ($(SYMTARGET),)
+@@ -147,7 +147,7 @@ ifneq ($(SYMTARGET),)
+ 	done
+ endif
+ ifneq ($(STATICLIBTARGET),)
+-	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
++	$(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ 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),)
+-	$(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
++	$(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ endif
+ ifneq ($(SYMTARGET),)
+ 	for tt in $(SYMTARGET); do \
+@@ -163,7 +163,7 @@ ifneq ($(SYMTARGET),)
+ 	done
+ endif
+ ifneq ($(STATICLIBTARGET),)
+-	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
++	$(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ 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
+===================================================================
+--- 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
+ 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 \
+@@ -62,7 +62,7 @@ ifneq ($(SYMTARGET),)
+ 	done
+ endif
+ ifneq ($(STATICLIBTARGET),)
+-	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
++	$(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ endif
+ 
+ default_pcp:	default
+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
+ ifneq ($(LIBTARGET),)
+-	$(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
++	$(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ 	$(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG)
+ endif
+ ifneq ($(SYMTARGET),)
+@@ -63,7 +63,7 @@ ifneq ($(SYMTARGET),)
+ 	done
+ endif
+ ifneq ($(STATICLIBTARGET),)
+-	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
++	$(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ endif
+ 
+ default_pcp: default
+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
+ 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 \
+@@ -55,7 +55,7 @@ ifneq ($(SYMTARGET),)
+ 	done
+ endif
+ ifneq ($(STATICLIBTARGET),)
+-	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
++	$(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ endif
+ 
+ default_pcp: default
+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
+ ifeq "$(TARGET_OS)" "mingw"
+-	$(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
++	$(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ endif
+ 
+ ifeq "$(ENABLE_PROBES)" "true"
+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
+ ifneq ($(LIBTARGET),)
+-	$(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
++	$(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ 	$(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG)
+ endif
+ ifneq ($(SYMTARGET),)
+@@ -73,7 +73,7 @@ ifneq ($(SYMTARGET),)
+ 	done
+ endif
+ ifneq ($(STATICLIBTARGET),)
+-	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
++	$(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ endif
+ 
+ $(XFILES):
+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
+ ifneq ($(LIBTARGET),)
+-	$(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
++	$(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ endif
+ ifneq ($(SYMTARGET),)
+ 	$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(SYMTARGET)
+ endif
+ ifneq ($(STATICLIBTARGET),)
+-	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
++	$(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ endif
+ 
+ default_pcp : default
+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 \
+@@ -115,7 +115,7 @@ ifneq ($(SYMTARGET),)
+ 	done
+ endif
+ ifneq ($(STATICLIBTARGET),)
+-	$(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
++	$(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ endif
+ 
+ $(XFILES):
+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)
+ 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(PMDAADMDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) Install Remove $(CMDTARGET) $(LIBTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(LIBTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR) Install Remove $(CMDTARGET) $(PMDAADMDIR)
+ 	@$(INSTALL_MAN)
+ else
+ build-me:
+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)
+ 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) Install Remove $(CMDTARGET) $(LIBTARGET) $(PMDAADMDIR)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h $(DFILES) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR) Install Remove $(CMDTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h $(DFILES) $(LIBTARGET) $(PMDAADMDIR)
+ 	@$(INSTALL_MAN)
+ else
+ build-me:
+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)
+ 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(PMDAADMDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(LIBTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ 	@$(INSTALL_MAN)
+ else
+ build-me:
+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)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS) root root_jbd2 $(PMDAADMDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS) root root_jbd2 $(LIBTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ 	$(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
+===================================================================
+--- 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)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_kvm $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_kvm $(LIBTARGET) $(PMDAADMDIR)
+ 	$(INSTALL) -m 755 -d $(PMDACONFIG)
+ 	$(INSTALL) -m 644 -t $(PMDATMPDIR)/kvm.conf kvm.conf $(PMDACONFIG)/kvm.conf
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ 	$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_kvm root_kvm $(PCP_PMNSADM_DIR)/root_kvm
+ 	@$(INSTALL_MAN)
+ else
+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)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS) $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS) $(LIBTARGET) $(PMDAADMDIR)
+ 	$(INSTALL) -m 755 -d $(PMDACONFIG)
+ 	$(INSTALL) -m 644 interfaces.conf $(PMDACONFIG)/interfaces.conf
+ 	$(INSTALL) -m 644 -t $(PMDATMPDIR)/samplebandwidth.conf bandwidth.conf $(PMDACONFIG)/samplebandwidth.conf
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR)/$(CMDTARGET) $(CMDTARGET) $(PMDAADMDIR)/$(CMDTARGET)
+ 	$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_linux root_linux $(PCP_PMNSADM_DIR)/root_linux
+ 	$(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_fs_nfsd_fixups.conf proc_fs_nfsd_fixups.conf $(REWRITEDIR)/linux_proc_fs_nfsd_fixups.conf
+ 	$(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_net_snmp_migrate.conf proc_net_snmp_migrate.conf $(REWRITEDIR)/linux_proc_net_snmp_migrate.conf
+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)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_proc $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_proc $(LIBTARGET) $(PMDAADMDIR)
+ 	$(INSTALL) -m 755 -d $(PMDACONFIG)
+ 	$(INSTALL) -m 644 -t $(PMDATMPDIR)/samplehotproc.conf samplehotproc.conf $(PMDACONFIG)/samplehotproc.conf
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ 	$(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_proc root_proc $(PCP_PMNSADM_DIR)/root_proc
+ 	$(INSTALL) -m 644 -t $(REWRITEVARDIR) $(LOGREWRITERS) $(REWRITEDIR)
+ 	@$(INSTALL_MAN)
+Index: pcp-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)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root root_xfs $(PMDAADMDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
++	$(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_perdev_buffer.conf $(REWRITEDIR)
+ 	@$(INSTALL_MAN)
+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)
+-	$(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
+@@ -37,9 +37,8 @@ include $(BUILDRULES)
+ install:	default
+ 	$(INSTALL) -m 755 -d $(PMDAADMDIR)
+ 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) Install Remove $(PMDAADMDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(PMDAADMDIR)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) root help pmns domain.h $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) Install Remove $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) root help pmns domain.h $(LIBTARGET) $(PMDAADMDIR)
+ 
+ $(OBJECTS): domain.h
+ 
+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)
+ 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR)/$(LIBTARGET) $(LIBTARGET) $(PMDAADMDIR)/$(LIBTARGET)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR)/$(LIBTARGET) $(LIBTARGET) $(PMDAADMDIR)/$(LIBTARGET)
+ 
+ include $(BUILDRULES)
+ 
+Index: pcp-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)
+-	$(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
+@@ -48,8 +48,8 @@ build-me: $(CMDTARGET) $(LIBTARGET)
+ install: default
+ 	$(INSTALL) -m 755 -d $(PMDAADMDIR)
+ 	$(INSTALL) -m 755 -d $(PMDATMPDIR)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(PMDAADMDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) root pmns domain.h help $(LIBTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ 	@$(INSTALL_MAN)
+ else
+ build-me:
+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)
+-	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h root_statsd $(PMDAADMDIR)
+-	$(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h root_statsd $(LIBTARGET) $(PMDAADMDIR)
++	$(INSTALL) -m 755 -t $(PMDATMPDIR)/$(CMDTARGET) $(CMDTARGET) $(PMDAADMDIR)/$(CMDTARGET)
+ 
+ CFILES += $(RFILES)
+ 
+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)
+ 	$(INSTALL) -m 755 -d $(AGENT_DIR)
+-	$(INSTALL) -m 755 $(LIBTARGET) $(AGENT_DIR)/$(LIBTARGET)
++	$(INSTALL) -m 644 $(LIBTARGET) $(AGENT_DIR)/$(LIBTARGET)
+ 	$(INSTALL) -S $(AGENT_DIR)/$(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET)
+ 	$(INSTALL) -m 755 -d $(CONFIG_DIR)
+ 	$(INSTALL) -m 644 $(LIBCONFIG) $(CONFIG_DIR)/$(LIBCONFIG)

0002-Remove-CPAN-rpaths.patch

@@ -0,0 +1,54 @@
+From cc6ffae33eef2fd1b595dfda72defed17aae89c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
+Date: Mon, 16 May 2022 17:32:55 +0200
+Subject: [PATCH] build: remove CPAN rpaths
+
+Acked-by: David Disseldorp <ddiss@suse.de>
+---
+ src/perl/LogImport/Makefile.PL | 2 +-
+ src/perl/MMV/Makefile.PL       | 2 +-
+ 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
+@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
+ else {
+     $ldfrom = "LogImport.o",
+     $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
+-    $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp/src -L$ENV{PCP_TOPDIR}/src/libpcp_import/src -lpcp_import -lpcp"];
++    $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
+@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
+ else {
+     $ldfrom = "MMV.o";
+     $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
+-    $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_mmv/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_mmv -lpcp"];
++    $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
+@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
+ else {
+     $ldfrom = "local.o PMDA.o";
+     $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
+-    $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_pmda/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_pmda -lpcp"];
++    $libs = ["-lpcp_pmda -lpcp"];
+ }
+ if ($ENV{TARGET_OS} eq "darwin") {
+     # standard ones, minus -arch ppc
+-- 
+2.35.3
+

0003-Remove-runlevel-4-from-init-scripts.patch

@@ -0,0 +1,92 @@
+From e94401a3f0f6c68f695f0b4a6467cf13daa35024 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
+Date: Mon, 16 May 2022 17:34:15 +0200
+Subject: [PATCH] rc scripts: remove runlevel 4 from init scripts
+
+Acked-by: David Disseldorp <ddiss@suse.de>
+---
+ src/pmcd/rc_pcp          | 12 ++++++------
+ src/pmcd/rc_pmcd         |  2 +-
+ src/pmie/rc_pmie         |  2 +-
+ src/pmlogger/rc_pmlogger |  2 +-
+ 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
+@@ -31,12 +31,12 @@
+ # e.g. SuSE, where chkconfig is a perl script.
+ ### BEGIN INIT INFO
+ # Provides:          pcp
+-# Required-Start:
+-# Should-Start:
+-# Required-Stop:
+-# Should-Stop:
+-# Default-Start:
+-# Default-Stop:
++# Required-Start:    $local_fs
++# Should-Start:      $network $remote_fs $syslog $time
++# Required-Stop:     $local_fs
++# Should-Stop:       $network $remote_fs $syslog
++# Default-Start:     2 3 5
++# Default-Stop:      0 1 6
+ # 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
+@@ -27,7 +27,7 @@
+ # Should-Start:      $network $remote_fs $syslog $time
+ # Required-Stop:     $local_fs
+ # Should-Stop:       $network $remote_fs $syslog
+-# Default-Start:     2 3 4 5
++# Default-Start:     2 3 5
+ # 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
+

0005-SUSE-fy-pmsnap-control-path.patch

@@ -0,0 +1,35 @@
+From 8f0a98dd4b8db4bd39a8df599b64391a78357775 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
+Date: Mon, 16 May 2022 17:39:53 +0200
+Subject: [PATCH] pmsnap: SUSE-fy pmsnap control path
+
+Acked-by: David Disseldorp <ddiss@suse.de>
+---
+ src/pmsnap/pmsnap.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/pmsnap/pmsnap.sh b/src/pmsnap/pmsnap.sh
+index 95ac61b90..c1a32de07 100755
+--- a/src/pmsnap/pmsnap.sh
++++ b/src/pmsnap/pmsnap.sh
+@@ -26,7 +26,7 @@ prog=`basename $0`
+ 
+ LOCALHOST=`pmhostname`
+ CONFIGDIR=$PCP_VAR_DIR/config/pmsnap
+-CONTROL=$CONFIGDIR/control
++CONTROL=/etc/pcp/pmsnap/control
+ [ -z "$PCP_PMSNAPCONTROL_PATH" ] || CONTROL="$PCP_PMSNAPCONTROL_PATH"
+ 
+ _usage()
+@@ -179,7 +179,7 @@ then
+ fi
+ commonargs="$commonargs $@"
+ 
+-CONTROL=$CONFIGDIR/control
++CONTROL=/etc/pcp/pmsnap/control
+ if [ ! -f "$CONTROL" ]
+ then
+     echo "$prog: Error: cannot find control file \"$CONTROL\""
+-- 
+2.35.3
+

0006-pmsnap-control-var-www-srv-www.patch

@@ -0,0 +1,25 @@
+From bb38e1bb3e1fa92f9a5ab1466c0957276a0cc370 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
+Date: Mon, 16 May 2022 17:42:29 +0200
+Subject: [PATCH] pmsnap: /var/www -> /srv/www
+
+Acked-by: David Disseldorp <ddiss@suse.de>
+---
+ src/pmsnap/control | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/pmsnap/control b/src/pmsnap/control
+index 54440b51b..6cb13206f 100644
+--- a/src/pmsnap/control
++++ b/src/pmsnap/control
+@@ -67,5 +67,5 @@ $commonargs=''
+ # === pmsnap Control Specifications ===
+ #
+ # Name (Output Image)                     Folio|Archive        Config  Arguments
+-/var/www/pcp/LOCALHOSTNAME.1hour.summary  LOCALHOSTNAME/Latest  Snap   -O-0 -A 10min -t 2min -v 30
+-/var/www/pcp/LOCALHOSTNAME.12hour.summary LOCALHOSTNAME/Latest  Snap   -O-0 -A 1hour -t 30min -v 30
++/srv/www/pcp/LOCALHOSTNAME.1hour.summary  LOCALHOSTNAME/Latest  Snap   -O-0 -A 10min -t 2min -v 30
++/srv/www/pcp/LOCALHOSTNAME.12hour.summary LOCALHOSTNAME/Latest  Snap   -O-0 -A 1hour -t 30min -v 30
+-- 
+2.35.3
+

0010-services-switch-logutil-and-pmieutil-scripts-from-ty.patch

@@ -0,0 +1,60 @@
+From e6d7bb6873531beb5b013a49e0b094cd7680cf89 Mon Sep 17 00:00:00 2001
+From: Mark Goodwin <mgoodwin@redhat.com>
+Date: Mon, 30 Aug 2021 11:22:19 +1000
+Subject: [PATCH] services: switch logutil and pmieutil scripts from type
+ oneshot to exec
+
+Switches the "daily" and "check" and related services from Type=oneshot
+to Type=exec (or Type=simple for older versions of systemd that do
+not support Type=exec) and nuke KillMode=none. Explicitly specify
+Restart=none, even though it's the default, to be clear that these
+timer invoked service scripts are not long running service daemons
+and are expected to exit normally.
+
+These changes are a precursor to further improvements to the long
+running PCP services and systemd integration.
+
+All tests in the logutil and pmieutil QA groups are passing and soak
+testing on several platforms has not shown any new issues (and the
+systemd warnings about "Support for KillMode=none is deprecated" are
+gone).
+
+Resolves: RHBZ#1942844
+Resolves: Fedora BZ#1897945
+Resolves: https://github.com/performancecopilot/pcp/issues/1186
+Obsoletes the earlier PR#1355.
+
+(cherry picked from commit 705b657107e8c812c96fa8b74d0f5d6384b00888)
+Reviewed-by: David Disseldorp <ddiss@suse.de>
+References: bsc#1186511
+---
+ configure                                          | 13 +++++++++++++
+ configure.ac                                       | 14 ++++++++++++++
+ src/include/builddefs.in                           |  3 +++
+ src/pmfind/GNUmakefile                             |  1 +
+ src/pmfind/pmfind.service.in                       |  4 ++--
+ src/pmie/GNUmakefile                               |  2 ++
+ src/pmie/pmie_check.service.in                     |  4 ++--
+ src/pmie/pmie_daily.service.in                     |  4 ++--
+ src/pmlogger/GNUmakefile                           |  5 +++++
+ src/pmlogger/pmlogger_check.service.in             |  4 ++--
+ src/pmlogger/pmlogger_daily-poll.service.in        |  4 ++--
+ src/pmlogger/pmlogger_daily.service.in             |  4 ++--
+ src/pmlogger/pmlogger_daily_report-poll.service.in |  4 ++--
+ src/pmlogger/pmlogger_daily_report.service.in      |  4 ++--
+ 14 files changed, 54 insertions(+), 16 deletions(-)
+
+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@
++
+ PCPLIB = -lpcp
+ PCPLIB_EXTRAS = $(LIB_FOR_MATH) $(LIB_FOR_PTHREADS) $(LIB_FOR_DLOPEN) $(LIB_FOR_RT)
+ ifneq "$(PCPLIB)" "$(LIB_FOR_BASENAME)"

_service

@@ -0,0 +1,17 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/performancecopilot/pcp.git</param>
+		<param name="filename">pcp</param>
+		<param name="revision">5.2.5</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="changesgenerate">disable</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">bz2</param>
+	</service>
+	<service name="set_version" mode="disabled">
+		<param name="basename">pcp</param>
+	</service>
+</services>

pcp-rpmlintrc

@@ -0,0 +1,15 @@
+# Note: there are some headers (e.g. domain.h) and in a few cases some
+# C source files that rpmlint complains about. These are not devel files,
+# but rather they are (slightly obscure) PMDA config files.
+#
+addFilter('E: devel-file-in-non-devel-package')
+# A /var/lib/pcp/tmp directory is created for the safe creation of shared
+# tmp files. it must be world writeable for PMDAs and client tools, which
+# may be run as anyone.
+#addFilter('E: permissions-world-writable')
+# pcp-testsuite.x86_64: W: potential-bashisms /var/lib/pcp/testsuite/archives/mk.ipcs
+# checkbashisms reported potential bashisms in a /bin/sh shell script, you might
+# want to manually check this script for bashisms.
+addFilter('pcp-testsuite.*W: potential-bashisms');
+# pcp-testsuite.x86_64: E: env-script-interpreter
+addFilter('pcp-testsuite.*E: env-script-interpreter');