Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/tools/networking/httpstat/default.nix

@@ -3,12 +3,12 @@
 pythonPackages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "httpstat";
-    version = "1.2.0";
+    version = "1.2.1";
     src = fetchFromGitHub {
       owner = "reorx";
       repo = pname;
       rev = "${version}";
-      sha256 = "1zfbv3fz3g3wwvsgrcyrk2cp7pjhkpf7lmx57ry9b43c62gcd7yh";
+      sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6";
     };
     doCheck = false; # No tests
     buildInputs = [ glibcLocales ];

pkgs/tools/networking/kea/default.nix

@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, openssl, botan, log4cplus
+, boost, python3, postgresql, mysql, gmp, bzip2 }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "kea";
+  version = "1.1.0";
+
+  src = fetchurl {
+    url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
+    sha256 = "0b9w71d7pfgr0asqpffh9h935xpvwabyfdvdzqzna6da9zp7mnf3";
+  };
+
+  patches = [ ./dont-create-var.patch ];
+
+  postPatch = ''
+    substituteInPlace ./src/bin/keactrl/Makefile.am '@sysconfdir@' "$out/etc"
+    substituteInPlace ./src/bin/keactrl/Makefile.am '@(sysconfdir)@' "$out/etc"
+  '';
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--with-botan-config=${botan}/bin/botan-config-1.10"
+    "--with-dhcp-pgsql=${postgresql}/bin/pg_config"
+    "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config"
+  ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [
+    openssl log4cplus boost python3 mysql.client
+    botan gmp bzip2
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://kea.isc.org/;
+    description = "High-performance, extensible DHCP server by ISC";
+    longDescription = ''
+      KEA is a new open source DHCPv4/DHCPv6 server being developed by
+      Internet Systems Consortium. The objective of this project is to
+      provide a very high-performance, extensible DHCP server engine for
+      use by enterprises and service providers, either as is or with
+      extensions and modifications.
+    '';
+    license = licenses.mpl20;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}

pkgs/tools/networking/kea/dont-create-var.patch

@@ -0,0 +1,28 @@
+diff --git a/Makefile.am b/Makefile.am
+index 897be34..b146729 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -103,11 +103,6 @@ cppcheck:
+ 		--template '{file}:{line}: check_fail: {message} ({severity},{id})' \
+ 		src
+ 
+-# These steps are necessary during installation
+-install-exec-hook:
+-	mkdir -p $(DESTDIR)${localstatedir}/log/
+-	mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
+-
+ EXTRA_DIST  = tools/path_replacer.sh
+ EXTRA_DIST += tools/mk_cfgrpt.sh
+ 
+diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
+index 066b410..16d3135 100755
+--- a/src/lib/dhcpsrv/Makefile.am
++++ b/src/lib/dhcpsrv/Makefile.am
+@@ -210,7 +210,3 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox
+ # Specification file
+ EXTRA_DIST += logging.spec
+ 
+-install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir)
+-
+-

pkgs/tools/networking/lftp/default.nix

@@ -1,28 +1,32 @@
-{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn }:
+{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn, gmp, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.7.1";
+  name = "lftp-4.7.3";
 
   src = fetchurl {
     urls = [
       "http://lftp.yar.ru/ftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "0n4l0n6ra6z5lh6v79hc0r0hhrsq0l6c47ir15vmq80sbgc9mmwv";
+    sha256 = "06jmc9x86ga67yyx7655zv96gfv1gdm955a7g4afd3bwf6bzfxac";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gnutls readline zlib libidn ];
+  buildInputs = [ gnutls readline zlib libidn gmp libiconv ];
 
   configureFlags = [
     "--with-readline=${readline.dev}"
   ];
 
+  postPatch = ''
+    substituteInPlace src/lftp_rl.c --replace 'history.h' 'readline/history.h'
+  '';
+
   meta = with stdenv.lib; {
     description = "A file transfer program supporting a number of network protocols";
     homepage = http://lftp.yar.ru/;
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }

pkgs/tools/networking/network-manager/PppdPath.patch

@@ -0,0 +1,13 @@
+diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
+index 89a7add..ae99eb4 100644
+--- a/src/ppp-manager/nm-ppp-manager.c
++++ b/src/ppp-manager/nm-ppp-manager.c
+@@ -843,7 +843,7 @@ create_pppd_cmd_line (NMPPPManager *self,
+ 
+ 	g_return_val_if_fail (setting != NULL, NULL);
+ 
+-	pppd_binary = nm_utils_find_helper ("pppd", NULL, err);
++	pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err);
+ 	if (!pppd_binary)
+ 		return NULL;
+ 

pkgs/tools/networking/network-manager/default.nix

@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
     "--with-libsoup=yes"
   ];
 
+  patches = [ ./PppdPath.patch ];
+
   buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp
                   bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup ];
 

pkgs/tools/networking/unbound/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.5.9";
+  version = "1.5.10";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "01328cfac99ab5b8c47115151896a244979e442e284eb962c0ea84b7782b6990";
+    sha256 = "11lli8jgq4n917gcx6nw728g1hqc2lszwlxa5mdb78m2ri7qp6x3";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Validating, recursive, and caching DNS resolver";
     license = licenses.bsd3;
-    homepage = http://www.unbound.net;
+    homepage = https://www.unbound.net;
     maintainers = with maintainers; [ ehmry fpletz ];
     platforms = stdenv.lib.platforms.unix;
   };