rpm/pcp
SHA256
1
0
Fork 0
forked from pool/pcp
Code Pull Requests Activity

Accepting request 634471 from home:kwk:branches:Base:System

Browse Source 
- Upgrade to 4.1.1
- renamed patches
  0002-Install-libraries-without-exec-permission.patch
  to 0001-Install-libraries-without-exec-permission.patch
  0005-Remove-runlevel-4-from-init-scripts.patch
  to 0003-Remove-runlevel-4-from-init-scripts.patch
  0006-create-pmlogger-and-pmie-logdirs-during-install.patch
  to 0004-create-pmlogger-and-pmie-logdirs-during-install.patch
  0008-SUSE-fy-pmsnap-control-path.patch
  to 0005-SUSE-fy-pmsnap-control-path.patch
  0009-pmsnap-control-var-www-srv-www.patch
  to 0006-pmsnap-control-var-www-srv-www.patch
- obsolete (upstream)
  sysmacros.patch
  0003-pcp-legacy-init-lsb.patch
  0007-Honor-CFLAGS-in-qmake.patch
  
- new
  0002-Remove-CPAN-rpaths.patch
  0003-pcp-legacy-init-lsb.patch
  0007-Honor-CFLAGS-in-qmake.patch

OBS-URL: https://build.opensuse.org/request/show/634471
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=63
This commit is contained in:
Klaus Kämpf 2018-09-08 14:50:14 +00:00 committed by Git OBS Bridge
parent 99f7f0ba58
commit 4c9c407f67
14 changed files with 488 additions and 633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

333
0001-Install-libraries-without-exec-permission.patch Normal file
View File

