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

5 files changed, 103 insertions, 11 deletions

diff --git a/sys-kernel/xbox-sources/ChangeLog b/sys-kernel/xbox-sources/ChangeLog
index 7e01a1724d34..2607773ce548 100644
--- a/sys-kernel/xbox-sources/ChangeLog
+++ b/sys-kernel/xbox-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/xbox-sources
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/ChangeLog,v 1.7 2004/08/05 12:17:09 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/ChangeLog,v 1.8 2004/08/08 21:13:54 plasmaroo Exp $
+
+*xbox-sources-2.4.26-r5 (08 Aug 2004)
+
+  08 Aug 2004; <plasmaroo@gentoo.org> -xbox-sources-2.4.26-r4.ebuild,
+  +xbox-sources-2.4.26-r5.ebuild,
+  +files/xbox-sources-2.4.26.CAN-2004-0685.patch:
+  Version bump for CAN-2004-0685, bug #59769.
 
 *xbox-sources-2.4.26-r4 (05 Aug 2004)
 
diff --git a/sys-kernel/xbox-sources/Manifest b/sys-kernel/xbox-sources/Manifest
index 06662f7968f6..35bc22201f2a 100644
--- a/sys-kernel/xbox-sources/Manifest
+++ b/sys-kernel/xbox-sources/Manifest
@@ -1,14 +1,15 @@
-MD5 597742758f2df6c4e7ea9cbc69ce7bbb ChangeLog 2070
+MD5 79a8a23642910b6e4959f2def0e9aa7a ChangeLog 2310
 MD5 c2a56d354398d9255422286f7af425ee metadata.xml 351
+MD5 1e67fe0305966de6cb20c916e490907b xbox-sources-2.4.26-r5.ebuild 988
 MD5 1bb55ecc1fffc30ace153f9d39e7361e xbox-sources-2.6.7-r4.ebuild 1062
-MD5 4b9a159dbb488169de041fc3e36e36e8 xbox-sources-2.4.26-r4.ebuild 950
-MD5 39361f8d16b1fe5891aab62e92f8cd30 files/xbox-sources.IPTables-RDoS.patch 390
+MD5 fe1bb5109f7249a5b2bc3355252af40b files/digest-xbox-sources-2.4.26-r5 220
 MD5 95708646470a95668e8789cd415844ed files/xbox-sources.CAN-2004-0497.patch 846
-MD5 b738cb0120a32aa92cfcfdbd564dd21f files/xbox-sources.ProcPerms.patch 1368
-MD5 d4a740ae56c2049247083af387a22a85 files/xbox-sources-2.4.26.CAN-2004-0394.patch 350
 MD5 dc18e982f8149588a291956481885a8c files/xbox-sources-2.4.26.CAN-2004-0495.patch 17549
+MD5 e8473a36d7996787f7df82f8f9468b73 files/digest-xbox-sources-2.6.7-r4 221
+MD5 8204afea1d572b49a4a80d8da4eef0c9 files/xbox-sources-2.6.7.CAN-2004-0596.patch 1033
+MD5 b738cb0120a32aa92cfcfdbd564dd21f files/xbox-sources.ProcPerms.patch 1368
+MD5 60d25ff310fc6abfdce39ec9e47345af files/xbox-sources-2.4.26.CAN-2004-0685.patch 2809
+MD5 39361f8d16b1fe5891aab62e92f8cd30 files/xbox-sources.IPTables-RDoS.patch 390
 MD5 0f66013f643c79c97fda489618a4e2fd files/xbox-sources-2.4.26.CAN-2004-0535.patch 476
+MD5 d4a740ae56c2049247083af387a22a85 files/xbox-sources-2.4.26.CAN-2004-0394.patch 350
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/xbox-sources-2.4.26.FPULockup-53804.patch 354
-MD5 8204afea1d572b49a4a80d8da4eef0c9 files/xbox-sources-2.6.7.CAN-2004-0596.patch 1033
-MD5 fe1bb5109f7249a5b2bc3355252af40b files/digest-xbox-sources-2.4.26-r4 220
-MD5 e8473a36d7996787f7df82f8f9468b73 files/digest-xbox-sources-2.6.7-r4 221
diff --git a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.26-r4 b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.26-r5
index d21bf34991a3..d21bf34991a3 100644
--- a/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.26-r4
+++ b/sys-kernel/xbox-sources/files/digest-xbox-sources-2.4.26-r5
diff --git a/sys-kernel/xbox-sources/files/xbox-sources-2.4.26.CAN-2004-0685.patch b/sys-kernel/xbox-sources/files/xbox-sources-2.4.26.CAN-2004-0685.patch
new file mode 100644
index 000000000000..d1be834cc8a5
--- /dev/null
+++ b/sys-kernel/xbox-sources/files/xbox-sources-2.4.26.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/xbox-sources/xbox-sources-2.4.26-r4.ebuild b/sys-kernel/xbox-sources/xbox-sources-2.4.26-r5.ebuild
index 8fcd8e74e518..2f3b3bc76afe 100644
--- a/sys-kernel/xbox-sources/xbox-sources-2.4.26-r4.ebuild
+++ b/sys-kernel/xbox-sources/xbox-sources-2.4.26-r5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.4.26-r4.ebuild,v 1.1 2004/08/05 12:17:09 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xbox-sources/xbox-sources-2.4.26-r5.ebuild,v 1.1 2004/08/08 21:13:54 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
 detect_version
 
-XBOX_PATCH="xbox-sources-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-${PR/r4/r3}.patch.bz2"
+XBOX_PATCH="xbox-sources-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-${PR/r5/r3}.patch.bz2"
 
 SRC_URI="${KERNEL_URI}
 	mirror://gentoo/${XBOX_PATCH}
@@ -23,4 +23,5 @@ UNIPATCH_LIST="
 	${FILESDIR}/${P}.CAN-2004-0495.patch
 	${FILESDIR}/${PN}.CAN-2004-0497.patch
 	${FILESDIR}/${P}.CAN-2004-0535.patch
+	${FILESDIR}/${P}.CAN-2004-0685.patch
 	${FILESDIR}/${P}.FPULockup-53804.patch"