diff --git a/.gitignore b/.gitignore index 9fb578d..c2466be 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.6.7.src.tar.gz /pcp-3.6.8.src.tar.gz /pcp-3.6.9.src.tar.gz +/pcp-3.6.10.src.tar.gz diff --git a/pcp.spec b/pcp.spec index ece19b3..5c7aa8a 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,6 +1,6 @@ Summary: System-level performance monitoring and performance management Name: pcp -Version: 3.6.9 +Version: 3.6.10 %define buildversion 1 Release: %{buildversion}%{?dist} @@ -17,7 +17,8 @@ BuildRequires: readline-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: initscripts man /bin/hostname -Requires: bash gawk sed grep fileutils findutils initscripts perl python +Requires: bash gawk sed grep fileutils findutils initscripts perl +Requires: python python-ctypes Requires: pcp-libs = %{version}-%{release} Requires: python-pcp = %{version}-%{release} @@ -211,7 +212,7 @@ building Performance Metric API (PMAPI) tools using Python. rm -Rf $RPM_BUILD_ROOT %build -%configure --with-rcdir=/etc/rc.d/init.d +%configure --with-rcdir=/etc/rc.d/init.d --with-tmpdir=/var/lib/pcp/tmp make default_pcp %install @@ -249,6 +250,16 @@ getent passwd pcpqa >/dev/null || \ useradd -c "PCP Quality Assurance" -g pcpqa -m -r -s /bin/bash pcpqa 2>/dev/null exit 0 +%post testsuite +chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null +exit 0 + +%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 + %preun if [ "$1" -eq 0 ] then @@ -258,7 +269,6 @@ then /sbin/service pmlogger stop >/dev/null 2>&1 /sbin/service pmie stop >/dev/null 2>&1 /sbin/service pmproxy stop >/dev/null 2>&1 - /sbin/service pcp stop >/dev/null 2>&1 /sbin/service pmcd stop >/dev/null 2>&1 /sbin/chkconfig --del pcp >/dev/null 2>&1 @@ -269,6 +279,7 @@ then fi %post +chown -R pcp:pcp %{_localstatedir}/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 @@ -394,6 +405,11 @@ fi %defattr(-,root,root) %changelog +* Mon Nov 19 2012 Nathan Scott - 3.6.10-1 +- Update to latest PCP sources. +- Resolve tmpfile security flaws: CVE-2012-5530 +- Introduces new "pcp" user account for all daemons to use. + * Fri Oct 12 2012 Nathan Scott - 3.6.9-1 - Update to latest PCP sources. - Fix pmcd sigsegv in NUMA/CPU indom setup (BZ 858384) diff --git a/sources b/sources index debd91f..57bd924 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e2570362680aa866ae7b9ed81163fa1a pcp-3.6.9.src.tar.gz +f39a581638ab9419d30f3d814841938b pcp-3.6.10.src.tar.gz