@ -0,0 +1,333 @@
From 550357486d093e60ddf8102cf3ff474c7fa1721d 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 1/6] Install libraries without exec permission
---
src/genpmda/genpmda | 4 ++--
src/libpcp/src/GNUmakefile | 4 ++--
src/libpcp_fault/src/GNUmakefile | 4 ++--
src/libpcp_gui/src/GNUmakefile | 4 ++--
src/libpcp_import/src/GNUmakefile | 4 ++--
src/libpcp_mmv/src/GNUmakefile | 4 ++--
src/libpcp_pmcd/src/GNUmakefile | 2 +-
src/libpcp_pmda/src/GNUmakefile | 4 ++--
src/libpcp_trace/src/GNUmakefile | 4 ++--
src/pmdas/aix/GNUmakefile | 2 +-
src/pmdas/darwin/GNUmakefile | 2 +-
src/pmdas/freebsd/GNUmakefile | 2 +-
src/pmdas/linux/GNUmakefile | 2 +-
src/pmdas/linux_proc/GNUmakefile | 2 +-
src/pmdas/lustrecomm/GNUmakefile | 2 +-
src/pmdas/pmcd/src/GNUmakefile | 2 +-
src/pmdas/sendmail/GNUmakefile | 2 +-
src/pmdas/solaris/GNUmakefile | 2 +-
18 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda
index 5e5c110d19e1..9670b74614f7 100755
--- a/src/genpmda/genpmda
+++ b/src/genpmda/genpmda
@@ -899,7 +899,7 @@ install: default
\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
\$(INSTALL) -m 755 -d \$(PMDADIR)
\$(INSTALL) -m 755 \$(CMDTARGET) \$(PMDADIR)/\$(CMDTARGET)
- \$(INSTALL) -m 755 \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
+ \$(INSTALL) -m 644 \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
\$(INSTALL) -m 755 $oflag/Install \$(PMDADIR)/Install
\$(INSTALL) -m 755 $oflag/Remove \$(PMDADIR)/Remove
\$(INSTALL) -m 644 $oflag/Makefile.install \$(PMDADIR)/Makefile
@@ -962,7 +962,7 @@ install: default
\$(INSTALL) -m 755 -d \$(PCP_VAR_DIR)/pmdas
\$(INSTALL) -m 755 -d \$(PMDADIR)
\$(INSTALL) -m 755 -f \$(CMDTARGET) \$(PMDADIR)/\$(CMDTARGET)
- \$(INSTALL) -m 755 -f \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
+ \$(INSTALL) -m 644 -f \$(LIBTARGET) \$(PMDADIR)/\$(LIBTARGET)
\$(INSTALL) -m 755 -f $oflag/Install \$(PMDADIR)/Install
\$(INSTALL) -m 755 -f $oflag/Remove \$(PMDADIR)/Remove
\$(INSTALL) -m 644 -f $oflag/Makefile.install \$(PMDADIR)/Makefile
diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile
index c854255875d4..099555588a76 100644
--- a/src/libpcp/src/GNUmakefile
+++ b/src/libpcp/src/GNUmakefile
@@ -124,7 +124,7 @@ endif
install : default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
$(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG)
endif
ifneq ($(SYMTARGET),)
@@ -133,7 +133,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
$(EXT_FILES):
diff --git a/src/libpcp_fault/src/GNUmakefile b/src/libpcp_fault/src/GNUmakefile
index 9c548f08f9c4..726e1b8172cb 100644
--- a/src/libpcp_fault/src/GNUmakefile
+++ b/src/libpcp_fault/src/GNUmakefile
@@ -145,7 +145,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 \
@@ -153,7 +153,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
diff --git a/src/libpcp_gui/src/GNUmakefile b/src/libpcp_gui/src/GNUmakefile
index 2a40ac55b14b..4cbb254449e1 100644
--- a/src/libpcp_gui/src/GNUmakefile
+++ b/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
diff --git a/src/libpcp_import/src/GNUmakefile b/src/libpcp_import/src/GNUmakefile
index 25aad34f3252..f8155422a9ad 100644
--- a/src/libpcp_import/src/GNUmakefile
+++ b/src/libpcp_import/src/GNUmakefile
@@ -54,7 +54,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
$(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG)
endif
ifneq ($(SYMTARGET),)
@@ -63,7 +63,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp: default
diff --git a/src/libpcp_mmv/src/GNUmakefile b/src/libpcp_mmv/src/GNUmakefile
index 7cb833f26210..1d0b2202a6c0 100644
--- a/src/libpcp_mmv/src/GNUmakefile
+++ b/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
diff --git a/src/libpcp_pmcd/src/GNUmakefile b/src/libpcp_pmcd/src/GNUmakefile
index 85db369199e6..708c3c2de7ef 100644
--- a/src/libpcp_pmcd/src/GNUmakefile
+++ b/src/libpcp_pmcd/src/GNUmakefile
@@ -73,7 +73,7 @@ include $(BUILDRULES)
install : default
ifeq "$(TARGET_OS)" "mingw"
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifeq "$(ENABLE_PROBES)" "true"
diff --git a/src/libpcp_pmda/src/GNUmakefile b/src/libpcp_pmda/src/GNUmakefile
index e11d8928c5b2..93c2e6f4cd05 100644
--- a/src/libpcp_pmda/src/GNUmakefile
+++ b/src/libpcp_pmda/src/GNUmakefile
@@ -64,7 +64,7 @@ include $(BUILDRULES)
install: default
ifneq ($(LIBTARGET),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
$(INSTALL) -m 644 $(LIBCONFIG) $(PCP_LIB_DIR)/pkgconfig/$(LIBCONFIG)
endif
ifneq ($(SYMTARGET),)
@@ -73,7 +73,7 @@ ifneq ($(SYMTARGET),)
done
endif
ifneq ($(STATICLIBTARGET),)
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
$(XFILES):
diff --git a/src/libpcp_trace/src/GNUmakefile b/src/libpcp_trace/src/GNUmakefile
index 10738d63160e..6f11d06600f4 100644
--- a/src/libpcp_trace/src/GNUmakefile
+++ b/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
diff --git a/src/pmdas/aix/GNUmakefile b/src/pmdas/aix/GNUmakefile
index deb495ea42de..e0b66397d031 100644
--- a/src/pmdas/aix/GNUmakefile
+++ b/src/pmdas/aix/GNUmakefile
@@ -44,7 +44,7 @@ build-me: common.h root_aix $(CMDTARGET) $(LIBTARGET) help.dir help.pag
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 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 root_aix $(PCP_VAR_DIR)/pmns/root_aix
else
build-me:
diff --git a/src/pmdas/darwin/GNUmakefile b/src/pmdas/darwin/GNUmakefile
index d5be0e87c4a3..b5ee06d930f6 100644
--- a/src/pmdas/darwin/GNUmakefile
+++ b/src/pmdas/darwin/GNUmakefile
@@ -48,7 +48,7 @@ build-me: root_darwin $(LIBTARGET) $(CMDTARGET) help.dir help.pag
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 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 root_darwin $(PCP_VAR_DIR)/pmns/root_darwin
else
build-me:
diff --git a/src/pmdas/freebsd/GNUmakefile b/src/pmdas/freebsd/GNUmakefile
index 34b7f9329412..04f7524be857 100644
--- a/src/pmdas/freebsd/GNUmakefile
+++ b/src/pmdas/freebsd/GNUmakefile
@@ -48,7 +48,7 @@ build-me: $(LIBTARGET) $(CMDTARGET) help.dir help.pag
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 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 root_freebsd $(PCP_VAR_DIR)/pmns/root_freebsd
else
build-me:
diff --git a/src/pmdas/linux/GNUmakefile b/src/pmdas/linux/GNUmakefile
index bd76a5938154..b049d7a398ae 100644
--- a/src/pmdas/linux/GNUmakefile
+++ b/src/pmdas/linux/GNUmakefile
@@ -88,7 +88,7 @@ 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 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
diff --git a/src/pmdas/linux_proc/GNUmakefile b/src/pmdas/linux_proc/GNUmakefile
index 4933c9f56c25..66ac15e2e35b 100644
--- a/src/pmdas/linux_proc/GNUmakefile
+++ b/src/pmdas/linux_proc/GNUmakefile
@@ -69,7 +69,7 @@ build-me: root_proc $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(LOGREWRITERS)
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 644 root_proc $(PCP_VAR_DIR)/pmns/root_proc
$(INSTALL) -m 644 $(LOGREWRITERS) $(PCP_VAR_DIR)/config/pmlogrewrite
@$(INSTALL_MAN)
diff --git a/src/pmdas/lustrecomm/GNUmakefile b/src/pmdas/lustrecomm/GNUmakefile
index 8d8f801734c8..58375479cdd5 100644
--- a/src/pmdas/lustrecomm/GNUmakefile
+++ b/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)
diff --git a/src/pmdas/pmcd/src/GNUmakefile b/src/pmdas/pmcd/src/GNUmakefile
index 5ab2f22a565d..9f364f5cc7b5 100644
--- a/src/pmdas/pmcd/src/GNUmakefile
+++ b/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)
diff --git a/src/pmdas/sendmail/GNUmakefile b/src/pmdas/sendmail/GNUmakefile
index c679c880b9a1..3930eedd52e5 100644
--- a/src/pmdas/sendmail/GNUmakefile
+++ b/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)
diff --git a/src/pmdas/solaris/GNUmakefile b/src/pmdas/solaris/GNUmakefile
index 0720b37d98f0..f11a5dc8a25c 100644
--- a/src/pmdas/solaris/GNUmakefile
+++ b/src/pmdas/solaris/GNUmakefile
@@ -53,7 +53,7 @@ build-me: root_solaris $(LIBTARGET) $(CMDTARGET) $(HELPTARGETS) $(VERSION_SCRIPT
install: build-me
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h $(HELPTARGETS) $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris
else
build-me:
--
2.18.0

440
0002-Install-libraries-without-exec-permission.patch
View File

@ -1,440 +0,0 @@
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.9/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)
\$(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.9/src/libpcp/src/GNUmakefile
===================================================================
--- 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),)
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
endif
ifneq ($(SYMTARGET),)
for tt in $(SYMTARGET); do \
@@ -119,7 +119,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.9/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
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.9/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
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.9/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
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.9/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
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.9/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
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.9/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)
$(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.9/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)
$(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.9/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)
$(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.9/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)
$(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.9/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)
$(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.9/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)
$(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.9/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
$(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.9/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
$(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.9/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)
$(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.9/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
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.9/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)
$(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.9/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)
$(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.9/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)
$(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.9/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)
$(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
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

53
0002-Remove-CPAN-rpaths.patch Normal file
View File

@ -0,0 +1,53 @@
From 952ce8410406537e388a41e873941bbc427fd4d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 12 Dec 2014 15:45:33 +0100
Subject: [PATCH 2/6] Remove CPAN rpaths
---
src/perl/LogImport/Makefile.PL | 2 +-
src/perl/MMV/Makefile.PL | 2 +-
src/perl/PMDA/Makefile.PL | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/perl/LogImport/Makefile.PL b/src/perl/LogImport/Makefile.PL
index a254f5ad501f..2ec42f51a4eb 100644
--- a/src/perl/LogImport/Makefile.PL
+++ b/src/perl/LogImport/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "LogImport.o",
$inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp/src -L$ENV{PCP_TOPDIR}/src/libpcp_import/src -lpcp_import -lpcp"];
+ $libs = ["-lpcp_import -lpcp"];
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
diff --git a/src/perl/MMV/Makefile.PL b/src/perl/MMV/Makefile.PL
index 7a6787deda4a..1e4cea0317d4 100644
--- a/src/perl/MMV/Makefile.PL
+++ b/src/perl/MMV/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "MMV.o";
$inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_mmv/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_mmv -lpcp"];
+ $libs = ["-lpcp_mmv -lpcp"];
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
diff --git a/src/perl/PMDA/Makefile.PL b/src/perl/PMDA/Makefile.PL
index d5c44615a651..e2260c4b5397 100644
--- a/src/perl/PMDA/Makefile.PL
+++ b/src/perl/PMDA/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "local.o PMDA.o";
$inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp";
- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_pmda/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_pmda -lpcp"];
+ $libs = ["-lpcp_pmda -lpcp"];
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
--
2.18.0

42
0005-Remove-runlevel-4-from-init-scripts.patch → 0003-Remove-runlevel-4-from-init-scripts.patch
View File

@ -1,31 +1,41 @@
From 7b1eb0b00132d57ed184ab397e76ab1450aba773 Mon Sep 17 00:00:00 2001
From 582c2e703b48f2c8aa6a7e574997a4650b8a67a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 12 Dec 2014 15:46:15 +0100
Subject: [PATCH 5/6] Remove runlevel 4 from init scripts
Subject: [PATCH 3/6] Remove runlevel 4 from init scripts
---
src/pmcd/rc_pcp | 2 +-
src/pmcd/rc_pcp | 12 ++++++------
src/pmcd/rc_pmcd | 2 +-
src/pmie/rc_pmie | 2 +-
src/pmlogger/rc_pmlogger | 2 +-
src/pmproxy/rc_pmproxy | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/pmcd/rc_pcp b/src/pmcd/rc_pcp
index 8d6872cfad9c..0fcb4eded076 100644
index fc58627acc4b..9acf3c6f7cca 100644
--- a/src/pmcd/rc_pcp
+++ b/src/pmcd/rc_pcp
@@ -35,7 +35,7 @@
# Should-Start: $network $remote_fs $syslog $time
# Required-Stop: $local_fs
# Should-Stop: $network $remote_fs $syslog
-# Default-Start: 2 3 4 5
@@ -31,12 +31,12 @@
# e.g. SuSE, where chkconfig is a perl script.
### BEGIN INIT INFO
# Provides: pcp
-# Required-Start:
-# Should-Start:
-# Required-Stop:
-# Should-Stop:
-# Default-Start:
-# Default-Stop:
+# Required-Start: $local_fs
+# Should-Start: $network $remote_fs $syslog $time
+# Required-Stop: $local_fs
+# Should-Stop: $network $remote_fs $syslog
+# Default-Start: 2 3 5
# Default-Stop: 0 1 6
+# Default-Stop: 0 1 6
# Short-Description: Legacy control for PCP daemons
# Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons
### END INIT INFO
diff --git a/src/pmcd/rc_pmcd b/src/pmcd/rc_pmcd
index 1f5deef9f16a..e1bb4f7c2929 100644
index f42e435bdf3f..164526fac01a 100644
--- a/src/pmcd/rc_pmcd
+++ b/src/pmcd/rc_pmcd
@@ -27,7 +27,7 @@
@ -38,7 +48,7 @@ index 1f5deef9f16a..e1bb4f7c2929 100644
# Short-Description: Control pmcd (the collection daemon for PCP)
# Description: Configure and control pmcd (the collection daemon for the Performance Co-Pilot)
diff --git a/src/pmie/rc_pmie b/src/pmie/rc_pmie
index 685b52ab2897..51c7389aeefa 100644
index 013f2aab3eed..48c07c61081d 100644
--- a/src/pmie/rc_pmie
+++ b/src/pmie/rc_pmie
@@ -25,7 +25,7 @@
@ -51,7 +61,7 @@ index 685b52ab2897..51c7389aeefa 100644
# Short-Description: Control pmie (performance inference engine for PCP)
# Description: Configure and control pmie (the performance inference engine for the Performance Co-Pilot)
diff --git a/src/pmlogger/rc_pmlogger b/src/pmlogger/rc_pmlogger
index f28c084e097e..bdd4e72b877f 100644
index 390809a27255..b6038840f23e 100644
--- a/src/pmlogger/rc_pmlogger
+++ b/src/pmlogger/rc_pmlogger
@@ -27,7 +27,7 @@
@ -64,7 +74,7 @@ index f28c084e097e..bdd4e72b877f 100644
# Short-Description: Control pmlogger (the performance metrics logger for PCP)
# Description: Configure and control pmlogger (the performance metrics logger for the Performance Co-Pilot)
diff --git a/src/pmproxy/rc_pmproxy b/src/pmproxy/rc_pmproxy
index 5e776086cd31..c3e049483ec9 100644
index 0bb38c005a7b..45ca18b9a5c1 100644
--- a/src/pmproxy/rc_pmproxy
+++ b/src/pmproxy/rc_pmproxy
@@ -27,7 +27,7 @@
@ -77,5 +87,5 @@ index 5e776086cd31..c3e049483ec9 100644
# Short-Description: Control pmproxy (the pmcd proxy daemon for PCP)
# Description: Configure and control pmproxy (the pmcd proxy daemon for the Performance Co-Pilot)
--
2.1.2
2.18.0

41
0003-pcp-legacy-init-lsb.patch
View File

@ -1,41 +0,0 @@
From 18efe6b86936d454773a437cf50ab6a90c6506f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 12 Dec 2014 15:44:44 +0100
Subject: [PATCH 3/6] pcp legacy init lsb
---
src/pmcd/rc_pcp | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
Index: pcp-3.11.8/src/pmcd/rc_pcp
===================================================================
--- pcp-3.11.8.orig/src/pmcd/rc_pcp
+++ pcp-3.11.8/src/pmcd/rc_pcp
@@ -31,12 +31,12 @@
# e.g. SuSE, where chkconfig is a perl script.
### BEGIN INIT INFO
# Provides: pcp
-# Required-Start:
-# Should-Start:
-# Required-Stop:
-# Should-Stop:
-# Default-Start:
-# Default-Stop:
+# Required-Start: $local_fs
+# Should-Start: $network $remote_fs $syslog $time
+# Required-Stop: $local_fs
+# Should-Stop: $network $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
# Short-Description: Legacy control for PCP daemons
# Description: Legacy init script wrapper for the Performance Co-Pilot (PCP) daemons
### END INIT INFO
@@ -79,6 +79,8 @@ _service()
fi
}
+echo "The pcp init script is depricated, pmcd and pmlogger should be used instead"
+
case "$1" in
'start'|'restart'|'condrestart'|'reload'|'force-reload')

25
0006-create-pmlogger-and-pmie-logdirs-during-install.patch → 0004-create-pmlogger-and-pmie-logdirs-during-install.patch
View File

@ -1,17 +1,17 @@
From 0037ea80c895b72fffeb146c8a4eeb458001e2f6 Mon Sep 17 00:00:00 2001
From 2579ef49525c6de11b2ee543196d1719928b38ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 12 Dec 2014 15:46:47 +0100
Subject: [PATCH 6/6] create pmlogger and pmie logdirs during install
Subject: [PATCH 4/6] create pmlogger and pmie logdirs during install
---
src/pmie/GNUmakefile | 2 ++
src/pmlogger/GNUmakefile | 2 ++
2 files changed, 4 insertions(+)
Index: pcp-3.10.9/src/pmie/GNUmakefile
===================================================================
--- pcp-3.10.9.orig/src/pmie/GNUmakefile
+++ pcp-3.10.9/src/pmie/GNUmakefile
diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile
index 6c4eb0edb0c8..e27f2968dace 100644
--- a/src/pmie/GNUmakefile
+++ b/src/pmie/GNUmakefile
@@ -58,6 +58,8 @@ ifeq ($(TARGET_OS),linux)
# Docker version of the crontab into the hosts /etc/cron.d directory.
$(INSTALL) -m 644 crontab.docker $(PCP_VAR_DIR)/config/pmie/crontab.docker
@ -21,11 +21,11 @@ Index: pcp-3.10.9/src/pmie/GNUmakefile
endif
$(INSTALL) -m 644 crontab $(CRONTAB_PATH)
Index: pcp-3.10.9/src/pmlogger/GNUmakefile
===================================================================
--- pcp-3.10.9.orig/src/pmlogger/GNUmakefile
+++ pcp-3.10.9/src/pmlogger/GNUmakefile
@@ -62,6 +62,8 @@ ifeq ($(TARGET_OS),linux)
diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile
index 572b4af832fd..75af514d55a4 100644
--- a/src/pmlogger/GNUmakefile
+++ b/src/pmlogger/GNUmakefile
@@ -65,6 +65,8 @@ ifeq ($(TARGET_OS),linux)
# Docker version of the crontab into the hosts cron.d directory.
$(INSTALL) -m 644 crontab.docker $(PCP_VAR_DIR)/config/pmlogger/crontab.docker
$(INSTALL) -m 755 -d `dirname $(CRONTAB_PATH)`
@ -34,3 +34,6 @@ Index: pcp-3.10.9/src/pmlogger/GNUmakefile
endif
$(INSTALL) -m 644 crontab $(CRONTAB_PATH)
$(INSTALL) -m 644 utilproc.sh $(PCP_SHARE_DIR)/lib/utilproc.sh
--
2.18.0

6
0008-SUSE-fy-pmsnap-control-path.patch → 0005-SUSE-fy-pmsnap-control-path.patch
View File

@ -1,7 +1,7 @@
From e47109751682efd28989b6a4012cdbd032e0c9fe Mon Sep 17 00:00:00 2001
From 99d131530bdad67ea92eeeff85181500b5c03768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Mon, 23 Feb 2015 16:52:38 +0100
Subject: [PATCH 8/9] SUSE-fy pmsnap control path
Subject: [PATCH 5/6] SUSE-fy pmsnap control path
---
src/pmsnap/pmsnap.sh | 4 ++--
@ -30,5 +30,5 @@ index 87434a5fbfb9..92be253313ea 100755
then
echo "$prog: Error: cannot find control file \"$CONTROL\""
--
2.1.4
2.18.0

6
0009-pmsnap-control-var-www-srv-www.patch → 0006-pmsnap-control-var-www-srv-www.patch
View File

@ -1,7 +1,7 @@
From a778bc20b4a82ed7b72717880bff8bd91def7bd3 Mon Sep 17 00:00:00 2001
From ee16369892091cbd2eb68402209220591899ba3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Mon, 23 Feb 2015 16:54:20 +0100
Subject: [PATCH 9/9] pmsnap/control: /var/www -> /srv/www
Subject: [PATCH 6/6] pmsnap/control: /var/www -> /srv/www
---
src/pmsnap/control | 4 ++--
@ -20,5 +20,5 @@ index 54440b51bb1c..6cb13206fb1f 100644
+/srv/www/pcp/LOCALHOSTNAME.1hour.summary LOCALHOSTNAME/Latest Snap -O-0 -A 10min -t 2min -v 30
+/srv/www/pcp/LOCALHOSTNAME.12hour.summary LOCALHOSTNAME/Latest Snap -O-0 -A 1hour -t 30min -v 30
--
2.1.4
2.18.0

80
0007-Honor-CFLAGS-in-qmake.patch
View File

@ -1,80 +0,0 @@
From 4f195b3a280a2ced27028a210ae88724f6fe56d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Tue, 3 Feb 2015 14:15:10 +0100
Subject: [PATCH 7/7] Honor CFLAGS in qmake
rpm complained about files not compile with RPM_OPT_FLAGS
http://stackoverflow.com/questions/17578150/add-cflags-to-qmake-project-without-hard-coding-them-in-the-pro-file
---
src/libpcp_qed/src/libpcp_qed.pro | 1 +
src/libpcp_qmc/src/libpcp_qmc.pro | 1 +
src/libpcp_qwt/src/libpcp_qwt.pro | 1 +
src/pmdumptext/pmdumptext.pro | 1 +
src/pmquery/pmquery.pro | 1 +
src/pmtime/pmtime.pro | 1 +
6 files changed, 6 insertions(+)
Index: pcp-3.11.8/src/libpcp_qed/src/libpcp_qed.pro
===================================================================
--- pcp-3.11.8.orig/src/libpcp_qed/src/libpcp_qed.pro
+++ pcp-3.11.8/src/libpcp_qed/src/libpcp_qed.pro
@@ -6,6 +6,7 @@ INCLUDEPATH += ../../include ../../libpc
release:DESTDIR = build/debug
debug:DESTDIR = build/release
QT = core gui network printsupport svg widgets
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
HEADERS = qed.h \
qed_actionlist.h \
Index: pcp-3.11.8/src/libpcp_qmc/src/libpcp_qmc.pro
===================================================================
--- pcp-3.11.8.orig/src/libpcp_qmc/src/libpcp_qmc.pro
+++ pcp-3.11.8/src/libpcp_qmc/src/libpcp_qmc.pro
@@ -5,6 +5,7 @@ CONFIG += qt staticlib warn_on
INCLUDEPATH += ../../include
release:DESTDIR = build/debug
debug:DESTDIR = build/release
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
HEADERS = qmc_context.h qmc_desc.h qmc_group.h \
qmc_indom.h qmc_metric.h qmc_source.h \
Index: pcp-3.11.8/src/libpcp_qwt/src/libpcp_qwt.pro
===================================================================
--- pcp-3.11.8.orig/src/libpcp_qwt/src/libpcp_qwt.pro
+++ pcp-3.11.8/src/libpcp_qwt/src/libpcp_qwt.pro
@@ -8,6 +8,7 @@ QT = core gui network svg
greaterThan(QT_MAJOR_VERSION, 4) {
QT += concurrent printsupport
}
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
HEADERS += \
qwt.h \
Index: pcp-3.11.8/src/pmdumptext/pmdumptext.pro
===================================================================
--- pcp-3.11.8.orig/src/pmdumptext/pmdumptext.pro
+++ pcp-3.11.8/src/pmdumptext/pmdumptext.pro
@@ -10,3 +10,4 @@ LIBS += -L../libpcp_qmc/src -L../libpcp
LIBS += -lpcp_qmc -lpcp
win32:LIBS += -lwsock32 -liphlpapi
QT -= gui
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
Index: pcp-3.11.8/src/pmquery/pmquery.pro
===================================================================
--- pcp-3.11.8.orig/src/pmquery/pmquery.pro
+++ pcp-3.11.8/src/pmquery/pmquery.pro
@@ -8,3 +8,4 @@ CONFIG += qt warn_on
QT += widgets
release:DESTDIR = build/debug
debug:DESTDIR = build/release
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)
Index: pcp-3.11.8/src/pmtime/pmtime.pro
===================================================================
--- pcp-3.11.8.orig/src/pmtime/pmtime.pro
+++ pcp-3.11.8/src/pmtime/pmtime.pro
@@ -22,3 +22,4 @@ LIBS += -lpcp_qwt -lpcp_qmc -lpcp
win32:LIBS += -lwsock32 -liphlpapi
QT += network widgets
QMAKE_INFO_PLIST = pmtime.info
+QMAKE_CXXFLAGS += $$(PCP_CFLAGS)

