From 5b6d52b4fb7378740d3c2e7017326a5d0f68711e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 28 Nov 2016 09:55:17 +0100
Subject: [PATCH 1/2] nagios: 4.0.8 -> 4.2.3

This update includes many security related fixes.

Version 4.2.0 fixes:
- CVE-2008-4796
- CVE-2013-4214

Version 4.2.2 fixes:
- CVE-2016-9565

Version 4.2.3 fixes:
- CVE-2016-8641

See https://www.nagios.org/projects/nagios-core/history/4x/ for full
detail changes.
---
 pkgs/servers/monitoring/nagios/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index bf43a93a81b2..c4d60cabaa39 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, perl, php, gd, libpng, zlib }:
+{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }:
 
 stdenv.mkDerivation rec {
   name = "nagios-${version}";
-  version = "4.0.8";
+  version = "4.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
-    sha256 = "0jyad39wa318613awlnpczrrakvjcipz8qp1mdsig1cp1hjqs9lb";
+    sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3";
   };
 
   patches = [ ./nagios.patch ];
-  buildInputs = [ php perl gd libpng zlib ];
+  buildInputs = [ php perl gd libpng zlib unzip ];
 
   configureFlags = [ "--localstatedir=/var/lib/nagios" ];
   buildFlags = "all";

From c77011c6decc989d11eef7dcbd37625c980f0790 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 28 Nov 2016 09:58:29 +0100
Subject: [PATCH 2/2] nagiosPluginsOfficial: 2.0.3 -> 2.1.4

See https://github.com/nagios-plugins/nagios-plugins/blob/master/NEWS
for release history
---
 pkgs/servers/monitoring/nagios/plugins/official-2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 79180f172417..306dee0ec627 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nagios-plugins-${version}";
-  version = "2.0.3";
+  version = "2.1.4";
 
   src = fetchurl {
     url = "http://nagios-plugins.org/download/${name}.tar.gz";
-    sha256 = "0jm0mn55hqwl8ffx8ww9mql2wrkhp1h2k8jw53q3h0ff5m22204g";
+    sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3";
   };
 
   # !!! Awful hack. Grrr... this of course only works on NixOS.