Merge branch 'staging'

pkgs/tools/misc/rrdtool/default.nix

@@ -2,14 +2,16 @@
 , tcl-8_5 }:
 
 stdenv.mkDerivation rec {
-  name = "rrdtool-1.5.5";
+  name = "rrdtool-1.5.6";
+
   src = fetchurl {
     url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
-    sha256 = "1xm6ikzx8iaa6r7v292k8s7srkzhnifamp1szkimgmh5ki26sa1s";
+    sha256 = "1s2cci80g6kbp5p77mkxpfxwvjm1802fw0bjfsa8yjv8g5a7fclq";
   };
+
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]
     ++ stdenv.lib.optional stdenv.isDarwin tcl-8_5;
-  
+
   postInstall = ''
     # for munin and rrdtool support
     mkdir -p $out/lib/perl5/site_perl/

pkgs/tools/networking/ngrep/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libpcap, gnumake3 }:
+{ stdenv, fetchurl, fetchpatch, libpcap, gnumake3, pcre }:
 
 stdenv.mkDerivation rec {
   name = "ngrep-1.45";
@@ -8,13 +8,32 @@ stdenv.mkDerivation rec {
     sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf";
   };
 
-  buildInputs = [ gnumake3 libpcap ];
+  patches = [
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_debian-build.diff?h=debian/1.45.ds2-14";
+      sha256 = "1p359k54xjbh6r0d0lv1l679n250wxk6j8yyz23gn54kwdc29zfy";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_man-fixes.diff?h=debian/1.45.ds2-14";
+      sha256 = "1b66zfbsrsvg60j988i6ga9iif1c34fsbq3dp1gi993xy4va8m5k";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/20_setlocale.diff?h=debian/1.45.ds2-14";
+      sha256 = "16xbmnmvw5sjidz2qhay68k3xad05g74nrccflavxbi0jba52fdq";
+    })
+    (fetchpatch {
+      url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/40_ipv6-offsets.diff?h=debian/1.45.ds2-14";
+      sha256 = "0fjlk1sav5nnjapvsa8mvdwjkhgm3kgc6dw7r9h1qx6d3b8cgl76";
+    })
+  ];
+
+  buildInputs = [ gnumake3 libpcap pcre ];
 
   preConfigure = ''
     # Fix broken test for BPF header file
     sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure
 
-    configureFlags="$configureFlags --with-pcap-includes=${libpcap}/include"
+    configureFlags="$configureFlags --enable-ipv6 --enable-pcre --disable-pcap-restart --with-pcap-includes=${libpcap}/include"
   '';
 
   meta = with stdenv.lib; {

pkgs/tools/networking/tcpdump/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpcap, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
-  name = "tcpdump-4.7.4";
+  name = "tcpdump-4.8.1";
 
   src = fetchurl {
     url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    sha256 = "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb";
+    sha256 = "0743ipl0l7ymjss3ybvvc5cbk9kb7s8yl4p3ramp5kwgqhg39r10";
   };
 
   buildInputs = [ libpcap ];

pkgs/tools/system/collectd/default.nix

@@ -9,6 +9,7 @@
 , libdbi ? null
 , libgcrypt ? null
 , libmemcached ? null, cyrus_sasl ? null
+, libmicrohttpd ? null
 , libmodbus ? null
 , libnotify ? null, gdk_pixbuf ? null
 , liboping ? null
@@ -34,24 +35,19 @@
 , libmnl ? null
 }:
 stdenv.mkDerivation rec {
-  version = "5.6.0";
+  version = "5.7.0";
   name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "08w6fjzczi2psk7va0xkjh9pigpar6sbjx2a6ayq4dmc3zcvpzzh";
+    sha256 = "1cpjkv4d0iifngihxikzljavya0r2k3blarlahamgbdsqsymz815";
   };
 
   buildInputs = [
     pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
     cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
     lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
-    varnish yajl jdk libtool python udev net_snmp hiredis libmnl
-  ];
-
-  patches = [
-    # Replace deprecated readdir_r() with readdir() to avoid a fatal warning.
-    ./readdir-fix.patch
+    varnish yajl jdk libtool python udev net_snmp hiredis libmnl libmicrohttpd
   ];
 
   # for some reason libsigrok isn't auto-detected

pkgs/tools/system/collectd/readdir-fix.patch

@@ -1,55 +0,0 @@
-diff -Naur collectd-5.6.0/src/vserver.c collectd-5.6.0/src/vserver.c
---- collectd-5.6.0/src/vserver.c	2016-09-11 01:10:25.279038699 -0700
-+++ collectd-5.6.0/src/vserver.c	2016-09-25 07:44:40.771177458 -0700
-@@ -132,15 +132,8 @@
- 
- static int vserver_read (void)
- {
--#if NAME_MAX < 1024
--# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1)
--#else
--# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1)
--#endif
--
- 	DIR 			*proc;
- 	struct dirent 	*dent; /* 42 */
--	char dirent_buffer[DIRENT_BUFFER_SIZE];
- 
- 	errno = 0;
- 	proc = opendir (PROCDIR);
-@@ -165,19 +158,23 @@
- 
- 		int status;
- 
--		status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent);
--		if (status != 0)
--		{
--			char errbuf[4096];
--			ERROR ("vserver plugin: readdir_r failed: %s",
--					sstrerror (errno, errbuf, sizeof (errbuf)));
--			closedir (proc);
--			return (-1);
--		}
--		else if (dent == NULL)
-+		errno = 0;
-+		dent = readdir (proc);
-+		if (dent == NULL)
- 		{
--			/* end of directory */
--			break;
-+			if (errno != 0)
-+			{
-+				char errbuf[4096];
-+				ERROR ("vserver plugin: readdir failed: %s",
-+						sstrerror (errno, errbuf, sizeof (errbuf)));
-+				closedir (proc);
-+				return (-1);
-+			}
-+			else
-+			{
-+				/* end of directory */
-+				break;
-+			}
- 		}
- 
- 		if (dent->d_name[0] == '.')