Added wolk 4.15 and bumped 4.14-r7 to x86

6 files changed, 108 insertions, 25 deletions

diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index bd48b45033ad..1a57b8ed1d95 100644
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/wolk-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.56 2004/08/10 01:53:22 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.57 2004/08/15 01:16:16 nerdboy Exp $
+
+*wolk-sources-4.15 (14 Aug 2004)
+
+  14 Aug 2004; Steve Arnold <nerdboy@gentoo.org> +files/binfmt_elf.patch,
+  wolk-sources-4.14-r7.ebuild, +wolk-sources-4.15.ebuild:
+  Added wolk 4.15, contributed by Lance Albertson <ramereth@gentoo.org>
+  bumped 4.14-r7 to x86 (since it was basically a series of security fixes)
 
 *wolk-sources-4.9-r14 (10 Aug 2004)
 
diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest
index 4a891b38468f..e49c04b35f04 100644
--- a/sys-kernel/wolk-sources/Manifest
+++ b/sys-kernel/wolk-sources/Manifest
@@ -1,32 +1,35 @@
-MD5 fbfec3622855e2341e8c651ae724d246 ChangeLog 18030
+MD5 5fec660e3f5cafabbe8b4c3b8e130320 ChangeLog 18343
 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226
-MD5 20bd726173bc0bef01270f1e5a2f1521 wolk-sources-4.14-r7.ebuild 2300
-MD5 b88895bdcf65badf0968a1cf9a31d404 wolk-sources-4.9-r14.ebuild 5877
+MD5 fc869701c58aebb6db073eee02df1873 wolk-sources-4.15.ebuild 1296
 MD5 8152311fc4a52d0caaa96c83dfef0326 wolk-sources-4.11-r10.ebuild 2843
-MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476
+MD5 4c348b10d77fd82db31b028a2a63d1f7 wolk-sources-4.14-r7.ebuild 2297
+MD5 b88895bdcf65badf0968a1cf9a31d404 wolk-sources-4.9-r14.ebuild 5877
+MD5 2ca46d61e534cfd18a965e9ae8e870e2 files/binfmt_elf.patch 2347
+MD5 78191bfb63fdfd2714e57a8d3fb746c1 files/digest-wolk-sources-4.14-r7 168
+MD5 92f1b3aa68de326081b75653a77d64cf files/wolk-sources-4.9s.CAN-2004-0685.patch 2881
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
+MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
 MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635
+MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
+MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777
 MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424
-MD5 49b8fb6de609dcc985711120dfa0a509 files/digest-wolk-sources-4.9-r14 1400
+MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/wolk-sources-4.9s.munmap.patch 826
+MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414
 MD5 21f3a4f186017d925067335e24db36a1 files/wolk-sources.CAN-2004-0109.patch 1877
-MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
 MD5 5bf9836a632a861728d33f9736bb7431 files/wolk-sources.CAN-2004-0133.patch 427
-MD5 c9da1bc82b906f6abc648c056e7bf662 files/wolk-sources.FPULockup-53804.patch 354
-MD5 dc18e982f8149588a291956481885a8c files/wolk-sources.CAN-2004-0495.patch 17549
-MD5 c460ea130cb4ae84a5063ba044e3ce72 files/wolk-sources.CAN-2004-0427.patch 460
-MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/wolk-sources.CAN-2004-0177.patch 384
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424
+MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233
 MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350
+MD5 c460ea130cb4ae84a5063ba044e3ce72 files/wolk-sources.CAN-2004-0427.patch 460
+MD5 dc18e982f8149588a291956481885a8c files/wolk-sources.CAN-2004-0495.patch 17549
+MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476
+MD5 c9da1bc82b906f6abc648c056e7bf662 files/wolk-sources.FPULockup-53804.patch 354
+MD5 1555afc1bfb28980c75f13cff2e49b91 files/digest-wolk-sources-4.15 146
+MD5 823898399dbfae0de1c72688bc80a9f1 files/digest-wolk-sources-4.11-r10 312
+MD5 49b8fb6de609dcc985711120dfa0a509 files/digest-wolk-sources-4.9-r14 1400
 MD5 528da73c9e4a6fb017561e51dc0ab815 files/wolk-sources.CAN-2003-0643.patch 747
-MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777
-MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707
 MD5 60d25ff310fc6abfdce39ec9e47345af files/wolk-sources.CAN-2004-0685.patch 2809
-MD5 823898399dbfae0de1c72688bc80a9f1 files/digest-wolk-sources-4.11-r10 312
 MD5 d1ccc2047be533c992f67270a150a210 files/wolk-sources.cmdlineLeak.patch 388
-MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414
-MD5 78191bfb63fdfd2714e57a8d3fb746c1 files/digest-wolk-sources-4.14-r7 168
-MD5 92f1b3aa68de326081b75653a77d64cf files/wolk-sources-4.9s.CAN-2004-0685.patch 2881
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/wolk-sources.CAN-2004-0177.patch 384
-MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/wolk-sources-4.9s.munmap.patch 826
diff --git a/sys-kernel/wolk-sources/files/binfmt_elf.patch b/sys-kernel/wolk-sources/files/binfmt_elf.patch
new file mode 100644
index 000000000000..81590821bd01
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/binfmt_elf.patch
@@ -0,0 +1,38 @@
+--- fs/binfmt_elf.c	2004-07-20 14:54:17.000000000 -0500
++++ fs/binfmt_elf.c.new	2004-07-21 10:04:29.000000000 -0500
+@@ -105,7 +105,7 @@
+ 
+ #ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC
+ 	if (current->flags & PF_PAX_RANDEXEC)
+-		__do_mmap_pgoff(NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start);
++		__do_mmap_pgoff(current->mm, NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start);
+ #endif
+ 
+ }
+@@ -983,7 +983,7 @@
+ 				if (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len)
+ 					continue;
+ 				down_write(&current->mm->mmap_sem);
+-				error = __do_mmap_pgoff(bprm->file, addr, len, elf_prot, elf_flags, (elf_ppnt->p_offset - ELF_PAGEOFFSET(elf_ppnt->p_vaddr)) >> PAGE_SHIFT);
++				error = error = __do_mmap_pgoff(current->mm, bprm->file, addr, len, elf_prot, elf_flags, (elf_ppnt->p_offset - ELF_PAGEOFFSET(elf_ppnt->p_vaddr)) >> PAGE_SHIFT);
+ 				up_write(&current->mm->mmap_sem);
+ 			}
+ #endif
+@@ -1011,14 +1011,14 @@
+ #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
+ 			if (current->flags & PF_PAX_SEGMEXEC) {
+ 				if (elf_prot & PROT_EXEC) {
+-					load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr), elf_ppnt->p_memsz + ELF_PAGEOFFSET(elf_ppnt->p_vaddr), PROT_NONE, MAP_PRIVATE | MAP_FIXED, 0UL);
++					load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr), elf_ppnt->p_memsz + ELF_PAGEOFFSET(elf_ppnt->p_vaddr), PROT_NONE, MAP_PRIVATE | MAP_FIXED, 0UL);
+ 					if (!BAD_ADDR(load_addr_random)) {
+-						load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr + SEGMEXEC_TASK_SIZE), 0UL, elf_prot, elf_flags | MAP_MIRROR, error);
++						load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr + SEGMEXEC_TASK_SIZE), 0UL, elf_prot, elf_flags | MAP_MIRROR, error); 
+ 						if (!BAD_ADDR(load_addr_random))
+ 							load_addr_random -= SEGMEXEC_TASK_SIZE;
+ 					}
+ 				} else
+-					load_addr_random = __do_mmap_pgoff(NULL, ELF_PAGESTART(load_bias_random + vaddr), 0UL, elf_prot, elf_flags | MAP_MIRROR, error);
++					load_addr_random = __do_mmap_pgoff(current->mm, NULL, ELF_PAGESTART(load_bias_random + vaddr), 0UL, elf_prot, elf_flags | MAP_MIRROR, error);
+ 			}
+ #endif
+ 
diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15
new file mode 100644
index 000000000000..2690df82bf75
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15
@@ -0,0 +1,2 @@
+MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
+MD5 9288e5f01df7fae699a0a87069e35c83 linux-2.4.20-wolk4.15s.patch.bz2 13952014
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild
index 08a8adae447d..ceac93701bcd 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild,v 1.1 2004/08/10 01:53:22 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild,v 1.2 2004/08/15 01:16:16 nerdboy Exp $
 
 OKV="2.4.20"
 OKB="2.4"
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/mcp/${OKB}-WOLK/"
 SRC_URI="mirror://kernel/linux/kernel/people/mcp/${OKB}-WOLK/${WOLK_SRC}
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-4.11-CAN-2004-0415.patch"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips"
 
 K_EXTRAEINFO="If there are issues with this kernel, then please direct any queries to the
 mailing list: http://sourceforge.net/mailarchive/forum.php?forum_id=8245.
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.15.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.15.ebuild
new file mode 100644
index 000000000000..b08a093a76b1
--- /dev/null
+++ b/sys-kernel/wolk-sources/wolk-sources-4.15.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: 
+
+# Ramereth's contributed WOLK ebuild - thanks! (you didn't think you'd
+# go blameless, did you?)
+
+UNIPATCH_LIST="${DISTDIR}/${WOLK_SRC} ${FILESDIR}/binfmt_elf.patch"
+UNIPATCH_STRICTORDER="yes"
+
+OKV="2.4.20"
+OKB="2.4"
+EXTRAVERSION="-${PN%-*}-${PV/$OKV./}"
+KV="${OKV}${EXTRAVERSION}"
+S="${WORKDIR}/linux-${KV}"
+WOLK_SRC="linux-${OKV}-wolk${PV/${OKV}./}s.patch.bz2"
+
+ETYPE="sources"
+inherit kernel-2
+# detect_version doesn't work for WOLK yet -- don't use it!
+
+KEYWORDS="~x86"
+
+K_NOSETEXTRAVERSION="don't_set_it"
+RESTRICT="nomirror"
+DESCRIPTION=" Marc-Christian Peterson's WOLK kernel. A stable and development kernel, containing many useful patches from many projects."
+SRC_URI="mirror://kernel/linux/kernel/${OKB}/linux-${OKV}.tar.bz2 mirror://kernel/linux/kernel/people/mcp/${OKB}-WOLK/${WOLK_SRC}"
+
+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.
+Please read the ChangeLog and associated docs for more information."