[zabbix/f17] New upstream release 1.8.16

[Volker Fröhlich]

commit f21a47c3558d847ad73499c9edf2def0c39dd33e
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Jan 16 16:46:22 2013 +0100

    New upstream release 1.8.16
    
    - Solves LDAP security issue CVE-2013-1364
    - Obsolete docs subpackage
    - Remove .orig files in frontend left from patching
    - Remove defattr, no longer necessary since EL4

 .gitignore  |    1 +
 sources     |    2 +-
 zabbix.spec |   26 ++++++++++----------------
 3 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 56b60a3..6462604 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ zabbix-1.8.2.tar.gz
 /zabbix-1.8.13.tar.gz
 /zabbix-1.8.14.tar.gz
 /zabbix-1.8.15.tar.gz
+/zabbix-1.8.16.tar.gz
diff --git a/sources b/sources
index bd73e2f..1df73a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb1951b20c61c0f576c824d06f8318a6  zabbix-1.8.15.tar.gz
+891b7a5c915f3060b66687a483dc0551  zabbix-1.8.16.tar.gz
diff --git a/zabbix.spec b/zabbix.spec
index fb27823..607eff0 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -8,7 +8,7 @@
 %global srcname zabbix
 
 Name:           zabbix
-Version:        1.8.15
+Version:        1.8.16
 Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
@@ -58,6 +58,7 @@ BuildRequires:   libssh2-devel
 BuildRequires:   systemd-units
 
 Requires:        logrotate
+Obsoletes:       %{name}-docs < 1.8.15-2
 Requires(pre):   /usr/sbin/useradd
 %if %{srcname} != %{name}
 Conflicts:       %{srcname}
@@ -355,7 +356,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{srcname}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{srcname}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{srcname}
 
-# install the frontend
+# Install the frontend after removing backup files from patching
+find frontends/php -name '*.orig' -exec rm {} \;
 cp -a frontends/php $RPM_BUILD_ROOT%{_datadir}/%{srcname}
 
 # prepare ghosted config file
@@ -593,7 +595,6 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 %dir %{_sysconfdir}/%{srcname}
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/zabbix.conf
@@ -602,7 +603,6 @@ fi
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/%{srcname}
 
 %files server
-%defattr(-,root,root,-)
 %attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_server.conf
 %attr(0755,zabbix,zabbix) %dir %{_sysconfdir}/%{srcname}/externalscripts
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
@@ -612,25 +612,21 @@ fi
 %{_mandir}/man8/zabbix_server.8*
 
 %files server-mysql
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-server-mysql-%{version}/
 %{_sbindir}/zabbix_server_mysql
 %{_unitdir}/zabbix-server-mysql.service
 
 %files server-pgsql
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-server-pgsql-%{version}/
 %{_sbindir}/zabbix_server_pgsql
 %{_unitdir}/zabbix-server-pgsql.service
 
 %files server-sqlite3
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-server-sqlite3-%{version}/
 %{_sbindir}/zabbix_server_sqlite3
 %{_unitdir}/zabbix-server-sqlite3.service
 
 %files agent
-%defattr(-,root,root,-)
 %doc zabbix_snmptrap.README
 %config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_agent.conf
 %config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_agentd.conf
@@ -645,7 +641,6 @@ fi
 %{_mandir}/man8/zabbix_agentd.8*
 
 %files proxy
-%defattr(-,root,root,-)
 %attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/%{srcname}/zabbix_proxy.conf
 %attr(0755,zabbix,zabbix) %dir %{_sysconfdir}/%{srcname}/externalscripts
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
@@ -655,41 +650,40 @@ fi
 %{_mandir}/man8/zabbix_proxy.8*
 
 %files proxy-mysql
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-proxy-mysql-%{version}/
 %{_sbindir}/zabbix_proxy_mysql
 %{_unitdir}/zabbix-proxy-mysql.service
 
 %files proxy-pgsql
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-proxy-pgsql-%{version}/
 %{_sbindir}/zabbix_proxy_pgsql
 %{_unitdir}/zabbix-proxy-pgsql.service
 
 %files proxy-sqlite3
-%defattr(-,root,root,-)
 %{_docdir}/%{srcname}-proxy-sqlite3-%{version}/
 %{_sbindir}/zabbix_proxy_sqlite3
 %{_unitdir}/zabbix-proxy-sqlite3.service
 
 %files web
-%defattr(-,root,root,-)
 %dir %attr(0750,apache,apache) %{_sysconfdir}/%{srcname}/web
 %ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/%{srcname}/web/zabbix.conf.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf
 %{_datadir}/%{srcname}
 
 %files web-mysql
-%defattr(-,root,root,-)
 
 %files web-pgsql
-%defattr(-,root,root,-)
 
 %files web-sqlite3
-%defattr(-,root,root,-)
 
 
 %changelog
+* Sat Jan 19 2013 Volker Fröhlich <volker27 at gmx.at> - 1.8.16-1
+- update to 1.8.16, also solving LDAP security issue CVE-2013-1364
+- Remove defattr, no longer necessary since EL4
+- Obsolete docs subpackage
+- Really remove .orig files in frontend left from patching
+
 * Mon Aug 20 2012 Volker Fröhlich <volker27 at gmx.at> - 1.8.15-1
 - update to 1.8.15
 - Rework patches to not leave backup files in the frontend