- up to 0.8.7b, fixed "Multiple Security Vulnerabilities"

[packages/cacti.git] / cacti.spec

diff --git a/cacti.spec b/cacti.spec
index e31354419369199ced6b681cd097162a474e7ada..a3aa2c3338ab59cbd2796fef425d6f4d0d7dba7d 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -1,31 +1,33 @@
+# TODO
+# - patch source to use adodb system path instead of symlinking
 %include       /usr/lib/rpm/macros.perl
 Summary:       Cacti is a PHP frontend for rrdtool
-Summary(pl):   Cacti - frontend w PHP do rrdtoola
+Summary(pl.UTF-8):Cacti - frontend w PHP do rrdtoola
 Name:          cacti
-Version:       0.8.6g
+Version:       0.8.7b
 Release:       1
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: b3cf31349d2db47d14dcf347b8422bc2
-Patch0:                http://www.cacti.net/downloads/patches/0.8.6g/short_open_tag_parse_error.patch
-Patch1:                http://www.cacti.net/downloads/patches/0.8.6g/graph_properties_zoom.patch
-Patch2:                http://www.cacti.net/downloads/patches/0.8.6g/script_server_snmp_auth.patch
-Patch3:                http://www.cacti.net/downloads/patches/0.8.6g/mib_file_loading.patch
-Patch4:                %{name}-config.patch
+# Source0-md5: 63ffca5735b60bc33c68bc880f0e8042
+Patch10:       %{name}-plugin-%{version}.diff
+Patch11:       %{name}-config.patch
+Patch12:       %{name}-adodb.patch
 URL:           http://www.cacti.net/
 BuildRequires: rpm-perlprov
+Requires:      adodb >= 4.67-1.17
 Requires:      crondaemon
 Requires:      net-snmp-utils
-Requires:      php
+Requires:      php(gd)
+Requires:      php(mysql)
+Requires:      php(pcre)
+Requires:      php(snmp)
+Requires:      php(xml)
 Requires:      php-cli
-Requires:      php-gd
-Requires:      php-mysql
-Requires:      php-pcre
-Requires:      php-snmp
-Requires:      php-xml
 Requires:      rrdtool
 Requires:      webserver
+Requires:      webserver(php)
+Suggests:      cacti-spine
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,42 +43,56 @@ maintain Graphs, Data Sources, and Round Robin Archives in a database,
 cacti handles the data gathering also. There is also SNMP support for
 those used to creating traffic graphs with MRTG.
 
-%description -l pl
-Cacti to pe³ny frontend do rrdtoola, zapamiêtuj±cy wszystkie
-informacje potrzebne do tworzenia wykresów i wype³niaj±ce je danymi w
-bazie MySQL.
+%description -l pl.UTF-8
+Cacti to pełny frontend do rrdtoola, zapamiętujący wszystkie
+informacje potrzebne do tworzenia wykresów i wypełniające je danymi
+w bazie MySQL.
 
-Frontend jest w pe³ni oparty na PHP. Oprócz zarz±dzania wykresami,
-¼ród³ami danych, archiwami Round Robin w bazie danych, cacti obs³uguje
-tak¿e gromadzenie danych. Ma tak¿e obs³ugê SNMP przydatn± przy
-tworzeniu wykresów ruchu przy u¿yciu MRTG.
+Frontend jest w pełni oparty na PHP. Oprócz zarządzania wykresami,
+źródłami danych, archiwami Round Robin w bazie danych, cacti
+obsługuje także gromadzenie danych. Ma także obsługę SNMP
+przydatną przy tworzeniu wykresów ruchu przy użyciu MRTG.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
-%build
+rm -rf lib/adodb
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{webadminroot}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},cron.d}
 install -d $RPM_BUILD_ROOT/var/{log,lib/%{name}}
-
 cp -aRf * $RPM_BUILD_ROOT%{webadminroot}
 ln -s . $RPM_BUILD_ROOT%{webadminroot}/%{name}
 
-cat << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.cfg
+# TODO: move this to SOURCES. it's a lot better to backtrack changes
+# if it's a separate file.
+cat << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/%{name}.cfg
 <?php
-\$database_type = "mysql";
-\$database_default = "cacti";
-\$database_hostname = "localhost";
-\$database_username = "cactiuser";
-\$database_password = "cactiuser";
+$database_type = 'mysql';
+$database_default = 'cacti';
+$database_hostname = 'localhost';
+$database_username = 'cactiuser';
+$database_password = 'cactiuser';
+
+$plugins = array();
+// $plugins[] = 'thold';
+// $plugins[] = 'monitor';
+// $plugins[] = 'discovery';
+
+/* Do not edit this line */
+$config = array();
+
+/* This is full URL Path to the Cacti installation
+   For example, if your cacti was accessible by http://server/cacti/ you would user '/cacti/'
+   as the url path.  For just http://server/ use '/'
+*/
+$config['url_path'] = '/cacti/';
+
 ?>
 EOF
 
@@ -85,9 +101,10 @@ ln -sf /var/log/cacti $RPM_BUILD_ROOT%{webadminroot}/log
 
 mv $RPM_BUILD_ROOT%{webadminroot}/rra $RPM_BUILD_ROOT/var/lib/%{name}
 ln -sf /var/lib/%{name}/rra $RPM_BUILD_ROOT%{webadminroot}/rra
+ln -sf %{_datadir}/php/adodb $RPM_BUILD_ROOT%{webadminroot}/lib/adodb
 
-cat  << EOF > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name}
-*/5 * * * * http umask 022; /usr/bin/php %{webadminroot}/poller.php > /dev/null 2>&1
+cat  << 'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/%{name}
+*/5 * * * * http umask 022; %{_bindir}/php %{webadminroot}/poller.php > /dev/null 2>&1
 EOF
 
 %clean
@@ -97,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc docs/CHANGELOG docs/CONTRIB docs/README
 %attr(750,root,http) %dir %{_sysconfdir}/%{name}
-%attr(640,root,http) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}/%{name}.cfg
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.cfg
 %attr(770,root,http) %dir /var/log/%{name}
 %attr(660,root,http) %ghost /var/log/%{name}/*.log
 %attr(750,root,http) %dir /var/lib/%{name}