From dd3ac4fc827dad6acbc56eca57508e5d3d061398 Mon Sep 17 00:00:00 2001 From: Tim Yamin Date: Sat, 27 Nov 2004 20:04:10 +0000 Subject: Version bump for the AF_UNIX and a.out security vulnerabilities; bugs #72452 and #72317. --- sys-kernel/usermode-sources/ChangeLog | 13 ++++- sys-kernel/usermode-sources/Manifest | 29 +++++----- .../files/digest-usermode-sources-2.4.26-r10 | 4 ++ .../files/digest-usermode-sources-2.4.26-r9 | 4 -- .../files/digest-usermode-sources-2.6.8.1-r4 | 3 -- .../files/digest-usermode-sources-2.6.8.1-r5 | 3 ++ .../files/usermode-sources-2.4.binfmt_a.out.patch | 63 ++++++++++++++++++++++ .../files/usermode-sources-2.6.binfmt_a.out.patch | 63 ++++++++++++++++++++++ .../files/usermode-sources.AF_UNIX.patch | 24 +++++++++ .../usermode-sources-2.4.26-r10.ebuild | 50 +++++++++++++++++ .../usermode-sources-2.4.26-r9.ebuild | 48 ----------------- .../usermode-sources-2.6.8.1-r4.ebuild | 27 ---------- .../usermode-sources-2.6.8.1-r5.ebuild | 29 ++++++++++ 13 files changed, 264 insertions(+), 96 deletions(-) create mode 100644 sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r10 delete mode 100644 sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r9 delete mode 100644 sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.8.1-r4 create mode 100644 sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.8.1-r5 create mode 100644 sys-kernel/usermode-sources/files/usermode-sources-2.4.binfmt_a.out.patch create mode 100644 sys-kernel/usermode-sources/files/usermode-sources-2.6.binfmt_a.out.patch create mode 100644 sys-kernel/usermode-sources/files/usermode-sources.AF_UNIX.patch create mode 100644 sys-kernel/usermode-sources/usermode-sources-2.4.26-r10.ebuild delete mode 100644 sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild delete mode 100644 sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild create mode 100644 sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild (limited to 'sys-kernel') diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog index 273888a602c6..342dcf1f5fe2 100644 --- a/sys-kernel/usermode-sources/ChangeLog +++ b/sys-kernel/usermode-sources/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-kernel/usermode-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.52 2004/11/26 16:27:19 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.53 2004/11/27 20:04:10 plasmaroo Exp $ + +*usermode-sources-2.6.8.1-r5 (27 Nov 2004) + + 27 Nov 2004; +usermode-sources-2.4.26-r10.ebuild, + -usermode-sources-2.4.26-r9.ebuild, -usermode-sources-2.6.8.1-r4.ebuild, + +usermode-sources-2.6.8.1-r5.ebuild, + +files/usermode-sources-2.4.binfmt_a.out.patch, + +files/usermode-sources-2.6.binfmt_a.out.patch, + +files/usermode-sources.AF_UNIX.patch: + Version bump for the AF_UNIX and a.out security vulnerabilities; bugs #72452 + and #72317. 26 Nov 2004; Daniel Drake usermode-sources-2.4.26-r9.ebuild, usermode-sources-2.6.8.1-r4.ebuild: diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest index 608b4952bd10..bee43434c81c 100644 --- a/sys-kernel/usermode-sources/Manifest +++ b/sys-kernel/usermode-sources/Manifest @@ -1,20 +1,23 @@ -MD5 048fae91d93121008e7a6ceaa7d3cd51 usermode-sources-2.4.26-r9.ebuild 1797 -MD5 830ba0e46cfc4df8f58445dcb3727291 ChangeLog 14083 +MD5 c8e0fdef4d30261ec7c47cbf8be79752 usermode-sources-2.6.8.1-r5.ebuild 1063 +MD5 ba20c272e2dab8eecb1a916366bd6011 ChangeLog 14557 +MD5 19e3506068443dc2783e651d4bfb4b47 usermode-sources-2.4.26-r10.ebuild 1879 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159 -MD5 c49eefac1395494c36bdbc4adb7d858e usermode-sources-2.6.8.1-r4.ebuild 982 -MD5 60d25ff310fc6abfdce39ec9e47345af files/usermode-sources-2.4.CAN-2004-0685.patch 2809 +MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388 +MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549 +MD5 b0a1f80aff51d6601e8924329023b241 files/usermode-sources.AF_UNIX.patch 515 +MD5 b9a94233e1457787352e5f85e3e3582d files/usermode-sources-2.4.binfmt_a.out.patch 2009 +MD5 054d55975dd07c5a434e0ccfcf26f682 files/digest-usermode-sources-2.4.26-r10 297 +MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350 +MD5 915e8d7a0618736caa44d96968015467 files/usermode-sources-2.4.binfmt_elf.patch 2346 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/usermode-sources-2.4.smbfs.patch 3434 +MD5 025c80544aef14ce3a49024d791c5596 files/usermode-sources-2.6.binfmt_a.out.patch 1763 MD5 a9991d6324d7404ed99e79be6e44e9de files/usermode-sources-2.6.binfmt_elf.patch 2348 -MD5 054d55975dd07c5a434e0ccfcf26f682 files/digest-usermode-sources-2.4.26-r9 297 -MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354 -MD5 915e8d7a0618736caa44d96968015467 files/usermode-sources-2.4.binfmt_elf.patch 2346 -MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350 -MD5 2b3ddb8b8b15f8da35ade38544b57857 files/usermode-sources-2.4.XDRWrapFix.patch 1499 -MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 572 +MD5 60d25ff310fc6abfdce39ec9e47345af files/usermode-sources-2.4.CAN-2004-0685.patch 2809 MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476 -MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549 -MD5 5748125eb42554148c90a042a7454065 files/digest-usermode-sources-2.6.8.1-r4 214 +MD5 5748125eb42554148c90a042a7454065 files/digest-usermode-sources-2.6.8.1-r5 214 MD5 8165de5e2ab6e0d3263ea35ce856fd1b files/usermode-sources-2.6.smbfs.patch 3309 MD5 c2510fe1891f5a9effb12c2196922206 files/usermode-sources-2.6.cmdlineLeak.patch 281 -MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388 MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846 +MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 572 +MD5 2b3ddb8b8b15f8da35ade38544b57857 files/usermode-sources-2.4.XDRWrapFix.patch 1499 +MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354 diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r10 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r10 new file mode 100644 index 000000000000..9e29fc732ec2 --- /dev/null +++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r10 @@ -0,0 +1,4 @@ +MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 +MD5 3fb146ded9e33819b815f5d233b891c2 uml-patch-2.4.26-3.bz2 206477 +MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145 +MD5 ad331c801d0a51a55f6f16046f2b15f8 usermode-sources-2.4.26-CAN-2004-0814.patch 81511 diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r9 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r9 deleted file mode 100644 index 9e29fc732ec2..000000000000 --- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r9 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 -MD5 3fb146ded9e33819b815f5d233b891c2 uml-patch-2.4.26-3.bz2 206477 -MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145 -MD5 ad331c801d0a51a55f6f16046f2b15f8 usermode-sources-2.4.26-CAN-2004-0814.patch 81511 diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.8.1-r4 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.8.1-r4 deleted file mode 100644 index 39318607e58d..000000000000 --- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.8.1-r4 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066 -MD5 71cbf81acbd2a4229024a5cf2f9a7119 uml-patch-2.6.8.1-1.bz2 142306 -MD5 154a348c46bdd0a33b20d3bbfb5e2a3b linux-2.6.8.1-CAN-2004-0814.patch 131240 diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.8.1-r5 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.8.1-r5 new file mode 100644 index 000000000000..39318607e58d --- /dev/null +++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.8.1-r5 @@ -0,0 +1,3 @@ +MD5 9517ca999e822b898fbdc7e72796b1aa linux-2.6.8.1.tar.bz2 35628066 +MD5 71cbf81acbd2a4229024a5cf2f9a7119 uml-patch-2.6.8.1-1.bz2 142306 +MD5 154a348c46bdd0a33b20d3bbfb5e2a3b linux-2.6.8.1-CAN-2004-0814.patch 131240 diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.4.binfmt_a.out.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.4.binfmt_a.out.patch new file mode 100644 index 000000000000..4644ae28bce4 --- /dev/null +++ b/sys-kernel/usermode-sources/files/usermode-sources-2.4.binfmt_a.out.patch @@ -0,0 +1,63 @@ +diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c +--- linux-2.4.28/fs/exec.c 2004-04-15 10:44:45 -07:00 ++++ linux-2.4.28.plasmaroo/fs/exec.c 2004-11-12 12:02:40 -08:00 +@@ -342,6 +342,7 @@ int setup_arg_pages(struct linux_binprm + + down_write(¤t->mm->mmap_sem); + { ++ struct vm_area_struct *vma; + mpnt->vm_mm = current->mm; + mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p; + mpnt->vm_end = STACK_TOP; +@@ -351,6 +352,12 @@ int setup_arg_pages(struct linux_binprm + mpnt->vm_pgoff = 0; + mpnt->vm_file = NULL; + mpnt->vm_private_data = (void *) 0; ++ vma = find_vma(current->mm, mpnt->vm_start); ++ if (vma) { ++ up_write(¤t->mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, mpnt); ++ return -ENOMEM; ++ } + insert_vm_struct(current->mm, mpnt); + current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT; + } +diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c +--- linux-2.4.28/fs/binfmt_aout.c 2002-02-04 23:54:04 -08:00 ++++ linux-2.4.28.plasmaroo/fs/binfmt_aout.c 2004-11-12 11:55:14 -08:00 +@@ -39,13 +39,18 @@ static struct linux_binfmt aout_format = + NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE + }; + +-static void set_brk(unsigned long start, unsigned long end) ++#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE) ++ ++static int set_brk(unsigned long start, unsigned long end) + { + start = PAGE_ALIGN(start); + end = PAGE_ALIGN(end); +- if (end <= start) +- return; +- do_brk(start, end - start); ++ if (end > start) { ++ unsigned long addr = do_brk(start, end - start); ++ if (BAD_ADDR(addr)) ++ return addr; ++ } ++ return 0; + } + + /* +@@ -405,7 +410,11 @@ static int load_aout_binary(struct linux + beyond_if: + set_binfmt(&aout_format); + +- set_brk(current->mm->start_brk, current->mm->brk); ++ retval = set_brk(current->mm->start_brk, current->mm->brk); ++ if (retval < 0) { ++ send_sig(SIGKILL, current, 0); ++ return retval; ++ } + + retval = setup_arg_pages(bprm); + if (retval < 0) { diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.binfmt_a.out.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.binfmt_a.out.patch new file mode 100644 index 000000000000..89665ce8db42 --- /dev/null +++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.binfmt_a.out.patch @@ -0,0 +1,63 @@ +diff -Nru linux-2.6.9/fs/exec.c linux-2.6.9.plasmaroo/fs/exec.c +--- linux-2.6.9/fs/exec.c 2004-11-27 08:30:03 -08:00 ++++ linux-2.6.9.plasmaroo/fs/exec.c 2004-11-27 08:30:03 -08:00 +@@ -413,6 +413,7 @@ + + down_write(&mm->mmap_sem); + { ++ struct vm_area_struct *vma; + mpnt->vm_mm = mm; + #ifdef CONFIG_STACK_GROWSUP + mpnt->vm_start = stack_base; +@@ -433,6 +434,12 @@ + mpnt->vm_flags = VM_STACK_FLAGS; + mpnt->vm_flags |= mm->def_flags; + mpnt->vm_page_prot = protection_map[mpnt->vm_flags & 0x7]; ++ vma = find_vma(mm, mpnt->vm_start); ++ if (vma) { ++ up_write(&mm->mmap_sem); ++ kmem_cache_free(vm_area_cachep, mpnt); ++ return -ENOMEM; ++ } + insert_vm_struct(mm, mpnt); + mm->stack_vm = mm->total_vm = vma_pages(mpnt); + } +diff -Nru linux-2.6.9/fs/binfmt_aout.c linux-2.6.9.plasmaroo/fs/binfmt_aout.c +--- linux-2.6.9/fs/binfmt_aout.c 2004-11-27 08:31:43 -08:00 ++++ linux-2.6.9.plasmaroo/fs/binfmt_aout.c 2004-11-27 08:31:43 -08:00 +@@ -43,13 +43,18 @@ + .min_coredump = PAGE_SIZE + }; + +-static void set_brk(unsigned long start, unsigned long end) ++#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE) ++ ++static int set_brk(unsigned long start, unsigned long end) + { + start = PAGE_ALIGN(start); + end = PAGE_ALIGN(end); +- if (end <= start) +- return; +- do_brk(start, end - start); ++ if (end > start) { ++ unsigned long addr = do_brk(start, end - start); ++ if (BAD_ADDR(addr)) ++ return addr; ++ } ++ return 0; + } + + /* +@@ -413,7 +418,11 @@ + beyond_if: + set_binfmt(&aout_format); + +- set_brk(current->mm->start_brk, current->mm->brk); ++ retval = set_brk(current->mm->start_brk, current->mm->brk); ++ if (retval < 0) { ++ send_sig(SIGKILL, current, 0); ++ return retval; ++ } + + retval = setup_arg_pages(bprm, EXSTACK_DEFAULT); + if (retval < 0) { diff --git a/sys-kernel/usermode-sources/files/usermode-sources.AF_UNIX.patch b/sys-kernel/usermode-sources/files/usermode-sources.AF_UNIX.patch new file mode 100644 index 000000000000..6ced78404a2d --- /dev/null +++ b/sys-kernel/usermode-sources/files/usermode-sources.AF_UNIX.patch @@ -0,0 +1,24 @@ +--- linux-2.4.27/net/unix/af_unix.c 2004-11-24 08:23:21 -08:00 ++++ linux-2.4.28/net/unix/af_unix.c 2004-11-24 08:23:21 -08:00 +@@ -1403,9 +1403,11 @@ + + msg->msg_namelen = 0; + ++ down(&sk->protinfo.af_unix.readsem); ++ + skb = skb_recv_datagram(sk, flags, noblock, &err); + if (!skb) +- goto out; ++ goto out_unlock; + + wake_up_interruptible(&sk->protinfo.af_unix.peer_wait); + +@@ -1449,6 +1451,8 @@ + + out_free: + skb_free_datagram(sk,skb); ++out_unlock: ++ up(&sk->protinfo.af_unix.readsem); + out: + return err; + } diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r10.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r10.ebuild new file mode 100644 index 000000000000..29b7ccc808bb --- /dev/null +++ b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r10.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2004 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.4.26-r10.ebuild,v 1.1 2004/11/27 20:04:10 plasmaroo Exp $ + +ETYPE="sources" +inherit kernel-2 +detect_version + +EXTRAVERSION="${EXTRAVERSION/usermode/uml1}" +KV_FULL="${KV_FULL/usermode/uml1}" + +UML_PATCH="uml-patch-${PV}-3" + +DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel" +SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2 + mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2 + http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${PV}-CAN-2004-0415.patch + http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch" +HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net" +LICENSE="GPL-2" +KEYWORDS="x86 -ppc" +IUSE="" +RESTRICT="nomirror" + +# console-tools is needed to solve the loadkeys fiasco. +# binutils version needed to avoid Athlon/PIII/SSE assembler bugs. +DEPEND="${DEPEND} >=sys-devel/binutils-2.11.90.0.31 dev-lang/perl" +RDEPEND="${RDEPEND} >=sys-libs/ncurses-5.2" + +UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 + ${FILESDIR}/${P}.CAN-2004-0394.patch + ${DISTDIR}/linux-${PV}-CAN-2004-0415.patch + ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch + ${FILESDIR}/${PN}.CAN-2004-0497.patch + ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch + ${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch + ${DISTDIR}/${P}-CAN-2004-0814.patch + ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch + ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch + ${FILESDIR}/${PN}-2.4.XDRWrapFix.patch + ${FILESDIR}/${PN}-2.4.binfmt_elf.patch + ${FILESDIR}/${PN}-2.4.smbfs.patch + ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch + ${FILESDIR}/${PN}.AF_UNIX.patch" + +src_install() { + kernel-2_src_install + mkdir -p ${D}/usr/src/uml + mv ${D}/usr/src/linux-${KV_FULL} ${D}/usr/src/uml/ +} diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild deleted file mode 100644 index ca263554e755..000000000000 --- a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r9.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2004 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.4.26-r9.ebuild,v 1.2 2004/11/26 16:27:19 dsd Exp $ - -ETYPE="sources" -inherit kernel-2 -detect_version - -EXTRAVERSION="${EXTRAVERSION/usermode/uml1}" -KV_FULL="${KV_FULL/usermode/uml1}" - -UML_PATCH="uml-patch-${PV}-3" - -DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel" -SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2 - mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2 - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${PV}-CAN-2004-0415.patch - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch" -HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net" -LICENSE="GPL-2" -KEYWORDS="x86 -ppc" -IUSE="" -RESTRICT="nomirror" - -# console-tools is needed to solve the loadkeys fiasco. -# binutils version needed to avoid Athlon/PIII/SSE assembler bugs. -DEPEND="${DEPEND} >=sys-devel/binutils-2.11.90.0.31 dev-lang/perl" -RDEPEND="${RDEPEND} >=sys-libs/ncurses-5.2" - -UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 - ${FILESDIR}/${P}.CAN-2004-0394.patch - ${DISTDIR}/linux-${PV}-CAN-2004-0415.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch - ${FILESDIR}/${PN}.CAN-2004-0497.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch - ${DISTDIR}/${P}-CAN-2004-0814.patch - ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch - ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch - ${FILESDIR}/${PN}-2.4.XDRWrapFix.patch - ${FILESDIR}/${PN}-2.4.binfmt_elf.patch - ${FILESDIR}/${PN}-2.4.smbfs.patch" - -src_install() { - kernel-2_src_install - mkdir -p ${D}/usr/src/uml - mv ${D}/usr/src/linux-${KV_FULL} ${D}/usr/src/uml/ -} diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild deleted file mode 100644 index e789df0be4e7..000000000000 --- a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r4.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2004 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.8.1-r4.ebuild,v 1.2 2004/11/26 16:27:19 dsd Exp $ - -K_NOUSENAME="yes" -ETYPE="sources" -inherit kernel-2 -detect_version - -UML_PATCH="uml-patch-${PV}-1" - -UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 - ${DISTDIR}/linux-${PV}-CAN-2004-0814.patch - ${FILESDIR}/${PN}-2.6.cmdlineLeak.patch - ${FILESDIR}/${PN}-2.6.devPtmx.patch - ${FILESDIR}/${PN}-2.6.binfmt_elf.patch - ${FILESDIR}/${PN}-2.6.smbfs.patch" - -DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel" -SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2 - mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2 - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${PV}-CAN-2004-0814.patch" -HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net" -KEYWORDS="~x86" -RESTRICT="nomirror" -IUSE="" - diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild new file mode 100644 index 000000000000..f3041f8fb52b --- /dev/null +++ b/sys-kernel/usermode-sources/usermode-sources-2.6.8.1-r5.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2004 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.8.1-r5.ebuild,v 1.1 2004/11/27 20:04:10 plasmaroo Exp $ + +K_NOUSENAME="yes" +ETYPE="sources" +inherit kernel-2 +detect_version + +UML_PATCH="uml-patch-${PV}-1" + +UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 + ${DISTDIR}/linux-${PV}-CAN-2004-0814.patch + ${FILESDIR}/${PN}-2.6.cmdlineLeak.patch + ${FILESDIR}/${PN}-2.6.devPtmx.patch + ${FILESDIR}/${PN}-2.6.binfmt_elf.patch + ${FILESDIR}/${PN}-2.6.smbfs.patch + ${FILESDIR}/${PN}-2.6.binfmt_a.out.patch + ${FILESDIR}/${PN}.AF_UNIX.patch" + +DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel" +SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2 + mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2 + http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${PV}-CAN-2004-0814.patch" +HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net" +KEYWORDS="~x86" +RESTRICT="nomirror" +IUSE="" + -- cgit v1.2.3-65-gdbad