- use exec to avoid /bin/sh in process table

[packages/cacti.git] / cacti.spec

diff --git a/cacti.spec b/cacti.spec
index b78c4960cb271ac313d50254dec388c477bb9bba..3d20b11177f61f75fb03e5ff15e539a2ce0f62fe 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,11 +1,9 @@
-# TODO
-# - shouldn't files in scripts dir be executable?
 %include       /usr/lib/rpm/macros.perl
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
 Version:       0.8.7b
-Release:       9.17
+Release:       11
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
@@ -16,13 +14,20 @@ Source3:    http://cactiusers.org/downloads/%{name}-plugin-arch.tar.gz
 # Source3-md5: 7079c1f366e8ea1b26c7e251e6373226
 Source4:       %{name}-apache.conf
 Source5:       %{name}-lighttpd.conf
-Patch1:                %{name}-upgrade_from_086k_fix.patch
-Patch2:                http://www.cacti.net/downloads/patches/0.8.7b/snmp_auth_none_notice.patch
-Patch3:                http://www.cacti.net/downloads/patches/0.8.7b/reset_each_patch.patch
-Patch11:       %{name}-config.patch
-Patch12:       %{name}-adodb.patch
+Source6:       %{name}-rrdpath.sql
+Patch100:      http://www.cacti.net/downloads/patches/0.8.7b/upgrade_from_086k_fix.patch
+Patch101:      http://www.cacti.net/downloads/patches/0.8.7b/snmp_auth_none_notice.patch
+Patch102:      http://www.cacti.net/downloads/patches/0.8.7b/reset_each_patch.patch
+Patch0:                %{name}-config.patch
+Patch1:                %{name}-adodb.patch
+Patch2:                %{name}-ioerror.patch
+Patch3:                %{name}-webroot.patch
+Patch4:                %{name}-linux_memory.patch
+Patch5:                %{name}-log-verbosity.patch
+Patch6:                %{name}-ss_disk-array-indices.patch
 URL:           http://www.cacti.net/
 BuildRequires: rpm-perlprov
+BuildRequires: sed >= 4.0
 Requires(postun):      /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/useradd
@@ -75,38 +80,62 @@ Summary:    Cacti setup package
 Summary(pl.UTF-8):     Pakiet do wstępnej konfiguracji Cacti
 Group:         Applications/WWW
 Requires:      %{name} = %{version}-%{release}
-Requires:      %{name}-doc = %{version}-%{release}
+Suggests:      %{name}-doc = %{version}-%{release}
 
 %description setup
 Install this package to configure initial Cacti installation. You
 should uninstall this package when you're done, as it considered
 insecure to keep the setup files in place.
 
+%description setup -l pl.UTF-8
+Ten pakiet należy zainstalować, aby wstępnie skonfigurować instalację
+Cacti. Po tym pakiet powinien zostać odinstalowany, jako że jego
+obecność może być niebezpieczna.
+
 %package doc
 Summary:       HTML Documentation for Cacti
+Summary(pl.UTF-8):     Dokumentacja do Cacti w formacie HTML
 Group:         Documentation
 Requires:      %{name} = %{version}-%{release}
 
 %description doc
 HTML Documentation for Cacti.
 
+%description doc -l pl.UTF-8
+Dokumentacja do Cacti w formacie HTML.
+
 %prep
 %setup -q -a 3
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%{__patch} -p1 -s < cacti-plugin-arch/cacti-plugin-0.8.7b-PA-v2.1.diff
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%{__patch} -p1 -s < cacti-plugin-arch/cacti-plugin-0.8.7b-PA-v2.1.diff
-%patch11 -p1
-%patch12 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 mkdir -p sql
 mv *.sql sql
+# you should run this sql if your database contains path to %{_datadir}...
+cp %{SOURCE6} sql
 
 mv cacti-plugin-arch/pa.sql sql
 rm -rf cacti-plugin-arch
 rm -rf lib/adodb
 rm -f log/.htaccess
+rm -f cli/.htaccess
 rm -f rra/.placeholder
+rm -f plugins/index.php
+
+%{__sed} -i -e '1i#!%{_bindir}/php' scripts/*.php
+chmod a+rx scripts/*
+
+%{__sed} -i -e '1i#!%{_bindir}/php' cli/*.php
+chmod a+rx cli/*
 
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -124,7 +153,6 @@ cp -a log $RPM_BUILD_ROOT/var/log/%{name}
 cp -a rra $RPM_BUILD_ROOT/var/lib/%{name}
 
 cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
-# TODO: switch to user cacti here
 cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/cron.d/%{name}
 
 cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -181,9 +209,22 @@ fi
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/config.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}
 %attr(755,root,root) %{_sbindir}/cacti-poller
-%{_appdir}
+%dir %{_appdir}
 %exclude %{_appdir}/install
 %exclude %{_appdir}/docs
+%{_appdir}/resource
+%{_appdir}/sql
+%{_appdir}/lib
+%{_appdir}/include
+%{_appdir}/images
+%{_appdir}/plugins
+%{_appdir}/*.php
+
+%dir %{_appdir}/cli
+%attr(755,root,root) %{_appdir}/cli/*
+
+%dir %{_appdir}/scripts
+%attr(755,root,root) %{_appdir}/scripts/*
 
 %attr(750,root,http) %dir /var/lib/%{name}
 %attr(770,root,http) %dir /var/lib/%{name}/rra