From 865c920542f1cc499500c97217bfb36b70541765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= 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.10.4/src/genpmda/genpmda =================================================================== --- pcp-3.10.4.orig/src/genpmda/genpmda +++ pcp-3.10.4/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.10.4/src/libpcp/src/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/libpcp/src/GNUmakefile +++ pcp-3.10.4/src/libpcp/src/GNUmakefile @@ -125,7 +125,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 \ @@ -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 default_pcp : default Index: pcp-3.10.4/src/libpcp_gui/src/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/libpcp_gui/src/GNUmakefile +++ pcp-3.10.4/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.10.4/src/libpcp_import/src/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/libpcp_import/src/GNUmakefile +++ pcp-3.10.4/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.10.4/src/libpcp_mmv/src/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/libpcp_mmv/src/GNUmakefile +++ pcp-3.10.4/src/libpcp_mmv/src/GNUmakefile @@ -48,7 +48,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 \ @@ -56,7 +56,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.10.4/src/libpcp_pmda/src/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/libpcp_pmda/src/GNUmakefile +++ pcp-3.10.4/src/libpcp_pmda/src/GNUmakefile @@ -60,7 +60,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 \ @@ -68,7 +68,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.10.4/src/libpcp_trace/src/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/libpcp_trace/src/GNUmakefile +++ pcp-3.10.4/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.10.4/src/pmdas/aix/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/aix/GNUmakefile +++ pcp-3.10.4/src/pmdas/aix/GNUmakefile @@ -43,7 +43,8 @@ build-me: common.h root_aix domain.h $(C 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.10.4/src/pmdas/darwin/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/darwin/GNUmakefile +++ pcp-3.10.4/src/pmdas/darwin/GNUmakefile @@ -47,7 +47,8 @@ build-me: root_darwin domain.h $(LIBTARG 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.10.4/src/pmdas/freebsd/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/freebsd/GNUmakefile +++ pcp-3.10.4/src/pmdas/freebsd/GNUmakefile @@ -48,7 +48,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTAR 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.10.4/src/pmdas/linux/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/linux/GNUmakefile +++ pcp-3.10.4/src/pmdas/linux/GNUmakefile @@ -75,7 +75,8 @@ build-me: domain.h $(LIBTARGET) $(CMDTAR install: default $(INSTALL) -m 755 -d $(PMDADIR) $(INSTALL) -m 644 domain.h help $(HELPTARGETS) $(PMDADIR) - $(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 else Index: pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/linux_proc/GNUmakefile +++ pcp-3.10.4/src/pmdas/linux_proc/GNUmakefile @@ -66,7 +66,8 @@ build-me: domain.h root_proc $(LIBTARGET 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.10.4/src/pmdas/lustrecomm/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/lustrecomm/GNUmakefile +++ pcp-3.10.4/src/pmdas/lustrecomm/GNUmakefile @@ -50,7 +50,7 @@ build-me: domain.h $(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.10.4/src/pmdas/pmcd/src/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/pmcd/src/GNUmakefile +++ pcp-3.10.4/src/pmdas/pmcd/src/GNUmakefile @@ -54,7 +54,7 @@ default: $(LIBTARGET) domain.h 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.10.4/src/pmdas/sendmail/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/sendmail/GNUmakefile +++ pcp-3.10.4/src/pmdas/sendmail/GNUmakefile @@ -39,7 +39,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.10.4/src/pmdas/solaris/GNUmakefile =================================================================== --- pcp-3.10.4.orig/src/pmdas/solaris/GNUmakefile +++ pcp-3.10.4/src/pmdas/solaris/GNUmakefile @@ -53,7 +53,8 @@ build-me: root_solaris domain.h $(LIBTAR 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: