pcp/0002-Install-libraries-without-exec-permission.patch
David Disseldorp 24c2d0e20f Accepting request 483206 from home:dmdiss:pcp-311
- Update to 3.11.8
  See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.11.8
  for details.
- Remove 0010-build-do-not-include-.gitignore-in-installed-file-se.patch
  + Upstream
- Drop pcp-webjs.src.tar.gz
  + https://github.com/performancecopilot/pcp-webjs/issues/3
  + Vector will be pulled in from the upstream source in future
- Enable pmda-systemd package
  + libsystemd pkg-config detection fixed upstream
- New packages
  + pcp-devel: Upstream split of non-essential devel packages from
    libpcp-devel
  + pcp-pmda-bind2
  + pcp-pmda-docker
  + pcp-pmda-lio
  + pcp-pmda-nutcracker
  + pcp-pmda-oracle
  + pcp-pmda-redis
  + pcp-pmda-libvirt
  + pcp-export-pcp2influxdb

- Update to 3.10.9
  See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.10.9
  for details.
- Drop obsolete 0001-Fix-XEN-build.patch
  + PCP_PS_ALL_FLAGS now used explicitly
- Add 0010-build-do-not-include-.gitignore-in-installed-file-se.patch
- Split out a number of agents from the base package into separate rpms
- Disable sheet2pcp

OBS-URL: https://build.opensuse.org/request/show/483206
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=49
2017-03-28 22:11:53 +00:00

377 lines
15 KiB
Diff

