Merge branch 'master' into staging

Conflicts:
	pkgs/development/libraries/fontconfig/default.nix

pkgs/tools/security/afl/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "0.68b";
+  version = "0.85b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "07z5lnkl82d6rpm63wr7lxs3g49wb7lw8zi9wwazzv2hi7l2vcs7";
+    sha256 = "010sgsjxb76bsqaw7sa5mm9r4avpf4c0bw9q2898bymfqisji033";
   };
 
   buildPhase   = "make PREFIX=$out";

pkgs/tools/security/lastpass-cli/default.nix

@@ -0,0 +1,34 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }:
+
+stdenv.mkDerivation rec {
+  name = "lastpass-cli-${version}";
+
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "lastpass";
+    repo = "lastpass-cli";
+    rev = "v${version}";
+    sha256 = "1r06lifjc28sm88d6x3xwn76l9fjwjmd1wbmvr9j8rna889q0wl9";
+  };
+
+  buildInputs = [
+    openssl curl libxml2 pkgconfig asciidoc docbook_xsl libxslt
+  ];
+
+  prePatch = ''
+    substituteInPlace version.h --replace "0.3.0" "0.4.0"
+  '';
+
+  makeFlags = "PREFIX=$(out)";
+
+  installTargets = "install install-doc";
+
+  meta = with lib; {
+    description = "Stores, retrieves, generates, and synchronizes passwords securely";
+    homepage    = "https://github.com/lastpass/lastpass-cli";
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}

pkgs/tools/security/tor/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libevent, openssl, zlib }:
+{ stdenv, fetchurl, libevent, openssl, zlib, torsocks }:
 
 stdenv.mkDerivation rec {
   name = "tor-0.2.5.10";
@@ -8,10 +8,20 @@ stdenv.mkDerivation rec {
     sha256 = "0fx8qnwh2f8ykfx0np4hyznjfi4xfy96z59pk96y3zyjvjjh5pdk";
   };
 
-  buildInputs = [ libevent openssl zlib ];
+  # Note: torsocks is specified as a dependency, as the distributed
+  # 'torify' wrapper attempts to use it; although there is no
+  # ./configure time check for any of this.
+  buildInputs = [ libevent openssl zlib torsocks ];
 
   CFLAGS = "-lgcc_s";
 
+  # Patch 'torify' to point directly to torsocks.
+  patchPhase = ''
+    substituteInPlace contrib/client-tools/torify \
+      --replace 'pathfind torsocks' true          \
+      --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks'
+  '';
+
   doCheck = true;
 
   meta = {
@@ -31,7 +41,8 @@ stdenv.mkDerivation rec {
 
     license="mBSD";
 
-    maintainers = with stdenv.lib.maintainers; [ phreedom ludo doublec ];
+    maintainers = with stdenv.lib.maintainers;
+      [ phreedom ludo doublec thoughtpolice ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

pkgs/tools/security/tor/torbrowser.nix

@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "1cz36g7jfcz8xs7sa2fl44g1bxlrl0psbsx5hig6j5ydsl87vyak" else
-      "135ya109skzd4x8zhmsiwjg6d533yijbdrscm36lsplgcf7dx8l3";
+      "02ibpkfq6cmr5dxgps9hr0dk1vgmda3m4g24yq6cg15sp94147mh" else
+      "1cxhkbdrwixfg81wwd6hdf5zbil12mff4yfqxzlwp55iqh49skry";
   };
 
   patchPhase = ''
@@ -64,10 +64,11 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ stdenv ];
 
-  meta = with stdenv.lib; {
-    description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet";
-    homepage = https://www.torproject.org/;
-    platforms = ["i686-linux" "x86_64-linux"];
-    maintainers = [ maintainers.offline maintainers.matejc maintainers.doublec ];
+  meta = {
+    description = "Tor Browser Bundle";
+    homepage    = https://www.torproject.org/;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers;
+      [ offline matejc doublec thoughtpolice ];
   };
 }

pkgs/tools/security/tor/torsocks.nix

@@ -1,13 +1,13 @@
-{ stdenv, fetchgit, autoreconfHook }:
+{ stdenv, fetchgit, autoreconfHook, which }:
+
 stdenv.mkDerivation rec {
-  pname = "torsocks";
-  name = "${pname}-${version}";
-  version = "1.3";
-  
+  name = "torsocks-${version}";
+  version = "2.0.0";
+
   src = fetchgit {
-    url = meta.repositories.git;
-    rev = "refs/tags/${version}";
-    sha256 = "1cqplb36fkdb81kzf48xlxclf64wnp8r56x1gjayax1h6x4aal1w";
+    url    = meta.repositories.git;
+    rev    = "refs/tags/v${version}";
+    sha256 = "e3868ae8baadce1854cc9e604a5fcfa0433a15e4eb1223cc9da5b3c586db0048";
   };
 
   buildInputs = [ autoreconfHook ];
@@ -15,11 +15,17 @@ stdenv.mkDerivation rec {
       export configureFlags="$configureFlags --libdir=$out/lib"
   '';
 
+  patchPhase = ''
+    substituteInPlace src/bin/torsocks.in \
+      --replace which ${which}/bin/which
+  '';
+
   meta = {
-    description = "use socks-friendly applications with Tor";
-    homepage = http://code.google.com/p/torsocks/;
+    description      = "Wrapper to safely torify applications";
+    homepage         = http://code.google.com/p/torsocks/;
     repositories.git = https://git.torproject.org/torsocks.git;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.phreedom ];
+    license          = stdenv.lib.licenses.gpl2;
+    platforms        = stdenv.lib.platforms.unix;
+    maintainers      = with stdenv.lib.maintainers; [ phreedom thoughtpolice ];
   };
 }