Version bump for CAN-2004-0685, bug #59769.

14 files changed, 210 insertions, 25 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index e8dba2122867..384da25a39f6 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.85 2004/08/05 19:59:25 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.86 2004/08/08 18:32:21 plasmaroo Exp $
+
+*gentoo-sources-2.4.25-r8 (08 Aug 2004)
+
+  08 Aug 2004; <plasmaroo@gentoo.org> -gentoo-sources-2.4.19-r20.ebuild,
+  +gentoo-sources-2.4.19-r21.ebuild, -gentoo-sources-2.4.20-r23.ebuild,
+  +gentoo-sources-2.4.20-r24.ebuild, -gentoo-sources-2.4.22-r14.ebuild,
+  +gentoo-sources-2.4.22-r15.ebuild, -gentoo-sources-2.4.25-r7.ebuild,
+  +gentoo-sources-2.4.25-r8.ebuild, -gentoo-sources-2.4.26-r7.ebuild,
+  +gentoo-sources-2.4.26-r8.ebuild,
+  +files/gentoo-sources-2.4.20-CAN-2004-0685.patch,
+  +files/gentoo-sources-2.4.CAN-2004-0685.patch:
+  Version bump for CAN-2004-0685, bug #59769.
 
   05 Aug 2004; <plasmaroo@gentoo.org> gentoo-sources-2.4.19-r20.ebuild,
   +files/security.patch5:
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index f53858ee3821..2ad344f3808a 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,14 +1,15 @@
-MD5 d2ea8b9e03858d2f9aead24b5f2273e7 ChangeLog 21342
-MD5 ac5f47ecc3e30716256f6c18592eb6ce gentoo-sources-2.4.25-r7.ebuild 1153
-MD5 b78e55b8792da80ec3a7086a7f0bf29c gentoo-sources-2.4.26-r7.ebuild 931
-MD5 8be7bec4cfe9503c0bd5fa0347ff4019 gentoo-sources-2.4.20-r23.ebuild 6980
+MD5 df430a5b12b96f83470ea83f72841752 ChangeLog 21925
+MD5 0599bbcd18ef6aba4a4e9cfb4dde74e2 gentoo-sources-2.4.19-r21.ebuild 4413
 MD5 91ea2908f17a4069774ffce01264df0c metadata.xml 354
-MD5 18975e4a9174095988b915641bbe1da2 gentoo-sources-2.4.22-r14.ebuild 1760
-MD5 3a3b9d7dda77e646ce888189326b409d gentoo-sources-2.4.19-r20.ebuild 4312
+MD5 aac3871d2a198fdcaee8a6584238cdef gentoo-sources-2.4.26-r8.ebuild 974
+MD5 012fd09ba20f6d7c0f3b1959aa608374 gentoo-sources-2.4.25-r8.ebuild 1196
+MD5 4e316c2f8c2333f6007be796534ef15e gentoo-sources-2.4.22-r15.ebuild 1803
+MD5 36d3409bfdbf4aece3621f6e98cbe2e7 gentoo-sources-2.4.20-r24.ebuild 7073
 MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gentoo-sources-2.4.CAN-2004-0427.patch 460
-MD5 bdc383e4317a9021331a10c4db4e4eb7 files/digest-gentoo-sources-2.4.19-r20 222
 MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
+MD5 d2621671130d63518828122ac9bc3bf5 files/digest-gentoo-sources-2.4.22-r15 223
+MD5 a69691970ab5b5d89cd64341330d38ed files/digest-gentoo-sources-2.4.25-r8 220
 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 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
@@ -25,18 +26,19 @@ MD5 dc18e982f8149588a291956481885a8c files/gentoo-sources-2.4.CAN-2004-0495.patc
 MD5 528da73c9e4a6fb017561e51dc0ab815 files/gentoo-sources-2.4.CAN-2003-0643.patch 747
 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 a69691970ab5b5d89cd64341330d38ed files/digest-gentoo-sources-2.4.25-r7 220
-MD5 faa37fac65a03d0c962b636e20d8b729 files/digest-gentoo-sources-2.4.26-r7 221
 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
 MD5 39af009b63a2f2042ac251fa801044d9 files/gentoo-sources-2.4.19-CAN-2004-0181.patch 1180
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/gentoo-sources-2.4.20-rtc_fix.patch 6769
 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 7cc7f3f118c9d9a680719a28cc153900 files/digest-gentoo-sources-2.4.20-r23 231
+MD5 faa37fac65a03d0c962b636e20d8b729 files/digest-gentoo-sources-2.4.26-r8 221
 MD5 152e60bd6e74485e08c4f0bd8f98250a files/gentoo-sources-2.4.19-gcc33.patch 8526
