Update to bb2 and genpatches 8; fixes bug #154313, bug #155769, and bug #158792

Package-Manager: portage-2.1.2_rc4-r4

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 290f27d7ad129f60e0c361f86d9facfe21e36030..528616f6f6ceab2d6e26f5a1f019fdaf52a9839d 100644 (file)
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/usermode-sources
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.84 2006/09/30 21:10:10 dang Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.85 2007/01/03 03:59:08 dang Exp $
+
+*usermode-sources-2.6.18-r1 (03 Jan 2007)
+
+  03 Jan 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/uml-2.6.18-genpatches-8-prep.patch,
+  +usermode-sources-2.6.18-r1.ebuild:
+  Update to bb2 and genpatches 8; fixes bug #154313, bug #155769, and bug #158792
 
 *usermode-sources-2.6.18 (30 Sep 2006)
 

diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 594d55ce5fad04df89497fa6908149ddcc66b14b..954b5a652490ce1266063babeb4caa8eb918ae37 100644 (file)
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -5,6 +5,10 @@ AUX uml-2.6.16-bs2-new-glibc.patch 1210 RMD160 26ae9898a3a666f415fcaabed470f1b9c
 MD5 3f0abc012a8ac90dca4de1ce99f666da files/uml-2.6.16-bs2-new-glibc.patch 1210
 RMD160 26ae9898a3a666f415fcaabed470f1b9c0dda480 files/uml-2.6.16-bs2-new-glibc.patch 1210
 SHA256 744d827ab362884581a77bc18c3b9736a362d14aa94bc8d93b167b3733055182 files/uml-2.6.16-bs2-new-glibc.patch 1210
+AUX uml-2.6.18-genpatches-8-prep.patch 2838 RMD160 5db141e1ed101d8126410f7aa22a3d489105814f SHA1 8dc6c826c34a601e6e504207ec00efb08485c73a SHA256 2246a40ea4c8e60576a42f0f062ce35187e0cafda5f97c794378f92c85ce19c5
+MD5 89678501805c00fb65bc6e12f0baa563 files/uml-2.6.18-genpatches-8-prep.patch 2838
+RMD160 5db141e1ed101d8126410f7aa22a3d489105814f files/uml-2.6.18-genpatches-8-prep.patch 2838
+SHA256 2246a40ea4c8e60576a42f0f062ce35187e0cafda5f97c794378f92c85ce19c5 files/uml-2.6.18-genpatches-8-prep.patch 2838
 AUX usermode-sources-2.6.16-CVE-2006-2935.patch 987 RMD160 fd8896a08cbca676cc76ed713cd4e223d44ee0ba SHA1 fddc4204532f9a0e22e364bd4952b90e50de2ea3 SHA256 34eb3014c59ca234ff0ab0e22540fadb97f54d2cdca14743845820200a9245f3
 MD5 54151e6ebaffe8c0e120a81039a8ccda files/usermode-sources-2.6.16-CVE-2006-2935.patch 987
 RMD160 fd8896a08cbca676cc76ed713cd4e223d44ee0ba files/usermode-sources-2.6.16-CVE-2006-2935.patch 987
@@ -20,10 +24,12 @@ SHA256 e9c50befb4e9157cabc94f76c9ca0a7e80422d82d4c3280d8f852673f669adf1 files/us
 DIST genpatches-2.6.16-13.base.tar.bz2 98287 RMD160 55e01ae4090fdbb65c2033d7df3f6d667bcd874f SHA1 0d5bc13616264f0e58c67337dafe72e92a7b7025 SHA256 3bfa570f10939a838a3d460563f30b429d227e9f5b4cd0bd6b448a22bdb63858
 DIST genpatches-2.6.16-15.base.tar.bz2 98632 RMD160 46e8cfcae8fea262d7599c2e4d3e7fbc8af239b2 SHA1 e0f253ad01a4da388675af4b90223289d9bcd578 SHA256 fb78f2a4d32d1770a34d9ee254686a6a12102fa99c1bb73e9c282ab5f82dddaa
 DIST genpatches-2.6.18-1.base.tar.bz2 2397 RMD160 1b02d9e5adba7a9a17f85691f312ee2c870c9a48 SHA1 790186d9d44c358d05489cdff417beab03124708 SHA256 e87db440591d48f74b8d50f47bde55a1652c969626befa94aba48cee57aa5da8
+DIST genpatches-2.6.18-8.base.tar.bz2 108656 RMD160 b0d604f8a1f476e34f6a3a4143e07a24dbcab6e8 SHA1 03a9964f584e92d437dd0bb26b145958b4e35b16 SHA256 3ac24ea4b287429719de0b2828594e84eecbedb05f66300632363d3a60c185d0
 DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
 DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 DIST uml-2.6.16-bs2.patch.bz2 33936 RMD160 8a46545ae3ad355feb494d4e5a3f0dad76690aa3 SHA1 7a0417e42e18f17f83dccd570bfad2bc619feefd SHA256 aba5949f52f03b08c85171101824c323c7b6a812666ce4049699a8cb9de9d84e
 DIST uml-2.6.18-bb1.patch.bz2 38845 RMD160 3615aff4d9e6dfdc28ac5e9b24cf541e862f5367 SHA1 30105802b9985cbfb0b13d4903cda6fc9950856b SHA256 3153ad476b2ff743976467a45d27bfd4f741f57247a3e3f2416b8ce1acae9700
+DIST uml-2.6.18.1-bb2.patch.bz2 36108 RMD160 8984ba75df2283764c916cebc38a4d05ee617996 SHA1 6cb92a90a57d14709a503f0b25fdfed88e2f2af3 SHA256 58366bd9a2129ed4486c37f9756a35a981a0e3d30a960da1278254777c6d8ac2
 EBUILD usermode-sources-2.6.16-r3.ebuild 934 RMD160 ba9fc9dca5c83c3ea96832740c823cdaf0231916 SHA1 89fbc90686d64c6c451c00cb3cff0505de32960d SHA256 468658584284e84118d4c49c239be61fb0865c49e0d5a2d6efbdd9e5a6908c67
 MD5 622462077e249410823ebd5b4cdf1448 usermode-sources-2.6.16-r3.ebuild 934
 RMD160 ba9fc9dca5c83c3ea96832740c823cdaf0231916 usermode-sources-2.6.16-r3.ebuild 934
@@ -36,14 +42,18 @@ EBUILD usermode-sources-2.6.16-r5.ebuild 1048 RMD160 3d16510ec77d98dd389df63a222
 MD5 e1d1ee47b1cc11e17ad384ad6ce293bc usermode-sources-2.6.16-r5.ebuild 1048
 RMD160 3d16510ec77d98dd389df63a222c55e0e84298b3 usermode-sources-2.6.16-r5.ebuild 1048
 SHA256 c41f8ca0d95b147c26cab5158c58744a345ed14610052956a4b54895bdc9ee18 usermode-sources-2.6.16-r5.ebuild 1048
+EBUILD usermode-sources-2.6.18-r1.ebuild 970 RMD160 3418d148ecfff79f3a3d5279d9190e4fd144284d SHA1 5383316b0f3b722078a0592993011d8a51fc3f90 SHA256 e6fe8e9d0544ef6f2d97cf82437a6d5328e1d2593e2eb390585869db60b97672
+MD5 ad5c249aaf59e69b64129fc97aeaa140 usermode-sources-2.6.18-r1.ebuild 970
+RMD160 3418d148ecfff79f3a3d5279d9190e4fd144284d usermode-sources-2.6.18-r1.ebuild 970
+SHA256 e6fe8e9d0544ef6f2d97cf82437a6d5328e1d2593e2eb390585869db60b97672 usermode-sources-2.6.18-r1.ebuild 970
 EBUILD usermode-sources-2.6.18.ebuild 919 RMD160 2d409c33d4e75ada220c339ddb887ac6cdae521c SHA1 47bcb8a03fce0c8bf006728e578c73111e358858 SHA256 a936b615f74f3af610e5bbb43eeec34b74bb088a6433e744bf935c9ac1df5cf2
 MD5 80ad0f13a00939853185c632c423fd4c usermode-sources-2.6.18.ebuild 919
 RMD160 2d409c33d4e75ada220c339ddb887ac6cdae521c usermode-sources-2.6.18.ebuild 919
 SHA256 a936b615f74f3af610e5bbb43eeec34b74bb088a6433e744bf935c9ac1df5cf2 usermode-sources-2.6.18.ebuild 919
