diff options
Diffstat (limited to 'sys-kernel')
16 files changed, 697 insertions, 53 deletions
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog index e18d09295852..c226a65029ca 100644 --- a/sys-kernel/gentoo-sources/ChangeLog +++ b/sys-kernel/gentoo-sources/ChangeLog @@ -1,6 +1,22 @@ # 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.108 2005/02/05 10:17:22 dsd Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.109 2005/02/17 18:12:51 plasmaroo Exp $ + +*gentoo-sources-2.4.20-r32 (17 Feb 2005) + + 17 Feb 2005; <plasmaroo@gentoo.org> -gentoo-sources-2.4.20-r31.ebuild, + +gentoo-sources-2.4.20-r32.ebuild, -gentoo-sources-2.4.25-r15.ebuild, + +gentoo-sources-2.4.25-r16.ebuild, -gentoo-sources-2.4.26-r15.ebuild, + -gentoo-sources-2.4.28-r5.ebuild, +gentoo-sources-2.4.28-r6.ebuild, + +files/gentoo-sources-2.4.20.78362.patch, + +files/gentoo-sources-2.4.28.arpFix.patch, + +files/gentoo-sources-2.4.28.77181.patch, + +files/gentoo-sources-2.4.77666.patch, + +files/gentoo-sources-2.4.78362.patch, + +files/gentoo-sources-2.4.78363.patch, + +files/gentoo-sources-2.4.81106.patch: + Security fixes: #77666, #78362, #78363, #81106. Fix #78945 and #77181 for + 2.4.28. *gentoo-sources-2.6.10-r7 (05 Feb 2005) diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r31 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r32 index 56ce621133b7..56ce621133b7 100644 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r31 +++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r32 diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r15 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r16 index d8241ed0cb08..d8241ed0cb08 100644 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r15 +++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r16 diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r15 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r15 deleted file mode 100644 index bd60c43c1bc6..000000000000 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r15 +++ /dev/null @@ -1,4 +0,0 @@ -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 7a76408106f36520e58e0bc27ecf93f1 gentoo-sources-2.4.25-CAN-2004-0814.patch 147761 diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r5 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r6 index f231f9c88076..f231f9c88076 100644 --- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r5 +++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r6 diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20.78362.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20.78362.patch new file mode 100644 index 000000000000..3925a0b31ba0 --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20.78362.patch @@ -0,0 +1,241 @@ +# This is a BitKeeper generated diff -Nru style patch. +# +# ChangeSet +# 2004/12/08 13:33:08-08:00 davem@nuts.davemloft.net +# [NET]: CMSG compat code needs signedness fixes too. +# +# Signed-off-by: David S. Miller <davem@davemloft.net> +# +# arch/ia64/ia32/sys_ia32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -4 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/parisc/kernel/sys_parisc32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/ppc64/kernel/sys_ppc32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/s390x/kernel/linux32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/sparc64/kernel/sys_sparc32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/x86_64/ia32/socket32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +2 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# include/asm-x86_64/socket32.h +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +5 -0 +# [NET]: CMSG compat code needs signedness fixes too. +# +# ChangeSet +# 2004/12/15 09:25:31-02:00 marcelo@logos.cnet +# [PATCH] Make sure VC resizing fits in s16 +# +# Noted by George Guninski +# +# drivers/char/console.c +# 2004/12/15 10:58:17-02:00 marcelo@logos.cnet +6 -0 +# Import patch vc-patch +# +diff -Nru a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c +--- a/arch/ia64/ia32/sys_ia32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/ia64/ia32/sys_ia32.c 2005-02-15 11:50:28 -08:00 +@@ -1369,6 +1369,11 @@ + #define __CMSG32_FIRSTHDR(ctl,len) \ + ((len) >= sizeof(struct cmsghdr32) ? (struct cmsghdr32 *)(ctl) : (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + static inline struct cmsghdr32 * + __cmsg32_nxthdr (void *ctl, __kernel_size_t size, struct cmsghdr32 *cmsg, int cmsg_len) +@@ -1429,10 +1434,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if (CMSG32_ALIGN(ucmlen) < CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if ((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) + ucmlen) +- > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c +--- a/arch/parisc/kernel/sys_parisc32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/parisc/kernel/sys_parisc32.c 2005-02-15 11:50:28 -08:00 +@@ -1814,6 +1814,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +@@ -1940,11 +1945,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c +--- a/arch/ppc64/kernel/sys_ppc32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/ppc64/kernel/sys_ppc32.c 2005-02-15 11:50:28 -08:00 +@@ -3273,6 +3273,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + struct msghdr32 + { +@@ -3448,11 +3453,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/s390x/kernel/linux32.c b/arch/s390x/kernel/linux32.c +--- a/arch/s390x/kernel/linux32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/s390x/kernel/linux32.c 2005-02-15 11:50:28 -08:00 +@@ -2306,6 +2306,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +@@ -2432,11 +2437,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c +--- a/arch/sparc64/kernel/sys_sparc32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/sparc64/kernel/sys_sparc32.c 2005-02-15 11:50:28 -08:00 +@@ -2354,6 +2354,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +@@ -2480,11 +2485,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/x86_64/ia32/socket32.c b/arch/x86_64/ia32/socket32.c +--- a/arch/x86_64/ia32/socket32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/x86_64/ia32/socket32.c 2005-02-15 11:50:28 -08:00 +@@ -134,11 +134,10 @@ + return -EFAULT; + + /* Catch bogons. */ ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) + return -EINVAL; ++ ++ if (kmsg->msg_controllen > 65536) +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/include/asm-x86_64/socket32.h b/include/asm-x86_64/socket32.h +--- a/include/asm-x86_64/socket32.h 2005-02-15 11:50:28 -08:00 ++++ b/include/asm-x86_64/socket32.h 2005-02-15 11:50:28 -08:00 +@@ -45,6 +45,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +diff -Nru a/drivers/char/console.c b/drivers/char/console.c +--- a/drivers/char/console.c 2005-02-15 11:52:04 -08:00 ++++ b/drivers/char/console.c 2005-02-15 11:52:04 -08:00 +@@ -705,6 +705,9 @@ + return 0; + } + ++#define VC_RESIZE_MAXCOL (32767) ++#define VC_RESIZE_MAXROW (32767) ++ + /* + * Change # of rows and columns (0 means unchanged/the size of fg_console) + * [this is to be used together with some user program +@@ -716,6 +719,9 @@ + unsigned int cc, ll, ss, sr, todo = 0; + unsigned int currcons = fg_console, i; + unsigned short *newscreens[MAX_NR_CONSOLES]; ++ ++ if (cols > VC_RESIZE_MAXCOL || lines > VC_RESIZE_MAXROW) ++ return -EINVAL; + + cc = (cols ? cols : video_num_columns); + ll = (lines ? lines : video_num_lines); diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.77181.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.77181.patch new file mode 100644 index 000000000000..cc48250cb7e9 --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.77181.patch @@ -0,0 +1,10 @@ +--- 1.4/net/decnet/dn_neigh.c 2005-02-17 10:05:41 -08:00 ++++ 1.5/net/decnet/dn_neigh.c 2005-02-17 10:05:41 -08:00 +@@ -26,6 +26,7 @@ + + #include <linux/config.h> + #include <linux/net.h> ++#include <linux/module.h> + #include <linux/socket.h> + #include <linux/if_arp.h> + #include <linux/if_ether.h> diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.arpFix.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.arpFix.patch new file mode 100644 index 000000000000..cc695dff9991 --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.28.arpFix.patch @@ -0,0 +1,28 @@ +*** linux-2.4.28-gentoo-r5/net/core/neighbour.c Mon Jan 17 13:16:22 2005 +--- linux-2.4.28-gentoo-r5/net/core/neighbour.c Fri Jan 21 15:33:56 2005 +*************** +*** 427,437 **** + + n->confirmed = jiffies - (n->parms->base_reachable_time<<1); + +- hash_val = tbl->hash(pkey, dev) & tbl->hash_mask; +- + write_lock_bh(&tbl->lock); + if (atomic_read(&tbl->entries) > (tbl->hash_mask + 1)) + neigh_hash_grow(tbl, (tbl->hash_mask + 1) << 1); + for (n1 = tbl->hash_buckets[hash_val]; n1; n1 = n1->next) { + if (dev == n1->dev && + memcmp(n1->primary_key, pkey, key_len) == 0) { +--- 427,438 ---- + + n->confirmed = jiffies - (n->parms->base_reachable_time<<1); + + write_lock_bh(&tbl->lock); + if (atomic_read(&tbl->entries) > (tbl->hash_mask + 1)) + neigh_hash_grow(tbl, (tbl->hash_mask + 1) << 1); ++ ++ hash_val = tbl->hash(pkey, dev) & tbl->hash_mask; ++ + for (n1 = tbl->hash_buckets[hash_val]; n1; n1 = n1->next) { + if (dev == n1->dev && + memcmp(n1->primary_key, pkey, key_len) == 0) { diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.77666.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.77666.patch new file mode 100644 index 000000000000..6b687788f912 --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.77666.patch @@ -0,0 +1,44 @@ +# This is a BitKeeper generated diff -Nru style patch. +# +# ChangeSet +# 2005/01/12 09:14:50-02:00 marcelo.tosatti@cyclades.com +# [PATCH] Fix expand_stack() SMP race +# +# Description: Fix expand_stack() SMP race +# +# Two threads sharing the same VMA can race in expand_stack, resulting in incorrect VMA +# size accounting and possibly a "uncovered-by-VMA" pte leak. +# +# Fix is to check if the stack has already been expanded after acquiring a lock which +# guarantees exclusivity (page_table_lock in v2.4 and vma_anon lock in v2.6). +# +# include/linux/mm.h +# 2005/01/07 14:51:21-02:00 marcelo.tosatti@cyclades.com +10 -3 +# Fix expand_stack() SMP race +# +diff -Nru a/include/linux/mm.h b/include/linux/mm.h +--- a/include/linux/mm.h 2005-01-13 04:59:30 -08:00 ++++ b/include/linux/mm.h 2005-01-13 04:59:30 -08:00 +@@ -648,12 +648,19 @@ + unsigned long grow; + + /* +- * vma->vm_start/vm_end cannot change under us because the caller is required +- * to hold the mmap_sem in write mode. We need to get the spinlock only +- * before relocating the vma range ourself. ++ * vma->vm_start/vm_end cannot change under us because the caller ++ * is required to hold the mmap_sem in read mode. We need the ++ * page_table_lock lock to serialize against concurrent expand_stacks. + */ + address &= PAGE_MASK; + spin_lock(&vma->vm_mm->page_table_lock); ++ ++ /* already expanded while we were spinning? */ ++ if (vma->vm_start <= address) { ++ spin_unlock(&vma->vm_mm->page_table_lock); ++ return 0; ++ } ++ + grow = (vma->vm_start - address) >> PAGE_SHIFT; + if (vma->vm_end - address > current->rlim[RLIMIT_STACK].rlim_cur || + ((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) > current->rlim[RLIMIT_AS].rlim_cur) { diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.78362.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.78362.patch new file mode 100644 index 000000000000..a55aba8a0938 --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.78362.patch @@ -0,0 +1,274 @@ +# This is a BitKeeper generated diff -Nru style patch. +# +# ChangeSet +# 2004/12/08 13:33:08-08:00 davem@nuts.davemloft.net +# [NET]: CMSG compat code needs signedness fixes too. +# +# Signed-off-by: David S. Miller <davem@davemloft.net> +# +# arch/ia64/ia32/sys_ia32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -4 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/mips64/kernel/linux32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +7 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/parisc/kernel/sys_parisc32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/ppc64/kernel/sys_ppc32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/s390x/kernel/linux32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/sparc64/kernel/sys_sparc32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# arch/x86_64/ia32/socket32.c +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +2 -5 +# [NET]: CMSG compat code needs signedness fixes too. +# +# include/asm-x86_64/socket32.h +# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +5 -0 +# [NET]: CMSG compat code needs signedness fixes too. +# +# ChangeSet +# 2004/12/15 09:25:31-02:00 marcelo@logos.cnet +# [PATCH] Make sure VC resizing fits in s16 +# +# Noted by George Guninski +# +# drivers/char/console.c +# 2004/12/15 10:58:17-02:00 marcelo@logos.cnet +6 -0 +# Import patch vc-patch +# +diff -Nru a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c +--- a/arch/ia64/ia32/sys_ia32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/ia64/ia32/sys_ia32.c 2005-02-15 11:50:28 -08:00 +@@ -1369,6 +1369,11 @@ + #define __CMSG32_FIRSTHDR(ctl,len) \ + ((len) >= sizeof(struct cmsghdr32) ? (struct cmsghdr32 *)(ctl) : (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + static inline struct cmsghdr32 * + __cmsg32_nxthdr (void *ctl, __kernel_size_t size, struct cmsghdr32 *cmsg, int cmsg_len) +@@ -1429,10 +1434,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if (CMSG32_ALIGN(ucmlen) < CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if ((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) + ucmlen) +- > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/mips64/kernel/linux32.c b/arch/mips64/kernel/linux32.c +--- a/arch/mips64/kernel/linux32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/mips64/kernel/linux32.c 2005-02-15 11:50:28 -08:00 +@@ -2483,6 +2483,12 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) ++ + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +@@ -2623,11 +2629,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -ENOBUFS; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c +--- a/arch/parisc/kernel/sys_parisc32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/parisc/kernel/sys_parisc32.c 2005-02-15 11:50:28 -08:00 +@@ -1814,6 +1814,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +@@ -1940,11 +1945,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c +--- a/arch/ppc64/kernel/sys_ppc32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/ppc64/kernel/sys_ppc32.c 2005-02-15 11:50:28 -08:00 +@@ -3273,6 +3273,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + struct msghdr32 + { +@@ -3448,11 +3453,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/s390x/kernel/linux32.c b/arch/s390x/kernel/linux32.c +--- a/arch/s390x/kernel/linux32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/s390x/kernel/linux32.c 2005-02-15 11:50:28 -08:00 +@@ -2306,6 +2306,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +@@ -2432,11 +2437,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c +--- a/arch/sparc64/kernel/sys_sparc32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/sparc64/kernel/sys_sparc32.c 2005-02-15 11:50:28 -08:00 +@@ -2354,6 +2354,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +@@ -2480,11 +2485,7 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; + + tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) + +diff -Nru a/arch/x86_64/ia32/socket32.c b/arch/x86_64/ia32/socket32.c +--- a/arch/x86_64/ia32/socket32.c 2005-02-15 11:50:28 -08:00 ++++ b/arch/x86_64/ia32/socket32.c 2005-02-15 11:50:28 -08:00 +@@ -136,12 +136,9 @@ + return -EFAULT; + + /* Catch bogons. */ +- if(CMSG32_ALIGN(ucmlen) < +- CMSG32_ALIGN(sizeof(struct cmsghdr32))) +- return -EINVAL; +- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) +- + ucmlen) > kmsg->msg_controllen) ++ if (!CMSG32_OK(ucmlen, ucmsg, kmsg)) + return -EINVAL; ++ + if (kmsg->msg_controllen > 65536) + return -EINVAL; + +diff -Nru a/include/asm-x86_64/socket32.h b/include/asm-x86_64/socket32.h +--- a/include/asm-x86_64/socket32.h 2005-02-15 11:50:28 -08:00 ++++ b/include/asm-x86_64/socket32.h 2005-02-15 11:50:28 -08:00 +@@ -45,6 +45,11 @@ + (struct cmsghdr32 *)(ctl) : \ + (struct cmsghdr32 *)NULL) + #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen) ++#define CMSG32_OK(ucmlen, ucmsg, mhdr) \ ++ ((ucmlen) >= sizeof(struct cmsghdr) && \ ++ (ucmlen) <= (unsigned long) \ ++ ((mhdr)->msg_controllen - \ ++ ((char *)(ucmsg) - (char *)(mhdr)->msg_control))) + + __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size, + struct cmsghdr32 *__cmsg, int __cmsg_len) +diff -Nru a/drivers/char/console.c b/drivers/char/console.c +--- a/drivers/char/console.c 2005-02-15 11:52:04 -08:00 ++++ b/drivers/char/console.c 2005-02-15 11:52:04 -08:00 +@@ -705,6 +705,9 @@ + return 0; + } + ++#define VC_RESIZE_MAXCOL (32767) ++#define VC_RESIZE_MAXROW (32767) ++ + /* + * Change # of rows and columns (0 means unchanged/the size of fg_console) + * [this is to be used together with some user program +@@ -716,6 +719,9 @@ + unsigned int cc, ll, ss, sr, todo = 0; + unsigned int currcons = fg_console, i; + unsigned short *newscreens[MAX_NR_CONSOLES]; ++ ++ if (cols > VC_RESIZE_MAXCOL || lines > VC_RESIZE_MAXROW) ++ return -EINVAL; + + cc = (cols ? cols : video_num_columns); + ll = (lines ? lines : video_num_lines); diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.78363.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.78363.patch new file mode 100644 index 000000000000..852807ddc96f --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.78363.patch @@ -0,0 +1,29 @@ +# This is a BitKeeper generated diff -Nru style patch. +# +# ChangeSet +# 2004/12/08 12:39:15-08:00 davem@nuts.davemloft.net +# [IPV4]: Do not leak IP options. +# +# If the user makes ip_cmsg_send call ip_options_get +# multiple times, we leak kmalloced IP options data. +# +# Noticed by Georgi Guninski. +# +# Signed-off-by: David S. Miller <davem@davemloft.net> +# +# net/ipv4/ip_options.c +# 2004/12/08 12:38:09-08:00 davem@nuts.davemloft.net +2 -0 +# [IPV4]: Do not leak IP options. +# +diff -Nru a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c +--- a/net/ipv4/ip_options.c 2005-02-15 11:47:16 -08:00 ++++ b/net/ipv4/ip_options.c 2005-02-15 11:47:16 -08:00 +@@ -515,6 +515,8 @@ + kfree(opt); + return -EINVAL; + } ++ if (*optp) ++ kfree(*optp); + *optp = opt; + return 0; + } diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.81106.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.81106.patch new file mode 100644 index 000000000000..44abcbca1ac0 --- /dev/null +++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.81106.patch @@ -0,0 +1,32 @@ +# ChangeSet +# 2005/01/25 10:10:51+00:00 aia21@cantab.net +# NTFS: Add printk rate limiting for ntfs_warning() and ntfs_error() when +# compiled without debug. This avoids a possible denial of service +# attack. Thanks to Carl-Daniel Hailfinger from SuSE for pointing this +# out. +# +diff -Nru a/fs/ntfs/debug.c b/fs/ntfs/debug.c +--- a/fs/ntfs/debug.c 2005-02-15 12:38:26 -08:00 ++++ b/fs/ntfs/debug.c 2005-02-15 12:38:26 -08:00 +@@ -53,6 +53,10 @@ + va_list args; + int flen = 0; + ++#ifndef DEBUG ++ if (!printk_ratelimit()) ++ return; ++#endif + if (function) + flen = strlen(function); + spin_lock(&err_buf_lock); +@@ -93,6 +97,10 @@ + va_list args; + int flen = 0; + ++#ifndef DEBUG ++ if (!printk_ratelimit()) ++ return; ++#endif + if (function) + flen = strlen(function); + spin_lock(&err_buf_lock); diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r31.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r32.ebuild index 12fc39e0d40e..a0ae1de35111 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r31.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r32.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.20-r31.ebuild,v 1.1 2005/01/08 21:29:55 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r32.ebuild,v 1.1 2005/02/17 18:12:52 plasmaroo Exp $ IUSE="aavm crypt evms2 usagi" @@ -30,7 +30,7 @@ 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/31/28}.tar.bz2 + http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/32/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.2.patch" HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/" @@ -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/r31/r28} + cd ${WORKDIR}/${KV/r32/r28} # This is the *ratified* aavm USE flag, enables aavm support in this kernel if ! use aavm; then @@ -158,6 +158,10 @@ src_unpack() { 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!" + epatch ${FILESDIR}/${PN}-2.4.77666.patch || die "Failed to apply #77666 patch!" + epatch ${FILESDIR}/${P}.78362.patch || die "Failed to apply #78362 patch!" + epatch ${FILESDIR}/${PN}-2.4.78363.patch || die "Failed to apply #78363 patch!" + epatch ${FILESDIR}/${PN}-2.4.81106.patch || die "Failed to apply #81106 patch!" } pkg_postinst() { diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r16.ebuild index 88a6489a0e50..e79705141ccb 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r15.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r16.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.25-r15.ebuild,v 1.1 2005/01/08 21:29:55 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r16.ebuild,v 1.1 2005/02/17 18:12:52 plasmaroo Exp $ ETYPE="sources" inherit kernel-2 @@ -37,7 +37,11 @@ UNIPATCH_LIST=" ${FILESDIR}/${PN}-2.4.CAN-2004-1056.patch ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch ${FILESDIR}/${PN}-2.4.77094.patch - ${FILESDIR}/${PN}-2.4.brk-locked.patch" + ${FILESDIR}/${PN}-2.4.brk-locked.patch + ${FILESDIR}/${PN}-2.4.77666.patch + ${FILESDIR}/${PN}-2.4.78362.patch + ${FILESDIR}/${PN}-2.4.78363.patch + ${FILESDIR}/${PN}-2.4.81106.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 diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r15.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r15.ebuild deleted file mode 100644 index 147df1b0b290..000000000000 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r15.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# 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-r15.ebuild,v 1.1 2005/01/08 21:29:55 plasmaroo Exp $ - -ETYPE="sources" -inherit kernel-2 -detect_version - -KEYWORDS="x86 -ppc" -IUSE='' - -UNIPATCH_STRICTORDER='Y' -UNIPATCH_LIST=" - ${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 - ${FILESDIR}/${PN}-2.4.CAN-2004-0685.patch - ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch - ${FILESDIR}/${P}-OpenSWAN-CompileFix.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 - ${DISTDIR}/linux-${OKV}-CAN-2004-0415.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.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/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.25-CAN-2004-0814.patch" diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r6.ebuild index 1a013bbe8cae..cc86be50c41e 100644 --- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r5.ebuild +++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r6.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-r5.ebuild,v 1.1 2005/01/08 21:29:55 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r6.ebuild,v 1.1 2005/02/17 18:12:52 plasmaroo Exp $ ETYPE="sources" inherit kernel-2 @@ -10,7 +10,7 @@ KEYWORDS="x86 -ppc" IUSE='' UNIPATCH_STRICTORDER='Y' -UNIPATCH_LIST="${DISTDIR}/${PF/r5/r4}.tar.bz2 +UNIPATCH_LIST="${DISTDIR}/${PF/r6/r4}.tar.bz2 ${DISTDIR}/ck-sources-${PV}-CAN-2004-0814.patch ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch ${FILESDIR}/${PN}-2.4.vma.patch @@ -19,8 +19,13 @@ UNIPATCH_LIST="${DISTDIR}/${PF/r5/r4}.tar.bz2 ${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" + ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch + ${FILESDIR}/${PN}-2.4.77666.patch + ${FILESDIR}/${PN}-2.4.78362.patch + ${FILESDIR}/${PN}-2.4.78363.patch + ${FILESDIR}/${PN}-2.4.81106.patch + ${FILESDIR}/${P}.arpFix.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/r5/r4}.tar.bz2 +SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r6/r4}.tar.bz2 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/ck-sources-${PV}-CAN-2004-0814.patch" |