pyrox.dev
lol
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
+5
-4
+1
-1
nixos/modules/security/pam.nix
+1
-1
nixos/modules/security/pam.nix
···
251
251
${optionalString (!(config.security.pam.enableEcryptfs || cfg.pamMount)) "auth required pam_deny.so"}
252
252
253
253
# Password management.
254
+
password requisite pam_unix.so nullok sha512
254
255
${optionalString config.security.pam.enableEcryptfs
255
256
"password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
256
-
password requisite pam_unix.so nullok sha512
257
257
${optionalString cfg.pamMount
258
258
"password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"}
259
259
${optionalString config.users.ldap.enable
+4
-3
pkgs/tools/security/ecryptfs/default.nix
+4
-3
pkgs/tools/security/ecryptfs/default.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam
2
-
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }:
2
+
, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }:
3
3
4
4
stdenv.mkDerivation rec {
5
5
name = "ecryptfs-${version}";
6
-
version = "106";
6
+
version = "108";
7
7
8
8
src = fetchurl {
9
9
url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz";
10
-
sha256 = "1d5nlzcbl8ch639zi3lq6d14gkk4964j6dqhfs87i67867fhlghp";
10
+
sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj";
11
11
};
12
12
13
13
#TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
···
43
43
--prefix PATH ":" "${rsync}/bin" \
44
44
--prefix PATH ":" "${keyutils}/bin" \
45
45
--prefix PATH ":" "${which}/bin" \
46
+
--prefix PATH ":" "${lsof}/bin" \
46
47
--prefix PATH ":" "$out/bin"
47
48
done
48
49
'';