pool/pcp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
fe4241ff74
pcp/0001-Install-libraries-without-exec-permission.patch
Klaus Kämpf 4c9c407f67 Accepting request 634471 from home:kwk:branches:Base:System 
- 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
2018-09-08 14:50:14 +00:00

334 lines
13 KiB
Diff
Raw Blame History

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
Reference in New Issue View Git Blame Copy Permalink