diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2014-06-30 09:26:24 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-06-30 09:26:24 +0400 |
commit | dcf5e85c2ff7a9f4c34c8a6af6f8482e0dd88436 (patch) | |
tree | 5e8b846e043f2f10cb3b67768b98e6eca3b13f24 /pkgs/tools/security | |
parent | d2d969f08a1a8d8b3177de9f426da2a8aaa2da94 (diff) | |
parent | f75ea738eddeaba586e7f6749e9bf841598f37b5 (diff) | |
download | nixlib-dcf5e85c2ff7a9f4c34c8a6af6f8482e0dd88436.tar nixlib-dcf5e85c2ff7a9f4c34c8a6af6f8482e0dd88436.tar.gz nixlib-dcf5e85c2ff7a9f4c34c8a6af6f8482e0dd88436.tar.bz2 nixlib-dcf5e85c2ff7a9f4c34c8a6af6f8482e0dd88436.tar.lz nixlib-dcf5e85c2ff7a9f4c34c8a6af6f8482e0dd88436.tar.xz nixlib-dcf5e85c2ff7a9f4c34c8a6af6f8482e0dd88436.tar.zst nixlib-dcf5e85c2ff7a9f4c34c8a6af6f8482e0dd88436.zip |
Merge pull request #2595 from wkennington/master.ecryptfs
ecryptfs: Update from 82 -> 104
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/ecryptfs/default.nix | 35 |
1 files changed, 27 insertions, 8 deletions
diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index d1ed6f420ec3..13046aa0b2d1 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,18 +1,37 @@ -{stdenv, fetchurl, fuse, python, perl, keyutils, pam, nss, nspr}: +{ stdenv, fetchurl, pkgconfig, perl, keyutils, nss, nspr, python, pam +, intltool, makeWrapper, coreutils, gettext, cryptsetup, lvm2, rsync, which }: + stdenv.mkDerivation { - name = "ecryptfs-82"; + name = "ecryptfs-104"; src = fetchurl { - url = http://launchpad.net/ecryptfs/trunk/82/+download/ecryptfs-utils_82.orig.tar.gz; - sha256 = "1w3swispgp71prz8h56hqby2wwnvam5vllqvc69rn8cf605i69a6"; + url = http://launchpad.net/ecryptfs/trunk/104/+download/ecryptfs-utils_104.orig.tar.gz; + sha256 = "0f3lzpjw97vcdqzzgii03j3knd6pgwn1y0lpaaf46iidaiv0282a"; }; - NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss"; + buildInputs = [ pkgconfig perl nss nspr python pam intltool makeWrapper ]; + propagatedBuildInputs = [ coreutils gettext cryptsetup lvm2 rsync keyutils which ]; - buildInputs = [ python perl keyutils pam nss nspr ]; + postInstall = '' + FILES="$(grep -r '/bin/sh' $out/bin | sed 's,:.*,,' | uniq)" + for file in $FILES; do + sed -i $file -e "s,\(/sbin/u\?mount.ecryptfs\(_private\)\?\),$out\1," \ + -e "s,\(/sbin/cryptsetup\),${cryptsetup}\1," \ + -e "s,\(/sbin/dmsetup\),${lvm2}\1," \ + -e 's,/sbin/\(unix_chkpwd\),\1,' + wrapProgram $file \ + --prefix PATH ":" "${coreutils}/bin" \ + --prefix PATH ":" "${gettext}/bin" \ + --prefix PATH ":" "${rsync}/bin" \ + --prefix PATH ":" "${keyutils}/bin" \ + --prefix PATH ":" "${which}/bin" \ + --prefix PATH ":" "$out/bin" + done + ''; - meta = { + meta = with stdenv.lib; { description = "Enterprise-class stacked cryptographic filesystem"; - license = "GPLv2+"; + license = licenses.gpl2Plus; + platforms = platforms.linux; }; } |