nfs-utils: 1.2.5 -> 1.3.2, potentially fixes CVE-2013-1923

This commit is contained in:
Tuomas Tynkkynen 2015-07-20 12:19:56 +03:00
parent d54659fe96
commit 4f928f3550

View file

@ -1,18 +1,18 @@
{ fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap { fetchurl, stdenv, tcp_wrappers, utillinux, libcap, libtirpc, libevent, libnfsidmap
, lvm2, e2fsprogs, python , lvm2, e2fsprogs, python, sqlite
}: }:
stdenv.mkDerivation rec { 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 { src = fetchurl {
url = "mirror://sourceforge/nfs/${name}.tar.bz2"; url = "mirror://sourceforge/nfs/${name}.tar.bz2";
sha256 = "16ssfkj36ljifyaskgwpd3ys8ylhi5gasq88aha3bhg5dr7yv59m"; sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v";
}; };
buildInputs = buildInputs =
[ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap [ tcp_wrappers utillinux libcap libtirpc libevent libnfsidmap
lvm2 e2fsprogs python lvm2 e2fsprogs python sqlite
]; ];
# FIXME: Add the dependencies needed for NFSv4 and TI-RPC. # FIXME: Add the dependencies needed for NFSv4 and TI-RPC.
@ -32,14 +32,15 @@ stdenv.mkDerivation rec {
done done
sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c
# https://bugzilla.redhat.com/show_bug.cgi?id=749195 # HACK BUG FIX: needed for 1.3.2
sed -i s,PAGE_SIZE,getpagesize\(\), utils/blkmapd/device-process.c # 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 = preBuild =
'' ''
makeFlags="sbindir=$out/sbin" 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. # One test fails on mips.