pool/pcp
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Create pcp user and group during installation.

Browse Source 
- Package pre-populated tmp directory. The directory must be world writeable
  (with the sticky-bit set), as it may be used by any PMDAs or client tools;
  (bnc#782967).

- Update to pcp-3.6.10.
  + Transition daemons to run under an unprivileged account.
  + Fixes for security advisory CVE-2012-5530: tmpfile flaws;
    (bnc#782967).
  + Fix pcp(1) command short-form pmlogger reporting.
  + Fix pmdalogger error handling for directory files.
  + Fix pmstat handling of odd corner case in CPU metrics.
  + Correct the python ctype used for pmAtomValue 32bit ints.
  + Add missing RPM spec dependency for python-ctypes.
  + Corrections to pmdamysql metrics units.
  + Add pmdamysql slave status metrics.
  + Improve pmcollectl error messages.
  + Parameterize pmcollectl CPU counts in interrupt subsys.
  + Fix generic RPM packaging for powerpc builds.
  + Fix python API use of reentrant libpcp string routines.
  + Python code backporting for RHEL5 in qa and pmcollectl.
  + Fix edge cases in capturing interrupt error counts.
- Update to pcp-3.6.9.
  + Python wrapper for the pmimport API
  + Make sar2pcp work with the sysstat versions from RHEL5,
    RHEL6, and all recent Fedora versions (which is almost
    all current versions of sysstat verified).
  + Added a number of additional metrics into the importer
    for people starting to use it to analyse sar data from
    real customer incidents.

OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=25
This commit is contained in:
David Disseldorp 2012-11-21 15:07:21 +00:00 committed by Git OBS Bridge
parent 72d933b0e0
commit 6fb7136bf4
9 changed files with 483 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
configure_append_pcp_subdir.patch
View File

@ -1,46 +0,0 @@
From 8ae41f7080de22383990ef477d28f148dfa403a7 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@samba.org>
Date: Tue, 5 Jun 2012 17:01:28 +0200
Subject: [PATCH] build: append pcp sub-directory suffix
With the fix to correctly handle a --Xdir= configure arguments, a number
of PCP specific paths need a pcp/ suffix to match default (no --Xdir=)
paths.
---
configure.in | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/configure.in b/configure.in
index 6b83469..e25a7cc 100644
--- a/configure.in
+++ b/configure.in
@@ -1553,6 +1553,8 @@ then
else
pcp_share_dir=/usr/pcp
fi
+else
+ pcp_share_dir=`eval echo $pcp_share_dir/pcp`
fi
AC_SUBST(pcp_share_dir)
@@ -1598,6 +1600,8 @@ then
else
pcp_var_dir=/usr
fi
+else
+ pcp_var_dir=`eval echo $pcp_var_dir/pcp`
fi
AC_SUBST(pcp_var_dir)
@@ -1852,6 +1856,8 @@ then
else
pcp_inc_dir=/usr/include/pcp
fi
+else
+ pcp_inc_dir=`eval echo $pcp_inc_dir/pcp`
fi
AC_SUBST(pcp_inc_dir)
--
1.7.1

37
create-pmlogger-and-pmie-logdirs-during-install.patch Normal file
View File

@ -0,0 +1,37 @@
From 05c112bd44b4a5dbb432e9d13e1e51816bd0acf8 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Wed, 21 Nov 2012 12:53:25 +0100
Subject: [PATCH] create pmlogger and pmie logdirs during install
---
src/pmie/GNUmakefile | 1 +
src/pmlogger/GNUmakefile | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile
index c62b869..e0ec1cd 100644
--- a/src/pmie/GNUmakefile
+++ b/src/pmie/GNUmakefile
@@ -46,6 +46,7 @@ install:: default
$(INSTALL) -m 755 pmie_daily.sh $(PCP_BINADM_DIR)/pmie_daily
$(INSTALL) -m 755 pmie2col $(PCP_BIN_DIR)/pmie2col
$(INSTALL) -m 755 rc_pmie $(PCP_RC_DIR)/pmie
+ $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmie
$(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmie
include $(BUILDRULES)
diff --git a/src/pmlogger/GNUmakefile b/src/pmlogger/GNUmakefile
index 23c810c..b045bdb 100644
--- a/src/pmlogger/GNUmakefile
+++ b/src/pmlogger/GNUmakefile
@@ -37,6 +37,7 @@ include $(BUILDRULES)
install: $(CMDTARGET) $(OTHERS)
$(INSTALL) -m 755 $(CMDTARGET) $(PCP_BINADM_DIR)/$(CMDTARGET)
$(INSTALL) -m 755 rc_pmlogger $(PCP_RC_DIR)/pmlogger
+ $(INSTALL) -m 755 -d $(PCP_LOG_DIR)/pmlogger
$(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/pmlogger
YFLAGS += -v
--
1.7.10.4

85
fix_configure_path_tests.patch
View File

@ -1,85 +0,0 @@
From 70b76abe42aca1c968feb3bfe20b74c61cf05db6 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Mon, 21 Nov 2011 18:40:36 +0100
Subject: [PATCH] build: fix configure path tests
This commit fixes pcp_(share|binadm|var|lib|man)_dir configure tests:
if test -z "`echo $pcp_share_dir | sed 's;/.*\$;;'`"
Currently all tests evaluate to true when absolute paths are supplied,
as sed replaces from the leading '/', rather than the end which appears
to be the intended purpose.
---
configure.in | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.in b/configure.in
index 46e3f27..6b83469 100644
--- a/configure.in
+++ b/configure.in
@@ -1539,7 +1539,7 @@ AC_SUBST(pcp_etc_dir)
dnl shared PCP files (shareable for diskless)
pcp_share_dir=`eval echo $datadir`
pcp_share_dir=`eval echo $pcp_share_dir`
-if test -z "`echo $pcp_share_dir | sed 's;/.*\$;;'`"
+if test -z "`echo $pcp_share_dir | sed 's;/\s*\$;;'`"
then
if test $target_os = mingw
then
@@ -1559,7 +1559,7 @@ AC_SUBST(pcp_share_dir)
dnl private PCP executables
pcp_binadm_dir=`eval echo $libexecdir`
pcp_binadm_dir=`eval echo $pcp_binadm_dir`
-if test -z "`echo $pcp_binadm_dir | sed 's;/.*\$;;'`"
+if test -z "`echo $pcp_binadm_dir | sed 's;/\s*\$;;'`"
then
if test $target_distro = debian
then
@@ -1581,7 +1581,7 @@ AC_SUBST(pcp_binadm_dir)
dnl non-shared (i.e. system local) PCP files
pcp_var_dir=`eval echo $localstatedir`
pcp_var_dir=`eval echo $pcp_var_dir`
-if test -z "`echo $pcp_var_dir | sed 's;/.*\$;;'`"
+if test -z "`echo $pcp_var_dir | sed 's;/\s*\$;;'`"
then
if test $target_os = mingw
then
@@ -1654,7 +1654,7 @@ then
else
pcp_lib_dir=`eval echo $libdir`
pcp_lib_dir=`eval echo $pcp_lib_dir`
- if test -z "`echo $pcp_lib_dir | sed 's;/.*\$;;'`"
+ if test -z "`echo $pcp_lib_dir | sed 's;/\s*\$;;'`"
then
if test -d /usr/lib
then
@@ -1716,7 +1716,7 @@ need_old_tbl_header=false
man_header=
pcp_man_dir=`eval echo $mandir`
pcp_man_dir=`eval echo $pcp_man_dir`
-if test -z "`echo $pcp_man_dir | sed 's;/.*\$;;'`"
+if test -z "`echo $pcp_man_dir | sed 's;/\s*\$;;'`"
then
dnl some low risk defaults
if test $target_os = mingw
@@ -1827,7 +1827,7 @@ AC_SUBST(need_old_tbl_header)
dnl public binaries
pcp_bin_dir=`eval echo $bindir`
pcp_bin_dir=`eval echo $pcp_bin_dir`
-if test -z "`echo $pcp_bin_dir | sed 's;/.*\$;;'`"
+if test -z "`echo $pcp_bin_dir | sed 's;/\s*\$;;'`"
then
if test $target_os = mingw
then
@@ -1844,7 +1844,7 @@ AC_SUBST(pcp_bin_dir)
dnl include files
pcp_inc_dir=`eval echo $includedir`
pcp_inc_dir=`eval echo $pcp_inc_dir`
-if test -z "`echo $pcp_inc_dir | sed 's;/.*\$;;'`"
+if test -z "`echo $pcp_inc_dir | sed 's;/\s*\$;;'`"
then
if test $target_os = mingw
then
--
1.7.1

3
pcp-3.6.10.src.tar.gz Normal file
View File

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

4
pcp-rpmlintrc
View File

@ -3,3 +3,7 @@
# but rather they are (slightly obscure) PMDA config files.
#
addFilter('E: devel-file-in-non-devel-package')
# A /var/lib/pcp/tmp directory is created for the safe creation of shared
# tmp files. it must be world writeable for PMDAs and client tools, which
# may be run as anyone.
addFilter('E: permissions-world-writable')

102
pcp.changes
View File

@ -1,3 +1,105 @@
-------------------------------------------------------------------
Wed Nov 21 13:27:25 UTC 2012 - ddiss@suse.com
- Create pcp user and group during installation.
- Package pre-populated tmp directory. The directory must be world writeable
(with the sticky-bit set), as it may be used by any PMDAs or client tools;
(bnc#782967).
-------------------------------------------------------------------
Mon Nov 19 17:19:01 UTC 2012 - ddiss@suse.com
- Update to pcp-3.6.10.
+ Transition daemons to run under an unprivileged account.
+ Fixes for security advisory CVE-2012-5530: tmpfile flaws;
(bnc#782967).
+ Fix pcp(1) command short-form pmlogger reporting.
+ Fix pmdalogger error handling for directory files.
+ Fix pmstat handling of odd corner case in CPU metrics.
+ Correct the python ctype used for pmAtomValue 32bit ints.
+ Add missing RPM spec dependency for python-ctypes.
+ Corrections to pmdamysql metrics units.
+ Add pmdamysql slave status metrics.
+ Improve pmcollectl error messages.
+ Parameterize pmcollectl CPU counts in interrupt subsys.
+ Fix generic RPM packaging for powerpc builds.
+ Fix python API use of reentrant libpcp string routines.
+ Python code backporting for RHEL5 in qa and pmcollectl.
+ Fix edge cases in capturing interrupt error counts.
- Update to pcp-3.6.9.
+ Python wrapper for the pmimport API
+ Make sar2pcp work with the sysstat versions from RHEL5,
RHEL6, and all recent Fedora versions (which is almost
all current versions of sysstat verified).
+ Added a number of additional metrics into the importer
for people starting to use it to analyse sar data from
real customer incidents.
+ Rework use of C99 "restrict" keyword in pmdalogger
(Debian bug: 689552)
+ Alot of work on the PCP QA suite, special thanks to Tomas
Dohnalek for all his efforts there.
+ Win32 build updates
+ Add "raw" disk active metrics so that existing tools like
iostat can be emulated
+ Allow sar2pcp to accept XML input directly (.xml suffix),
allowing it to not have to run on the same platform as the
sadc/sadf that originally generated it.
+ Add PMI error codes into the PCP::LogImport perl module.
+ Fix a typo in pmiUnits man page synopsis section
+ Resolve pmdalinux ordering issue in NUMA/CPU indom setup
(Redhat bug: 858384)
+ Remove unused pmcollectl imports (Redhat bug: 863210)
+ Allow event traces to be used in libpcp interpolate mode
- Update to pcp-3.6.8.
+ Corrects the disk/partition identification for the MMC
driver, which makes disk indom handling correct on the
Raspberry Pi (http://www.raspberrypi.org/)
+ Several minor/basic fixes for pmdaoracle.
+ Improve pmcollectl compatibility.
+ Make a few clarifications to pmcollectl.1.
+ Improve python API test coverage.
+ Numerous updates to the test suite in general.
+ Allow pmda Install scripts to specify own dso name again.
+ Reconcile spec file differences between PCP flavours.
+ Fix handling of multiple contexts with a remote namespace.
+ Core socket interface abstractions to support NSS (later).
+ Fix man page SYNOPSIS section for pmUnpackEventRecords.
+ Add --disable-shared build option for static builds.
- Update to pcp-3.6.6.
+ Added the python PMAPI bindings and an initial python client
in pmcollectl. Separate, new package exists for python libs
for those platforms that split out packages (rpm, deb).
+ Added a pcp-testsuite package for those platforms that might
want this (rpm, deb again, mainly)
+ Re-introduced the pcp/qa subdirectory in pcp and deprecated
the external pcpqa git tree.
+ Fix potential buffer overflow in pmlogger host name handling.
+ Reworked the configure --prefix handling to be more like the
rest of the open source world.
+ Ensure the __pmDecodeText ident parameter is always set
Resolves Red Hat bugzilla bug #841306.
-------------------------------------------------------------------
Tue Nov 13 11:10:58 UTC 2012 - ddiss@suse.com
- Ensure pmlogger and pmie temporary state is always placed under
PCP_TMP_DIR.
-------------------------------------------------------------------
Mon Nov 12 14:14:20 UTC 2012 - ddiss@suse.com
- Specify the PCP temporary file directory at configure time using the
--with-tempdir= argument.
-------------------------------------------------------------------
Fri Nov 9 15:32:28 UTC 2012 - ddiss@suse.com
- Use mktemp for the placement of init script temp files. Place global
temp files under run_dir; (bnc#782967).
-------------------------------------------------------------------
Wed Aug 15 23:57:34 UTC 2012 - ddiss@suse.com

44
pcp.spec
View File

@ -21,9 +21,8 @@ License: GPL-2.0
Group: System/Monitoring
Name: pcp
Version: 3.6.5
Version: 3.6.10
Release: 0
%define buildversion 1
%if (0%{?suse_version} > 0)
%define pcp_gr System/Monitoring
@ -51,7 +50,7 @@ Release: 0
%endif
Url: http://oss.sgi.com/projects/pcp
Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.tar.gz
Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}.src.tar.gz
Source1: pcp-rpmlintrc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -60,15 +59,15 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: ncurses-devel
BuildRequires: procps
BuildRequires: pwdutils
BuildRequires: readline-devel
BuildRequires: perl(ExtUtils::MakeMaker)
Patch6: pcp-xenbuild.patch
Patch9: static_lib_perms.diff
Patch10: pcp_legacy_init_lsb.patch
Patch11: fix_configure_path_tests.patch
Patch12: configure_append_pcp_subdir.patch
Patch13: remove_cpan_rpaths.patch
Patch14: rm_init_script_runlevel_4.patch
Patch15: create-pmlogger-and-pmie-logdirs-during-install.patch
%if (0%{?suse_version} > 0)
Requires: cpp
@ -115,6 +114,7 @@ Performance Co-Pilot (PCP) run-time libraries
#
# pcp-libs-devel
# SLE uses the legacy pcp-devel package name.
#
%package -n %{lib_devel_pkg}
Summary: Performance Co-Pilot (PCP) development headers and documentation
@ -123,6 +123,10 @@ Group: %{lib_devel_gr}
Url: http://oss.sgi.com/projects/pcp/
Requires: %{lib_pkg} = %{version}
Conflicts: %{lib_devel_pkg_conflict}
%if (0%{?suse_version} > 0)
Provides: pcp-devel = %{version}
Obsoletes: pcp-devel < %{version}
%endif
%if (0%{?fedora} > 0)
AutoReq: no
%endif
@ -276,14 +280,14 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
%prep
%setup -q
%patch6
%patch9
%patch9 -p1
%patch10
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
autoconf
%configure --localstatedir=/var/lib
%configure --with-rcdir=/etc/init.d --with-tmpdir=/var/lib/pcp/tmp \
--with-docdir=%{_datadir}/doc/packages/pcp
%clean
rm -Rf $RPM_BUILD_ROOT
@ -297,13 +301,17 @@ make install_pcp
# Fix stuff we do/don't want to ship
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/lib/pcp/testsuite
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pcp
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/pcp/tmp
%if (0%{?suse_version} > 0)
# add /etc/init.d/X symlinks at /usr/sbin/rcX
%__install -d -m 0755 ${RPM_BUILD_ROOT}/%{_sbindir}
for script in pcp pmie pmproxy pmlogger pmcd; do
ln -s "%{_sysconfdir}/init.d/${script}" "${RPM_BUILD_ROOT}/%{_sbindir}/rc${script}"
ln -s "%{_sysconfdir}/init.d/${script}" \
"${RPM_BUILD_ROOT}/%{_sbindir}/rc${script}"
done
%else
# default chkconfig off for Fedora and RHEL
@ -326,6 +334,12 @@ sed -e 's#$#*#' >base_man1files.list
cat base_pmdas.list base_binfiles.list base_man1files.list > base_specialfiles.list
%pre
getent group pcp >/dev/null || groupadd -r pcp
getent passwd pcp >/dev/null || \
useradd -c "Performance Co-Pilot" -g pcp -d %{_localstatedir}/lib/pcp -M -r -s /sbin/nologin pcp
exit 0
%if (0%{?suse_version} > 0)
%preun
@ -337,6 +351,7 @@ cat base_pmdas.list base_binfiles.list base_man1files.list > base_specialfiles.l
%{?insserv_cleanup:%{insserv_cleanup}}
%post
chown -R pcp:pcp /var/log/pcp/{pmcd,pmlogger,pmie,pmproxy} 2>/dev/null
/sbin/ldconfig
%else
@ -361,6 +376,7 @@ then
fi
%post
chown -R pcp:pcp /var/log/pcp/{pmcd,pmlogger,pmie,pmproxy} 2>/dev/null
/sbin/chkconfig --add pmcd >/dev/null 2>&1
/sbin/service pmcd condrestart
/sbin/chkconfig --add pmlogger >/dev/null 2>&1
@ -383,13 +399,17 @@ fi
# but rather they are (slightly obscure) PMDA config files.
#
%defattr(-,root,root)
# pcp_doc_dir should be derived from a configure option, currently it's not
%{_datadir}/doc/packages/pcp-%{version}
%{_datadir}/doc/packages/pcp
%if (0%{?suse_version} > 0)
%{_sbindir}/rc*
%endif
%ghost %dir %{_localstatedir}/run/pcp
%dir %{_localstatedir}/lib/pcp/tmp
%dir %{_localstatedir}/lib/pcp/tmp/pmdabash
%dir %{_localstatedir}/lib/pcp/tmp/mmv
%dir %{_localstatedir}/lib/pcp/tmp/pmie
%dir %{_localstatedir}/lib/pcp/tmp/pmlogger
%dir %{_pmdasdir}
%dir %{_datadir}/pcp
%dir %{_localstatedir}/lib/pcp

18
remove_cpan_rpaths.patch
View File

@ -1,7 +1,7 @@
Index: pcp-3.6.3/src/cpan/PMDA/Makefile.PL
Index: pcp-3.6.10/src/perl/PMDA/Makefile.PL
===================================================================
--- pcp-3.6.3.orig/src/cpan/PMDA/Makefile.PL
+++ pcp-3.6.3/src/cpan/PMDA/Makefile.PL
--- pcp-3.6.10.orig/src/perl/PMDA/Makefile.PL
+++ pcp-3.6.10/src/perl/PMDA/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "local.o PMDA.o";
@ -11,10 +11,10 @@ Index: pcp-3.6.3/src/cpan/PMDA/Makefile.PL
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
Index: pcp-3.6.3/src/cpan/LogImport/Makefile.PL
Index: pcp-3.6.10/src/perl/LogImport/Makefile.PL
===================================================================
--- pcp-3.6.3.orig/src/cpan/LogImport/Makefile.PL
+++ pcp-3.6.3/src/cpan/LogImport/Makefile.PL
--- pcp-3.6.10.orig/src/perl/LogImport/Makefile.PL
+++ pcp-3.6.10/src/perl/LogImport/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "LogImport.o",
@ -24,10 +24,10 @@ Index: pcp-3.6.3/src/cpan/LogImport/Makefile.PL
}
if ($ENV{TARGET_OS} eq "darwin") {
# standard ones, minus -arch ppc
Index: pcp-3.6.3/src/cpan/MMV/Makefile.PL
Index: pcp-3.6.10/src/perl/MMV/Makefile.PL
===================================================================
--- pcp-3.6.3.orig/src/cpan/MMV/Makefile.PL
+++ pcp-3.6.3/src/cpan/MMV/Makefile.PL
--- pcp-3.6.10.orig/src/perl/MMV/Makefile.PL
+++ pcp-3.6.10/src/perl/MMV/Makefile.PL
@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") {
else {
$ldfrom = "MMV.o";

385
static_lib_perms.diff
View File

@ -1,17 +1,153 @@
Index: src/libpcp_pmda/src/GNUmakefile
===================================================================
--- src/libpcp_pmda/src/GNUmakefile
+++ src/libpcp_pmda/src/GNUmakefile
@@ -65,7 +65,7 @@ $(LIBTARGET_V2): $(LIBTARGET_V3)
include $(BUILDRULES)
From bcd50d9e0a84c54c2e5d909f2567312c9af0335e Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.de>
Date: Mon, 19 Nov 2012 17:15:07 +0100
Subject: [PATCH] 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/mmv/GNUmakefile | 3 ++-
src/pmdas/pmcd/src/GNUmakefile | 2 +-
src/pmdas/sample/src/GNUmakefile | 3 ++-
src/pmdas/sendmail/GNUmakefile | 2 +-
src/pmdas/solaris/GNUmakefile | 3 ++-
18 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/src/genpmda/genpmda b/src/genpmda/genpmda
index 4650315..1bd2cba 100755
--- a/src/genpmda/genpmda
+++ b/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
diff --git a/src/libpcp/src/GNUmakefile b/src/libpcp/src/GNUmakefile
index 18adb88..6a7627d 100644
--- a/src/libpcp/src/GNUmakefile
+++ b/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
diff --git a/src/libpcp_gui/src/GNUmakefile b/src/libpcp_gui/src/GNUmakefile
index 6d636e0..d8fe1e7 100644
--- a/src/libpcp_gui/src/GNUmakefile
+++ b/src/libpcp_gui/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
diff --git a/src/libpcp_import/src/GNUmakefile b/src/libpcp_import/src/GNUmakefile
index 1cdf529..f1c7d1d 100644
--- a/src/libpcp_import/src/GNUmakefile
+++ b/src/libpcp_import/src/GNUmakefile
@@ -50,7 +50,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 \
@@ -58,7 +58,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 e2395f3..9619df5 100644
--- a/src/libpcp_mmv/src/GNUmakefile
+++ b/src/libpcp_mmv/src/GNUmakefile
@@ -45,7 +45,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 \
@@ -53,7 +53,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_pmda/src/GNUmakefile b/src/libpcp_pmda/src/GNUmakefile
index 23a1b10..182d68d 100644
--- a/src/libpcp_pmda/src/GNUmakefile
+++ b/src/libpcp_pmda/src/GNUmakefile
@@ -79,7 +79,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 "$(LIBTARGET_V1)" ""
$(INSTALL) -S $(LIBTARGET_V3) $(PCP_LIB_DIR)/$(LIBTARGET_V1)
endif
@@ -73,7 +73,7 @@ ifneq "$(LIBTARGET_V2)" ""
@@ -88,7 +88,7 @@ ifneq "$(LIBTARGET_V2)" ""
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET_V2)
endif
ifneq "$(STATICLIBTARGET)" ""
@ -20,16 +156,17 @@ Index: src/libpcp_pmda/src/GNUmakefile
endif
default_pcp : default
Index: src/libpcp_trace/src/GNUmakefile
===================================================================
--- src/libpcp_trace/src/GNUmakefile
+++ src/libpcp_trace/src/GNUmakefile
@@ -54,12 +54,12 @@ endif
include $(BUILDRULES)
diff --git a/src/libpcp_trace/src/GNUmakefile b/src/libpcp_trace/src/GNUmakefile
index d3ea55d..034195a 100644
--- a/src/libpcp_trace/src/GNUmakefile
+++ b/src/libpcp_trace/src/GNUmakefile
@@ -51,13 +51,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
@ -39,87 +176,157 @@ Index: src/libpcp_trace/src/GNUmakefile
endif
default_pcp : default
Index: src/libpcp_gui/src/GNUmakefile
===================================================================
--- src/libpcp_gui/src/GNUmakefile
+++ src/libpcp_gui/src/GNUmakefile
@@ -52,14 +52,14 @@ endif
include $(BUILDRULES)
diff --git a/src/pmdas/aix/GNUmakefile b/src/pmdas/aix/GNUmakefile
index 9282d76..46336a7 100644
--- a/src/pmdas/aix/GNUmakefile
+++ b/src/pmdas/aix/GNUmakefile
@@ -41,7 +41,8 @@ build-me: common.h root_aix domain.h $(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 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(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 a2fd3a7..081cc98 100644
--- a/src/pmdas/darwin/GNUmakefile
+++ b/src/pmdas/darwin/GNUmakefile
@@ -45,7 +45,8 @@ build-me: root_darwin domain.h $(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 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(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 217fcd8..00b2dcd 100644
--- a/src/pmdas/freebsd/GNUmakefile
+++ b/src/pmdas/freebsd/GNUmakefile
@@ -46,7 +46,8 @@ build-me: domain.h $(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 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(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 087e53a..bc81973 100644
--- a/src/pmdas/linux/GNUmakefile
+++ b/src/pmdas/linux/GNUmakefile
@@ -67,7 +67,8 @@ build-me: domain.h $(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 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 root_linux $(PCP_VAR_DIR)/pmns/root_linux
else
build-me:
diff --git a/src/pmdas/linux_proc/GNUmakefile b/src/pmdas/linux_proc/GNUmakefile
index 7d8961a..89aa43f 100644
--- a/src/pmdas/linux_proc/GNUmakefile
+++ b/src/pmdas/linux_proc/GNUmakefile
@@ -48,7 +48,8 @@ install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 755 Install Remove $(PMDADIR)
$(INSTALL) -m 644 domain.h pmns pmns.cgroup root help $(PMDADIR)
- $(INSTALL) -m 755 $(LIBTARGET) $(CMDTARGET) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 linux_proc_migrate.conf $(PCP_VAR_DIR)/config/pmlogrewrite/linux_proc_migrate.conf
else
build-me:
diff --git a/src/pmdas/lustrecomm/GNUmakefile b/src/pmdas/lustrecomm/GNUmakefile
index bd0aadc..153fe83 100644
--- a/src/pmdas/lustrecomm/GNUmakefile
+++ b/src/pmdas/lustrecomm/GNUmakefile
@@ -47,7 +47,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)
else
diff --git a/src/pmdas/mmv/GNUmakefile b/src/pmdas/mmv/GNUmakefile
index 302c212..7c6d1cd 100644
--- a/src/pmdas/mmv/GNUmakefile
+++ b/src/pmdas/mmv/GNUmakefile
@@ -44,7 +44,8 @@ include $(BUILDRULES)
install_pcp install: default
$(INSTALL) -m 755 -d $(PMDADIR)
$(INSTALL) -m 644 domain.h $(PMDADIR)/domain.h
- $(INSTALL) -m 755 $(TARGETS) Install Remove $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) mmvdump$(EXECSUFFIX) Install Remove $(PMDADIR)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 pmns $(PMDADIR)/root_mmv
$(INSTALL) -m 644 root_mmv $(PCP_VAR_DIR)/pmns/root_mmv
$(INSTALL) -m 1777 -d $(PCP_TMP_DIR)/mmv
diff --git a/src/pmdas/pmcd/src/GNUmakefile b/src/pmdas/pmcd/src/GNUmakefile
index 00e1e9c..34bbeb7 100644
--- a/src/pmdas/pmcd/src/GNUmakefile
+++ b/src/pmdas/pmcd/src/GNUmakefile
@@ -47,7 +47,7 @@ default: $(LIBTARGET)
install: default
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
ifneq "$(SYMTARGET)" ""
for tt in $(SYMTARGET); do \
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \
done
endif
ifneq "$(STATICLIBTARGET)" ""
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
$(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)
default_pcp: default
Index: src/libpcp_import/src/GNUmakefile
===================================================================
--- src/libpcp_import/src/GNUmakefile
+++ src/libpcp_import/src/GNUmakefile
@@ -45,14 +45,14 @@ $(OBJECTS): $(HFILES)
include $(BUILDRULES)
install: default
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
ifneq "$(SYMTARGET)" ""
for tt in $(SYMTARGET); do \
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \
done
endif
ifneq "$(STATICLIBTARGET)" ""
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
diff --git a/src/pmdas/sample/src/GNUmakefile b/src/pmdas/sample/src/GNUmakefile
index 57b61be..57b9a17 100644
--- a/src/pmdas/sample/src/GNUmakefile
+++ b/src/pmdas/sample/src/GNUmakefile
@@ -43,7 +43,8 @@ sample.o events.o: events.h
install: default
$(INSTALL) -m 755 -d $(PMDADIR)
- $(INSTALL) -m 755 $(CMDTARGET) $(LIBTARGET) $(PMDADIR)
+ $(INSTALL) -m 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
default_pcp: default
Index: src/libpcp_mmv/src/GNUmakefile
===================================================================
--- src/libpcp_mmv/src/GNUmakefile
+++ src/libpcp_mmv/src/GNUmakefile
@@ -40,14 +40,14 @@ default: pcp $(LIBTARGET) $(SYMTARGET) $
include $(BUILDRULES)
install: default
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
ifneq "$(SYMTARGET)" ""
for tt in $(SYMTARGET); do \
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \
done
endif
ifneq "$(STATICLIBTARGET)" ""
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
diff --git a/src/pmdas/sendmail/GNUmakefile b/src/pmdas/sendmail/GNUmakefile
index e551ad2..0c81c0a 100644
--- a/src/pmdas/sendmail/GNUmakefile
+++ b/src/pmdas/sendmail/GNUmakefile
@@ -36,7 +36,7 @@ include $(BUILDRULES)
default_pcp: default
Index: src/libpcp/src/GNUmakefile
===================================================================
--- src/libpcp/src/GNUmakefile
+++ src/libpcp/src/GNUmakefile
@@ -93,14 +93,14 @@ kernel_pmda_dso = $(TARGET_OS)
endif
install : default
- $(INSTALL) -m 755 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PCP_LIB_DIR)/$(LIBTARGET)
ifneq "$(SYMTARGET)" ""
for tt in $(SYMTARGET); do \
$(INSTALL) -S $(LIBTARGET) $(PCP_LIB_DIR)/$$tt || exit 1; \
done
endif
ifneq "$(STATICLIBTARGET)" ""
- $(INSTALL) -m 755 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
+ $(INSTALL) -m 644 $(STATICLIBTARGET) $(PCP_LIB_DIR)/$(STATICLIBTARGET)
endif
default_pcp : default
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 0d81837..5a4f0d8 100644
--- a/src/pmdas/solaris/GNUmakefile
+++ b/src/pmdas/solaris/GNUmakefile
@@ -45,7 +45,8 @@ build-me: root_solaris domain.h $(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 755 $(CMDTARGET) $(PMDADIR)/$(CMDTARGET)
+ $(INSTALL) -m 644 $(LIBTARGET) $(PMDADIR)/$(LIBTARGET)
$(INSTALL) -m 644 root_solaris $(PCP_VAR_DIR)/pmns/root_solaris
else
build-me:
--
1.7.10.4