From: Tim Yamin Date: Sat, 8 Jan 2005 21:29:55 +0000 (+0000) Subject: Security bump; fixes bugs #77025 and #77094. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6b61a51f614bd8a2defc1c26a45c991aee63df23;p=gentoo.git Security bump; fixes bugs #77025 and #77094. --- diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog index ff16f6d8f44d..624e2d9d82b1 100644 --- a/sys-kernel/gentoo-sources/ChangeLog +++ b/sys-kernel/gentoo-sources/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for sys-kernel/gentoo-sources # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.99 2005/01/07 22:31:25 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.100 2005/01/08 21:29:55 plasmaroo Exp $ + +*gentoo-sources-2.4.28-r5 (08 Jan 2005) + + 08 Jan 2005; -gentoo-sources-2.4.20-r30.ebuild, + +gentoo-sources-2.4.20-r31.ebuild, -gentoo-sources-2.4.22-r21.ebuild, + -gentoo-sources-2.4.25-r14.ebuild, +gentoo-sources-2.4.25-r15.ebuild, + -gentoo-sources-2.4.26-r14.ebuild, +gentoo-sources-2.4.26-r15.ebuild, + -gentoo-sources-2.4.28-r4.ebuild, +gentoo-sources-2.4.28-r5.ebuild, + +files/gentoo-sources-2.4.28.brk-locked.patch, + +files/gentoo-sources-2.4.77094.patch, + +files/gentoo-sources-2.4.brk-locked.patch: + Security bump; fixes bugs #77025 and #77094. 07 Jan 2005; -gentoo-sources-2.4.27-r6.ebuild, gentoo-sources-2.4.28-r4.ebuild: diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest index 815e56c14bfb..848e3b46895d 100644 --- a/sys-kernel/gentoo-sources/Manifest +++ b/sys-kernel/gentoo-sources/Manifest @@ -1,20 +1,20 @@ -MD5 3caba9fd4358d7ecfdc845bfc94ee63c ChangeLog 27504 -MD5 05ce186fe011fd03b429e0de1039df80 gentoo-sources-2.4.26-r14.ebuild 1549 -MD5 d5e5878f7d9bd621678c4c9f505ba61b gentoo-sources-2.4.22-r21.ebuild 2300 -MD5 43206df02738401739296b1990193867 gentoo-sources-2.4.25-r14.ebuild 1764 -MD5 223fa995272e9f66c7cf0ccdf0ae5de4 gentoo-sources-2.4.20-r30.ebuild 8055 +MD5 74e0637ad0d7e10f400ec6762959d185 ChangeLog 28089 +MD5 986bab4cf03777c2fe63e11dac55790e gentoo-sources-2.4.26-r15.ebuild 1624 MD5 91ea2908f17a4069774ffce01264df0c metadata.xml 354 -MD5 0937439e6e96b29a6f9235c02c9f4486 gentoo-sources-2.4.28-r4.ebuild 977 +MD5 21d976c796c1ac378ddd4b2502e0ceb0 gentoo-sources-2.4.28-r5.ebuild 1067 +MD5 576e59e299775e038294cfa8d17ead12 gentoo-sources-2.4.20-r31.ebuild 8239 +MD5 be68fad5f4c03e1e6dd1c42fd016422a gentoo-sources-2.4.25-r15.ebuild 1823 MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374 +MD5 179bd3656f72932f69b0f860d23483cd files/digest-gentoo-sources-2.4.28-r5 226 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gentoo-sources-2.4.CAN-2004-0427.patch 460 MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783 MD5 e47f4118ace22fbcd917d36fdc648c3c files/gentoo-sources-2.4.20-CAN-2004-1056.patch 11020 -MD5 3a83764576b40cd440269b408dc12d26 files/digest-gentoo-sources-2.4.20-r30 316 MD5 2f4db0083c0ed762c0af63f26812a68b files/gentoo-sources-2.4.20-fix-proc-mm.patch 1300 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414 MD5 d1ccc2047be533c992f67270a150a210 files/gentoo-sources-2.4.cmdlineLeak.patch 388 MD5 9971231cef0a944990e47a3c1e4b717c files/gentoo-sources-2.4.20-smbfs.patch 2790 MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455 +MD5 bf7030a67c46e734e2a7ea9265a45191 files/gentoo-sources-2.4.brk-locked.patch 8859 MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837 MD5 ac42024b6e6ee1e2165914db4b22a61c files/gentoo-sources-2.4.CAN-2004-0178.patch 424 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/gentoo-sources-2.4.CAN-2004-0497.patch 707 @@ -25,10 +25,9 @@ MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch MD5 dc18e982f8149588a291956481885a8c files/gentoo-sources-2.4.CAN-2004-0495.patch 17549 MD5 a4cb2b30bc0ad5f4f3913a6ec2ddfe1a files/gentoo-sources-2.4.binfmt_elf.patch 2618 MD5 528da73c9e4a6fb017561e51dc0ab815 files/gentoo-sources-2.4.CAN-2003-0643.patch 747 -MD5 8f9d0248685f16e79838732155537a9f files/digest-gentoo-sources-2.4.28-r4 229 MD5 751d36c76691a7cab7c5bb48ca2ac092 files/gentoo-sources-2.4.26-OpenSWAN-CompileFix.patch 1447 MD5 d96fe98630a0a160723a67e4ca93dcff files/gentoo-sources-2.4.20-grsec-datasize_fix.patch 1421 -MD5 3bf139832981003e66e2b702515b2f1b files/digest-gentoo-sources-2.4.22-r21 308 +MD5 53dd83bb917143055880930125ef63fe files/digest-gentoo-sources-2.4.20-r31 319 MD5 de75cfa969ed092578d9ddda6c5be334 files/gentoo-sources-2.4.CAN-2004-0181.patch 1233 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014 MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400 @@ -37,16 +36,18 @@ MD5 2b3ddb8b8b15f8da35ade38544b57857 files/gentoo-sources-2.4.XDRWrapFix.patch 1 MD5 147fec50180ad91b6260fc7201dcb90f files/gentoo-sources-2.4.CAN-2004-0010.patch 6050 MD5 60d25ff310fc6abfdce39ec9e47345af files/gentoo-sources-2.4.CAN-2004-0685.patch 2809 MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973 -MD5 a1ea0b29ae36f749e1d26f5ceef9c0b7 files/digest-gentoo-sources-2.4.25-r14 305 +MD5 1d78b90e495e432432e095ee47bbc2fc files/gentoo-sources-2.4.77094.patch 452 +MD5 351d637f1c30b5a7190d0ca4bfad0af9 files/digest-gentoo-sources-2.4.26-r15 307 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/gentoo-sources-2.4.smbfs.patch 3434 -MD5 d1561fff7fcca1dd43d5bb8fe2fed05a files/digest-gentoo-sources-2.4.26-r14 306 MD5 b0a1f80aff51d6601e8924329023b241 files/gentoo-sources-2.4.AF_UNIX.patch 515 +MD5 8074ddd4c564dbb2caeb9c950d5fa56a files/digest-gentoo-sources-2.4.25-r15 306 MD5 6ed89b8ac0b47a4c25d3a616ef9245cc files/gentoo-sources-2.4.vma.patch 11369 MD5 5bf9836a632a861728d33f9736bb7431 files/gentoo-sources-2.4.CAN-2004-0133.patch 427 MD5 8c35751caf824a9dacb02e80d6189b2e files/gentoo-sources-2.4.CAN-2004-1137.patch 1764 MD5 757ee1239c3f14645ccea3640d551e11 files/gentoo-sources-2.4.CAN-2004-1056.patch 11249 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gentoo-sources-2.4.22-rtc_fix.patch 7073 MD5 0f66013f643c79c97fda489618a4e2fd files/gentoo-sources-2.4.CAN-2004-0535.patch 476 +MD5 29e531cdd3f2effce5e31a1f2afb5b5d files/gentoo-sources-2.4.28.brk-locked.patch 8912 MD5 370cc17582bbb17605090009d24eba51 files/gentoo-sources-2.4.22-CAN-2004-1016.patch 2168 MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328 MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307 diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r30 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r31 similarity index 72% rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r30 rename to sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r31 index cf24929f42e8..419536cf2a12 100644 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r30 +++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r31 @@ -1,4 +1,4 @@ MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046 MD5 50863b3ed5ebab8214e5355b084bab07 patches-2.4.20-gentoo-r28.tar.bz2 4327906 MD5 cfc6815222d154bcf3aa9144903a2bba gentoo-sources-2.4.20-CAN-2004-0415.patch 82999 -MD5 5f7602c85170565535c87cd7d6705254 gentoo-sources-2.4.20-CAN-2004-0814.patch 81528 +MD5 11342aa3e5f93b0ead62d8637b082462 gentoo-sources-2.4.20-CAN-2004-0814.2.patch 146483 diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r21 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r21 deleted file mode 100644 index ae62b02192ec..000000000000 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r21 +++ /dev/null @@ -1,4 +0,0 @@ -MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612 -MD5 7f4a97d9c29f7dfc959a7a7efb077e29 gentoo-sources-2.4.22-r5.patch.bz2 3766950 -MD5 a4851f4a8922fcaecfbd995a73b59e77 linux-2.4.22-CAN-2004-0415.patch 90192 -MD5 225e809802a992bf9ca10caae34edb25 gentoo-sources-2.4.22-CAN-2004-0814.patch 82260 diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r14 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r15 similarity index 71% rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r14 rename to sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r15 index ddf72226d1b3..debf42baf1bd 100644 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r14 +++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r15 @@ -1,4 +1,4 @@ MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548 MD5 221b18b5bcc2ede8a1d3616fda8e7ace gentoo-sources-2.4.25.patch.bz2 1617350 MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145 -MD5 225e809802a992bf9ca10caae34edb25 gentoo-sources-2.4.22-CAN-2004-0814.patch 82260 +MD5 bee85457ee7cbe0f3b762cf4dc5d95f7 gentoo-sources-2.4.25-CAN-2004-0814.patch 147782 diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r14 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r15 similarity index 71% rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r14 rename to sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r15 index 33596a1b91ba..39dc70c43115 100644 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r14 +++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r15 @@ -1,4 +1,4 @@ MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389 MD5 5da46eea9886f6943477d98b40648b4c gentoo-sources-2.4.26-r6.tar.bz2 1041792 MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145 -MD5 225e809802a992bf9ca10caae34edb25 gentoo-sources-2.4.22-CAN-2004-0814.patch 82260 +MD5 bee85457ee7cbe0f3b762cf4dc5d95f7 gentoo-sources-2.4.25-CAN-2004-0814.patch 147782 diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r4 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r5 similarity index 62% rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r4 rename to sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r5 index 74be8198b704..f231f9c88076 100644 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r4 +++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r5 @@ -1,3 +1,3 @@ MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046 MD5 c115734967dea547bc09a266a75b04e4 gentoo-sources-2.4.28-r4.tar.bz2 999208 -MD5 225e809802a992bf9ca10caae34edb25 gentoo-sources-2.4.22-CAN-2004-0814.patch 82260 +MD5 5ea3dab67a9193d767327cf3b8ee8c27 ck-sources-2.4.28-CAN-2004-0814.patch 144998 diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.brk-locked.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.brk-locked.patch new file mode 100644 index 000000000000..c275b0b1649e --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.brk-locked.patch @@ -0,0 +1,265 @@ +diff -ur linux-2.4.28-gentoo-r4/arch/mips/kernel/irixelf.c linux-2.4.28-gentoo-r5/arch/mips/kernel/irixelf.c +--- linux-2.4.28-gentoo-r4/arch/mips/kernel/irixelf.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/arch/mips/kernel/irixelf.c 2005-01-07 20:20:32.000000000 +0000 +@@ -130,7 +130,7 @@ + end = PAGE_ALIGN(end); + if (end <= start) + return; +- do_brk(start, end - start); ++ do_brk_locked(start, end - start); + } + + +@@ -379,7 +379,7 @@ + + /* Map the last of the bss segment */ + if (last_bss > len) { +- do_brk(len, (last_bss - len)); ++ do_brk_locked(len, (last_bss - len)); + } + kfree(elf_phdata); + +@@ -567,7 +567,7 @@ + unsigned long v; + struct prda *pp; + +- v = do_brk (PRDA_ADDRESS, PAGE_SIZE); ++ v = do_brk_locked (PRDA_ADDRESS, PAGE_SIZE); + + if (v < 0) + return; +@@ -859,7 +859,7 @@ + len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000; + bss = elf_phdata->p_memsz + elf_phdata->p_vaddr; + if (bss > len) +- do_brk(len, bss-len); ++ do_brk_locked(len, bss-len); + kfree(elf_phdata); + return 0; + } +diff -ur linux-2.4.28-gentoo-r4/arch/sparc64/kernel/binfmt_aout32.c linux-2.4.28-gentoo-r5/arch/sparc64/kernel/binfmt_aout32.c +--- linux-2.4.28-gentoo-r4/arch/sparc64/kernel/binfmt_aout32.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/arch/sparc64/kernel/binfmt_aout32.c 2005-01-07 20:20:32.000000000 +0000 +@@ -49,7 +49,7 @@ + end = PAGE_ALIGN(end); + if (end <= start) + return; +- do_brk(start, end - start); ++ do_brk_locked(start, end - start); + } + + /* +@@ -246,10 +246,10 @@ + if (N_MAGIC(ex) == NMAGIC) { + loff_t pos = fd_offset; + /* Fuck me plenty... */ +- error = do_brk(N_TXTADDR(ex), ex.a_text); ++ error = do_brk_locked(N_TXTADDR(ex), ex.a_text); + bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex), + ex.a_text, &pos); +- error = do_brk(N_DATADDR(ex), ex.a_data); ++ error = do_brk_locked(N_DATADDR(ex), ex.a_data); + bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex), + ex.a_data, &pos); + goto beyond_if; +@@ -257,7 +257,7 @@ + + if (N_MAGIC(ex) == OMAGIC) { + loff_t pos = fd_offset; +- do_brk(N_TXTADDR(ex) & PAGE_MASK, ++ do_brk_locked(N_TXTADDR(ex) & PAGE_MASK, + ex.a_text+ex.a_data + PAGE_SIZE - 1); + bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex), + ex.a_text+ex.a_data, &pos); +@@ -272,7 +272,7 @@ + + if (!bprm->file->f_op->mmap) { + loff_t pos = fd_offset; +- do_brk(0, ex.a_text+ex.a_data); ++ do_brk_locked(0, ex.a_text+ex.a_data); + bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex), + ex.a_text+ex.a_data, &pos); + goto beyond_if; +@@ -388,7 +388,7 @@ + len = PAGE_ALIGN(ex.a_text + ex.a_data); + bss = ex.a_text + ex.a_data + ex.a_bss; + if (bss > len) { +- error = do_brk(start_addr + len, bss - len); ++ error = do_brk_locked(start_addr + len, bss - len); + retval = error; + if (error != start_addr + len) + goto out; +diff -ur linux-2.4.28-gentoo-r4/fs/binfmt_aout.c linux-2.4.28-gentoo-r5/fs/binfmt_aout.c +--- linux-2.4.28-gentoo-r4/fs/binfmt_aout.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/fs/binfmt_aout.c 2005-01-07 20:20:32.000000000 +0000 +@@ -46,7 +46,7 @@ + start = PAGE_ALIGN(start); + end = PAGE_ALIGN(end); + if (end > start) { +- unsigned long addr = do_brk(start, end - start); ++ unsigned long addr = do_brk_locked(start, end - start); + if (BAD_ADDR(addr)) + return addr; + } +@@ -341,10 +341,10 @@ + loff_t pos = fd_offset; + /* Fuck me plenty... */ + /* */ +- error = do_brk(N_TXTADDR(ex), ex.a_text); ++ error = do_brk_locked(N_TXTADDR(ex), ex.a_text); + bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex), + ex.a_text, &pos); +- error = do_brk(N_DATADDR(ex), ex.a_data); ++ error = do_brk_locked(N_DATADDR(ex), ex.a_data); + bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex), + ex.a_data, &pos); + goto beyond_if; +@@ -365,7 +365,7 @@ + map_size = ex.a_text+ex.a_data; + #endif + +- error = do_brk(text_addr & PAGE_MASK, map_size); ++ error = do_brk_locked(text_addr & PAGE_MASK, map_size); + if (error != (text_addr & PAGE_MASK)) { + send_sig(SIGKILL, current, 0); + return error; +@@ -399,7 +399,7 @@ + + if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) { + loff_t pos = fd_offset; +- do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); ++ do_brk_locked(N_TXTADDR(ex), ex.a_text+ex.a_data); + bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex), + ex.a_text+ex.a_data, &pos); + flush_icache_range((unsigned long) N_TXTADDR(ex), +@@ -500,7 +500,7 @@ + error_time = jiffies; + } + +- do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); ++ do_brk_locked(start_addr, ex.a_text + ex.a_data + ex.a_bss); + + file->f_op->read(file, (char *)start_addr, + ex.a_text + ex.a_data, &pos); +@@ -524,7 +524,7 @@ + len = PAGE_ALIGN(ex.a_text + ex.a_data); + bss = ex.a_text + ex.a_data + ex.a_bss; + if (bss > len) { +- error = do_brk(start_addr + len, bss - len); ++ error = do_brk_locked(start_addr + len, bss - len); + retval = error; + if (error != start_addr + len) + goto out; +diff -ur linux-2.4.28-gentoo-r4/fs/binfmt_elf.c linux-2.4.28-gentoo-r5/fs/binfmt_elf.c +--- linux-2.4.28-gentoo-r4/fs/binfmt_elf.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/fs/binfmt_elf.c 2005-01-07 20:20:46.000000000 +0000 +@@ -88,6 +88,7 @@ static void set_brk(unsigned long start, + end = ELF_PAGEALIGN(end); + if (end <= start) + return; ++ down_write(¤t->mm->mmap_sem); + do_brk(start, end - start); + + #ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC +@@ -95,6 +96,7 @@ static void set_brk(unsigned long start, + __do_mmap_pgoff(NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start); + #endif + ++ up_write(¤t->mm->mmap_sem); + } + + +@@ -295,7 +297,9 @@ static unsigned long load_elf_interp(str + */ + if (interp_elf_ex->e_phentsize != sizeof(struct elf_phdr)) + goto out; +- if (interp_elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr)) ++ ++ if (interp_elf_ex->e_phnum < 1 || ++ interp_elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr)) + goto out; + + /* Now read in all of the header information */ +@@ -370,7 +370,7 @@ + + /* Map the last of the bss segment */ + if (last_bss > elf_bss) +- do_brk(elf_bss, last_bss - elf_bss); ++ do_brk_locked(elf_bss, last_bss - elf_bss); + + *interp_load_addr = load_addr; + error = ((unsigned long) interp_elf_ex->e_entry) + load_addr; +@@ -407,7 +407,7 @@ + goto out; + } + +- do_brk(0, text_data); ++ do_brk_locked(0, text_data); + if (!interpreter->f_op || !interpreter->f_op->read) + goto out; + if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0) +@@ -415,7 +415,7 @@ + flush_icache_range((unsigned long)addr, + (unsigned long)addr + text_data); + +- do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1), ++ do_brk_locked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1), + interp_ex->a_bss); + elf_entry = interp_ex->a_entry; + +@@ -1271,7 +1271,7 @@ + len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1); + bss = elf_phdata->p_memsz + elf_phdata->p_vaddr; + if (bss > len) +- do_brk(len, bss - len); ++ do_brk_locked(len, bss - len); + error = 0; + + out_free_ph: +diff -ur linux-2.4.28-gentoo-r4/include/linux/mm.h linux-2.4.28-gentoo-r5/include/linux/mm.h +--- linux-2.4.28-gentoo-r4/include/linux/mm.h 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/include/linux/mm.h 2005-01-07 20:20:32.000000000 +0000 +@@ -601,6 +601,7 @@ + extern int do_munmap(struct mm_struct *, unsigned long, size_t); + + extern unsigned long do_brk(unsigned long, unsigned long); ++extern unsigned long do_brk_locked(unsigned long, unsigned long); + + static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev) + { +diff -ur linux-2.4.28-gentoo-r4/kernel/ksyms.c linux-2.4.28-gentoo-r5/kernel/ksyms.c +--- linux-2.4.28-gentoo-r4/kernel/ksyms.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/kernel/ksyms.c 2005-01-07 20:20:32.000000000 +0000 +@@ -90,6 +90,7 @@ + EXPORT_SYMBOL(__do_mmap_pgoff); + EXPORT_SYMBOL(do_munmap); + EXPORT_SYMBOL(do_brk); ++EXPORT_SYMBOL(do_brk_locked); + EXPORT_SYMBOL(exit_mm); + EXPORT_SYMBOL(exit_files); + EXPORT_SYMBOL(exit_fs); +diff -ur linux-2.4.28-gentoo-r4/mm/mmap.c linux-2.4.28-gentoo-r5/mm/mmap.c +--- linux-2.4.28-gentoo-r4/mm/mmap.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/mm/mmap.c 2005-01-07 20:20:32.000000000 +0000 +@@ -1401,6 +1401,21 @@ + return addr; + } + ++/* locking version of do_brk. */ ++unsigned long do_brk_locked(unsigned long addr, unsigned long len) ++{ ++ unsigned long ret; ++ ++ down_write(¤t->mm->mmap_sem); ++ ret = do_brk(addr, len); ++ up_write(¤t->mm->mmap_sem); ++ ++ return ret; ++} ++ ++ ++ ++ + /* Build the RB tree corresponding to the VMA list. */ + void build_mmap_rb(struct mm_struct * mm) + { diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.77094.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.77094.patch new file mode 100644 index 000000000000..cc3a1552c83d --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.77094.patch @@ -0,0 +1,12 @@ +diff -ur linux-2.4.28/drivers/char/random.c linux-2.4.28.plasmaroo/drivers/char/random.c +--- linux-2.4.28/drivers/char/random.c 2004-11-17 11:54:21.000000000 +0000 ++++ linux-2.4.28.plasmaroo/drivers/char/random.c 2005-01-08 02:54:49.198635736 +0000 +@@ -1787,7 +1787,7 @@ + void *oldval, size_t *oldlenp, + void *newval, size_t newlen, void **context) + { +- int len; ++ size_t len; + + sysctl_poolsize = random_state->poolinfo.POOLBYTES; + diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.brk-locked.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.brk-locked.patch new file mode 100644 index 000000000000..78bed1e5577a --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.brk-locked.patch @@ -0,0 +1,265 @@ +diff -ur linux-2.4.28-gentoo-r4/arch/mips/kernel/irixelf.c linux-2.4.28-gentoo-r5/arch/mips/kernel/irixelf.c +--- linux-2.4.28-gentoo-r4/arch/mips/kernel/irixelf.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/arch/mips/kernel/irixelf.c 2005-01-07 20:20:32.000000000 +0000 +@@ -130,7 +130,7 @@ + end = PAGE_ALIGN(end); + if (end <= start) + return; +- do_brk(start, end - start); ++ do_brk_locked(start, end - start); + } + + +@@ -379,7 +379,7 @@ + + /* Map the last of the bss segment */ + if (last_bss > len) { +- do_brk(len, (last_bss - len)); ++ do_brk_locked(len, (last_bss - len)); + } + kfree(elf_phdata); + +@@ -567,7 +567,7 @@ + unsigned long v; + struct prda *pp; + +- v = do_brk (PRDA_ADDRESS, PAGE_SIZE); ++ v = do_brk_locked (PRDA_ADDRESS, PAGE_SIZE); + + if (v < 0) + return; +@@ -859,7 +859,7 @@ + len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000; + bss = elf_phdata->p_memsz + elf_phdata->p_vaddr; + if (bss > len) +- do_brk(len, bss-len); ++ do_brk_locked(len, bss-len); + kfree(elf_phdata); + return 0; + } +diff -ur linux-2.4.28-gentoo-r4/arch/sparc64/kernel/binfmt_aout32.c linux-2.4.28-gentoo-r5/arch/sparc64/kernel/binfmt_aout32.c +--- linux-2.4.28-gentoo-r4/arch/sparc64/kernel/binfmt_aout32.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/arch/sparc64/kernel/binfmt_aout32.c 2005-01-07 20:20:32.000000000 +0000 +@@ -49,7 +49,7 @@ + end = PAGE_ALIGN(end); + if (end <= start) + return; +- do_brk(start, end - start); ++ do_brk_locked(start, end - start); + } + + /* +@@ -246,10 +246,10 @@ + if (N_MAGIC(ex) == NMAGIC) { + loff_t pos = fd_offset; + /* Fuck me plenty... */ +- error = do_brk(N_TXTADDR(ex), ex.a_text); ++ error = do_brk_locked(N_TXTADDR(ex), ex.a_text); + bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex), + ex.a_text, &pos); +- error = do_brk(N_DATADDR(ex), ex.a_data); ++ error = do_brk_locked(N_DATADDR(ex), ex.a_data); + bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex), + ex.a_data, &pos); + goto beyond_if; +@@ -257,7 +257,7 @@ + + if (N_MAGIC(ex) == OMAGIC) { + loff_t pos = fd_offset; +- do_brk(N_TXTADDR(ex) & PAGE_MASK, ++ do_brk_locked(N_TXTADDR(ex) & PAGE_MASK, + ex.a_text+ex.a_data + PAGE_SIZE - 1); + bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex), + ex.a_text+ex.a_data, &pos); +@@ -272,7 +272,7 @@ + + if (!bprm->file->f_op->mmap) { + loff_t pos = fd_offset; +- do_brk(0, ex.a_text+ex.a_data); ++ do_brk_locked(0, ex.a_text+ex.a_data); + bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex), + ex.a_text+ex.a_data, &pos); + goto beyond_if; +@@ -388,7 +388,7 @@ + len = PAGE_ALIGN(ex.a_text + ex.a_data); + bss = ex.a_text + ex.a_data + ex.a_bss; + if (bss > len) { +- error = do_brk(start_addr + len, bss - len); ++ error = do_brk_locked(start_addr + len, bss - len); + retval = error; + if (error != start_addr + len) + goto out; +diff -ur linux-2.4.28-gentoo-r4/fs/binfmt_aout.c linux-2.4.28-gentoo-r5/fs/binfmt_aout.c +--- linux-2.4.28-gentoo-r4/fs/binfmt_aout.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/fs/binfmt_aout.c 2005-01-07 20:20:32.000000000 +0000 +@@ -46,7 +46,7 @@ + start = PAGE_ALIGN(start); + end = PAGE_ALIGN(end); + if (end > start) { +- unsigned long addr = do_brk(start, end - start); ++ unsigned long addr = do_brk_locked(start, end - start); + if (BAD_ADDR(addr)) + return addr; + } +@@ -341,10 +341,10 @@ + loff_t pos = fd_offset; + /* Fuck me plenty... */ + /* */ +- error = do_brk(N_TXTADDR(ex), ex.a_text); ++ error = do_brk_locked(N_TXTADDR(ex), ex.a_text); + bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex), + ex.a_text, &pos); +- error = do_brk(N_DATADDR(ex), ex.a_data); ++ error = do_brk_locked(N_DATADDR(ex), ex.a_data); + bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex), + ex.a_data, &pos); + goto beyond_if; +@@ -365,7 +365,7 @@ + map_size = ex.a_text+ex.a_data; + #endif + +- error = do_brk(text_addr & PAGE_MASK, map_size); ++ error = do_brk_locked(text_addr & PAGE_MASK, map_size); + if (error != (text_addr & PAGE_MASK)) { + send_sig(SIGKILL, current, 0); + return error; +@@ -399,7 +399,7 @@ + + if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) { + loff_t pos = fd_offset; +- do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data); ++ do_brk_locked(N_TXTADDR(ex), ex.a_text+ex.a_data); + bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex), + ex.a_text+ex.a_data, &pos); + flush_icache_range((unsigned long) N_TXTADDR(ex), +@@ -500,7 +500,7 @@ + error_time = jiffies; + } + +- do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss); ++ do_brk_locked(start_addr, ex.a_text + ex.a_data + ex.a_bss); + + file->f_op->read(file, (char *)start_addr, + ex.a_text + ex.a_data, &pos); +@@ -524,7 +524,7 @@ + len = PAGE_ALIGN(ex.a_text + ex.a_data); + bss = ex.a_text + ex.a_data + ex.a_bss; + if (bss > len) { +- error = do_brk(start_addr + len, bss - len); ++ error = do_brk_locked(start_addr + len, bss - len); + retval = error; + if (error != start_addr + len) + goto out; +diff -ur linux-2.4.28-gentoo-r4/fs/binfmt_elf.c linux-2.4.28-gentoo-r5/fs/binfmt_elf.c +--- linux-2.4.28-gentoo-r4/fs/binfmt_elf.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/fs/binfmt_elf.c 2005-01-07 20:20:46.000000000 +0000 +@@ -88,6 +88,7 @@ static void set_brk(unsigned long start, + end = ELF_PAGEALIGN(end); + if (end <= start) + return; ++ down_write(¤t->mm->mmap_sem); + do_brk(start, end - start); + + #ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC +@@ -95,6 +96,7 @@ static void set_brk(unsigned long start, + __do_mmap_pgoff(NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start); + #endif + ++ up_write(¤t->mm->mmap_sem); + } + + +@@ -295,7 +297,9 @@ static unsigned long load_elf_interp(str + */ + if (interp_elf_ex->e_phentsize != sizeof(struct elf_phdr)) + goto out; +- if (interp_elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr)) ++ ++ if (interp_elf_ex->e_phnum < 1 || ++ interp_elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr)) + goto out; + + /* Now read in all of the header information */ +@@ -370,7 +370,7 @@ + + /* Map the last of the bss segment */ + if (last_bss > elf_bss) +- do_brk(elf_bss, last_bss - elf_bss); ++ do_brk_locked(elf_bss, last_bss - elf_bss); + + *interp_load_addr = load_addr; + error = ((unsigned long) interp_elf_ex->e_entry) + load_addr; +@@ -407,7 +407,7 @@ + goto out; + } + +- do_brk(0, text_data); ++ do_brk_locked(0, text_data); + retval = -ENOEXEC; + if (!interpreter->f_op || !interpreter->f_op->read) + goto out; +@@ -415,7 +415,7 @@ + flush_icache_range((unsigned long)addr, + (unsigned long)addr + text_data); + +- do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1), ++ do_brk_locked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1), + interp_ex->a_bss); + elf_entry = interp_ex->a_entry; + +@@ -1271,7 +1271,7 @@ + len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1); + bss = elf_phdata->p_memsz + elf_phdata->p_vaddr; + if (bss > len) +- do_brk(len, bss - len); ++ do_brk_locked(len, bss - len); + error = 0; + + out_free_ph: +diff -ur linux-2.4.28-gentoo-r4/include/linux/mm.h linux-2.4.28-gentoo-r5/include/linux/mm.h +--- linux-2.4.28-gentoo-r4/include/linux/mm.h 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/include/linux/mm.h 2005-01-07 20:20:32.000000000 +0000 +@@ -601,6 +601,7 @@ + extern int do_munmap(struct mm_struct *, unsigned long, size_t); + + extern unsigned long do_brk(unsigned long, unsigned long); ++extern unsigned long do_brk_locked(unsigned long, unsigned long); + + static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev) + { +diff -ur linux-2.4.28-gentoo-r4/kernel/ksyms.c linux-2.4.28-gentoo-r5/kernel/ksyms.c +--- linux-2.4.28-gentoo-r4/kernel/ksyms.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/kernel/ksyms.c 2005-01-07 20:20:32.000000000 +0000 +@@ -90,6 +90,7 @@ + EXPORT_SYMBOL(__do_mmap_pgoff); + EXPORT_SYMBOL(do_munmap); + EXPORT_SYMBOL(do_brk); ++EXPORT_SYMBOL(do_brk_locked); + EXPORT_SYMBOL(exit_mm); + EXPORT_SYMBOL(exit_files); + EXPORT_SYMBOL(exit_fs); +diff -ur linux-2.4.28-gentoo-r4/mm/mmap.c linux-2.4.28-gentoo-r5/mm/mmap.c +--- linux-2.4.28-gentoo-r4/mm/mmap.c 2005-01-07 20:33:12.000000000 +0000 ++++ linux-2.4.28-gentoo-r5/mm/mmap.c 2005-01-07 20:20:32.000000000 +0000 +@@ -1401,6 +1401,21 @@ + return addr; + } + ++/* locking version of do_brk. */ ++unsigned long do_brk_locked(unsigned long addr, unsigned long len) ++{ ++ unsigned long ret; ++ ++ down_write(¤t->mm->mmap_sem); ++ ret = do_brk(addr, len); ++ up_write(¤t->mm->mmap_sem); ++ ++ return ret; ++} ++ ++ ++ ++ + /* Build the RB tree corresponding to the VMA list. */ + void build_mmap_rb(struct mm_struct * mm) + { diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r30.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r31.ebuild similarity index 94% rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r30.ebuild rename to sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r31.ebuild index fd26b75f8c2d..12fc39e0d40e 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r30.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r31.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r30.ebuild,v 1.1 2004/12/24 18:23:50 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r31.ebuild,v 1.1 2005/01/08 21:29:55 plasmaroo Exp $ IUSE="aavm crypt evms2 usagi" @@ -30,9 +30,9 @@ S=${WORKDIR}/linux-${KV} DESCRIPTION="Full sources for the Gentoo Kernel." SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/30/28}.tar.bz2 + http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/31/28}.tar.bz2 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0415.patch - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch" + http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.2.patch" HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/" LICENSE="GPL-2" KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips" @@ -42,7 +42,7 @@ src_unpack() { unpack ${A} mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}" - cd ${WORKDIR}/${KV/r30/r28} + cd ${WORKDIR}/${KV/r31/r28} # This is the *ratified* aavm USE flag, enables aavm support in this kernel if ! use aavm; then @@ -144,7 +144,7 @@ src_unpack() { epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!" epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!" epatch ${FILESDIR}/${P}-CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!" - epatch ${DISTDIR}/${P}-CAN-2004-0814.patch || die "Failed to add the CAN-2004-0814 patch!" + epatch ${DISTDIR}/${P}-CAN-2004-0814.2.patch || die "Failed to add the CAN-2004-0814 patch!" epatch ${FILESDIR}/${PN}-2.4.I2C_Limits.patch || die "Failed to patch the I2C i2cdev_ioctl() kmalloc() bug!" epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" epatch ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!" @@ -156,6 +156,8 @@ src_unpack() { epatch ${FILESDIR}/${PN}-2.4.vma.patch || die "Failed to apply the VMA patch!" epatch ${FILESDIR}/${PN}-2.4.22-CAN-2004-1016.patch || die "Failed to apply the CAN-2004-1016 patch!" epatch ${FILESDIR}/${P}-CAN-2004-1056.patch || die "Failed to apply the CAN-2004-1056 patch!" + epatch ${FILESDIR}/${PN}-2.4.77094.patch || die "Failed to apply bug #77094 patch!" + epatch ${FILESDIR}/${PN}-2.4.brk-locked.patch || die "Failed to apply do_brk_locked() patch!" } pkg_postinst() { diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r21.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r21.ebuild deleted file mode 100644 index c38593ab7c7d..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r21.ebuild +++ /dev/null @@ -1,56 +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/gentoo-sources/gentoo-sources-2.4.22-r21.ebuild,v 1.1 2004/12/24 18:23:50 plasmaroo Exp $ - -ETYPE="sources" - -inherit kernel-2 -detect_version - -UNIPATCH_STRICTORDER='Y' -UNIPATCH_LIST=" - ${DISTDIR}/gentoo-sources-${PVR/21/5}.patch.bz2 - ${FILESDIR}/${PN}-2.4.munmap.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0001.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0010.patch - ${FILESDIR}/${P}-CAN-2004-0075.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0109.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0133.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0177.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0178.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0181.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch - ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-0535.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.20-smbfs.patch - ${FILESDIR}/${PN}-2.4.AF_UNIX.patch - ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch - ${FILESDIR}/${P}-vma.patch - ${FILESDIR}/${P}-CAN-2004-1016.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-1056.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch" - -S=${WORKDIR}/linux-${KV} - -DESCRIPTION="Full sources for the Gentoo Kernel." -SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 - http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/21/5}.patch.bz2 - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch" -KEYWORDS="x86 -*" -IUSE="" -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. -Please read the ChangeLog and associated docs for more information." diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r15.ebuild similarity index 84% rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r14.ebuild rename to sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r15.ebuild index 68b38553d6a8..88a6489a0e50 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r14.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r14.ebuild,v 1.1 2004/12/24 18:23:50 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r15.ebuild,v 1.1 2005/01/08 21:29:55 plasmaroo Exp $ ETYPE="sources" inherit kernel-2 @@ -29,16 +29,18 @@ UNIPATCH_LIST=" ${FILESDIR}/${PN}-2.4.binfmt_elf.patch ${FILESDIR}/${PN}-2.4.smbfs.patch ${DISTDIR}/linux-2.4.26-CAN-2004-0415.patch - ${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch + ${DISTDIR}/${P}-CAN-2004-0814.patch ${FILESDIR}/${PN}-2.4.AF_UNIX.patch ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch ${FILESDIR}/${PN}-2.4.vma.patch ${FILESDIR}/${PN}-2.4.CAN-2004-1016.patch ${FILESDIR}/${PN}-2.4.CAN-2004-1056.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch" + ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch + ${FILESDIR}/${PN}-2.4.77094.patch + ${FILESDIR}/${PN}-2.4.brk-locked.patch" DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~livewire/${P}.patch.bz2 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.26-CAN-2004-0415.patch - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-2.4.22-CAN-2004-0814.patch" + http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r15.ebuild similarity index 76% rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r14.ebuild rename to sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r15.ebuild index bb032d1257ad..147df1b0b290 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r14.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r14.ebuild,v 1.1 2004/12/24 18:23:50 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r15.ebuild,v 1.1 2005/01/08 21:29:55 plasmaroo Exp $ ETYPE="sources" inherit kernel-2 @@ -11,7 +11,7 @@ IUSE='' UNIPATCH_STRICTORDER='Y' UNIPATCH_LIST=" - ${DISTDIR}/${PF/r14/r6}.tar.bz2 + ${DISTDIR}/${PF/r15/r6}.tar.bz2 ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch ${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch @@ -23,15 +23,17 @@ UNIPATCH_LIST=" ${FILESDIR}/${PN}-2.4.binfmt_elf.patch ${FILESDIR}/${PN}-2.4.smbfs.patch ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch - ${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch + ${DISTDIR}/${PN}-2.4.25-CAN-2004-0814.patch ${FILESDIR}/${PN}-2.4.AF_UNIX.patch ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch ${FILESDIR}/${PN}-2.4.vma.patch ${FILESDIR}/${PN}-2.4.CAN-2004-1016.patch ${FILESDIR}/${PN}-2.4.CAN-2004-1056.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch" + ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch + ${FILESDIR}/${PN}-2.4.77094.patch + ${FILESDIR}/${PN}-2.4.brk-locked.patch" DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r14/r6}.tar.bz2 +SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r15/r6}.tar.bz2 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-2.4.22-CAN-2004-0814.patch" + http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-2.4.25-CAN-2004-0814.patch" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r5.ebuild similarity index 62% rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r4.ebuild rename to sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r5.ebuild index 5aac9aeea58a..1a013bbe8cae 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r4.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r4.ebuild,v 1.2 2005/01/07 22:31:25 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r5.ebuild,v 1.1 2005/01/08 21:29:55 plasmaroo Exp $ ETYPE="sources" inherit kernel-2 @@ -10,15 +10,17 @@ KEYWORDS="x86 -ppc" IUSE='' UNIPATCH_STRICTORDER='Y' -UNIPATCH_LIST="${DISTDIR}/${PF}.tar.bz2 - ${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch +UNIPATCH_LIST="${DISTDIR}/${PF/r5/r4}.tar.bz2 + ${DISTDIR}/ck-sources-${PV}-CAN-2004-0814.patch ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch - ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch ${FILESDIR}/${PN}-2.4.vma.patch ${FILESDIR}/${PN}-2.4.CAN-2004-1016.patch ${FILESDIR}/${PN}-2.4.CAN-2004-1056.patch - ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch" + ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch + ${FILESDIR}/${PN}-2.4.77094.patch + ${FILESDIR}/${P}.brk-locked.patch + ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch" DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree" -SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF}.tar.bz2 - http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-2.4.22-CAN-2004-0814.patch" +SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r5/r4}.tar.bz2 + http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/ck-sources-${PV}-CAN-2004-0814.patch"