From e5ebb59e1d4cff48d799bfa89aef0d69a7344c55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 4 Oct 2013 13:52:49 +0200
Subject: [PATCH] zabbix: Apply fix for a SQL injection bug

https://support.zabbix.com/browse/ZBX-7091

CVE-2013-5743
---
 pkgs/servers/monitoring/zabbix/2.0.nix     | 8 ++++++++
 pkgs/servers/monitoring/zabbix/default.nix | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix
index 14a4e8bd5a58..8752f54647f0 100644
--- a/pkgs/servers/monitoring/zabbix/2.0.nix
+++ b/pkgs/servers/monitoring/zabbix/2.0.nix
@@ -31,6 +31,14 @@ in
 
     inherit src preConfigure;
 
+    patchFlags = "-p0";
+    patches =
+      [ (fetchurl {
+          url = "https://support.zabbix.com/secure/attachment/24449/ZBX-7091-2.0.8.patch";
+          sha256 = "1rlk3812dd12imk29i0fw6bzpgi44a8231kiq3bl5yryx18qh580";
+        })
+      ];
+
     configureFlags = [
       "--enable-agent"
       "--enable-server"
diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 6ee4712ae657..b106921cdf69 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "1.8.17";
+  version = "1.8.18rc1";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "0c2dpx7ncahp161p6zymrrxwyn3algkfzh6dz7x2j0wsnvb6lrp2";
+    sha256 = "1pa4656dcl5r7r36nwk05zy38z49np6j717wjmmd8sqlz6szw01n";
   };
 
   preConfigure =