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

pkgs/tools/security/ecryptfs/default.nix

@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Enterprise-class stacked cryptographic filesystem";
     license     = licenses.gpl2Plus;
-    maintainers = [ maintainers.obadz ];
+    maintainers = with maintainers; [ obadz ];
     platforms   = platforms.linux;
   };
 }

pkgs/tools/security/ecryptfs/helper.nix

@@ -0,0 +1,35 @@
+{ stdenv
+, fetchurl
+, makeWrapper
+, python
+}:
+
+stdenv.mkDerivation rec {
+  name    = pname + "-" + version;
+  pname   = "ecryptfs-helper";
+  version = "20160722";
+
+  src = fetchurl {
+    url    = "https://gist.githubusercontent.com/obadz/ec053fdb00dcb48441d8313169874e30/raw/4b657a4b7c3dc684e4d5e3ffaf46ced1b7675163/ecryptfs-helper.py";
+    sha256 = "0gp4m22zc80814ng80s38hp930aa8r4zqihr7jr23m0m2iq4pdpg";
+  };
+
+  phases = [ "installPhase" ];
+
+  buildInputs = [ makeWrapper ];
+
+  # Do not hardcode PATH to ${ecryptfs} as we need the script to invoke executables from /var/setuid-wrappers
+  installPhase = ''
+    mkdir -p $out/bin $out/libexec
+    cp $src $out/libexec/ecryptfs-helper.py
+    makeWrapper "${python.interpreter} $out/libexec/ecryptfs-helper.py" $out/bin/ecryptfs-helper
+  '';
+
+  meta = with stdenv.lib; {
+    description    = "Helper script to create/mount/unemount encrypted directories using eCryptfs without needing root permissions";
+    license        = licenses.gpl2Plus;
+    maintainers    = with maintainers; [ obadz ];
+    platforms      = platforms.linux;
+    hydraPlatforms = [];
+  };
+}

pkgs/tools/security/haka/default.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = {
-    dscription = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files";
+    description = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files";
     homepage = http://www.haka-security.org/;
     license = stdenv.lib.licenses.mpl20;
     maintaineres = [ stdenv.lib.maintainers.tvestelind ];