Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pcp for openSUSE:Factory checked in
at 2021-02-22 14:23:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pcp (Old)
and /work/SRC/openSUSE:Factory/.pcp.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcp"
Mon Feb 22 14:23:09 2021 rev:58 rq:873360 version:5.2.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/pcp/pcp.changes 2020-08-28 21:20:43.376305613
+0200
+++ /work/SRC/openSUSE:Factory/.pcp.new.2378/pcp.changes 2021-02-22
14:23:12.567599174 +0100
@@ -1,0 +2,42 @@
+Sun Feb 14 21:43:28 UTC 2021 - David Disseldorp <dd...@suse.com>
+
+- Spec file fixes and cleanups
+ + disable pcp-export-zabbix-agent to avoid conflicting /etc/zabbix/
+ ownership.
+ + fix unversioned Provides
+ + remove unused python2 build logic and unconditionally enable python3
+ + 0009-remove-rundir-install.patch
+- Add SUSE specific dejavu-fonts dependency for pcp-gui sans
+- Disable pcp-pmda-libvirt to avoid build dependency loop
+
+-------------------------------------------------------------------
+Wed Feb 10 11:03:13 UTC 2021 - David Disseldorp <dd...@suse.com>
+
+- Drop unnecessary %pre/%post recursive chown calls; (bsc#1152533)
+- Changelog for patches carried as part of 5.2.2 source tarball:
+ + build-drop-old-config-file-transition-code-from-rpm-.patch
+ + 0007-pmdas-perf-Add-cpunumber-option-for-dynamic-perf-eve.patch
+ + 0008-pmdas-perf-Add-support-for-hv_24x7-nest-events-on-mu.patch
+ + 0009-qa-perfevent-Test-hv_24x7-events-on-multinode.patch
+
+-------------------------------------------------------------------
+Thu Nov 19 11:39:51 UTC 2020 - David Disseldorp <dd...@suse.com>
+
+- Upgrade to 5.2.2; (jsc#SLE-16929)
+ + improvements to client tools and utilities
+ + new pmdabpftrace monitoring agent
+ + pmdaperfevent enhancements
+ + pmproxy, libpcp_web and libpcp hardening and improvements
+ + assorted bug fixes
+ + obsolete pcp-manager discovery service, now provided by pmfind
+ + improved FHS compliance
+- Remove upstreamed:
+ + 0001-Add-missing-includes-in-Qt-5.15-beta2.patch
+- Rebase against upstream (faeb2507f):
+ + 0001-Install-libraries-without-exec-permission.patch
+- Fix build with -fno-common; (bsc#1160411)
+- Merge upstream build-time tmpdir fixes
+ + 0007-pmns-Make-drop-duplicate-if-else.patch
+ + 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch
+
+-------------------------------------------------------------------
@@ -16,0 +59,16 @@
+
+-------------------------------------------------------------------
+Wed Feb 26 10:57:30 UTC 2020 - Michal Suchanek <msucha...@suse.de>
+
+- hv24x7 support (bsc#1155054 ltc#182081).
+ + 0007-pmdas-perf-Add-cpunumber-option-for-dynamic-perf-eve.patch
+ + 0008-pmdas-perf-Add-support-for-hv_24x7-nest-events-on-mu.patch
+ + 0009-qa-perfevent-Test-hv_24x7-events-on-multinode.patch
+
+-------------------------------------------------------------------
+Fri Jan 24 15:56:53 UTC 2020 - David Disseldorp <dd...@suse.com>
+
+- Fix for security advisory CVE-2019-3696; (bsc#1153921)
+ + code change already carried
+- Fix for security advisory CVE-2019-3695; (bsc#1152763)
+ + build-drop-old-config-file-transition-code-from-rpm-.patch
Old:
----
0001-Add-missing-includes-in-Qt-5.15-beta2.patch
pcp-4.3.4.tar.bz2
New:
----
0007-pmns-Make-drop-duplicate-if-else.patch
0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch
0009-remove-rundir-install.patch
pcp-5.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pcp.spec ++++++
++++ 2283 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/pcp/pcp.spec
++++ and /work/SRC/openSUSE:Factory/.pcp.new.2378/pcp.spec
++++++ 0001-Install-libraries-without-exec-permission.patch ++++++
--- /var/tmp/diff_new_pack.SbXU0D/_old 2021-02-22 14:23:13.395599983 +0100
+++ /var/tmp/diff_new_pack.SbXU0D/_new 2021-02-22 14:23:13.399599987 +0100
@@ -50,7 +50,7 @@
===================================================================
--- pcp.orig/src/libpcp/src/GNUmakefile
+++ pcp/src/libpcp/src/GNUmakefile
-@@ -124,7 +124,7 @@ endif
+@@ -125,7 +125,7 @@ endif
install : default
ifneq ($(LIBTARGET),)
@@ -59,7 +59,7 @@
$(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG)
endif
ifneq ($(SYMTARGET),)
-@@ -133,7 +133,7 @@ ifneq ($(SYMTARGET),)
+@@ -134,7 +134,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@@ -72,7 +72,7 @@
===================================================================
--- pcp.orig/src/libpcp_fault/src/GNUmakefile
+++ pcp/src/libpcp_fault/src/GNUmakefile
-@@ -145,7 +145,7 @@ endif
+@@ -150,7 +150,7 @@ endif
install : default
ifneq ($(LIBTARGET),)
@@ -81,7 +81,7 @@
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
-@@ -153,7 +153,7 @@ ifneq ($(SYMTARGET),)
+@@ -158,7 +158,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
@@ -211,99 +211,50 @@
endif
default_pcp : default
-Index: pcp/src/pmdas/aix/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/aix/GNUmakefile
-+++ pcp/src/pmdas/aix/GNUmakefile
-@@ -44,7 +44,8 @@ build-me: common.h root_aix $(CMDTARGET)
- install: build-me
- $(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR)
-- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
-+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
-+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
- $(INSTALL) -m 644 root_aix $(PCP_VAR_DIR)/pmns/root_aix
- else
- build-me:
-Index: pcp/src/pmdas/darwin/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/darwin/GNUmakefile
-+++ pcp/src/pmdas/darwin/GNUmakefile
-@@ -48,7 +48,8 @@ build-me: root_darwin $(LIBTARGET) $(CMD
- install: build-me
- $(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 644 domain.h help.dir help.pag $(PMDADIR)
-- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
-+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
-+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
- $(INSTALL) -m 644 root_darwin $(PCP_VAR_DIR)/pmns/root_darwin
- else
- build-me:
-Index: pcp/src/pmdas/freebsd/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/freebsd/GNUmakefile
-+++ pcp/src/pmdas/freebsd/GNUmakefile
-@@ -49,7 +49,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) help
- install: default
- $(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 644 domain.h help help.dir help.pag $(PMDADIR)
-- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
-+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
-+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
- $(INSTALL) -m 644 root_freebsd $(PCP_VAR_DIR)/pmns/root_freebsd
- $(INSTALL) -m 644 freebsd_disk_units.conf
$(LOGREWRITEDIR)/freebsd_disk_units.conf
- $(INSTALL) -m 644 freebsd_misc.conf $(LOGREWRITEDIR)/freebsd_misc.conf
Index: pcp/src/pmdas/linux/GNUmakefile
===================================================================
--- pcp.orig/src/pmdas/linux/GNUmakefile
+++ pcp/src/pmdas/linux/GNUmakefile
-@@ -88,7 +88,8 @@ install: default
- $(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR)
- $(INSTALL) -m 644 bandwidth.conf $(PMDADIR)/samplebandwidth.conf
-- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
-+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
-+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
- $(INSTALL) -m 644 root_linux $(PCP_VAR_DIR)/pmns/root_linux
- $(INSTALL) -m 644 proc_fs_nfsd_fixups.conf
$(LOGREWRITEDIR)/linux_proc_fs_nfsd_fixups.conf
- $(INSTALL) -m 644 proc_net_snmp_migrate.conf
$(LOGREWRITEDIR)/linux_proc_net_snmp_migrate.conf
+@@ -89,10 +89,10 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
+ install: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS)
$(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help $(HELPTARGETS)
$(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDACONFIG)
+ $(INSTALL) -m 644 -t $(PMDATMPDIR)/samplebandwidth.conf bandwidth.conf
$(PMDACONFIG)/samplebandwidth.conf
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET)
$(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR)/$(CMDTARGET) $(CMDTARGET)
$(PMDAADMDIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_linux root_linux
$(PCP_PMNSADM_DIR)/root_linux
+ $(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_fs_nfsd_fixups.conf
proc_fs_nfsd_fixups.conf $(REWRITEDIR)/linux_proc_fs_nfsd_fixups.conf
+ $(INSTALL) -m 644 -t $(REWRITEVARDIR)/linux_proc_net_snmp_migrate.conf
proc_net_snmp_migrate.conf $(REWRITEDIR)/linux_proc_net_snmp_migrate.conf
Index: pcp/src/pmdas/linux_proc/GNUmakefile
===================================================================
--- pcp.orig/src/pmdas/linux_proc/GNUmakefile
+++ pcp/src/pmdas/linux_proc/GNUmakefile
-@@ -69,7 +69,8 @@ build-me: root_proc $(LIBTARGET) $(CMDTA
+@@ -73,10 +73,10 @@ build-me: root_proc $(LIBTARGET) $(CMDTA
install: default
- $(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 644 domain.h help help.dir help.pag root root_proc
samplehotproc.conf $(PMDADIR)
-- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
-+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
-+ $(INSTALL) -m 644 $(LIBTARGET) $(SCRIPTS) $(PMDADIR)
- $(INSTALL) -m 644 root_proc $(PCP_VAR_DIR)/pmns/root_proc
- $(INSTALL) -m 644 $(LOGREWRITERS) $(PCP_VAR_DIR)/config/pmlogrewrite
- @$(INSTALL_MAN)
-Index: pcp/src/pmdas/lustrecomm/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/lustrecomm/GNUmakefile
-+++ pcp/src/pmdas/lustrecomm/GNUmakefile
-@@ -51,7 +51,7 @@ build-me: $(TARGETS)
- install: default
- $(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 Install Remove $(PMDADIR)
- $(INSTALL) -m 644 $(DFILES) root pmns domain.h help $(PMDADIR)
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root
root_proc $(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) domain.h help help.dir help.pag root
root_proc $(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDACONFIG)
+ $(INSTALL) -m 644 -t $(PMDATMPDIR)/samplehotproc.conf
samplehotproc.conf $(PMDACONFIG)/samplehotproc.conf
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(CMDTARGET) $(SCRIPTS)
$(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(CMDTARGET) $(SCRIPTS) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PCP_PMNS_DIR)/root_proc root_proc
$(PCP_PMNSADM_DIR)/root_proc
+ $(INSTALL) -m 644 -t $(REWRITEVARDIR) $(LOGREWRITERS) $(REWRITEDIR)
@$(INSTALL_MAN)
Index: pcp/src/pmdas/pmcd/src/GNUmakefile
===================================================================
--- pcp.orig/src/pmdas/pmcd/src/GNUmakefile
+++ pcp/src/pmdas/pmcd/src/GNUmakefile
-@@ -55,7 +55,7 @@ default: $(LIBTARGET)
-
+@@ -59,7 +59,7 @@ default: $(LIBTARGET)
install: default
- $(INSTALL) -m 755 -d $(PCP_PMDAS_DIR)/pmcd
-- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_PMDAS_DIR)/pmcd/$(LIBTARGET)
-+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_PMDAS_DIR)/pmcd/$(LIBTARGET)
+ $(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)
@@ -311,26 +262,217 @@
===================================================================
--- pcp.orig/src/pmdas/sendmail/GNUmakefile
+++ pcp/src/pmdas/sendmail/GNUmakefile
-@@ -40,7 +40,7 @@ include $(BUILDRULES)
+@@ -44,8 +44,8 @@ install install_pcp: default
+ $(INSTALL) -m 755 -d $(PMDAADMDIR)
+ $(INSTALL) -m 755 -d $(PMDATMPDIR)
+ $(INSTALL) -m 755 -t $(PMDATMPDIR)/pmda$(IAM)$(EXECSUFFIX) $(CMDTARGET)
$(PMDAADMDIR)/pmda$(IAM)$(EXECSUFFIX)
+- $(INSTALL) -m 755 -t $(PMDATMPDIR) $(LIBTARGET) $(SCRIPTS) $(PMDAADMDIR)
+- $(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) pmns help root domain.h
$(PMDAADMDIR)
++ $(INSTALL) -m 755 -t $(PMDATMPDIR) $(SCRIPTS) $(PMDAADMDIR)
++ $(INSTALL) -m 644 -t $(PMDATMPDIR) $(DFILES) pmns help root domain.h
$(LIBTARGET) $(PMDAADMDIR)
+ $(INSTALL) -m 644 -t $(PMCHARTVARDIR)/Sendmail Sendmail.pmchart
$(PMCHARTDIR)/Sendmail
+
+ $(CMDTARGET): $(OBJECTS)
+Index: pcp/src/libpcp_web/src/GNUmakefile
+===================================================================
+--- pcp.orig/src/libpcp_web/src/GNUmakefile
++++ pcp/src/libpcp_web/src/GNUmakefile
+@@ -84,7 +84,7 @@ endif
- install install_pcp: default
- $(INSTALL) -m 755 -d $(PMDADIR)
-- $(INSTALL) -m 755 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
-+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
- $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/pmda$(IAM)$(EXECSUFFIX)
- $(INSTALL) -m 755 $(SCRIPTS) $(PMDADIR)
- $(INSTALL) -m 644 $(DFILES) pmns help root domain.h $(PMDADIR)
-Index: pcp/src/pmdas/solaris/GNUmakefile
-===================================================================
---- pcp.orig/src/pmdas/solaris/GNUmakefile
-+++ pcp/src/pmdas/solaris/GNUmakefile
-@@ -53,7 +53,8 @@ build-me: root_solaris $(LIBTARGET) $(CM
- install: build-me
- $(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 644 domain.h $(HELPTARGETS) $(PMDADIR)
-- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
-+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
-+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
- $(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris
+ 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 \
+@@ -92,7 +92,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/src/pmdas/cifs/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/cifs/GNUmakefile
++++ pcp/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/src/pmdas/dm/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/dm/GNUmakefile
++++ pcp/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)
+Index: pcp/src/pmdas/docker/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/docker/GNUmakefile
++++ pcp/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/src/pmdas/jbd2/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/jbd2/GNUmakefile
++++ pcp/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/src/pmdas/kvm/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/kvm/GNUmakefile
++++ pcp/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/src/pmdas/linux_xfs/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/linux_xfs/GNUmakefile
++++ pcp/src/pmdas/linux_xfs/GNUmakefile
+@@ -57,8 +57,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
+ 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_migrate.conf $(REWRITEDIR)/linux_xfs_migrate.conf
+ @$(INSTALL_MAN)
+Index: pcp/src/pmdas/nvidia/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/nvidia/GNUmakefile
++++ pcp/src/pmdas/nvidia/GNUmakefile
+@@ -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/src/pmdas/podman/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/podman/GNUmakefile
++++ pcp/src/pmdas/podman/GNUmakefile
+@@ -48,8 +48,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_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/src/pmdas/rpm/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/rpm/GNUmakefile
++++ pcp/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
+Index: pcp/src/pmdas/smart/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/smart/GNUmakefile
++++ pcp/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/src/pmdas/statsd/src/GNUmakefile
+===================================================================
+--- pcp.orig/src/pmdas/statsd/src/GNUmakefile
++++ pcp/src/pmdas/statsd/src/GNUmakefile
+@@ -68,8 +68,8 @@ build-me: $(RAGELTARGET).o $(CMDTARGET)
+ 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/src/zabbix-agent/src/GNUmakefile
+===================================================================
+--- pcp.orig/src/zabbix-agent/src/GNUmakefile
++++ pcp/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)
++++++ 0007-pmns-Make-drop-duplicate-if-else.patch ++++++
>From 7d35e45561eaba184711676f587118ff054d8f14 Mon Sep 17 00:00:00 2001
From: David Disseldorp <dd...@suse.de>
Date: Tue, 10 Nov 2020 18:21:08 +0100
Subject: [PATCH] pmns/Make: drop duplicate if/else
As of 029add427a42344ea7129452c9e0fb286d3cf881, both the if and else
branches here match. Restoration of the previous build-time logic is
tracked via https://github.com/performancecopilot/pcp/issues/1140 and
will affect more scripts than just this one.
Signed-off-by: David Disseldorp <dd...@suse.de>
---
src/pmns/Make.stdpmid | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/pmns/Make.stdpmid b/src/pmns/Make.stdpmid
index 8eaaf94ce2..aa6cd74275 100755
--- a/src/pmns/Make.stdpmid
+++ b/src/pmns/Make.stdpmid
@@ -16,15 +16,7 @@
# source the PCP configuration environment variables
. $PCP_DIR/etc/pcp.env
-if [ -d "$PCP_TMPFILE_DIR" ]
-then
- tmp=`mktemp -d "$PCP_TMPFILE_DIR/pmns_stdpmid.XXXXXXXXX"` || exit 1
-else
- # if configure --prefix is used in a the build, then $PCP_TMPFILE_DIR
- # may not yet exist ... /tmp is a safe bet
- #
- tmp=`mktemp -d "$PCP_TMPFILE_DIR/pmns_stdpmid.XXXXXXXXX"` || exit 1
-fi
+tmp=`mktemp -d "$PCP_TMPFILE_DIR/pmns_stdpmid.XXXXXXXXX"` || exit 1
status=1
trap "rm -rf $tmp; exit \$status" 0 1 2 3 15
++++++ 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch ++++++
>From adb769a8a9a56659774bc127a0bb7bc3527e4d25 Mon Sep 17 00:00:00 2001
From: Ken McDonell <k...@kenj.id.au>
Date: Fri, 29 Jan 2021 11:18:18 +1100
Subject: [PATCH] fixes for GH #1140 - PCP_TMPFILE_DIR used in build
$PCP_TMPFILE_DIR does double duty for both build time and run time
(some scripts are used in the build AND installed in the packages).
As outlined in https://github.com/performancecopilot/pcp/issues/1140
if, via configure options, $PCP_TMPFILE_DIR is set to something that
will be a directory after package installation, but does not exist
on the build machine, the build would fail.
Change the files below to check if $PCP_TMPFILE_DIR is set and is
the name of an existing directory before using it, otherwise fallback
to /tmp.
modified: src/libpcp/src/mk.exports
modified: src/libpcp/src/mk.pmdbg
modified: src/pmieconf/xtractnames
modified: src/pmns/Make.stdpmid
---
src/libpcp/src/mk.exports | 10 +++++++++-
src/libpcp/src/mk.pmdbg | 9 ++++++++-
src/pmieconf/xtractnames | 10 +++++++++-
src/pmns/Make.stdpmid | 10 +++++++++-
4 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/libpcp/src/mk.exports b/src/libpcp/src/mk.exports
index 2f4fdfefca..a22c15c2c8 100755
--- a/src/libpcp/src/mk.exports
+++ b/src/libpcp/src/mk.exports
@@ -13,7 +13,15 @@ fi
. ../../include/pcp.conf
-tmp=`mktemp -d "$PCP_TMPFILE_DIR/pcp-build-mk.exports.XXXXXXXXX"` || exit 1
+if [ -n "$PCP_TMPFILE_DIR" -a -d "$PCP_TMPFILE_DIR" ]
+then
+ tmp=`mktemp -d "$PCP_TMPFILE_DIR/pcp-build-mk.exports.XXXXXXXXX"` || exit 1
+else
+ # assume run during a build and /tmp is a safe bet
+ #
+ tmp=`mktemp -d "/tmp/pcp-build-mk.exports.XXXXXXXXX"` || exit 1
+fi
+
sts=0
trap "rm -rf $tmp; exit \$sts" 0 1 2 3 15
diff --git a/src/libpcp/src/mk.pmdbg b/src/libpcp/src/mk.pmdbg
index 174fd3f515..44e88ef92d 100755
--- a/src/libpcp/src/mk.pmdbg
+++ b/src/libpcp/src/mk.pmdbg
@@ -45,7 +45,14 @@ then
exit 1
fi
-tmp=`mktemp -d "$PCP_TMPFILE_DIR/pcp-build-mk.pmdbg.XXXXXXXXX"` || exit 1
+if [ -n "$PCP_TMPFILE_DIR" -a -d "$PCP_TMPFILE_DIR" ]
+then
+ tmp=`mktemp -d "$PCP_TMPFILE_DIR/pcp-build-mk.pmdbg.XXXXXXXXX"` || exit 1
+else
+ # assume run during a build and /tmp is a safe bet
+ #
+ tmp=`mktemp -d "/tmp/pcp-build-mk.pmdbg.XXXXXXXXX"` || exit 1
+fi
trap "rm -rf $tmp; exit 0" 0 1 2 3 15
rm -f pmdbg.h
diff --git a/src/pmieconf/xtractnames b/src/pmieconf/xtractnames
index 6178f362a3..b5986b5f86 100755
--- a/src/pmieconf/xtractnames
+++ b/src/pmieconf/xtractnames
@@ -29,7 +29,15 @@ do
fi
done
-tmp=`mktemp -d "$PCP_TMPFILE_DIR/pmieconf-xtract.XXXXXXXXX"` || exit 1
+if [ -n "$PCP_TMPFILE_DIR" -a -d "$PCP_TMPFILE_DIR" ]
+then
+ tmp=`mktemp -d "$PCP_TMPFILE_DIR/pmieconf-xtract.XXXXXXXXX"` || exit 1
+else
+ # assume run during a build and /tmp is a safe bet
+ #
+ tmp=`mktemp -d "/tmp/pmieconf-xtract.XXXXXXXXX"` || exit 1
+fi
+
trap "rm -rf $tmp; exit" 0 1 2 3 15
_usage()
diff --git a/src/pmns/Make.stdpmid b/src/pmns/Make.stdpmid
index aa6cd74275..4d06929c84 100755
--- a/src/pmns/Make.stdpmid
+++ b/src/pmns/Make.stdpmid
@@ -16,7 +16,15 @@
# source the PCP configuration environment variables
. $PCP_DIR/etc/pcp.env
-tmp=`mktemp -d "$PCP_TMPFILE_DIR/pmns_stdpmid.XXXXXXXXX"` || exit 1
+if [ -n "$PCP_TMPFILE_DIR" -a -d "$PCP_TMPFILE_DIR" ]
+then
+ tmp=`mktemp -d "$PCP_TMPFILE_DIR/pmns_stdpmid.XXXXXXXXX"` || exit 1
+else
+ # assume run during a build and /tmp is a safe bet
+ #
+ tmp=`mktemp -d "/tmp/pmms_stdpmid.XXXXXXXXX"` || exit 1
+fi
+
status=1
trap "rm -rf $tmp; exit \$status" 0 1 2 3 15
++++++ 0009-remove-rundir-install.patch ++++++
Index: pcp/GNUmakefile
===================================================================
--- pcp.orig/GNUmakefile
+++ pcp/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
++++++ _service ++++++
--- /var/tmp/diff_new_pack.SbXU0D/_old 2021-02-22 14:23:13.487600073 +0100
+++ /var/tmp/diff_new_pack.SbXU0D/_new 2021-02-22 14:23:13.491600077 +0100
@@ -3,7 +3,7 @@
<param name="scm">git</param>
<param
name="url">https://github.com/performancecopilot/pcp.git</param>
<param name="filename">pcp</param>
- <param name="revision">4.3.4</param>
+ <param name="revision">5.2.2</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param>
</service>
++++++ pcp-4.3.4.tar.bz2 -> pcp-5.2.2.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/pcp/pcp-4.3.4.tar.bz2
/work/SRC/openSUSE:Factory/.pcp.new.2378/pcp-5.2.2.tar.bz2 differ: char 11,
line 1
