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

pkgs/tools/security/ccid/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.20";
+  version = "1.4.23";
   name = "ccid-${version}";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/4140/ccid-1.4.20.tar.bz2";
-    sha256 = "1g0w4pv6q30d8lhs3kd6nywkhh34nhf9fbcbcvbxdvk3pdjvh320";
+    url = "https://alioth.debian.org/frs/download.php/file/4169/ccid-1.4.23.tar.bz2";
+    sha256 = "0s7c2g8idnnh19958aswaa2s51ncr2j7gqrkk5g95qpfnv7asdh8";
   };
 
   patchPhase = ''

pkgs/tools/security/dirmngr/default.nix

@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, openldap }:
+{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap }:
 
 stdenv.mkDerivation rec {
-  name = "dirmngr-1.0.3";
+  name = "dirmngr-1.1.1";
   src = fetchurl {
-    url = "mirror://gnupg/${name}.tar.bz2";
-    sha256 = "03f54582caxgwjdv1b71azyk612a738ckgk2k05bmg466r1cw8jd";
+    url = "mirror://gnupg/dirmngr/${name}.tar.bz2";
+    sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j";
   };
-
-  buildInputs = [ libgpgerror libgcrypt libassuan libksba openldap ];
+  buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ];
 }

pkgs/tools/security/eid-mw/default.nix

@@ -1,19 +1,20 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite
-, pkgconfig }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook, pkgconfig
+, gtk3, nssTools, pcsclite }:
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.1.16";
+  version = "4.1.17";
 
   src = fetchFromGitHub {
-    sha256 = "14b17aa45l0pyqd87c17mgfmpgq1qmybnl6hq9mc29rxw6jdb1ka";
+    sha256 = "11d4wafcbhamkqvcfqkpz1sq66jq7bxz07m777cqsnyibccns7q6";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
   };
 
-  buildInputs = [ gtk3 pcsclite ];
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gtk3 pcsclite ];
 
   postPatch = ''
     sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac

pkgs/tools/security/gnupg/21.nix

@@ -13,11 +13,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.11";
+  name = "gnupg-2.1.12";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p";
+    sha256 = "01n5py45x0r97l4dzmd803jpbpbcxr1591k3k4s8m9804jfr4d5c";
   };
 
   buildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = http://gnupg.org;
     description = "a complete and free implementation of the OpenPGP standard";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ wkennington simons ];
+    maintainers = with maintainers; [ wkennington peti fpletz ];
     platforms = platforms.all;
   };
 }

pkgs/tools/security/hashcat/default.nix

@@ -1,49 +1,39 @@
-{ stdenv, fetchurl, p7zip, patchelf, gmp }:
+{ stdenv, fetchurl, gmp }:
 
 assert stdenv.isLinux;
 
 let
-  bits    = if stdenv.system == "x86_64-linux" then "64" else "32";
-  libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc gmp ];
-
-  fixBin = x: ''
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath} ${x}
-  '';
+  bits = if stdenv.system == "x86_64-linux" then "64" else "32";
 in
 stdenv.mkDerivation rec {
   name    = "hashcat-${version}";
-  version = "0.49";
+  version = "2.00";
 
   src = fetchurl {
-    url    = "http://hashcat.net/files/${name}.7z";
-    sha256 = "0va07flncihgmnri5wj0jn636w86x5qwm4jmj2halcyg7qwqijh2";
+    name = "${name}.tar.gz";
+    url = "https://codeload.github.com/hashcat/hashcat/tar.gz/${version}";
+    sha256 = "0i2l4i1jkdhj9bkvycgd2nf809kki3jp83y0vrd4iwsdbbbyc9b3";
   };
 
-  buildInputs = [ p7zip patchelf ];
+  buildInputs = [ gmp ];
 
-  unpackPhase = "7z x $src > /dev/null && cd ${name}";
+  buildFlags = [ "posix${bits}" ]
+    ++ stdenv.lib.optionals (bits == "64") [ "posixXOP" "posixAVX" ];
 
+  # Upstream Makefile doesn't have 'install' target
   installPhase = ''
     mkdir -p $out/bin $out/libexec
     cp -R * $out/libexec
 
-    echo -n "/" > $out/bin/eula.accepted
     ln -s $out/libexec/hashcat-cli${bits}.bin $out/bin/hashcat
     ln -s $out/libexec/hashcat-cliXOP.bin $out/bin/hashcat-xop
     ln -s $out/libexec/hashcat-cliAVX.bin $out/bin/hashcat-avx
   '';
 
-  fixupPhase = ''
-    ${fixBin "$out/libexec/hashcat-cli${bits}.bin"}
-    ${fixBin "$out/libexec/hashcat-cliXOP.bin"}
-    ${fixBin "$out/libexec/hashcat-cliAVX.bin"}
-  '';
-
   meta = {
     description = "Fast password cracker";
     homepage    = "http://hashcat.net/hashcat/";
-    license     = stdenv.lib.licenses.unfreeRedistributable;
+    license     = stdenv.lib.licenses.mit;
     platforms   = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };

pkgs/tools/security/haveged/default.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://www.issihosts.com/haveged/;
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ stdenv.lib.maintainers.iElectric ];
+    maintainers = [ stdenv.lib.maintainers.domenkozar ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/security/p0f/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "p0f-${version}";
-  version = "3.08b";
+  version = "3.09b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/p0f3/releases/${name}.tgz";
-    sha256 = "1v4afs66qxk53h8vhfk5x17xvgj32qixwjvz4023gnx59gzag2fs";
+    sha256 = "0zqfq3gdnha29ckvlqmyp36c0jhj7f69bhqqx31yb6vkirinhfsl";
   };
 
   buildInputs = [ libpcap ];