3
pcp-3.11.9.tar.bz2
View File

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

3
pcp-4.1.1.tar.gz Normal file
View File

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

27
pcp.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Sep 7 10:39:49 UTC 2018 - kkaempf@suse.com
- Upgrade to 4.1.1
- renamed patches
0002-Install-libraries-without-exec-permission.patch
to 0001-Install-libraries-without-exec-permission.patch
0005-Remove-runlevel-4-from-init-scripts.patch
to 0003-Remove-runlevel-4-from-init-scripts.patch
0006-create-pmlogger-and-pmie-logdirs-during-install.patch
to 0004-create-pmlogger-and-pmie-logdirs-during-install.patch
0008-SUSE-fy-pmsnap-control-path.patch
to 0005-SUSE-fy-pmsnap-control-path.patch
0009-pmsnap-control-var-www-srv-www.patch
to 0006-pmsnap-control-var-www-srv-www.patch
- obsolete (upstream)
sysmacros.patch
0003-pcp-legacy-init-lsb.patch
0007-Honor-CFLAGS-in-qmake.patch
- new
0002-Remove-CPAN-rpaths.patch
0003-pcp-legacy-init-lsb.patch
0007-Honor-CFLAGS-in-qmake.patch
-------------------------------------------------------------------
Mon Aug 6 09:30:46 UTC 2018 - schwab@suse.de

