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

5 files changed, 98 insertions, 7 deletions

diff --git a/sys-kernel/alpha-sources/ChangeLog b/sys-kernel/alpha-sources/ChangeLog
index f728cbacc3f6..dad6ccf54f87 100644
--- a/sys-kernel/alpha-sources/ChangeLog
+++ b/sys-kernel/alpha-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/alpha-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.31 2004/08/04 20:51:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/ChangeLog,v 1.32 2004/08/08 15:32:20 plasmaroo Exp $
+
+*alpha-sources-2.4.21-r11 (08 Aug 2004)
+
+  08 Aug 2004; <plasmaroo@gentoo.org> -alpha-sources-2.4.21-r10.ebuild,
+  +alpha-sources-2.4.21-r11.ebuild, +files/alpha-sources.CAN-2004-0685.patch:
+  Version bump for CAN-2004-0685, bug #57886.
 
 *alpha-sources-2.4.21-r10 (04 Aug 2004)
 
diff --git a/sys-kernel/alpha-sources/Manifest b/sys-kernel/alpha-sources/Manifest
index c326c741186d..c38b17b64baa 100644
--- a/sys-kernel/alpha-sources/Manifest
+++ b/sys-kernel/alpha-sources/Manifest
@@ -1,7 +1,6 @@
-MD5 e54658ae6f603573331f53a6d6c9534e ChangeLog 5562
-MD5 6082d96aa8a80f0a4e66448ca2afc1b8 alpha-sources-2.4.21-r10.ebuild 3987
+MD5 4f48c74e703b7b1a7686f060aebfd3b2 ChangeLog 5800
+MD5 5489f8eb12a0c346f40c5759b22abe8c alpha-sources-2.4.21-r11.ebuild 4081
 MD5 5bf9836a632a861728d33f9736bb7431 files/alpha-sources.CAN-2004-0133.patch 427
-MD5 323e19d6d35ebd2e9300669e0a7bad6b files/digest-alpha-sources-2.4.21-r10 220
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/alpha-sources.CAN-2004-0427.patch 460
 MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/alpha-sources.CAN-2004-0075.patch 634
 MD5 d4a740ae56c2049247083af387a22a85 files/alpha-sources.CAN-2004-0394.patch 350
@@ -10,7 +9,9 @@ MD5 dc18e982f8149588a291956481885a8c files/alpha-sources.CAN-2004-0495.patch 175
 MD5 df40eece807d039cba79f477e80ebda2 files/alpha-sources-2.4.19.rtc_fix.patch 4974
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/alpha-sources.rtc_fix.patch 6769
 MD5 174438d215b70cad5ffb00ca8123c062 files/alpha-sources.munmap.patch 837
+MD5 60d25ff310fc6abfdce39ec9e47345af files/alpha-sources.CAN-2004-0685.patch 2809
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/alpha-sources.CAN-2004-0497.patch 707
+MD5 323e19d6d35ebd2e9300669e0a7bad6b files/digest-alpha-sources-2.4.21-r11 220
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/alpha-sources.CAN-2003-0985.patch 414
 MD5 de75cfa969ed092578d9ddda6c5be334 files/alpha-sources.CAN-2004-0181.patch 1233
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/alpha-sources.CAN-2004-0177.patch 384
diff --git a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r10.ebuild b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r11.ebuild
index 6aa3ca3cd914..7c3700d00157 100644
--- a/sys-kernel/alpha-sources/alpha-sources-2.4.21-r10.ebuild
+++ b/sys-kernel/alpha-sources/alpha-sources-2.4.21-r11.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/alpha-sources/alpha-sources-2.4.21-r10.ebuild,v 1.1 2004/08/04 20:51:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/alpha-sources/alpha-sources-2.4.21-r11.ebuild,v 1.1 2004/08/08 15:32:20 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -16,7 +16,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Linux Alpha kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	mirror://gentoo/patches-${KV/10/3}.tar.bz2
+	mirror://gentoo/patches-${KV/11/3}.tar.bz2
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 SLOT="${KV}"
 KEYWORDS="alpha -sparc -x86 -ppc -hppa -mips"
@@ -24,7 +24,7 @@ KEYWORDS="alpha -sparc -x86 -ppc -hppa -mips"
 src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
-	cd ${WORKDIR}/${KV/10/1}
+	cd ${WORKDIR}/${KV/11/1}
 
 	# This is the crypt USE flag, keeps {USAGI/superfreeswan/patch-int/loop-jari}
 	if ! use crypt; then
@@ -73,6 +73,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}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 	epatch ${FILESDIR}/${PN}.munmap.patch || die "Failed to apply munmap patch!"
 
diff --git a/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0685.patch b/sys-kernel/alpha-sources/files/alpha-sources.CAN-2004-0685.patch
new file mode 100644
index 000000000000..d1be834cc8a5
--- /dev/null
+++ b/sys-kernel/alpha-sources/files/alpha-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/alpha-sources/files/digest-alpha-sources-2.4.21-r10 b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r11
index 363cacc1766b..363cacc1766b 100644
--- a/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r10
+++ b/sys-kernel/alpha-sources/files/digest-alpha-sources-2.4.21-r11