Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 37cad0b90efc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a9523ed9c1b0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 28, 2016

  1. 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.

(cherry picked from commit 5b6d52b)
    @lsix
    lsix authored and Graham Christensen committed Nov 28, 2016
    Copy the full SHA
    7fc197f View commit details

  2. nagiosPluginsOfficial: 2.0.3 -> 2.1.4 

    See https://github.com/nagios-plugins/nagios-plugins/blob/master/NEWS
for release history

(cherry picked from commit c77011c)
    @lsix
    lsix authored and Graham Christensen committed Nov 28, 2016
    Copy the full SHA
    a9523ed View commit details
Showing with 6 additions and 6 deletions.
  1. +4 −4 pkgs/servers/monitoring/nagios/default.nix
  2. +2 −2 pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
8 changes: 4 additions & 4 deletions pkgs/servers/monitoring/nagios/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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";
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -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.