+MD5 7cc7f3f118c9d9a680719a28cc153900 files/digest-gentoo-sources-2.4.20-r24 231
 MD5 5bf9836a632a861728d33f9736bb7431 files/gentoo-sources-2.4.CAN-2004-0133.patch 427
+MD5 bdc383e4317a9021331a10c4db4e4eb7 files/digest-gentoo-sources-2.4.19-r21 222
 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 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
@@ -50,8 +52,8 @@ MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
 MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
 MD5 394bae02a20af95fc9d320f6cea3834e files/gentoo-sources-2.4.22-kmsgdump.patch 887
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gentoo-sources-2.4.CAN-2004-0177.patch 384
-MD5 d2621671130d63518828122ac9bc3bf5 files/digest-gentoo-sources-2.4.22-r14 223
 MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/gentoo-sources-2.4.22-CAN-2004-0075.patch 634
+MD5 92f1b3aa68de326081b75653a77d64cf files/gentoo-sources-2.4.20-CAN-2004-0685.patch 2881
 MD5 a580e6b8c602c2e13fb5de7cc2de65a0 files/do_brk_fix.patch 242
 MD5 bf2b609e8cab6460d220b1267db09826 files/gentoo-sources-2.4.CAN-2004-0001.patch 982
 MD5 02b1f745c441693b1558b2b6d3f28c45 files/gentoo-sources-2.4.20-mdcount.patch 1345
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r20 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r21
index b708cb670aa9..b708cb670aa9 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r20
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r21
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r23 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r24
index 3cf440f6d20e..3cf440f6d20e 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r23
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r24
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r14 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r15
index 9ee5ce3b934c..9ee5ce3b934c 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r14
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r15
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r7 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r8
index 4e797f96694e..4e797f96694e 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r7
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r8
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r7 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r8
index 925972bf56cc..925972bf56cc 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r7
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r8
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-CAN-2004-0685.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-CAN-2004-0685.patch
new file mode 100644
index 000000000000..77808162b2fb
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-CAN-2004-0685.patch
@@ -0,0 +1,83 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/07/26 19:14:16-03:00 mjc@redhat.com 
+#   [PATCH] USB: more sparse fixes
+#   
+#   Back in October 2003 Arnaldo commited some fixes prior to 2.6 for some leaking info to userspace in the
+#   usb drivers:
+#   http://linux.bkbits.net:8080/linux-2.6/cset@3f986b35LyBKc-OxB8G6k22oOjgYTQ
+#   
+#   The corresponding changes have not been commited to 2.4, or included in
+#   the previous sparse fixes.
+# 
+# drivers/usb/audio.c
+#   2004/07/15 08:46:52-03:00 mjc@redhat.com +4 -0
+#   USB: more sparse fixes
+# 
+# drivers/usb/brlvger.c
+#   2004/07/15 08:47:27-03:00 mjc@redhat.com +1 -0
+#   USB: more sparse fixes
+# 
+# drivers/usb/serial/io_edgeport.c
+#   2004/07/15 08:48:06-03:00 mjc@redhat.com +1 -0
+#   USB: more sparse fixes
+# 
+# drivers/usb/vicam.c
+#   2004/07/15 08:47:13-03:00 mjc@redhat.com +1 -0
+#   USB: more sparse fixes
+# 
+diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c
+--- a/drivers/usb/audio.c	2004-08-08 07:41:30 -07:00
++++ b/drivers/usb/audio.c	2004-08-08 07:41:30 -07:00
+@@ -2141,6 +2141,8 @@
+   
+ 	if (cmd == SOUND_MIXER_INFO) {
+ 		mixer_info info;
++
++		memset(&info, 0, sizeof(info));
+ 		strncpy(info.id, "USB_AUDIO", sizeof(info.id));
+ 		strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
+ 		info.modify_counter = ms->modcnt;
+@@ -2150,6 +2152,8 @@
+ 	}
+ 	if (cmd == SOUND_OLD_MIXER_INFO) {
+ 		_old_mixer_info info;
++
++		memset(&info, 0, sizeof(info));
+ 		strncpy(info.id, "USB_AUDIO", sizeof(info.id));
+ 		strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
+ 		if (copy_to_user((void *)arg, &info, sizeof(info)))
+diff -Nru a/drivers/usb/brlvger.c b/drivers/usb/brlvger.c
+--- a/drivers/usb/brlvger.c	2004-08-08 07:41:30 -07:00
++++ b/drivers/usb/brlvger.c	2004-08-08 07:41:30 -07:00
+@@ -743,6 +743,7 @@
+ 	case BRLVGER_GET_INFO: {
+ 		struct brlvger_info vi;
+ 
++		memset(&vi, 0, sizeof(vi));
+ 		strncpy(vi.driver_version, DRIVER_VERSION,
+ 			sizeof(vi.driver_version));
+ 		vi.driver_version[sizeof(vi.driver_version)-1] = 0;
+diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
+--- a/drivers/usb/serial/io_edgeport.c	2004-08-08 07:41:30 -07:00
++++ b/drivers/usb/serial/io_edgeport.c	2004-08-08 07:41:30 -07:00
+@@ -1913,6 +1913,7 @@
+ 
+ 		case TIOCGICOUNT:
+ 			cnow = edge_port->icount;
++			memset(&icount, 0, sizeof(icount));
+ 			icount.cts = cnow.cts;
+ 			icount.dsr = cnow.dsr;
+ 			icount.rng = cnow.rng;
+diff -Nru a/drivers/usb/vicam.c b/drivers/usb/vicam.c
+--- a/drivers/usb/vicam.c	2004-08-04 22:41:03.000000000 +0100
++++ a/drivers/usb/vicam.c.new	2004-08-08 15:56:04.026739936 +0100
+@@ -504,6 +504,7 @@ static int vicam_v4l_ioctl(struct video_
+ 	{
+ 		struct video_capability b;
+ 		ret = vicam_get_capability(vicam,&b);
++		memset(&b, 0, sizeof(b));
+ 		dbg("name %s",b.name);
+ 		if (copy_to_user(arg, &b, sizeof(b)))
+ 			ret = -EFAULT;
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0685.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0685.patch
new file mode 100644
index 000000000000..d1be834cc8a5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0685.patch
@@ -0,0 +1,83 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/07/26 19:14:16-03:00 mjc@redhat.com 
+#   [PATCH] USB: more sparse fixes
+#   
+#   Back in October 2003 Arnaldo commited some fixes prior to 2.6 for some leaking info to userspace in the
+#   usb drivers:
+#   http://linux.bkbits.net:8080/linux-2.6/cset@3f986b35LyBKc-OxB8G6k22oOjgYTQ
+#   
+#   The corresponding changes have not been commited to 2.4, or included in
+#   the previous sparse fixes.
+# 
+# drivers/usb/audio.c
+#   2004/07/15 08:46:52-03:00 mjc@redhat.com +4 -0
+#   USB: more sparse fixes
+# 
+# drivers/usb/brlvger.c
+#   2004/07/15 08:47:27-03:00 mjc@redhat.com +1 -0
+#   USB: more sparse fixes
+# 
+# drivers/usb/serial/io_edgeport.c
+#   2004/07/15 08:48:06-03:00 mjc@redhat.com +1 -0
+#   USB: more sparse fixes
+# 
+# drivers/usb/vicam.c
+#   2004/07/15 08:47:13-03:00 mjc@redhat.com +1 -0
+#   USB: more sparse fixes
+# 
+diff -Nru a/drivers/usb/audio.c b/drivers/usb/audio.c
+--- a/drivers/usb/audio.c	2004-08-08 07:41:30 -07:00
++++ b/drivers/usb/audio.c	2004-08-08 07:41:30 -07:00
+@@ -2141,6 +2141,8 @@
+   
+ 	if (cmd == SOUND_MIXER_INFO) {
+ 		mixer_info info;
++
++		memset(&info, 0, sizeof(info));
+ 		strncpy(info.id, "USB_AUDIO", sizeof(info.id));
+ 		strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
+ 		info.modify_counter = ms->modcnt;
+@@ -2150,6 +2152,8 @@
+ 	}
+ 	if (cmd == SOUND_OLD_MIXER_INFO) {
+ 		_old_mixer_info info;
++
++		memset(&info, 0, sizeof(info));
+ 		strncpy(info.id, "USB_AUDIO", sizeof(info.id));
+ 		strncpy(info.name, "USB Audio Class Driver", sizeof(info.name));
+ 		if (copy_to_user((void *)arg, &info, sizeof(info)))
+diff -Nru a/drivers/usb/brlvger.c b/drivers/usb/brlvger.c
+--- a/drivers/usb/brlvger.c	2004-08-08 07:41:30 -07:00
++++ b/drivers/usb/brlvger.c	2004-08-08 07:41:30 -07:00
+@@ -743,6 +743,7 @@
+ 	case BRLVGER_GET_INFO: {
+ 		struct brlvger_info vi;
+ 
++		memset(&vi, 0, sizeof(vi));
+ 		strncpy(vi.driver_version, DRIVER_VERSION,
+ 			sizeof(vi.driver_version));
+ 		vi.driver_version[sizeof(vi.driver_version)-1] = 0;
+diff -Nru a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
+--- a/drivers/usb/serial/io_edgeport.c	2004-08-08 07:41:30 -07:00
++++ b/drivers/usb/serial/io_edgeport.c	2004-08-08 07:41:30 -07:00
+@@ -1913,6 +1913,7 @@
+ 
+ 		case TIOCGICOUNT:
+ 			cnow = edge_port->icount;
++			memset(&icount, 0, sizeof(icount));
+ 			icount.cts = cnow.cts;
+ 			icount.dsr = cnow.dsr;
+ 			icount.rng = cnow.rng;
+diff -Nru a/drivers/usb/vicam.c b/drivers/usb/vicam.c
+--- a/drivers/usb/vicam.c	2004-08-08 07:41:30 -07:00
++++ b/drivers/usb/vicam.c	2004-08-08 07:41:30 -07:00
+@@ -481,6 +481,7 @@
+ 			struct video_capability b;
+ 
+ 			DBG("VIDIOCGCAP\n");
++			memset(&b, 0, sizeof(b));
+ 			strcpy(b.name, "ViCam-based Camera");
+ 			b.type = VID_TYPE_CAPTURE;
+ 			b.channels = 1;
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r20.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r21.ebuild
index c23dc9804b00..04c8d3d36ee1 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r20.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r21.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/gentoo-sources/gentoo-sources-2.4.19-r20.ebuild,v 1.2 2004/08/05 19:59:25 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r21.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
 
 IUSE="acpi4linux crypt xfs"
 
@@ -35,7 +35,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV/-r20/-r10}.tar.bz2
+	 http://gentoo.lostlogicx.com/patches-${KV/-r21/-r10}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 KEYWORDS="x86 -ppc -sparc -amd64 -ia64"
 SLOT="${KV}"
@@ -44,7 +44,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/-r20/-r10}
+	cd ${KV/-r21/-r10}
 	# Kill patches we aren't suppposed to use, don't worry about
 	# failures, if they aren't there that is a good thing!
 
@@ -87,5 +87,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.20-CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r23.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r24.ebuild
index fd27333f6880..451c95557887 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r23.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r24.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/gentoo-sources/gentoo-sources-2.4.20-r23.ebuild,v 1.1 2004/08/04 22:06:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r24.ebuild,v 1.1 2004/08/08 18:32:21 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/r23/r14}.tar.bz2
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/r24/r14}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/gentoo-sources-${OKV}-CAN-2004-0415.patch"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
@@ -41,7 +41,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/r23/r14}
+	cd ${WORKDIR}/${KV/r24/r14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if ! use aavm; then
@@ -142,6 +142,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
 	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 ${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!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r15.ebuild
index bc741c2af150..d4a78be21b43 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r14.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r15.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/gentoo-sources/gentoo-sources-2.4.22-r14.ebuild,v 1.1 2004/08/04 22:06:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r15.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
 
 ETYPE="sources"
 
@@ -23,14 +23,15 @@ UNIPATCH_LIST="
 	${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
-	${DISTDIR}/gentoo-sources-${PVR/14/5}.patch.bz2"
+	${DISTDIR}/gentoo-sources-${PVR/15/5}.patch.bz2"
 
 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/14/5}.patch.bz2
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/15/5}.patch.bz2
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 KEYWORDS="x86 -*"
 IUSE=""
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r8.ebuild
index 7633f551141f..699b7c6fb89d 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r8.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/gentoo-sources/gentoo-sources-2.4.25-r7.ebuild,v 1.1 2004/08/04 22:06:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r8.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -19,6 +19,7 @@ UNIPATCH_LIST="
 	${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
 	${DISTDIR}/linux-2.4.26-CAN-2004-0415.patch
 	${DISTDIR}/${P}.patch.bz2"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r8.ebuild
index 0c61ed7934f5..d26a045c3e59 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r8.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/gentoo-sources/gentoo-sources-2.4.26-r7.ebuild,v 1.1 2004/08/04 22:06:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r8.ebuild,v 1.1 2004/08/08 18:32:21 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -11,11 +11,12 @@ IUSE=""
 UNIPATCH_LIST="${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
 	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
-	${DISTDIR}/${PF/r7/r6}.tar.bz2"
+	${DISTDIR}/${PF/r8/r6}.tar.bz2"
 
 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/r7/r6}.tar.bz2
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r8/r6}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"