pkgs/tools/security/pcsclite/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 }:
 
 stdenv.mkDerivation rec {
-  name = "pcsclite-1.8.14";
+  name = "pcsclite-1.8.16";
 
   src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/file/4138/pcsc-lite-1.8.14.tar.bz2";
-    sha256 = "0kik09dif6hih09vvprd7zvj31lnrclrbrh5y10mlca2c209f7xr";
+    url = "https://alioth.debian.org/frs/download.php/file/4164/pcsc-lite-1.8.16.tar.bz2";
+    sha256 = "12k8q0ckyy1fqcfh7x0b7kfrlfiscrqaqmidcggnzs4pi2iqml77";
   };
 
   configureFlags = [

pkgs/tools/security/pius/default.nix

@@ -12,19 +12,19 @@ stdenv.mkDerivation {
 
   buildInputs = [ python ];
 
-  patchPhase =
-    '' sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g'
-    '';
+  patchPhase = ''
+    sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g'
+  '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase =
-    '' mkdir -p "$out/bin"
-       cp -v pius "$out/bin"
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp -v pius "$out/bin"
 
-       mkdir -p "$out/doc/pius-${version}"
-       cp -v README "$out/doc/pius-${version}"
-    '';
+    mkdir -p "$out/doc/pius-${version}"
+    cp -v README "$out/doc/pius-${version}"
+  '';
 
   meta = {
     homepage = http://www.phildev.net/pius/;

pkgs/tools/security/prey/default.nix

@@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://preyproject.com;
     description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing";
-    maintainers = with maintainers; [ iElectric ];
+    maintainers = with maintainers; [ domenkozar ];
     license = licenses.gpl3;
   };
 }

pkgs/tools/security/seccure/default.nix

@@ -1,14 +1,15 @@
-{stdenv, fetchurl, libgcrypt}:
+{ stdenv, fetchurl, libgcrypt }:
 
 stdenv.mkDerivation rec {
-  name = "seccure-0.4";
+  name = "seccure-${version}";
+  version = "0.5";
   
   src = fetchurl {
     url = "http://point-at-infinity.org/seccure/${name}.tar.gz";
-    sha256 = "33d690a7034ee349bce4911a8b7c73e6e3cd13a140f429e9e628d5cd5a3bb955";
+    sha256 = "0nwnk3hfhgvf5xr0xipbh6smfnya22wphc5rj0vgi5d0zr5cwrk5";
   };
 
-  buildInputs = [libgcrypt];
+  buildInputs = [ libgcrypt ];
   
   preConfigure = ''
     sed -e s@/usr/@$out/@g -i Makefile

pkgs/tools/security/sshuttle/default.nix

@@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec {
       target network (though it does require Python 2 at both ends).
       Works with Linux and Mac OS and supports DNS tunneling.
     '';
-    maintainers = with maintainers; [ iElectric nckx ];
+    maintainers = with maintainers; [ domenkozar nckx ];
     platforms = platforms.unix;
   };
 }

pkgs/tools/security/tcpcrypt/default.nix

@@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://tcpcrypt.org/";
     description = "enable opportunistic encryption of all TCP traffic";
-
-    maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/security/vidalia/default.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.torproject.org/projects/vidalia.html.en;
-    repositories.git = git://git.torproject.org/vidalia;
+    repositories.git = https://git.torproject.org/vidalia;
     description = "a cross-platform graphical controller for the Tor software, built using the Qt framework";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.phreedom ];