42
pcp.spec
View File

@ -73,32 +73,28 @@ 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.9
Version: 4.1.1
Release: 0
%global buildversion 1
Url: http://www.pcp.io
Source0: pcp-%{version}.tar.bz2
Source0: pcp-%{version}.tar.gz
%if 0%{?suse_version}
Source2: pcp-rpmlintrc
%endif
# PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch2: 0002-Install-libraries-without-exec-permission.patch
Patch1: 0001-Install-libraries-without-exec-permission.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch3: 0003-pcp-legacy-init-lsb.patch
Patch2: 0002-Remove-CPAN-rpaths.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch5: 0005-Remove-runlevel-4-from-init-scripts.patch
Patch3: 0003-Remove-runlevel-4-from-init-scripts.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch6: 0006-create-pmlogger-and-pmie-logdirs-during-install.patch
Patch4: 0004-create-pmlogger-and-pmie-logdirs-during-install.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch7: 0007-Honor-CFLAGS-in-qmake.patch
Patch5: 0005-SUSE-fy-pmsnap-control-path.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch8: 0008-SUSE-fy-pmsnap-control-path.patch
# PATCH-FIX-OPENSUSE, kkaempf@suse.de
Patch9: 0009-pmsnap-control-var-www-srv-www.patch
# PATCH-FIX-UPSTREAM Include <sys/sysmacros.h> for major/minor/makedev
Patch10: sysmacros.patch
Patch6: 0006-pmsnap-control-var-www-srv-www.patch
%if 0%{?fedora} || 0%{?rhel}
%global disable_selinux 0
@ -255,6 +251,8 @@ BuildRequires: perl
BuildRequires: procps
BuildRequires: python-devel
BuildRequires: rpm-devel
BuildRequires: perl(JSON)
BuildRequires: perl(LWP::UserAgent)
%if !%{disable_python3}
BuildRequires: python3-devel
%endif
@ -2111,14 +2109,12 @@ updated policy package.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
autoconf
@ -2748,13 +2744,14 @@ fi
%license COPYING
%if 0%{?suse_version}
%exclude %{_docdir}/pcp/demos
%exclude %{_docdir}/pcp/examples
%exclude %{_docdir}/pcp/trivial
%exclude %{_docdir}/pcp/txmon
%exclude %{_testsdir}
%endif
%dir %{_confdir}
%dir %{_confdir}/dstat
%{_confdir}/dstat/*
%dir %{_confdir}/discover
%{_confdir}/discover/*
%dir %{_pmdasdir}
%dir %{_datadir}/pcp
%dir %{_localstatedir}/lib/pcp
@ -2812,6 +2809,7 @@ fi
%dir %{_sysconfdir}/sasl2
%config(noreplace) %{_sysconfdir}/sasl2/pmcd.conf
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmlogger-daily-report
%config(noreplace) %{_sysconfdir}/cron.d/pcp-pmie
%if 0%{?suse_version}
%{_fillupdir}/sysconfig.pmlogger
@ -2849,7 +2847,7 @@ fi
%{_localstatedir}/lib/pcp/config/pmlogrewrite
%dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmda
%{_datadir}/bash-completion/completions/pcp
%{_datadir}/bash-completion/completions/*
%{_datadir}/zsh/site-functions/_pcp
%if !%{disable_sdt}
@ -2912,6 +2910,7 @@ fi
%files devel -f devel.list
%{_datadir}/pcp/examples
%{_libdir}/pkgconfig/*.pc
# PMDAs that ship src and are not for production use
# straight out-of-the-box, for devel or QA use only.
@ -3139,6 +3138,9 @@ fi
%files export-zabbix-agent
%{_libdir}/zabbix
%{_bindir}/pcp2zabbix
%dir %{_sysconfdir}/zabbix
%{_sysconfdir}/zabbix/*
%if !%{disable_json}
%files pmda-json

12
sysmacros.patch
View File

@ -1,12 +0,0 @@
Index: pcp-3.11.9/src/pmdas/gfs2/pmda.c
===================================================================
--- pcp-3.11.9.orig/src/pmdas/gfs2/pmda.c
+++ pcp-3.11.9/src/pmdas/gfs2/pmda.c
@@ -22,6 +22,7 @@
#include "pmdagfs2.h"
#include <sys/types.h>
+#include <sys/sysmacros.h>
#include <ctype.h>
static char *gfs2_sysfsdir = "/sys/kernel/debug/gfs2";