[zabbix20/el5] New upstream release 2.0.9

[Volker Fröhlich]

commit b1967fdf1cf5b475a65cddc8290e99e33093ad53
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Wed Oct 9 22:16:42 2013 +0200

    New upstream release 2.0.9
    
    - Drop now-incorporated patches

 .gitignore                  |    1 +
 sources                     |    2 +-
 zabbix-2.0.6-ZBX-5924.patch |   13 -
 zabbix-2.0.8-ZBX-6804.patch |  121 ---
 zabbix-2.0.8-ZBX-6922.patch |   21 -
 zabbix-2.0.8-ZBX-6992.patch |   15 -
 zabbix-2.0.8-ZBX-7091.patch | 2021 -------------------------------------------
 zabbix20.spec               |   27 +-
 8 files changed, 8 insertions(+), 2213 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bafbdfb..d853b83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /zabbix-2.0.7-free.tar.gz
 /zabbix-2.0.8.tar.gz
 /zabbix-2.0.8-free.tar.gz
+/zabbix-2.0.9-free.tar.gz
diff --git a/sources b/sources
index ab672de..b1d6d3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-213cfb023a9c3afb807746003027a9c2  zabbix-2.0.8-free.tar.gz
+1b895bc113adb98c605d36b1a9328a26  zabbix-2.0.9-free.tar.gz
diff --git a/zabbix20.spec b/zabbix20.spec
index 42bad6c..568210a 100644
--- a/zabbix20.spec
+++ b/zabbix20.spec
@@ -11,8 +11,8 @@
 %global srcname zabbix
 
 Name:           zabbix20
-Version:        2.0.8
-Release:        3%{?dist}
+Version:        2.0.9
+Release:        1%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -36,21 +36,6 @@ Patch1:         %{srcname}-2.0.3-fonts-config.patch
 # remove flash content (#737337)
 # https://support.zabbix.com/browse/ZBX-4794
 Patch2:         %{srcname}-2.0.1-no-flash.patch
-# Services page broken due to missing AS in SQL
-# https://support.zabbix.com/browse/ZBX-6992
-Patch4:         %{srcname}-2.0.8-ZBX-6992.patch
-
-# SQL speedup for graphs, fixed in 2.0.9
-# https://support.zabbix.com/browse/ZBX-6840
-Patch5:         %{srcname}-2.0.8-ZBX-6804.patch
-
-# Failure on XML import of hosts, fixed in 2.0.9
-# https://support.zabbix.com/browse/ZBX-6922
-Patch6:         %{srcname}-2.0.8-ZBX-6922.patch
-
-# Frontend and API vulnerability to SQL injections
-# CVE-2013-5743
-Patch7:         %{srcname}-2.0.8-ZBX-7091.patch
 
 BuildRequires:   mysql-devel
 BuildRequires:   postgresql-devel
@@ -238,10 +223,6 @@ Zabbix web frontend for PostgreSQL
 %setup0 -q -n %{srcname}-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
 
 # Logrotate's su option is currently only available in Fedora
 sed -i '/su zabbix zabbix/d' %{SOURCE5}
@@ -673,6 +654,10 @@ fi
 %files web-pgsql
 
 %changelog
+* Wed Oct  9 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.9-1
+- New upstream release
+- Drop obsolete patches ZBX-6804, ZBX-7091, ZBX-6922, ZBX-6992
+
 * Mon Sep 23 2013 Volker Fröhlich <volker27 at gmx.at> - 2.0.8-3
 - Add SQL speed-up patch (ZBX-6804)
 - Add SQL injection vulnerability patch (ZBX-7091, CVE-2013-5743)