* UML updated to 2.4.27-1.

svn path=/nixpkgs/trunk/; revision=1845

4 files changed, 32 insertions, 79 deletions

diff --git a/pkgs/misc/uml/builder.sh b/pkgs/misc/uml/builder.sh
index 3790f479b16f..f2a615494f58 100644
--- a/pkgs/misc/uml/builder.sh
+++ b/pkgs/misc/uml/builder.sh
@@ -16,7 +16,7 @@ postUnpack=postUnpack
 
 configurePhase() {
     cp $config .config
-    make oldconfig ARCH=um
+    yes | make oldconfig ARCH=um
 }
 configurePhase=configurePhase
 
diff --git a/pkgs/misc/uml/config b/pkgs/misc/uml/config
index 8005c416b6e6..37bf83b86904 100644
--- a/pkgs/misc/uml/config
+++ b/pkgs/misc/uml/config
@@ -99,7 +99,7 @@ CONFIG_UML_NET_DAEMON=y
 CONFIG_UML_NET_MCAST=y
 # CONFIG_UML_NET_PCAP is not set
 CONFIG_DUMMY=y
-CONFIG_BONDING=n
+# CONFIG_BONDING is not set
 CONFIG_EQUALIZER=m
 CONFIG_TUN=y
 CONFIG_PPP=m
@@ -140,7 +140,6 @@ CONFIG_INET=y
 #
 #    SCTP Configuration (EXPERIMENTAL)
 #
-CONFIG_IPV6_SCTP__=y
 # CONFIG_IP_SCTP is not set
 # CONFIG_ATM is not set
 # CONFIG_VLAN_8021Q is not set
@@ -189,7 +188,7 @@ CONFIG_REISERFS_FS=m
 CONFIG_ADFS_FS=m
 # CONFIG_ADFS_FS_RW is not set
 CONFIG_AFFS_FS=m
-CONFIG_HFS_FS=n
+# CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
 # CONFIG_BEFS_DEBUG is not set
@@ -362,6 +361,30 @@ CONFIG_ZLIB_INFLATE=m
 CONFIG_ZLIB_DEFLATE=m
 
 #
+# Cryptographic options
+#
+CONFIG_CRYPTO=n
+CONFIG_CRYPTO_HMAC=n
+CONFIG_CRYPTO_NULL=n
+CONFIG_CRYPTO_MD4=n
+CONFIG_CRYPTO_MD5=n
+CONFIG_CRYPTO_SHA1=n
+CONFIG_CRYPTO_SHA256=n
+CONFIG_CRYPTO_SHA512=n
+CONFIG_CRYPTO_DES=n
+CONFIG_CRYPTO_BLOWFISH=n
+CONFIG_CRYPTO_TWOFISH=n
+CONFIG_CRYPTO_SERPENT=n
+CONFIG_CRYPTO_AES=n
+CONFIG_CRYPTO_CAST5=n
+CONFIG_CRYPTO_CAST6=n
+CONFIG_CRYPTO_TEA=n
+CONFIG_CRYPTO_ARC4=n
+CONFIG_CRYPTO_DEFLATE=n
+CONFIG_CRYPTO_MICHAEL_MIC=n
+CONFIG_CRYPTO_TEST=n
+
+#
 # Kernel hacking
 #
 # CONFIG_DEBUG_SLAB is not set
diff --git a/pkgs/misc/uml/default.nix b/pkgs/misc/uml/default.nix
index f420890e21f8..7f4b0e6d8f1d 100644
--- a/pkgs/misc/uml/default.nix
+++ b/pkgs/misc/uml/default.nix
@@ -3,17 +3,15 @@
 assert perl != null && m4 != null;
 
 stdenv.mkDerivation {
-  name = "uml-2.4.24-2";
+  name = "uml-2.4.27-1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.24.tar.bz2;
-    md5 = "1e055c42921b2396a559d84df4c3d9aa";
-#    url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.26.tar.bz2;
-#    md5 = "88d7aefa03c92739cb70298a0b486e2c";
+    url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.4/linux-2.4.27.tar.bz2;
+    md5 = "59a2e6fde1d110e2ffa20351ac8b4d9e";
   };
   umlPatch = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/user-mode-linux/uml-patch-2.4.24-2.bz2;
-    md5 = "f2aeb4d44f5734d63e98e6d66cc256de";
+    url = http://heanet.dl.sourceforge.net/sourceforge/user-mode-linux/uml-patch-2.4.27-1.bz2;
+    md5 = "63178bbd3a383a1005738f4628ff583e";
   };
   noAioPatch = ./no-aio.patch;
 #  hostfsPatch = ./hostfs.patch;
diff --git a/pkgs/misc/uml/no-aio.patch b/pkgs/misc/uml/no-aio.patch
index 6a961cec8370..a5ce94be8cb7 100644
--- a/pkgs/misc/uml/no-aio.patch
+++ b/pkgs/misc/uml/no-aio.patch
@@ -1,71 +1,3 @@
-diff -rc linux-orig/arch/um/os-Linux/aio.c linux-2.4.24/arch/um/os-Linux/aio.c
-*** linux-orig/arch/um/os-Linux/aio.c	2004-07-29 23:32:53.000000000 +0200
---- linux-2.4.24/arch/um/os-Linux/aio.c	2004-07-30 12:39:46.000000000 +0200
-***************
-*** 9,15 ****
---- 9,17 ----
-  #include <errno.h>
-  #include <sched.h>
-  #include <sys/syscall.h>
-+ #if defined(HAVE_AIO_ABI)
-  #include <linux/aio_abi.h>
-+ #endif
-  #include "os.h"
-  #include "helper.h"
-  #include "aio.h"
-***************
-*** 245,250 ****
---- 247,253 ----
-  	return(0);
-  }
-  
-+ #if defined(HAVE_AIO_ABI)
-  static int init_aio_26(void)
-  {
-  	unsigned long stack;
-***************
-*** 282,287 ****
---- 285,297 ----
-  		return(init_aio_24());
-  	else return(init_aio_26());
-  }
-+ #else
-+ static int init_aio(void)
-+ {
-+ 	printk("Compiled without 2.6 AIO support\n");
-+ 	return(init_aio_24());
-+ }
-+ #endif
-  
-  __initcall(init_aio);
-  
-***************
-*** 313,318 ****
---- 323,329 ----
-  	return(err);
-  }
-  
-+ #if defined(HAVE_AIO_ABI)
-  int submit_aio_26(enum aio_type type, int io_fd, char *buf, int len, 
-  		  unsigned long long offset, int reply_fd, void *data)
-  {
-***************
-*** 345,350 ****
---- 356,368 ----
-  				     data));
-  	}
-  }
-+ #else
-+ int submit_aio(enum aio_type type, int io_fd, char *buf, int len, 
-+ 	       unsigned long long offset, int reply_fd, void *data)
-+ {
-+ 	return(submit_aio_24(type, io_fd, buf, len, offset, reply_fd, data));
-+ }
-+ #endif
-  
-  /*
-   * Overrides for Emacs so that we follow Linus's tabbing style.
-Only in linux-2.4.24/arch/um/os-Linux: aio.c~
 diff -rc linux-orig/arch/um/os-Linux/Makefile linux-2.4.24/arch/um/os-Linux/Makefile
 *** linux-orig/arch/um/os-Linux/Makefile	2004-07-29 23:32:53.000000000 +0200
 --- linux-2.4.24/arch/um/os-Linux/Makefile	2004-07-29 23:33:15.000000000 +0200