diff options
| author | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-07-20 12:19:56 +0300 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi> | 2015-07-20 12:20:42 +0300 |
| commit | 4f928f3550df3025106d1c7231b703aad28d1510 (patch) | |
| tree | c434ccc0fa61af7c35ee45d91294e8bc60499af7 /pkgs/os-specific/linux/nfs-utils | |
| parent | d54659fe9628fc460b4b591fac84dfe4b1841231 (diff) | |
| download | nixpkgs-4f928f3550df3025106d1c7231b703aad28d1510.tar nixpkgs-4f928f3550df3025106d1c7231b703aad28d1510.tar.gz nixpkgs-4f928f3550df3025106d1c7231b703aad28d1510.tar.bz2 nixpkgs-4f928f3550df3025106d1c7231b703aad28d1510.tar.lz nixpkgs-4f928f3550df3025106d1c7231b703aad28d1510.tar.xz nixpkgs-4f928f3550df3025106d1c7231b703aad28d1510.tar.zst nixpkgs-4f928f3550df3025106d1c7231b703aad28d1510.zip | |
nfs-utils: 1.2.5 -> 1.3.2, potentially fixes CVE-2013-1923
Diffstat (limited to 'pkgs/os-specific/linux/nfs-utils')
| -rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 6b30104b083..75f25e26804 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,18 +1,18 @@ { fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap -, lvm2, e2fsprogs, python +, lvm2, e2fsprogs, python, sqlite }: stdenv.mkDerivation rec { - name = "nfs-utils-1.2.5"; + name = "nfs-utils-1.3.2"; # NOTE: when updating, remove the HACK BUG FIX below src = fetchurl { url = "mirror://sourceforge/nfs/${name}.tar.bz2"; - sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m"; + sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v"; }; buildInputs = [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap - lvm2 e2fsprogs python + lvm2 e2fsprogs python sqlite ]; # FIXME: Add the dependencies needed for NFSv4 and TI-RPC. @@ -32,14 +32,15 @@ stdenv.mkDerivation rec { done sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c - # https://bugzilla.redhat.com/show_bug.cgi?id=749195 - sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c + # HACK BUG FIX: needed for 1.3.2 + # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=17a3e5bffb7110d46de1bf42b64b90713ff5ea50 + sed -e 's,daemon_init(!,daemon_init(,' -i utils/statd/statd.c ''; preBuild = '' makeFlags="sbindir=$out/sbin" - installFlags="statedir=$TMPDIR" # hack to make `make install' work + installFlags="statedir=$TMPDIR statdpath=$TMPDIR" # hack to make `make install' work ''; # One test fails on mips. |