-MISC ChangeLog 23477 RMD160 6d91426070a3176d960943d7a2c85f5c534f1b7a SHA1 ab3c47591973d6f3bc4b70f2ab9841a47b45533f SHA256 79bbac331ee93eb0879f6d60799e668b36dd75770a91e9af747e2758ac09d7ae
-MD5 049af7b14c77a7e3925c4ed9b0302f57 ChangeLog 23477
-RMD160 6d91426070a3176d960943d7a2c85f5c534f1b7a ChangeLog 23477
-SHA256 79bbac331ee93eb0879f6d60799e668b36dd75770a91e9af747e2758ac09d7ae ChangeLog 23477
+MISC ChangeLog 23737 RMD160 d5147ee802d0e63b0b5ee51877fe22a684bb6bb8 SHA1 29f84175a92e781a9355b3bbbf16650f6cd6ba0e SHA256 54da62f19f6dbf48b5ea7c27a63f164e9dda639bb5a90c5be2d6f2af24c161c6
+MD5 1ac69f46fe24da890862892b3f6f3352 ChangeLog 23737
+RMD160 d5147ee802d0e63b0b5ee51877fe22a684bb6bb8 ChangeLog 23737
+SHA256 54da62f19f6dbf48b5ea7c27a63f164e9dda639bb5a90c5be2d6f2af24c161c6 ChangeLog 23737
 MISC metadata.xml 250 RMD160 9657d63a141d387fa3a42ef4087ee0ed3757cf67 SHA1 7a59aecd3ddaed1b49f15c552a7893929b5155ed SHA256 c1aa14289c2eb84cdf6c739f3d48b122a09d4c99de38bd22ae558ac47be0cf90
 MD5 5811f74eb87a97c082114675db0ef41b metadata.xml 250
 RMD160 9657d63a141d387fa3a42ef4087ee0ed3757cf67 metadata.xml 250
@@ -60,10 +70,13 @@ SHA256 c5f0c87d798f8977a4b89600fc6f19382a0b09b8140c59d8d3e2367840a9c484 files/di
 MD5 0e70bb8d5a4d64b2e49a66324ee72ec3 files/digest-usermode-sources-2.6.18 768
 RMD160 d61d649a016d287dfcb8f9c2dc9dc4c2d6cf2be8 files/digest-usermode-sources-2.6.18 768
 SHA256 0d6676ef2ae421b16b6c04e38bdcd6c6deabe3df4873669eda46c47f5af0d631 files/digest-usermode-sources-2.6.18 768
+MD5 bb664042fcd485eb4961aebdfe1b7ecf files/digest-usermode-sources-2.6.18-r1 780
+RMD160 76b5427db2aa54c270a317dafc2939a56bf6c443 files/digest-usermode-sources-2.6.18-r1 780
+SHA256 f3424bc44e5d7f5e8b016bfb117b6bb2fea5d20d7cc997cdce3012b1baa6c6f1 files/digest-usermode-sources-2.6.18-r1 780
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFHt1AomPajV0RnrERAmg5AJ99FQvPgoxc4rnBT642QQbKdULZAgCfZera
-DudmMQThWyYRIqhmD8mnRTs=
-=iwsx
+iD8DBQFFmyn0omPajV0RnrERAoEYAJ9K4UfDSSA0cpuKYAAmMF1gsvtrpQCeK0+G
+iauSIVOBLy+YTs0rNMJ7adA=
+=NIi0
 -----END PGP SIGNATURE-----

diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r1 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r1
new file mode 100644 (file)
index 0000000..4784d64
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.18-r1
@@ -0,0 +1,9 @@
+MD5 65e0ac78c740fd7e70cdd2fcab6d89ad genpatches-2.6.18-8.base.tar.bz2 108656
+RMD160 b0d604f8a1f476e34f6a3a4143e07a24dbcab6e8 genpatches-2.6.18-8.base.tar.bz2 108656
+SHA256 3ac24ea4b287429719de0b2828594e84eecbedb05f66300632363d3a60c185d0 genpatches-2.6.18-8.base.tar.bz2 108656
+MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
+RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
+SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
+MD5 683956ae680b9a09e5c5d7b99a568775 uml-2.6.18.1-bb2.patch.bz2 36108
+RMD160 8984ba75df2283764c916cebc38a4d05ee617996 uml-2.6.18.1-bb2.patch.bz2 36108
+SHA256 58366bd9a2129ed4486c37f9756a35a981a0e3d30a960da1278254777c6d8ac2 uml-2.6.18.1-bb2.patch.bz2 36108

