about summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorobadz <dav-github@odav.org>2015-08-19 12:14:18 +0100
committerobadz <dav-github@odav.org>2015-08-19 12:16:57 +0100
commit172522e153b9601c86bb4eacc46ca1cc934d90b5 (patch)
tree0a9c1dc673d3b58d5a05203e7a0c7369a6502429 /pkgs/tools/security
parent9d5508d85c33b8fb22d79dde6176792eac2c2696 (diff)
downloadnixlib-172522e153b9601c86bb4eacc46ca1cc934d90b5.tar
nixlib-172522e153b9601c86bb4eacc46ca1cc934d90b5.tar.gz
nixlib-172522e153b9601c86bb4eacc46ca1cc934d90b5.tar.bz2
nixlib-172522e153b9601c86bb4eacc46ca1cc934d90b5.tar.lz
nixlib-172522e153b9601c86bb4eacc46ca1cc934d90b5.tar.xz
nixlib-172522e153b9601c86bb4eacc46ca1cc934d90b5.tar.zst
nixlib-172522e153b9601c86bb4eacc46ca1cc934d90b5.zip
ecryptfs:
- upgrade 106 -> 108
- fix passphrase rewrapper (password changing should now work fine) as
  discussed on https://bugs.launchpad.net/ecryptfs/+bug/1486470
- add lsof dependency so ecryptfs-migrate-home should work out of the
  box
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/ecryptfs/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix
index 590e6071b529..0ea5bc62fd4e 100644
--- a/pkgs/tools/security/ecryptfs/default.nix
+++ b/pkgs/tools/security/ecryptfs/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam
-, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }:
+, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
 
 stdenv.mkDerivation rec {
   name = "ecryptfs-${version}";
-  version = "106";
+  version = "108";
 
   src = fetchurl {
     url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz";
-    sha256 = "1d5nlzcbl8ch639zi3lq6d14gkk4964j6dqhfs87i67867fhlghp";
+    sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj";
   };
 
   #TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
         --prefix PATH ":" "${rsync}/bin" \
         --prefix PATH ":" "${keyutils}/bin" \
         --prefix PATH ":" "${which}/bin" \
+        --prefix PATH ":" "${lsof}/bin" \
         --prefix PATH ":" "$out/bin"
     done
   '';