diff --git a/0002-Install-libraries-without-exec-permission.patch b/0002-Install-libraries-without-exec-permission.patch index bad8e08..f16bb35 100644 --- a/0002-Install-libraries-without-exec-permission.patch +++ b/0002-Install-libraries-without-exec-permission.patch @@ -22,10 +22,10 @@ Subject: [PATCH 2/6] Install libraries without exec permission src/pmdas/solaris/GNUmakefile | 3 ++- 16 files changed, 29 insertions(+), 23 deletions(-) -Index: pcp-3.11.8/src/genpmda/genpmda +Index: pcp-3.11.9/src/genpmda/genpmda =================================================================== ---- pcp-3.11.8.orig/src/genpmda/genpmda -+++ pcp-3.11.8/src/genpmda/genpmda +--- pcp-3.11.9.orig/src/genpmda/genpmda ++++ pcp-3.11.9/src/genpmda/genpmda @@ -909,7 +909,7 @@ install: default \$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas \$(INSTALL) -m 755 -d \$(PMDADIR) @@ -44,11 +44,11 @@ Index: pcp-3.11.8/src/genpmda/genpmda \$(INSTALL) -m 755 -f $oflag/Install \$(PMDADIR)/Install \$(INSTALL) -m 755 -f $oflag/Remove \$(PMDADIR)/Remove \$(INSTALL) -m 644 -f $oflag/Makefile.install \$(PMDADIR)/Makefile -Index: pcp-3.11.8/src/libpcp/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/libpcp/src/GNUmakefile -+++ pcp-3.11.8/src/libpcp/src/GNUmakefile -@@ -103,7 +103,7 @@ endif +--- pcp-3.11.9.orig/src/libpcp/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp/src/GNUmakefile +@@ -111,7 +111,7 @@ endif install : default ifneq ($(LIBTARGET),) @@ -57,7 +57,7 @@ Index: pcp-3.11.8/src/libpcp/src/GNUmakefile endif ifneq ($(SYMTARGET),) for tt in $(SYMTARGET); do \ -@@ -111,7 +111,7 @@ ifneq ($(SYMTARGET),) +@@ -119,7 +119,7 @@ ifneq ($(SYMTARGET),) done endif ifneq ($(STATICLIBTARGET),) @@ -66,10 +66,10 @@ Index: pcp-3.11.8/src/libpcp/src/GNUmakefile endif default_pcp : default -Index: pcp-3.11.8/src/libpcp_gui/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_gui/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/libpcp_gui/src/GNUmakefile -+++ pcp-3.11.8/src/libpcp_gui/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_gui/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_gui/src/GNUmakefile @@ -54,7 +54,7 @@ include $(BUILDRULES) install: default @@ -88,10 +88,10 @@ Index: pcp-3.11.8/src/libpcp_gui/src/GNUmakefile endif default_pcp: default -Index: pcp-3.11.8/src/libpcp_import/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_import/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/libpcp_import/src/GNUmakefile -+++ pcp-3.11.8/src/libpcp_import/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_import/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_import/src/GNUmakefile @@ -53,7 +53,7 @@ include $(BUILDRULES) install: default @@ -110,10 +110,10 @@ Index: pcp-3.11.8/src/libpcp_import/src/GNUmakefile endif default_pcp: default -Index: pcp-3.11.8/src/libpcp_mmv/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_mmv/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/libpcp_mmv/src/GNUmakefile -+++ pcp-3.11.8/src/libpcp_mmv/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_mmv/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_mmv/src/GNUmakefile @@ -47,7 +47,7 @@ include $(BUILDRULES) install: default @@ -132,10 +132,10 @@ Index: pcp-3.11.8/src/libpcp_mmv/src/GNUmakefile endif default_pcp: default -Index: pcp-3.11.8/src/libpcp_pmda/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_pmda/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/libpcp_pmda/src/GNUmakefile -+++ pcp-3.11.8/src/libpcp_pmda/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_pmda/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_pmda/src/GNUmakefile @@ -61,7 +61,7 @@ include $(BUILDRULES) install: default @@ -154,10 +154,10 @@ Index: pcp-3.11.8/src/libpcp_pmda/src/GNUmakefile endif default_pcp: default -Index: pcp-3.11.8/src/libpcp_trace/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_trace/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/libpcp_trace/src/GNUmakefile -+++ pcp-3.11.8/src/libpcp_trace/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_trace/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_trace/src/GNUmakefile @@ -56,13 +56,13 @@ include $(BUILDRULES) install : default @@ -174,10 +174,10 @@ Index: pcp-3.11.8/src/libpcp_trace/src/GNUmakefile endif default_pcp : default -Index: pcp-3.11.8/src/pmdas/aix/GNUmakefile +Index: pcp-3.11.9/src/pmdas/aix/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/aix/GNUmakefile -+++ pcp-3.11.8/src/pmdas/aix/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/aix/GNUmakefile ++++ pcp-3.11.9/src/pmdas/aix/GNUmakefile @@ -44,7 +44,8 @@ build-me: common.h root_aix $(CMDTARGET) install: build-me $(INSTALL) -m 755 -d $(PMDADIR) @@ -188,10 +188,10 @@ Index: pcp-3.11.8/src/pmdas/aix/GNUmakefile $(INSTALL) -m 644 root_aix $(PCP_VAR_DIR)/pmns/root_aix else build-me: -Index: pcp-3.11.8/src/pmdas/darwin/GNUmakefile +Index: pcp-3.11.9/src/pmdas/darwin/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/darwin/GNUmakefile -+++ pcp-3.11.8/src/pmdas/darwin/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/darwin/GNUmakefile ++++ pcp-3.11.9/src/pmdas/darwin/GNUmakefile @@ -48,7 +48,8 @@ build-me: root_darwin $(LIBTARGET) $(CMD install: build-me $(INSTALL) -m 755 -d $(PMDADIR) @@ -202,10 +202,10 @@ Index: pcp-3.11.8/src/pmdas/darwin/GNUmakefile $(INSTALL) -m 644 root_darwin $(PCP_VAR_DIR)/pmns/root_darwin else build-me: -Index: pcp-3.11.8/src/pmdas/freebsd/GNUmakefile +Index: pcp-3.11.9/src/pmdas/freebsd/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/freebsd/GNUmakefile -+++ pcp-3.11.8/src/pmdas/freebsd/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/freebsd/GNUmakefile ++++ pcp-3.11.9/src/pmdas/freebsd/GNUmakefile @@ -48,7 +48,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) help install: default $(INSTALL) -m 755 -d $(PMDADIR) @@ -216,10 +216,10 @@ Index: pcp-3.11.8/src/pmdas/freebsd/GNUmakefile $(INSTALL) -m 644 root_freebsd $(PCP_VAR_DIR)/pmns/root_freebsd else build-me: -Index: pcp-3.11.8/src/pmdas/linux/GNUmakefile +Index: pcp-3.11.9/src/pmdas/linux/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/linux/GNUmakefile -+++ pcp-3.11.8/src/pmdas/linux/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/linux/GNUmakefile ++++ pcp-3.11.9/src/pmdas/linux/GNUmakefile @@ -78,7 +78,8 @@ install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR) @@ -230,10 +230,10 @@ Index: pcp-3.11.8/src/pmdas/linux/GNUmakefile $(INSTALL) -m 644 root_linux $(PCP_VAR_DIR)/pmns/root_linux $(INSTALL) -m 644 proc_net_snmp_migrate.conf $(LOGREWRITEDIR)/linux_proc_net_snmp_migrate.conf $(INSTALL) -m 644 proc_net_tcp_migrate.conf $(LOGREWRITEDIR)/linux_proc_net_tcp_migrate.conf -Index: pcp-3.11.8/src/pmdas/linux_proc/GNUmakefile +Index: pcp-3.11.9/src/pmdas/linux_proc/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/linux_proc/GNUmakefile -+++ pcp-3.11.8/src/pmdas/linux_proc/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/linux_proc/GNUmakefile ++++ pcp-3.11.9/src/pmdas/linux_proc/GNUmakefile @@ -68,7 +68,8 @@ build-me: root_proc $(LIBTARGET) $(CMDTA install: default $(INSTALL) -m 755 -d $(PMDADIR) @@ -244,10 +244,10 @@ Index: pcp-3.11.8/src/pmdas/linux_proc/GNUmakefile $(INSTALL) -m 644 root_proc $(PCP_VAR_DIR)/pmns/root_proc $(INSTALL) -m 644 $(LOGREWRITERS) $(PCP_VAR_DIR)/config/pmlogrewrite @$(INSTALL_MAN) -Index: pcp-3.11.8/src/pmdas/lustrecomm/GNUmakefile +Index: pcp-3.11.9/src/pmdas/lustrecomm/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/lustrecomm/GNUmakefile -+++ pcp-3.11.8/src/pmdas/lustrecomm/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/lustrecomm/GNUmakefile ++++ pcp-3.11.9/src/pmdas/lustrecomm/GNUmakefile @@ -51,7 +51,7 @@ build-me: $(TARGETS) install: default $(INSTALL) -m 755 -d $(PMDADIR) @@ -257,10 +257,10 @@ Index: pcp-3.11.8/src/pmdas/lustrecomm/GNUmakefile $(INSTALL) -m 755 Install Remove $(PMDADIR) $(INSTALL) -m 644 $(DFILES) root pmns domain.h help $(PMDADIR) @$(INSTALL_MAN) -Index: pcp-3.11.8/src/pmdas/pmcd/src/GNUmakefile +Index: pcp-3.11.9/src/pmdas/pmcd/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/pmcd/src/GNUmakefile -+++ pcp-3.11.8/src/pmdas/pmcd/src/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/pmcd/src/GNUmakefile ++++ pcp-3.11.9/src/pmdas/pmcd/src/GNUmakefile @@ -55,7 +55,7 @@ default: $(LIBTARGET) install: default @@ -270,10 +270,10 @@ Index: pcp-3.11.8/src/pmdas/pmcd/src/GNUmakefile include $(BUILDRULES) -Index: pcp-3.11.8/src/pmdas/sendmail/GNUmakefile +Index: pcp-3.11.9/src/pmdas/sendmail/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/sendmail/GNUmakefile -+++ pcp-3.11.8/src/pmdas/sendmail/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/sendmail/GNUmakefile ++++ pcp-3.11.9/src/pmdas/sendmail/GNUmakefile @@ -40,7 +40,7 @@ include $(BUILDRULES) install install_pcp: default @@ -283,10 +283,10 @@ Index: pcp-3.11.8/src/pmdas/sendmail/GNUmakefile $(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-3.11.8/src/pmdas/solaris/GNUmakefile +Index: pcp-3.11.9/src/pmdas/solaris/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/solaris/GNUmakefile -+++ pcp-3.11.8/src/pmdas/solaris/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/solaris/GNUmakefile ++++ pcp-3.11.9/src/pmdas/solaris/GNUmakefile @@ -53,7 +53,8 @@ build-me: root_solaris $(LIBTARGET) $(CM install: build-me $(INSTALL) -m 755 -d $(PMDADIR) @@ -297,10 +297,10 @@ Index: pcp-3.11.8/src/pmdas/solaris/GNUmakefile $(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris else build-me: -Index: pcp-3.11.8/src/libpcp_fault/src/GNUmakefile +Index: pcp-3.11.9/src/libpcp_fault/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/libpcp_fault/src/GNUmakefile -+++ pcp-3.11.8/src/libpcp_fault/src/GNUmakefile +--- pcp-3.11.9.orig/src/libpcp_fault/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_fault/src/GNUmakefile @@ -132,7 +132,7 @@ endif install : default @@ -319,10 +319,10 @@ Index: pcp-3.11.8/src/libpcp_fault/src/GNUmakefile endif $(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h $(PCP_INC_DIR)/fault.h -Index: pcp-3.11.8/src/pmdas/jbd2/GNUmakefile +Index: pcp-3.11.9/src/pmdas/jbd2/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/jbd2/GNUmakefile -+++ pcp-3.11.8/src/pmdas/jbd2/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/jbd2/GNUmakefile ++++ pcp-3.11.9/src/pmdas/jbd2/GNUmakefile @@ -54,7 +54,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDADIR) @@ -333,10 +333,10 @@ Index: pcp-3.11.8/src/pmdas/jbd2/GNUmakefile $(INSTALL) -m 644 root_jbd2 $(PCP_VAR_DIR)/pmns/root_jbd2 $(INSTALL) -m 644 jbd2_kernel_ulong.conf $(LOGREWRITEDIR)/jbd2_kernel_ulong.conf @$(INSTALL_MAN) -Index: pcp-3.11.8/src/pmdas/linux_xfs/GNUmakefile +Index: pcp-3.11.9/src/pmdas/linux_xfs/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/linux_xfs/GNUmakefile -+++ pcp-3.11.8/src/pmdas/linux_xfs/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/linux_xfs/GNUmakefile ++++ pcp-3.11.9/src/pmdas/linux_xfs/GNUmakefile @@ -55,7 +55,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE install: default $(INSTALL) -m 755 -d $(PMDADIR) @@ -347,10 +347,10 @@ Index: pcp-3.11.8/src/pmdas/linux_xfs/GNUmakefile $(INSTALL) -m 644 root_xfs $(PCP_VAR_DIR)/pmns/root_xfs $(INSTALL) -m 644 linux_xfs_migrate.conf $(PCP_VAR_DIR)/config/pmlogrewrite/linux_xfs_migrate.conf @$(INSTALL_MAN) -Index: pcp-3.11.8/src/pmdas/nvidia/GNUmakefile +Index: pcp-3.11.9/src/pmdas/nvidia/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/pmdas/nvidia/GNUmakefile -+++ pcp-3.11.8/src/pmdas/nvidia/GNUmakefile +--- pcp-3.11.9.orig/src/pmdas/nvidia/GNUmakefile ++++ pcp-3.11.9/src/pmdas/nvidia/GNUmakefile @@ -37,7 +37,8 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PMDADIR) @@ -361,10 +361,10 @@ Index: pcp-3.11.8/src/pmdas/nvidia/GNUmakefile $(INSTALL) -m 644 $(DFILES) root help pmns domain.h $(PMDADIR) $(OBJECTS): domain.h -Index: pcp-3.11.8/src/zabbix-agent/src/GNUmakefile +Index: pcp-3.11.9/src/zabbix-agent/src/GNUmakefile =================================================================== ---- pcp-3.11.8.orig/src/zabbix-agent/src/GNUmakefile -+++ pcp-3.11.8/src/zabbix-agent/src/GNUmakefile +--- pcp-3.11.9.orig/src/zabbix-agent/src/GNUmakefile ++++ pcp-3.11.9/src/zabbix-agent/src/GNUmakefile @@ -37,7 +37,7 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(ZABBIX_DIR) @@ -374,3 +374,67 @@ Index: pcp-3.11.8/src/zabbix-agent/src/GNUmakefile @$(INSTALL_MAN) default_pcp: default +Index: pcp-3.11.9/src/pmdas/rpm/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/rpm/GNUmakefile ++++ pcp-3.11.9/src/pmdas/rpm/GNUmakefile +@@ -45,7 +45,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) + install_pcp install: default + $(INSTALL) -m 755 -d $(PMDADIR) + $(INSTALL) -m 644 root pmns domain.h help $(PMDADIR) +- $(INSTALL) -m 755 $(CMDTARGET) $(LIBTARGET) $(SCRIPTS) $(PMDADIR) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) ++ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR) + $(INSTALL) -m 644 migrate.conf $(PCP_VAR_DIR)/config/pmlogrewrite/rpm_migrate.conf + else + build-me: +Index: pcp-3.11.9/src/pmdas/docker/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/docker/GNUmakefile ++++ pcp-3.11.9/src/pmdas/docker/GNUmakefile +@@ -46,7 +46,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) + + install_pcp install: default + $(INSTALL) -m 755 -d $(PMDADIR) +- $(INSTALL) -m 755 Install Remove $(CMDTARGET) $(LIBTARGET) $(PMDADIR) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) ++ $(INSTALL) -m 755 Install Remove $(CMDTARGET) $(PMDADIR) + $(INSTALL) -m 644 root pmns domain.h $(DFILES) $(PMDADIR) + @$(INSTALL_MAN) + else +Index: pcp-3.11.9/src/pmdas/cifs/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/pmdas/cifs/GNUmakefile ++++ pcp-3.11.9/src/pmdas/cifs/GNUmakefile +@@ -43,8 +43,8 @@ build-me: $(CMDTARGET) $(LIBTARGET) + install: default + $(INSTALL) -m 755 -d $(PMDADIR) + $(INSTALL) -m 644 root pmns domain.h help $(PMDADIR) ++ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET) + $(INSTALL) -m 755 Install Remove $(CMDTARGET) $(PMDADIR) +- $(INSTALL) -m 755 Install Remove $(LIBTARGET) $(PMDADIR) + @$(INSTALL_MAN) + else + build-me: +Index: pcp-3.11.9/src/libpcp_web/src/GNUmakefile +=================================================================== +--- pcp-3.11.9.orig/src/libpcp_web/src/GNUmakefile ++++ pcp-3.11.9/src/libpcp_web/src/GNUmakefile +@@ -43,7 +43,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 \ +@@ -51,7 +51,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 diff --git a/_service b/_service index 4a5f00c..5735f75 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git https://github.com/performancecopilot/pcp.git pcp - 3d9cb4fad25d7d0406a571157645a028d5d3a5c2 + 6a273f2027f9d052316b81f2beb1b5efe12c4ae5 @PARENT_TAG@ disable diff --git a/pcp-3.11.8.tar.bz2 b/pcp-3.11.8.tar.bz2 deleted file mode 100644 index 12dc332..0000000 --- a/pcp-3.11.8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0e4c057d5ffb787ffae38b8d729f1e2ad1203d12afb1b3358db55174b078860 -size 14607758 diff --git a/pcp-3.11.9.tar.bz2 b/pcp-3.11.9.tar.bz2 new file mode 100644 index 0000000..046a4de --- /dev/null +++ b/pcp-3.11.9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b24e6b5268075c9f2aa654eff4d659b480fef347b98045bfe7cd97cc064aedb6 +size 14889014 diff --git a/pcp.changes b/pcp.changes index 48b9f2e..fb0c837 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Jun 19 23:09:32 UTC 2017 - ddiss@suse.com + +- Follow the shared library packaging policy and split libpcp_gui.so.2, + libpcp_mmv.so.1, libpcp_trace.so.2, libpcp_import.so.1 and libpcp_web.so.1 + out from libpcp3 into separate packages. +- Drop a number of unneeded explicit library package Requires. + +------------------------------------------------------------------- +Sun Jun 18 19:53:55 UTC 2017 - ddiss@suse.com + +- Update to 3.11.9 + See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.11.9 + for details. + ------------------------------------------------------------------- Fri Mar 31 12:42:00 UTC 2017 - ddiss@suse.com diff --git a/pcp.spec b/pcp.spec index cd44892..d933ef3 100644 --- a/pcp.spec +++ b/pcp.spec @@ -63,7 +63,7 @@ Summary: System-level performance monitoring and performance management License: %{license_gplv2plus} and %{license_lgplv2plus} and %{license_cc_by} Group: %{pcp_gr} Name: pcp -Version: 3.11.8 +Version: 3.11.9 Release: 0 %global buildversion 1 @@ -149,6 +149,13 @@ Patch9: 0009-pmsnap-control-var-www-srv-www.patch %global disable_json 1 %endif +# support for pmdanutcracker (perl deps missing on rhel) +%if 0%{?rhel} == 0 +%global disable_nutcracker 0 +%else +%global disable_nutcracker 1 +%endif + # support for pmdarpm %if 0%{?rhel} == 0 || 0%{?rhel} > 5 %global disable_rpm 0 @@ -362,6 +369,12 @@ Obsoletes: pcp-pmda-nvidia < %{version} %global _with_json --with-pmdajson=yes %endif +%if %{disable_nutcracker} +%global _with_nutcracker --with-pmdanutcracker=no +%else +%global _with_nutcracker --with-pmdanutcracker=yes +%endif + %if %{disable_snmp} %global _with_snmp --with-pmdasnmp=no %else @@ -405,6 +418,53 @@ Requires: pcp-conf >= %{version}-%{release} %description -n %{lib_pkg} Performance Co-Pilot (PCP) run-time libraries +%if 0%{?suse_version} +%package -n libpcp_gui2 +Summary: Performance Co-Pilot run-time GUI library +License: %{license_lgplv21plus} +Group: %{lib_gr} +Url: http://www.pcp.io + +%description -n libpcp_gui2 +Performance Co-Pilot (PCP) run-time graphical user interface library + +%package -n libpcp_mmv1 +Summary: Performance Co-Pilot run-time MMV library +License: %{license_lgplv21plus} +Group: %{lib_gr} +Url: http://www.pcp.io + +%description -n libpcp_mmv1 +Performance Co-Pilot (PCP) run-time Memory Mapped Values library + +%package -n libpcp_trace2 +Summary: Performance Co-Pilot run-time tracing library +License: %{license_lgplv21plus} +Group: %{lib_gr} +Url: http://www.pcp.io + +%description -n libpcp_trace2 +Performance Co-Pilot (PCP) run-time tracing library + +%package -n libpcp_import1 +Summary: Performance Co-Pilot run-time import library +License: %{license_lgplv21plus} +Group: %{lib_gr} +Url: http://www.pcp.io + +%description -n libpcp_import1 +Performance Co-Pilot (PCP) run-time import library + +%package -n libpcp_web1 +Summary: Performance Co-Pilot run-time web library +License: %{license_lgplv21plus} +Group: %{lib_gr} +Url: http://www.pcp.io + +%description -n libpcp_web1 +Performance Co-Pilot (PCP) run-time web library +%endif + # # pcp-libs-devel # SLE uses the legacy libpcp-devel package name. @@ -432,9 +492,11 @@ Summary: Performance Co-Pilot (PCP) development tools and documentation License: %{license_gplv2plus} and %{license_lgplv21plus} Group: %{lib_devel_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_devel_pkg} = %{version}-%{release} Requires: %{lib_pkg} = %{version}-%{release} Requires: pcp = %{version}-%{release} +%endif %description devel Performance Co-Pilot (PCP) documentation and tools for development. @@ -447,8 +509,10 @@ Summary: Performance Co-Pilot (PCP) test suite License: %{license_gplv2plus} and %{license_mit} Group: %{lib_devel_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_devel_pkg} = %{version}-%{release} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} Requires: pcp-devel = %{version}-%{release} Obsoletes: pcp-gui-testsuite @@ -464,7 +528,9 @@ Summary: Performance Co-Pilot (PCP) manager daemon License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %description manager @@ -484,7 +550,9 @@ Summary: Performance Co-Pilot (PCP) web API service License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %description webapi @@ -672,7 +740,9 @@ Summary: Performance Co-Pilot archive tools for importing collectl data License: %{license_lgplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description import-collectl2pcp Performance Co-Pilot (PCP) front-end tools for importing collectl data @@ -686,7 +756,9 @@ Summary: Module for exporting from PCP into a Zabbix agent daemon License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} >= %{version}-%{release} +%endif %description export-zabbix-agent Performance Co-Pilot (PCP) module for exporting metrics from PCP to @@ -721,7 +793,9 @@ Summary: Performance Co-Pilot tools for exporting PCP metrics to InfluxDB License: %{license_lgplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} >= %{version}-%{release} +%endif %if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} Requires: python3-requests @@ -846,6 +920,7 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from Redis servers (redis.io). #end pcp-pmda-redis +%if !%{disable_nutcracker} # # pcp-pmda-nutcracker # @@ -862,6 +937,7 @@ Requires: perl(YAML::XS::LibYAML) This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from NutCracker (TwemCache). #end pcp-pmda-nutcracker +%endif # # pcp-pmda-bonding @@ -1028,7 +1104,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem Comm License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %description pmda-lustrecomm @@ -1330,7 +1408,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the Device Mapper Cache a License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-dm This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1507,7 +1587,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the Apache webserver License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-apache This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1522,7 +1604,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the Bash shell License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-bash This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1537,7 +1621,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the CIFS protocol License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-cifs This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1552,7 +1638,9 @@ Summary: Performance Co-Pilot (PCP) metrics for Cisco routers License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-cisco This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1567,7 +1655,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the GFS2 filesystem License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-gfs2 This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1582,7 +1672,9 @@ Summary: Performance Co-Pilot (PCP) metrics for hardware sensors License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-lmsensors This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1597,7 +1689,9 @@ Summary: Performance Co-Pilot (PCP) metrics from arbitrary log files License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-logger This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1613,7 +1707,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the sendmail queue License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-mailq This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1628,7 +1724,9 @@ Summary: Performance Co-Pilot (PCP) metrics for filesystem mounts License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-mounts This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1643,7 +1741,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the Nvidia GPU License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-nvidia-gpu This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1658,7 +1758,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the room temperature License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %description pmda-roomtemp @@ -1675,7 +1777,9 @@ Summary: Performance Co-Pilot (PCP) metrics for the RPM package manager License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %description pmda-rpm @@ -1692,7 +1796,9 @@ Summary: Performance Co-Pilot (PCP) metrics for Sendmail License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %description pmda-sendmail @@ -1708,7 +1814,9 @@ Summary: Performance Co-Pilot (PCP) metrics for shell command responses License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-shping This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1724,7 +1832,9 @@ Summary: Performance Co-Pilot (PCP) summary metrics from pmie License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %description pmda-summary @@ -1741,7 +1851,9 @@ Summary: Performance Co-Pilot (PCP) metrics from the Systemd journal License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-systemd This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1757,7 +1869,9 @@ Summary: Performance Co-Pilot (PCP) metrics for application tracing License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif %description pmda-trace This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1772,7 +1886,9 @@ Summary: Performance Co-Pilot (PCP) metrics from web server logs License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %description pmda-weblog @@ -1789,7 +1905,9 @@ Summary: Performance Co-Pilot (PCP) Python bindings and documentation License: %{license_gplv2plus} Group: Development/Libraries Url: http://www.pcp.io +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} +%endif Requires: pcp = %{version}-%{release} %if 0%{?rhel} == 5 Requires: python%{default_python} @@ -1837,8 +1955,9 @@ Requires: python3-pcp = %{version}-%{release} %if !%{disable_python2} Requires: python-pcp = %{version}-%{release} %endif +%if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} -Requires: pcp-libs = %{version}-%{release} +%endif %description system-tools This PCP module contains additional system monitoring tools written @@ -1901,6 +2020,11 @@ License: %{license_gplv2plus} and %{license_cc_by} Group: Applications/System Url: http://www.pcp.io BuildRequires: selinux-policy-devel +%if 0%{?rhel} == 5 +BuildRequires: setools +%else +BuildRequires: setools-console +%endif Requires: pcp = %{version}-%{release} Requires: policycoreutils @@ -1936,7 +2060,8 @@ PCP_CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" CXX %{?_with_papi} \ %{?_with_perfevent} \ %{?_with_json} \ - %{?_with_snmp} + %{?_with_snmp} \ + %{?_with_nutcracker} PCP_CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" make default_pcp ############################################################################### @@ -2009,6 +2134,8 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop %endif %if 0%{?suse_version} +rm -rf $RPM_BUILD_ROOT/%{_datadir}/pcp/webapps + mkdir -p $RPM_BUILD_ROOT/%{_tempsdir} %__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sbindir} @@ -2126,13 +2253,13 @@ ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ grep -E 'pmiostat|pmcollectl|pmatop|pmrep' |\ sed -e 's#^#'%{_bindir}'\/#' >pcp_system_tools.list ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ - grep -E 'atop|collectl|dmcache|free|iostat|mpstat|numastat|pidstat|verify|uptime|shping' |\ + grep -E 'atop|collectl|dmcache|free|iostat|mpstat|numastat|pidstat|tapestat|verify|uptime|shping' |\ sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp_system_tools.list %endif ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ %if !%{disable_python2} || !%{disable_python3} - grep -E -v 'atop|collectl|dmcache|free|iostat|mpstat|numastat|pidstat|verify|uptime|shping' |\ + grep -E -v 'atop|collectl|dmcache|free|iostat|mpstat|numastat|pidstat|tapestat|verify|uptime|shping' |\ %endif sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >base_exec.list ls -1 $RPM_BUILD_ROOT/%{_booksdir} |\ @@ -2370,10 +2497,29 @@ chown -R pcp:pcp %{_logsdir}/pmmgr 2>/dev/null %if !%{disable_selinux} %post selinux %if 0%{?fedora} >= 24 || 0%{?rhel} > 6 - semodule -X 400 -i %{localstatedir}/lib/pcp/selinux/pcpupstream.pp + semodule -X 400 -i %{_selinuxdir}/pcpupstream.pp %else - semodule -i %{localstatedir}/lib/pcp/selinux/pcpupstream.pp + semodule -i %{_selinuxdir}/pcpupstream.pp %endif #distro version check +%triggerin selinux -- docker-selinux +if ls %{_selinuxdir} | grep -q docker 2>/dev/null +then +%if 0%{?fedora} >= 24 || 0%{?rhel} > 6 + semodule -X 400 -i %{_selinuxdir}/pcpupstream-docker.pp +%else + semodule -i %{_selinuxdir}/pcpupstream-docker.pp +%endif #distro version check +fi + +%triggerin selinux -- container-selinux +if ls %{_selinuxdir} | grep -q container 2>/dev/null +then +%if 0%{?fedora} >= 24 || 0%{?rhel} > 6 + semodule -X 400 -i %{_selinuxdir}/pcpupstream-container.pp +%else + semodule -i %{_selinuxdir}/pcpupstream-container.pp +%endif #distro version check +fi %endif %post @@ -2448,14 +2594,53 @@ cd %post -n %{lib_pkg} -p /sbin/ldconfig %postun -n %{lib_pkg} -p /sbin/ldconfig +%if 0%{?suse_version} +%post -n libpcp_gui2 -p /sbin/ldconfig +%postun -n libpcp_gui2 -p /sbin/ldconfig + +%post -n libpcp_mmv1 -p /sbin/ldconfig +%postun -n libpcp_mmv1 -p /sbin/ldconfig + +%post -n libpcp_trace2 -p /sbin/ldconfig +%postun -n libpcp_trace2 -p /sbin/ldconfig + +%post -n libpcp_import1 -p /sbin/ldconfig +%postun -n libpcp_import1 -p /sbin/ldconfig + +%post -n libpcp_web1 -p /sbin/ldconfig +%postun -n libpcp_web1 -p /sbin/ldconfig +%endif %if !%{disable_selinux} -%postun selinux +%preun selinux +if [ `semodule -l | grep pcpupstream` ] +then %if 0%{?fedora} >= 24 || 0%{?rhel} > 6 semodule -X 400 -r pcpupstream >/dev/null %else semodule -r pcpupstream >/dev/null %endif +fi + +%triggerun selinux -- docker-selinux +if [ `semodule -l | grep pcpupstream-docker` ] +then +%if 0%{?fedora} >= 24 || 0%{?rhel} > 6 + semodule -X 400 -r pcpupstream-docker +%else +semodule -r pcpupstream-docker +%endif #distro version check +fi + +%triggerun selinux -- container-selinux +if [ `semodule -l | grep pcpupstream-container` ] +then +%if 0%{?fedora} >= 24 || 0%{?rhel} > 6 + semodule -X 400 -r pcpupstream-container +%else + semodule -r pcpupstream-container +%endif #distro version check +fi %endif %if 0%{?suse_version} @@ -2604,18 +2789,39 @@ cd %files -n %{lib_pkg} %defattr(-,root,root) - %{_libdir}/libpcp.so.3 +%{_libdir}/libpcp_pmda.so.3 +%if !0%{?suse_version} %{_libdir}/libpcp_gui.so.2 %{_libdir}/libpcp_mmv.so.1 -%{_libdir}/libpcp_pmda.so.3 %{_libdir}/libpcp_trace.so.2 %{_libdir}/libpcp_import.so.1 %{_libdir}/libpcp_web.so.1 +%else -%files -n %{lib_devel_pkg} -f devel.list +%files -n libpcp_gui2 %defattr(-,root,root) +%{_libdir}/libpcp_gui.so.2 +%files -n libpcp_mmv1 +%defattr(-,root,root) +%{_libdir}/libpcp_mmv.so.1 + +%files -n libpcp_trace2 +%defattr(-,root,root) +%{_libdir}/libpcp_trace.so.2 + +%files -n libpcp_import1 +%defattr(-,root,root) +%{_libdir}/libpcp_import.so.1 + +%files -n libpcp_web1 +%defattr(-,root,root) +%{_libdir}/libpcp_web.so.1 +%endif + +%files -n %{lib_devel_pkg} +%defattr(-,root,root) %{_libdir}/libpcp.so %{_libdir}/libpcp_gui.so %{_libdir}/libpcp_mmv.so @@ -2780,8 +2986,10 @@ cd %files pmda-nfsclient %{_pmdasdir}/nfsclient +%if !%{disable_nutcracker} %files pmda-nutcracker %{_pmdasdir}/nutcracker +%endif %files pmda-oracle %{_pmdasdir}/oracle