diff --git a/sys-kernel/usermode-sources/files/uml-2.6.18-genpatches-8-prep.patch b/sys-kernel/usermode-sources/files/uml-2.6.18-genpatches-8-prep.patch
new file mode 100644 (file)
index 0000000..19c6b13
--- /dev/null
+++ b/sys-kernel/usermode-sources/files/uml-2.6.18-genpatches-8-prep.patch
@@ -0,0 +1,64 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/i386/Kconfig.cpu linux-2.6.18-usermode-r1/arch/i386/Kconfig.cpu
+--- linux-2.6.18-usermode-r1.orig/arch/i386/Kconfig.cpu        2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/i386/Kconfig.cpu     2007-01-02 21:54:14.000000000 -0500
+@@ -7,7 +7,6 @@ choice
+ 
+ config M386
+       bool "386"
+-      depends on !UML
+       ---help---
+         This is the processor type of your CPU. This information is used for
+         optimizing purposes. In order to compile a kernel that can run on
+@@ -302,7 +301,7 @@ config X86_USE_PPRO_CHECKSUM
+ 
+ config X86_USE_3DNOW
+       bool
+-      depends on (MCYRIXIII || MK7 || MGEODE_LX) && !UML
++      depends on MCYRIXIII || MK7 || MGEODE_LX
+       default y
+ 
+ config X86_OOSTORE
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/include/kern_util.h linux-2.6.18-usermode-r1/arch/um/include/kern_util.h
+--- linux-2.6.18-usermode-r1.orig/arch/um/include/kern_util.h  2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/um/include/kern_util.h       2007-01-02 21:54:14.000000000 -0500
+@@ -6,6 +6,7 @@
+ #ifndef __KERN_UTIL_H__
+ #define __KERN_UTIL_H__
+ 
++#include "linux/threads.h"
+ #include "sysdep/ptrace.h"
+ #include "sysdep/faultinfo.h"
+ 
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/sys-i386/tls.c linux-2.6.18-usermode-r1/arch/um/os-Linux/sys-i386/tls.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/sys-i386/tls.c      2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/um/os-Linux/sys-i386/tls.c   2007-01-02 21:54:14.000000000 -0500
+@@ -1,6 +1,4 @@
+ #include <errno.h>
+-#include <sys/syscall.h>
+-#include <unistd.h>
+ #include <linux/unistd.h>
+ #include "sysdep/tls.h"
+ #include "user_util.h"
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/tls.c linux-2.6.18-usermode-r1/arch/um/os-Linux/tls.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/os-Linux/tls.c       2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/um/os-Linux/tls.c    2007-01-02 21:54:14.000000000 -0500
+@@ -1,8 +1,6 @@
+ #include <errno.h>
+ #include <sys/ptrace.h>
+-#include <sys/syscall.h>
+ #include <asm/ldt.h>
+-#include <unistd.h>
+ #include "sysdep/tls.h"
+ #include "uml-config.h"
+ 
+diff --exclude-from=/home/dang/.diffrc -up -ruN linux-2.6.18-usermode-r1.orig/arch/um/sys-x86_64/stub_segv.c linux-2.6.18-usermode-r1/arch/um/sys-x86_64/stub_segv.c
+--- linux-2.6.18-usermode-r1.orig/arch/um/sys-x86_64/stub_segv.c       2007-01-02 21:03:00.000000000 -0500
++++ linux-2.6.18-usermode-r1/arch/um/sys-x86_64/stub_segv.c    2007-01-02 21:54:14.000000000 -0500
+@@ -5,6 +5,7 @@
+ 
+ #include <stddef.h>
+ #include <signal.h>
++#include <linux/compiler.h>
+ #include <asm/unistd.h>
+ #include "uml-config.h"
+ #include "sysdep/sigcontext.h"

diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.18-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.18-r1.ebuild
new file mode 100644 (file)
index 0000000..958c701
--- /dev/null
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.18-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.18-r1.ebuild,v 1.1 2007/01/03 03:59:08 dang Exp $
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="8"
+inherit kernel-2
+detect_version
+
+UML_VER="uml-2.6.18.1-bb2"
+UNIPATCH_LIST="${FILESDIR}/uml-2.6.18-genpatches-8-prep.patch
+       ${DISTDIR}/${UML_VER}.patch.bz2"
+UNIPATCH_STRICTORDER="yes"
+
+DESCRIPTION="Full sources for the User Mode Linux kernel"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI}
+       http://www.user-mode-linux.org/~blaisorblade/patches/guest/${UML_VER}/${UML_VER}.patch.bz2"
+HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
+KEYWORDS="~amd64 ~x86"
+
+K_EXTRAEINFO="Since you are using UML, you may want to read the Gentoo Linux
+Developer's guide to system testing with User-Mode Linux that
+can be found at http://www.gentoo.org/doc/en/uml.xml"