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

5 files changed, 98 insertions, 7 deletions

diff --git a/sys-kernel/gs-sources/ChangeLog b/sys-kernel/gs-sources/ChangeLog
index 386a29438fd4..d782e3103d4d 100644
--- a/sys-kernel/gs-sources/ChangeLog
+++ b/sys-kernel/gs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/gs-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.48 2004/08/04 22:21:24 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.49 2004/08/08 18:47:27 plasmaroo Exp $
+
+*gs-sources-2.4.25_pre7-r10 (08 Aug 2004)
+
+  08 Aug 2004; <plasmaroo@gentoo.org> +gs-sources-2.4.25_pre7-r10.ebuild,
+  -gs-sources-2.4.25_pre7-r9.ebuild, +files/gs-sources.CAN-2004-0685.patch:
+  Version bump for CAN-2004-0685, bug #59769.
 
 *gs-sources-2.4.25_pre7-r9 (04 Aug 2004)
 
diff --git a/sys-kernel/gs-sources/Manifest b/sys-kernel/gs-sources/Manifest
index 415e27453e7d..a19845aff8a4 100644
--- a/sys-kernel/gs-sources/Manifest
+++ b/sys-kernel/gs-sources/Manifest
@@ -1,10 +1,11 @@
-MD5 ed56da3a1a4cef197c878d0e74abef17 ChangeLog 9112
+MD5 f087478c39f62d6914a83e64fa3d0865 ChangeLog 9352
 MD5 4df72e65b139d3e4c18bec81f3a561df metadata.xml 227
-MD5 0c55a2e6522382e14381c860a169086f gs-sources-2.4.25_pre7-r9.ebuild 3366
+MD5 f3f8ac3914ac60e0ac53a8e780a9e933 gs-sources-2.4.25_pre7-r10.ebuild 3463
 MD5 517fc1b71501382d041ce0bdfe304511 files/00_3.5-useraddress.patch 7247
 MD5 21f3a4f186017d925067335e24db36a1 files/gs-sources.CAN-2004-0109.patch 1877
 MD5 174438d215b70cad5ffb00ca8123c062 files/gs-sources.munmap.patch 837
 MD5 d4a740ae56c2049247083af387a22a85 files/gs-sources.CAN-2004-0394.patch 350
+MD5 60d25ff310fc6abfdce39ec9e47345af files/gs-sources.CAN-2004-0685.patch 2809
 MD5 0f66013f643c79c97fda489618a4e2fd files/gs-sources.CAN-2004-0535.patch 476
 MD5 de75cfa969ed092578d9ddda6c5be334 files/gs-sources.CAN-2004-0181.patch 1233
 MD5 dc18e982f8149588a291956481885a8c files/gs-sources.CAN-2004-0495.patch 17549
@@ -13,8 +14,8 @@ MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/gs-sources.CAN-2004-0497.patch 707
 MD5 a3ec1083055b245758b2262dd2245145 files/pci.ids.patch 3376
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gs-sources.CAN-2003-0985.patch 414
 MD5 5bf9836a632a861728d33f9736bb7431 files/gs-sources.CAN-2004-0133.patch 427
+MD5 351ec4910935b0191a59117f1ecfa561 files/digest-gs-sources-2.4.25_pre7-r10 223
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gs-sources.CAN-2004-0427.patch 460
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/gs-sources.CAN-2004-0178.patch 424
-MD5 351ec4910935b0191a59117f1ecfa561 files/digest-gs-sources-2.4.25_pre7-r9 223
 MD5 b1a5808ce9f7266bcca1f8de769ac9ac files/gs-sources.MKI.CompileFix.patch 445
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/gs-sources.FPULockup-53804.patch 354
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r9 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r10
index 6e0a8e42bbb2..6e0a8e42bbb2 100644
--- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r9
+++ b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r10
diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0685.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0685.patch
new file mode 100644
index 000000000000..d1be834cc8a5
--- /dev/null
+++ b/sys-kernel/gs-sources/files/gs-sources.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/gs-sources/gs-sources-2.4.25_pre7-r9.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r10.ebuild
index 00a933a2cb41..514970868063 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r9.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r10.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/gs-sources/gs-sources-2.4.25_pre7-r9.ebuild,v 1.1 2004/08/04 22:21:24 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r10.ebuild,v 1.1 2004/08/08 18:47:27 plasmaroo Exp $
 
 IUSE="crypt"
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/linux-${KV}
 DESCRIPTION="This kernel stays up to date with current kernel -pre's, with recent ACPI,
 	EVMS, Win4Lin, aic79xx, Super FreeS/WAN, preempt, and various hardware fixes."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV/r9/r1}.tar.bz2
+	 mirror://gentoo/patches-${KV/r10/r1}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.26-CAN-2004-0415.patch"
 KEYWORDS="x86 -ppc -sparc"
 SLOT="${KV}"
@@ -38,7 +38,7 @@ SLOT="${KV}"
 src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
-	cd ${KV/r9/r1} || die
+	cd ${KV/r10/r1} || die
 	# Kill patches we aren't suppposed to use, don't worry about
 	# failures, if they aren't there that is a good thing!
 	# This is the ratified crypt USE flag, enables IPSEC and patch-int
@@ -65,6 +65,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
 	epatch ${FILESDIR}/${PN}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 	epatch ${FILESDIR}/${PN}.MKI.CompileFix.patch || die "Failed to apply MKI compilefix patch!"
 }