ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-22 04:57:56 +03:00
Code Issues Projects Releases Wiki Activity

ecryptfs: 108 -> 110

Browse Source
This commit is contained in:
obadz 2016-03-24 12:10:13 +00:00
parent 9549257714
commit 09302c7b56
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/security/ecryptfs/default.nix
View File

@ -3,20 +3,22 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ecryptfs-${version}"; name = "ecryptfs-${version}";
version = "108"; version = "110";
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz"; url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz";
sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj"; sha256 = "1x03m9s409fmzjcnsa9f9ghzkpxcnj9irj05rx7jlwm5cach0lqs";
}; };
#TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir; # TODO: replace wrapperDir below with from <nixos> config.security.wrapperDir;
wrapperDir = "/var/setuid-wrappers";
postPatch = '' postPatch = ''
FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)" FILES="$(grep -r '/bin/sh' src/utils -l; find src -name \*.c)"
for file in $FILES; do for file in $FILES; do
substituteInPlace "$file" \ substituteInPlace "$file" \
--replace /sbin/mount.ecryptfs_private /var/setuid-wrappers/mount.ecryptfs_private \ --replace /sbin/mount.ecryptfs_private ${wrapperDir}/mount.ecryptfs_private \
--replace /sbin/umount.ecryptfs_private /var/setuid-wrappers/umount.ecryptfs_private \ --replace /sbin/umount.ecryptfs_private ${wrapperDir}/umount.ecryptfs_private \
--replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \ --replace /sbin/mount.ecryptfs $out/sbin/mount.ecryptfs \
--replace /sbin/umount.ecryptfs $out/sbin/umount.ecryptfs \ --replace /sbin/umount.ecryptfs $out/sbin/umount.ecryptfs \
--replace /usr/bin/ecryptfs-rewrite-file $out/bin/ecryptfs-rewrite-file \ --replace /usr/bin/ecryptfs-rewrite-file $out/bin/ecryptfs-rewrite-file \
@ -26,7 +28,7 @@ stdenv.mkDerivation rec {
--replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \ --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup \
--replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/mount ${utillinux}/bin/mount \
--replace /bin/umount ${utillinux}/bin/umount \ --replace /bin/umount ${utillinux}/bin/umount \
--replace /sbin/unix_chkpwd /var/setuid-wrappers/unix_chkpwd \ --replace /sbin/unix_chkpwd ${wrapperDir}/unix_chkpwd \
--replace /bin/bash ${bash}/bin/bash --replace /bin/bash ${bash}/bin/bash
done done
''; '';
@ -50,8 +52,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Enterprise-class stacked cryptographic filesystem"; description = "Enterprise-class stacked cryptographic filesystem";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ maintainers.obadz ]; maintainers = [ maintainers.obadz ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }