From bf82ed08c99756006f1a0cb858b23df191ed40f0 Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Mon, 15 Nov 2004 18:07:41 +0000 Subject: [PATCH] Version bump closes bug 62415 thanks to Derk W te Bokkel --- sys-kernel/win4lin-sources/ChangeLog | 9 ++- sys-kernel/win4lin-sources/Manifest | 31 ++++---- .../files/digest-win4lin-sources-2.6.9 | 3 + .../win4lin-sources-2.6.9.binfmt_elf.patch | 72 +++++++++++++++++++ .../win4lin-sources-2.6.9.ebuild | 30 ++++++++ 5 files changed, 130 insertions(+), 15 deletions(-) create mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9 create mode 100644 sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.binfmt_elf.patch create mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog index eceff6a7563b..6b91e91d6bf4 100644 --- a/sys-kernel/win4lin-sources/ChangeLog +++ b/sys-kernel/win4lin-sources/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-kernel/win4lin-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.40 2004/11/12 20:30:32 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.41 2004/11/15 18:07:41 genstef Exp $ + +*win4lin-sources-2.6.9 (15 Nov 2004) + + 15 Nov 2004; Stefan Schweizer + +files/win4lin-sources-2.6.9.binfmt_elf.patch, + +win4lin-sources-2.6.9.ebuild: + Version bump closes bug 62415 thanks to Derk W te Bokkel *win4lin-sources-2.4.26-r8 (12 Nov 2004) diff --git a/sys-kernel/win4lin-sources/Manifest b/sys-kernel/win4lin-sources/Manifest index b8fcbed59eca..34640f494797 100644 --- a/sys-kernel/win4lin-sources/Manifest +++ b/sys-kernel/win4lin-sources/Manifest @@ -1,23 +1,26 @@ -MD5 1dbcaaa98a7577627ad7a8039ca0c7b7 ChangeLog 8835 MD5 3cce735269e32f6bf2400e99460c63ed win4lin-sources-2.4.26-r8.ebuild 2425 +MD5 a7902a81fa8e139c4678adfd387c36ca win4lin-sources-2.6.9.ebuild 1229 MD5 029a407b2c1b3519e7fe897cbe0181f2 win4lin-sources-2.6.7-r8.ebuild 1793 +MD5 4a7a94b4da34a504b41d79dafd06f1d2 ChangeLog 9086 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290 -MD5 2b3ddb8b8b15f8da35ade38544b57857 files/win4lin-sources-2.4.26.XDRWrapFix.patch 1499 +MD5 aa595005721b58929ee55e2e8f4b6ba0 files/win4lin-sources-2.6.CAN-2004-0816.patch 1693 MD5 8204afea1d572b49a4a80d8da4eef0c9 files/win4lin-sources-2.6.CAN-2004-0596.patch 1033 -MD5 65254b087906bead43e7e7bf9eba7610 files/digest-win4lin-sources-2.4.26-r8 353 -MD5 c2510fe1891f5a9effb12c2196922206 files/win4lin-sources-2.6.cmdlineLeak.patch 281 -MD5 1ee8ba8362089c31fdd7d88b32eaf63e files/win4lin-sources-2.6.binfmt_elf.patch 1938 -MD5 452e04a312368605e145428c35bd0e05 files/win4lin-sources-2.6.devPtmx.patch 572 MD5 c9da1bc82b906f6abc648c056e7bf662 files/win4lin-sources-2.4.26.FPULockup-53804.patch 354 -MD5 d1ccc2047be533c992f67270a150a210 files/win4lin-sources-2.4.26.cmdlineLeak.patch 388 -MD5 9cae5cdb5da7ef0bbe13fbbf6daee5dd files/digest-win4lin-sources-2.6.7-r8 359 -MD5 aa595005721b58929ee55e2e8f4b6ba0 files/win4lin-sources-2.6.CAN-2004-0816.patch 1693 -MD5 dc18e982f8149588a291956481885a8c files/win4lin-sources-2.4.26.CAN-2004-0495.patch 17549 -MD5 60d25ff310fc6abfdce39ec9e47345af files/win4lin-sources-2.4.26.CAN-2004-0685.patch 2809 -MD5 39361f8d16b1fe5891aab62e92f8cd30 files/win4lin-sources-2.6.IPTables-RDoS.patch 390 +MD5 d9127fc038c80114d40b69d761803ed2 files/win4lin-sources-2.6.9.binfmt_elf.patch 1929 MD5 d4a740ae56c2049247083af387a22a85 files/win4lin-sources-2.4.26.CAN-2004-0394.patch 350 +MD5 b738cb0120a32aa92cfcfdbd564dd21f files/win4lin-sources-2.6.ProcPerms.patch 1368 +MD5 1ee8ba8362089c31fdd7d88b32eaf63e files/win4lin-sources-2.6.binfmt_elf.patch 1938 MD5 24c53f49954dab29cfc172d4a3ba1a31 files/win4lin-sources-2.4.26.binfmt_elf.patch 1928 +MD5 2b3ddb8b8b15f8da35ade38544b57857 files/win4lin-sources-2.4.26.XDRWrapFix.patch 1499 +MD5 9cae5cdb5da7ef0bbe13fbbf6daee5dd files/digest-win4lin-sources-2.6.7-r8 359 MD5 02c062ec3a11a6a1498cdf0b1716c90a files/win4lin-sources-2.6.6.FPULockup-53804.patch 895 -MD5 0f66013f643c79c97fda489618a4e2fd files/win4lin-sources-2.4.26.CAN-2004-0535.patch 476 MD5 95708646470a95668e8789cd415844ed files/win4lin-sources.CAN-2004-0497.patch 846 -MD5 b738cb0120a32aa92cfcfdbd564dd21f files/win4lin-sources-2.6.ProcPerms.patch 1368 +MD5 60d25ff310fc6abfdce39ec9e47345af files/win4lin-sources-2.4.26.CAN-2004-0685.patch 2809 +MD5 65254b087906bead43e7e7bf9eba7610 files/digest-win4lin-sources-2.4.26-r8 353 +MD5 39361f8d16b1fe5891aab62e92f8cd30 files/win4lin-sources-2.6.IPTables-RDoS.patch 390 +MD5 452e04a312368605e145428c35bd0e05 files/win4lin-sources-2.6.devPtmx.patch 572 +MD5 c2510fe1891f5a9effb12c2196922206 files/win4lin-sources-2.6.cmdlineLeak.patch 281 +MD5 d1ccc2047be533c992f67270a150a210 files/win4lin-sources-2.4.26.cmdlineLeak.patch 388 +MD5 0f66013f643c79c97fda489618a4e2fd files/win4lin-sources-2.4.26.CAN-2004-0535.patch 476 +MD5 dc18e982f8149588a291956481885a8c files/win4lin-sources-2.4.26.CAN-2004-0495.patch 17549 +MD5 2bd92617d5f73fe2973abc0ceb071fc5 files/digest-win4lin-sources-2.6.9 207 diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9 new file mode 100644 index 000000000000..12075686996a --- /dev/null +++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9 @@ -0,0 +1,3 @@ +MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440 +MD5 e7710f224fc986d041c5b5dd50e619ac mki-adapter26_1_3_8.patch 127088 +MD5 f5494c6878eb693f1fa61c2022574777 Kernel-Win4Lin3-2.6.9.patch 25139 diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.binfmt_elf.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.binfmt_elf.patch new file mode 100644 index 000000000000..c4cc8a82d3fb --- /dev/null +++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.binfmt_elf.patch @@ -0,0 +1,72 @@ +--- linux-2.6.9/fs/binfmt_elf.c 2004-11-10 12:25:16 -08:00 ++++ linux-2.6.9-plasmaroo/fs/binfmt_elf.c 2004-11-10 12:25:16 -08:00 +@@ -335,9 +335,12 @@ + goto out; + + retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size); +- error = retval; +- if (retval < 0) ++ error = -EIO; ++ if (retval != size) { ++ if (retval < 0) ++ error = retval; + goto out_close; ++ } + + eppnt = elf_phdata; + for (i=0; ie_phnum; i++, eppnt++) { +@@ -532,8 +535,11 @@ + goto out; + + retval = kernel_read(bprm->file, loc->elf_ex.e_phoff, (char *) elf_phdata, size); +- if (retval < 0) ++ if (retval != size) { ++ if (retval >= 0) ++ retval = -EIO; + goto out_free_ph; ++ } + + files = current->files; /* Refcounted so ok */ + retval = unshare_files(); +@@ -580,8 +586,14 @@ + retval = kernel_read(bprm->file, elf_ppnt->p_offset, + elf_interpreter, + elf_ppnt->p_filesz); +- if (retval < 0) ++ if (retval != elf_ppnt->p_filesz) { ++ if (retval >= 0) ++ retval = -EIO; + goto out_free_interp; ++ } ++ /* make sure path is NULL terminated */ ++ elf_interpreter[elf_ppnt->p_filesz - 1] = '\0'; ++ + /* If the program interpreter is one of these two, + * then assume an iBCS2 image. Otherwise assume + * a native linux image. +@@ -616,8 +628,11 @@ + if (IS_ERR(interpreter)) + goto out_free_interp; + retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE); +- if (retval < 0) ++ if (retval != BINPRM_BUF_SIZE) { ++ if (retval >= 0) ++ retval = -EIO; + goto out_free_dentry; ++ } + + /* Get the exec headers */ + loc->interp_ex = *((struct exec *) bprm->buf); +@@ -776,8 +791,10 @@ + } + + error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags); +- if (BAD_ADDR(error)) +- continue; ++ if (BAD_ADDR(error)) { ++ send_sig(SIGKILL, current, 0); ++ goto out_free_dentry; ++ } + + if (!load_addr_set) { + load_addr_set = 1; diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild new file mode 100644 index 000000000000..447d2b5187fb --- /dev/null +++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild,v 1.1 2004/11/15 18:07:41 genstef Exp $ + +ETYPE="sources" +inherit kernel-2 +detect_version + +MKI_VERSION='1_3_8' +UNIPATCH_LIST=" + ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch + ${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch:1 + ${FILESDIR}/${PN}-2.6.9.binfmt_elf.patch" + +S=${WORKDIR}/linux-${KV} + +DESCRIPTION="Full sources for the 2.6 of the Linux kernel with the Win4Lin patches" +SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2 + ftp://ftp.netraverse.com/pub/testing/kernel/patches/mki-adapter26_${MKI_VERSION}.patch + ftp://ftp.netraverse.com/pub/testing/kernel/patches/Kernel-Win4Lin3-${OKV}.patch" + +# Best to keep "~x86" until Win4Lin-5.1.10 is in the tree and stable; +# bug #55587. +KEYWORDS="~x86 -*" +SLOT="${KV}" + +K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an +existing bug. Only create a new bug if you have not found one that matches +your issue. It is best to do an advanced search as the initial search has a +very low yield. Please assign your bugs to x86-kernel@gentoo.org." -- 2.26.2