From 865c920542f1cc499500c97217bfb36b70541765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 12 Dec 2014 15:43:00 +0100
Subject: [PATCH 2/6] Install libraries without exec permission
---
src/genpmda/genpmda | 4 ++--
src/libpcp/src/GNUmakefile | 4 ++--
src/libpcp_gui/src/GNUmakefile | 4 ++--
src/libpcp_import/src/GNUmakefile | 4 ++--
src/libpcp_mmv/src/GNUmakefile | 4 ++--
src/libpcp_pmda/src/GNUmakefile | 4 ++--
src/libpcp_trace/src/GNUmakefile | 4 ++--
src/pmdas/aix/GNUmakefile | 3 ++-
src/pmdas/darwin/GNUmakefile | 3 ++-
src/pmdas/freebsd/GNUmakefile | 3 ++-
src/pmdas/linux/GNUmakefile | 3 ++-
src/pmdas/linux_proc/GNUmakefile | 3 ++-
src/pmdas/lustrecomm/GNUmakefile | 2 +-
src/pmdas/pmcd/src/GNUmakefile | 2 +-
src/pmdas/sendmail/GNUmakefile | 2 +-
src/pmdas/solaris/GNUmakefile | 3 ++-
16 files changed, 29 insertions(+), 23 deletions(-)
Index: pcp-3.11.8/src/genpmda/genpmda
===================================================================
--- pcp-3.11.8.orig/src/genpmda/genpmda
+++ pcp-3.11.8/src/genpmda/genpmda
@@ -909,7 +909,7 @@ install: default
\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
\$(INSTALL) -m 755 -d \$(PMDADIR)
\$(INSTALL) -m 755 \$(CMDTARGET) \$(PMDADIR)/\$(CMDTARGET)
- \$(INSTALL) -m 755 \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
+ \$(INSTALL) -m 644 \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
\$(INSTALL) -m 755 $oflag/Install \$(PMDADIR)/Install
\$(INSTALL) -m 755 $oflag/Remove \$(PMDADIR)/Remove
\$(INSTALL) -m 644 $oflag/Makefile.install \$(PMDADIR)/Makefile
@@ -972,7 +972,7 @@ install: default
\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
\$(INSTALL) -m 755 -d \$(PMDADIR)
\$(INSTALL) -m 755 -f \$(CMDTARGET) \$(PMDADIR)/\$(CMDTARGET)
- \$(INSTALL) -m 755 -f \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
+ \$(INSTALL) -m 644 -f \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
\$(INSTALL) -m 755 -f $oflag/Install \$(PMDADIR)/Install
\$(INSTALL) -m 755 -f $oflag/Remove \$(PMDADIR)/Remove
\$(INSTALL) -m 644 -f $oflag/Makefile.install \$(PMDADIR)/Makefile
Index: pcp-3.11.8/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
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 \
@@ -111,7 +111,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp : default
Index: pcp-3.11.8/src/libpcp_gui/src/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/libpcp_gui/src/GNUmakefile
+++ pcp-3.11.8/src/libpcp_gui/src/GNUmakefile
@@ -54,7 +54,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -62,7 +62,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp: default
Index: pcp-3.11.8/src/libpcp_import/src/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/libpcp_import/src/GNUmakefile
+++ pcp-3.11.8/src/libpcp_import/src/GNUmakefile
@@ -53,7 +53,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -61,7 +61,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp: default
Index: pcp-3.11.8/src/libpcp_mmv/src/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/libpcp_mmv/src/GNUmakefile
+++ pcp-3.11.8/src/libpcp_mmv/src/GNUmakefile
@@ -47,7 +47,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -55,7 +55,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp: default
Index: pcp-3.11.8/src/libpcp_pmda/src/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/libpcp_pmda/src/GNUmakefile
+++ pcp-3.11.8/src/libpcp_pmda/src/GNUmakefile
@@ -61,7 +61,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -69,7 +69,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp: default
Index: pcp-3.11.8/src/libpcp_trace/src/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/libpcp_trace/src/GNUmakefile
+++ pcp-3.11.8/src/libpcp_trace/src/GNUmakefile
@@ -56,13 +56,13 @@ include $(BUILDRULES)
install : default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq ($(SYMTARGET),)
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(SYMTARGET)
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp : default
Index: pcp-3.11.8/src/pmdas/aix/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/pmdas/aix/GNUmakefile
+++ pcp-3.11.8/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-3.11.8/src/pmdas/darwin/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/pmdas/darwin/GNUmakefile
+++ pcp-3.11.8/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-3.11.8/src/pmdas/freebsd/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/pmdas/freebsd/GNUmakefile
+++ pcp-3.11.8/src/pmdas/freebsd/GNUmakefile
@@ -48,7 +48,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
else
build-me:
Index: pcp-3.11.8/src/pmdas/linux/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/pmdas/linux/GNUmakefile
+++ pcp-3.11.8/src/pmdas/linux/GNUmakefile
@@ -78,7 +78,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 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
$(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
===================================================================
--- pcp-3.11.8.orig/src/pmdas/linux_proc/GNUmakefile
+++ pcp-3.11.8/src/pmdas/linux_proc/GNUmakefile
@@ -68,7 +68,8 @@ 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 644 $(LIBTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
$(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
===================================================================
--- pcp-3.11.8.orig/src/pmdas/lustrecomm/GNUmakefile
+++ pcp-3.11.8/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_MAN)
Index: pcp-3.11.8/src/pmdas/pmcd/src/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/pmdas/pmcd/src/GNUmakefile
+++ pcp-3.11.8/src/pmdas/pmcd/src/GNUmakefile
@@ -55,7 +55,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)
include $(BUILDRULES)
Index: pcp-3.11.8/src/pmdas/sendmail/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/pmdas/sendmail/GNUmakefile
+++ pcp-3.11.8/src/pmdas/sendmail/GNUmakefile
@@ -40,7 +40,7 @@ include $(BUILDRULES)
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-3.11.8/src/pmdas/solaris/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/pmdas/solaris/GNUmakefile
+++ pcp-3.11.8/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
else
build-me:
Index: pcp-3.11.8/src/libpcp_fault/src/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/libpcp_fault/src/GNUmakefile
+++ pcp-3.11.8/src/libpcp_fault/src/GNUmakefile
@@ -132,7 +132,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 \
@@ -140,7 +140,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
$(INSTALL) -m 644 $(TOPDIR)/src/include/pcp/fault.h $(PCP_INC_DIR)/fault.h
Index: pcp-3.11.8/src/pmdas/jbd2/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/pmdas/jbd2/GNUmakefile
+++ pcp-3.11.8/src/pmdas/jbd2/GNUmakefile
@@ -54,7 +54,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help $(HELPTARGETS) root root_jbd2 $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(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
===================================================================
--- pcp-3.11.8.orig/src/pmdas/linux_xfs/GNUmakefile
+++ pcp-3.11.8/src/pmdas/linux_xfs/GNUmakefile
@@ -55,7 +55,8 @@ build-me: $(LIBTARGET) $(CMDTARGET) $(HE
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h help help.dir help.pag root root_xfs $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(SCRIPTS) $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(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
===================================================================
--- pcp-3.11.8.orig/src/pmdas/nvidia/GNUmakefile
+++ pcp-3.11.8/src/pmdas/nvidia/GNUmakefile
@@ -37,7 +37,8 @@ include $(BUILDRULES)
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 755 Install Remove $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 $(DFILES) root help pmns domain.h $(PMDADIR)
$(OBJECTS): domain.h
Index: pcp-3.11.8/src/zabbix-agent/src/GNUmakefile
===================================================================
--- pcp-3.11.8.orig/src/zabbix-agent/src/GNUmakefile
+++ pcp-3.11.8/src/zabbix-agent/src/GNUmakefile
@@ -37,7 +37,7 @@ include $(BUILDRULES)
install: default
$(INSTALL) -m 755 -d $(ZABBIX_DIR)
$(INSTALL) -m 755 -d $(MODULE_DIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(MODULE_DIR)/$(LIBTARGET)
@$(INSTALL_MAN)
default_pcp: default