From 874804eb043e24ac2cf5f863ca91029ab590709a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 24 Jul 2008 13:48:23 +0000
Subject: [PATCH] * Security fix for CVE-2007-5191.

svn path=/nixpkgs/trunk/; revision=12417
---
 pkgs/os-specific/linux/util-linux/default.nix | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 0c7ebef7eb3b..8aed357d54cd 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{stdenv, fetchurl, ncurses ? null}:
 
 stdenv.mkDerivation {
   name = "util-linux-2.13-pre7";
@@ -7,16 +7,23 @@ stdenv.mkDerivation {
     url = mirror://kernel/linux/utils/util-linux/testing/util-linux-2.13-pre7.tar.bz2;
     md5 = "13cdf4b76533e8421dc49de188f85291";
   };
-  
+
+  patches = [
+    # Fix for a local root exploit via mount/umount
+    # (http://www.gentoo.org/security/en/glsa/glsa-200710-18.xml).
+    (fetchurl {
+      url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/util-linux/files/util-linux-2.13-setuid-checks.patch?rev=1.1";
+      sha256 = "02ky7ljzqpx8ii3dfmjydw8nnhshpw2inwh6w1vqllz8mhn81jdf";
+    })
+  ];
+
   configureFlags = "--disable-use-tty-group";
 
-  buildInputs = [] 
-  	++ (if args ? ncurses then [args.ncurses] else [])
-  ;
+  buildInputs = stdenv.lib.optional (ncurses != null) ncurses;
 
-  preBuild = "
+  preBuild = ''
     makeFlagsArray=(usrbinexecdir=$out/bin usrsbinexecdir=$out/sbin datadir=$out/share exampledir=$out/share/getopt)
-  ";
+  '';
 
   # Hack to get static builds to work.
   NIX_CFLAGS_COMPILE = "-DHAVE___PROGNAME=1";