Merging from trunk.

I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438

pkgs/tools/misc/grub/1.9x.nix

@@ -16,7 +16,17 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ bison ncurses libusb freetype ];
 
-  patchPhase =
+  patches =
+    [ # The udev rules for LVM create symlinks in /dev/mapper rathe
+      # than device nodes, causing GRUB to fail to recognize LVM
+      # volumes. See
+      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704
+      # This ugly workaround makes `find_root_device' use stat() on
+      # files in /dev/mapper instead of lstat().
+      ./device-mapper-symlinks.patch
+    ];
+
+  postPatch =
     '' gunzip < "${unifont_bdf}" > "unifont.bdf"
        sed -i "configure" \
            -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"

pkgs/tools/misc/grub/device-mapper-symlinks.patch

@@ -0,0 +1,28 @@
+Only in grub-1.97.1-orig/: grub-1.97.1
+diff -rc -x '*~' grub-1.97.1-orig/util/getroot.c grub-1.97.1/util/getroot.c
+*** grub-1.97.1-orig/util/getroot.c	2009-11-09 16:48:16.000000000 +0100
+--- grub-1.97.1/util/getroot.c	2010-01-08 00:26:12.000000000 +0100
+***************
+*** 217,224 ****
+  	continue;
+  
+        if (S_ISLNK (st.st_mode))
+! 	/* Don't follow symbolic links.  */
+! 	continue;
+  
+        if (S_ISDIR (st.st_mode))
+  	{
+--- 217,229 ----
+  	continue;
+  
+        if (S_ISLNK (st.st_mode))
+!         {
+!           if (strcmp(dir, "mapper") != 0)
+!             /* Don't follow symbolic links.  */
+!             continue;
+!           if (stat (ent->d_name, &st) < 0)
+!             continue;
+!         }
+  
+        if (S_ISDIR (st.st_mode))
+  	{

pkgs/tools/misc/parted/default.nix

@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline }:
+{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline, utillinuxng }:
 
 stdenv.mkDerivation rec {
-  name = "parted-1.9.0";
+  name = "parted-2.1";
 
   src = fetchurl {
     url = "mirror://gnu/parted/${name}.tar.gz";
-    sha256 = "02amqpzl8lgk247cjsbaz1nsiz9i1pbj0adx0z109h94p90i48sk";
+    sha256 = "1jc49lv0mglqdvrrh06vfqqmpa0cxczzmd2by6mlpxpblpgrb22a";
   };
 
   buildInputs = [ libuuid gettext readline libuuid devicemapper ];
@@ -21,7 +21,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  patches = [ ./t7000-scripting.patch ];
+  # The `t0400-loop-clobber-infloop.sh' test wants `mkswap'.
+  preCheck = "export PATH=\"${utillinuxng}/sbin:$PATH\"";
 
   meta = {
     description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions";

pkgs/tools/misc/parted/t7000-scripting.patch

@@ -1,15 +0,0 @@
-This patch fixes the `t7000-scripting' test.  See
-http://lists.alioth.debian.org/pipermail/parted-devel/2009-June/thread.html#2887
-for details.
-
---- parted-1.9.0/tests/t7000-scripting.sh	2009-07-23 19:52:08.000000000 +0200
-+++ parted-1.9.0/tests/t7000-scripting.sh	2009-07-26 14:20:28.000000000 +0200
-@@ -28,7 +28,7 @@ EOF
- 
- { emit_superuser_warning
-   sed s/Error/Warning/ errS
--  printf 'Is this still acceptable to you?\nYes/No?'; } >> errI || fail=1
-+  printf 'Is this still acceptable to you?\nYes/No? n\n'; } >> errI || fail=1
- 
- for mkpart in mkpart mkpartfs; do
-