pool/pcp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 870679 from home:dmdiss:pcp_522

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/870679
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=98
This commit is contained in:
Dirk Mueller 2021-02-09 21:45:47 +00:00 committed by Git OBS Bridge
parent 6ee429acc9
commit f4f94002b8
9 changed files with 1059 additions and 683 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
0001-Add-missing-includes-in-Qt-5.15-beta2.patch
View File

@ -1,116 +0,0 @@
From 04e083361da6c1f4ca4f58341ab9f2b9a6fdf892 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <alarrosa@suse.com>
Date: Fri, 27 Mar 2020 13:32:53 +0100
Subject: [PATCH] Add missing includes in Qt 5.15 beta2
Submitted to upstream in https://github.com/performancecopilot/pcp/pull/868
---
src/libpcp_qwt/src/qwt_compass_rose.cpp | 1 +
src/libpcp_qwt/src/qwt_dial_needle.cpp | 1 +
src/libpcp_qwt/src/qwt_null_paintdevice.cpp | 1 +
src/libpcp_qwt/src/qwt_painter.cpp | 1 +
src/libpcp_qwt/src/qwt_painter_command.h | 3 +--
src/libpcp_qwt/src/qwt_plot_panner.cpp | 1 +
src/libpcp_qwt/src/qwt_plot_renderer.cpp | 1 +
src/libpcp_qwt/src/qwt_widget_overlay.cpp | 1 +
8 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/libpcp_qwt/src/qwt_compass_rose.cpp b/src/libpcp_qwt/src/qwt_compass_rose.cpp
index 21a35f2444..d67175940b 100644
--- a/src/libpcp_qwt/src/qwt_compass_rose.cpp
+++ b/src/libpcp_qwt/src/qwt_compass_rose.cpp
@@ -11,6 +11,7 @@
#include "qwt_point_polar.h"
#include "qwt_painter.h"
#include <qpainter.h>
+#include <qpainterpath.h>
static QPointF qwtIntersection(
QPointF p11, QPointF p12, QPointF p21, QPointF p22 )
diff --git a/src/libpcp_qwt/src/qwt_dial_needle.cpp b/src/libpcp_qwt/src/qwt_dial_needle.cpp
index 1b53a3d5b3..694f7f2bb5 100644
--- a/src/libpcp_qwt/src/qwt_dial_needle.cpp
+++ b/src/libpcp_qwt/src/qwt_dial_needle.cpp
@@ -13,6 +13,7 @@
#include "qwt_painter.h"
#include <qapplication.h>
#include <qpainter.h>
+#include <qpainterpath.h>
#if QT_VERSION < 0x040601
#define qFastSin(x) qSin(x)
diff --git a/src/libpcp_qwt/src/qwt_null_paintdevice.cpp b/src/libpcp_qwt/src/qwt_null_paintdevice.cpp
index db1611da25..b9b5dafb65 100644
--- a/src/libpcp_qwt/src/qwt_null_paintdevice.cpp
+++ b/src/libpcp_qwt/src/qwt_null_paintdevice.cpp
@@ -9,6 +9,7 @@
#include "qwt_null_paintdevice.h"
#include <qpaintengine.h>
+#include <qpainterpath.h>
#include <qpixmap.h>
class QwtNullPaintDevice::PrivateData
diff --git a/src/libpcp_qwt/src/qwt_painter.cpp b/src/libpcp_qwt/src/qwt_painter.cpp
index 0501298b18..18d8939028 100644
--- a/src/libpcp_qwt/src/qwt_painter.cpp
+++ b/src/libpcp_qwt/src/qwt_painter.cpp
@@ -17,6 +17,7 @@
#include <qframe.h>
#include <qrect.h>
#include <qpainter.h>
+#include <qpainterpath.h>
#include <qpalette.h>
#include <qpaintdevice.h>
#include <qpixmap.h>
diff --git a/src/libpcp_qwt/src/qwt_painter_command.h b/src/libpcp_qwt/src/qwt_painter_command.h
index 2da597a7fa..612a0fb260 100644
--- a/src/libpcp_qwt/src/qwt_painter_command.h
+++ b/src/libpcp_qwt/src/qwt_painter_command.h
@@ -15,8 +15,7 @@
#include <qpixmap.h>
#include <qimage.h>
#include <qpolygon.h>
-
-class QPainterPath;
+#include <qpainterpath.h>
/*!
QwtPainterCommand represents the attributes of a paint operation
diff --git a/src/libpcp_qwt/src/qwt_plot_panner.cpp b/src/libpcp_qwt/src/qwt_plot_panner.cpp
index 62a75a2fb3..b242acceab 100644
--- a/src/libpcp_qwt/src/qwt_plot_panner.cpp
+++ b/src/libpcp_qwt/src/qwt_plot_panner.cpp
@@ -14,6 +14,7 @@
#include <qbitmap.h>
#include <qstyle.h>
#include <qstyleoption.h>
+#include <qpainterpath.h>
static QBitmap qwtBorderMask( const QWidget *canvas, const QSize &size )
{
diff --git a/src/libpcp_qwt/src/qwt_plot_renderer.cpp b/src/libpcp_qwt/src/qwt_plot_renderer.cpp
index 3416f98062..33c4c932e6 100644
--- a/src/libpcp_qwt/src/qwt_plot_renderer.cpp
+++ b/src/libpcp_qwt/src/qwt_plot_renderer.cpp
@@ -18,6 +18,7 @@
#include "qwt_text_label.h"
#include "qwt_math.h"
#include <qpainter.h>
+#include <qpainterpath.h>
#include <qpaintengine.h>
#include <qtransform.h>
#include <qprinter.h>
diff --git a/src/libpcp_qwt/src/qwt_widget_overlay.cpp b/src/libpcp_qwt/src/qwt_widget_overlay.cpp
index d2b4220c4d..cdc3d16fef 100644
--- a/src/libpcp_qwt/src/qwt_widget_overlay.cpp
+++ b/src/libpcp_qwt/src/qwt_widget_overlay.cpp
@@ -10,6 +10,7 @@
#include "qwt_widget_overlay.h"
#include "qwt_painter.h"
#include <qpainter.h>
+#include <qpainterpath.h>
#include <qpaintengine.h>
#include <qimage.h>
#include <qevent.h>

344
0001-Install-libraries-without-exec-permission.patch
View File

@ -50,7 +50,7 @@ Index: pcp/src/libpcp/src/GNUmakefile
===================================================================
--- 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 @@ Index: pcp/src/libpcp/src/GNUmakefile
$(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 @@ Index: pcp/src/libpcp_fault/src/GNUmakefile
===================================================================
--- 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 @@ Index: pcp/src/libpcp_fault/src/GNUmakefile
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 @@ Index: pcp/src/libpcp_trace/src/GNUmakefile
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 @@ Index: pcp/src/pmdas/sendmail/GNUmakefile
===================================================================
--- 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
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
$(CMDTARGET): $(OBJECTS)
Index: pcp/src/libpcp_web/src/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
--- pcp.orig/src/libpcp_web/src/GNUmakefile
+++ pcp/src/libpcp_web/src/GNUmakefile
@@ -84,7 +84,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 \
@@ -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)

36
0007-pmns-Make-drop-duplicate-if-else.patch Normal file
View File

@ -0,0 +1,36 @@
From 7d35e45561eaba184711676f587118ff054d8f14 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@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 <ddiss@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

111
0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch Normal file
View File

@ -0,0 +1,111 @@
From adb769a8a9a56659774bc127a0bb7bc3527e4d25 Mon Sep 17 00:00:00 2001
From: Ken McDonell <kenj@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

2
_service
View File

@ -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>

3
pcp-4.3.4.tar.bz2
View File

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

3
pcp-5.2.2.tar.bz2 Normal file
View File

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

20
pcp.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu Nov 19 11:39:51 UTC 2020 - David Disseldorp <ddiss@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
-------------------------------------------------------------------
Wed Aug 19 11:33:20 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>

1107
pcp.spec
View File

File diff suppressed because it is too large Load Diff