Merge remote-tracking branch 'upstream/master' into hardened-stdenv

8 files changed, 82 insertions, 43 deletions

diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index bd4fb7e9e6af..23355d61bea8 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -1,34 +1,23 @@
 { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }:
-assert stdenv.isLinux;
-assert stdenv.cc.isGNU;
-let
-version = "0.7";
-debianPatch = fetchurl {
-  url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg-11.diff.gz";
-  sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd";
-};
-in
-stdenv.mkDerivation {
+
+stdenv.mkDerivation rec {
   name = "atftp-${version}";
-  inherit version;
+  version = "0.7.1";
+
   src = fetchurl {
-    url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz";
-    sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q";
+    url = "mirror://sourceforge/atftp/${name}.tar.gz";
+    sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f";
   };
+
   buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ];
-  patches = [ debianPatch ];
-  postInstall = ''
-    wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib}/lib${if stdenv.system == "x86_64-linux" then "64" else ""}
-  '';
+
+  # Expects pre-GCC5 inline semantics
+  NIX_CFLAGS_COMPILE = "-std=gnu89";
+
   meta = {
     description = "Advanced tftp tools";
     maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl2Plus;
-    passthru = {
-      updateInfo = {
-      downloadPage = "http://packages.debian.org/source/wheezy/atftp";
-    };
   };
-};
 }
diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix
index be87f383c0a2..4fb0975a740e 100644
--- a/pkgs/tools/networking/bully/default.nix
+++ b/pkgs/tools/networking/bully/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "0wk9jmcibd03gspnnr2qvfkw57rg94cwmi0kjpy1mgi05s6vlw1y";
     rev = "v${version}";
     repo = "bully";
-    owner = "Lrs121";
+    owner = "HorayNarea";
   };
   buildInputs = [ openssl libpcap ];
 
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index d262f7fc9e0c..f5b5893d5437 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -24,15 +24,24 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Sets your computer's clock from time servers on the Net";
     homepage = http://chrony.tuxfamily.org/;
-    repository.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git;
+    repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git;
     license = licenses.gpl2;
     platforms = with platforms; linux ++ freebsd ++ openbsd;
     maintainers = with maintainers; [ rickynils fpletz ];
 
     longDescription = ''
-      Chronyd is a daemon which runs in background on the system. It obtains measurements via the network of the system clock’s offset relative to time servers on other systems and adjusts the system time accordingly. For isolated systems, the user can periodically enter the correct time by hand (using Chronyc). In either case, Chronyd determines the rate at which the computer gains or loses time, and compensates for this. Chronyd implements the NTP protocol and can act as either a client or a server.
-
-      Chronyc provides a user interface to Chronyd for monitoring its performance and configuring various settings. It can do so while running on the same computer as the Chronyd instance it is controlling or a different computer.
+      Chronyd is a daemon which runs in background on the system. It obtains
+      measurements via the network of the system clock’s offset relative to
+      time servers on other systems and adjusts the system time accordingly.
+      For isolated systems, the user can periodically enter the correct time by
+      hand (using Chronyc). In either case, Chronyd determines the rate at
+      which the computer gains or loses time, and compensates for this. Chronyd
+      implements the NTP protocol and can act as either a client or a server.
+
+      Chronyc provides a user interface to Chronyd for monitoring its
+      performance and configuring various settings. It can do so while running
+      on the same computer as the Chronyd instance it is controlling or a
+      different computer.
     '';
   };
 }
diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman-notify/default.nix
new file mode 100644
index 000000000000..070666901724
--- /dev/null
+++ b/pkgs/tools/networking/connman-notify/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "connman-notify-${version}";
+  version = "2014-06-23";
+
+  src = fetchFromGitHub {
+    owner = "wavexx";
+    repo = "connman-notify";
+    rev = "0ed9b5e4a0e1f03c83c4589cabf410cac66cd11d";
+    sha256 = "0lhk417fdg3qxs1marpqp277bdxhwnbyrld9xj224bfk5v7xi4bg";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [
+    pythonPackages.python
+    pythonPackages.dbus
+    pythonPackages.pygobject
+    pythonPackages.pygtk
+    pythonPackages.notify
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -vai connman-notify $out/bin/
+  '';
+
+  preFixup = ''
+    wrapProgram $out/bin/connman-notify --prefix PYTHONPATH : "$PYTHONPATH"
+  '';  
+
+  meta = with stdenv.lib; {
+    description = "Desktop notification integration for connman";
+    homepage = https://github.com/wavexx/connman-notify;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index bc9fb6ee4dee..b1f726ad27d6 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -2,11 +2,11 @@
 sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2016.73";
+  name = "dropbear-2016.74";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "1mzg18jss1bsmcnn88zv7kv5yj01hzimndnd5636hfq9kgva8qaw";
+    sha256 = "14c8f4gzixf0j9fkx68jgl85q7b05852kk0vf09gi6h0xmafl817";
   };
 
   dontDisableStatic = enableStatic;
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 86dd080f0b1f..548fc597e292 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, buildPythonApplication, sqlite3 }:
+{ stdenv, fetchFromGitHub, pythonPackages, sqlite3 }:
 
-buildPythonApplication rec {
-  version = "6.7.0.1";
+pythonPackages.buildPythonApplication rec {
+  version = "7.0.0";
   name = "offlineimap-${version}";
   namePrefix = "";
 
@@ -9,14 +9,12 @@ buildPythonApplication rec {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "15pzc095lhqyp55sya98wnnykvrnwzsmcl4ks8yl606kjii85md0";
+    sha256 = "15m0z3y3gxx30b980gym0mnc2icmdy2xy2ckcbmwp97ynm7pmzmp";
   };
 
   doCheck = false;
 
-  propagatedBuildInputs = [
-    sqlite3
-  ];
+  propagatedBuildInputs = [ sqlite3 pythonPackages.six ];
 
   meta = {
     description = "Synchronize emails between two repositories, so that you can read the same mailbox from multiple computers";
diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix
index 3bf23275a180..cc0cc620d27d 100644
--- a/pkgs/tools/networking/weighttp/default.nix
+++ b/pkgs/tools/networking/weighttp/default.nix
@@ -1,9 +1,12 @@
-{ stdenv, fetchurl, python, libev}:
-stdenv.mkDerivation {
-  name = "weighttp-0.3";
-  src = fetchurl {
-    url = http://cgit.lighttpd.net/weighttp.git/snapshot/weighttp-0.3.tar.gz;
-    sha256 = "0gl83vnip3nj7fdgbwqkmrx7kxp51sri9jfiwd04q9iz8f9bsmz5";
+{ stdenv, fetchgit, python, libev}:
+stdenv.mkDerivation rec {
+  name = "weighttp-${version}";
+  version = "0.4";
+
+  src = fetchgit {
+    url = https://git.lighttpd.net/weighttp.git;
+    rev = "refs/tags/weighttp-${version}";
+    sha256 = "14yjmdx9p8g8c3zlrx5qid8k156lsagfwhl3ny54162nxjf7kzgr";
   };
 
   buildInputs = [ python libev ];
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 51a90544ca4b..ba41fcdd687a 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "Create flat virtual Ethernet networks of almost unlimited size";
     homepage = https://www.zerotier.com;
     license = licenses.gpl3;
-    maintainers = [ sjmackenzie ];
+    maintainers = with maintainers; [ sjmackenzie ];
     platforms = platforms.allBut [ "i686-linux" ];
   };
 }