diff options
Diffstat (limited to 'sys-kernel/wolk-sources')
-rw-r--r-- | sys-kernel/wolk-sources/ChangeLog | 11 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/Manifest | 16 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r9 (renamed from sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r8) | 0 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r6 (renamed from sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r5) | 0 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r13 (renamed from sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r12) | 0 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/wolk-sources-4.9s.CAN-2004-0685.patch | 83 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0685.patch | 83 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/wolk-sources-4.11-r9.ebuild (renamed from sys-kernel/wolk-sources/wolk-sources-4.11-r8.ebuild) | 3 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/wolk-sources-4.14-r6.ebuild (renamed from sys-kernel/wolk-sources/wolk-sources-4.14-r5.ebuild) | 3 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/wolk-sources-4.9-r13.ebuild (renamed from sys-kernel/wolk-sources/wolk-sources-4.9-r12.ebuild) | 5 |
10 files changed, 192 insertions, 12 deletions
diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog index f070d5fe6eea..bb4f9921876f 100644 --- a/sys-kernel/wolk-sources/ChangeLog +++ b/sys-kernel/wolk-sources/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-kernel/wolk-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.54 2004/08/05 13:58:58 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.55 2004/08/08 22:28:58 plasmaroo Exp $ + +*wolk-sources-4.9-r13 (08 Aug 2004) + + 08 Aug 2004; <plasmaroo@gentoo.org> -wolk-sources-4.11-r8.ebuild, + +wolk-sources-4.11-r9.ebuild, -wolk-sources-4.14-r5.ebuild, + +wolk-sources-4.14-r6.ebuild, -wolk-sources-4.9-r12.ebuild, + +wolk-sources-4.9-r13.ebuild, +files/wolk-sources-4.9s.CAN-2004-0685.patch, + +files/wolk-sources.CAN-2004-0685.patch: + Version bump for CAN-2004-0685, bug #59769. *wolk-sources-4.14-r5 (05 Aug 2004) diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest index b5e830290ca3..a458addf1f38 100644 --- a/sys-kernel/wolk-sources/Manifest +++ b/sys-kernel/wolk-sources/Manifest @@ -1,13 +1,12 @@ -MD5 03bd16af0f50f62debf6717911aebb9b ChangeLog 17262 +MD5 37342c87d42387d7bdeadfc0e998c0c4 ChangeLog 17659 +MD5 4eb93fc85d77756d517d91ac85a4cd67 wolk-sources-4.11-r9.ebuild 2748 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226 -MD5 e655c4e161b42c14883e9ec723c004b5 wolk-sources-4.9-r12.ebuild 5684 -MD5 4267f39f8a35a900a32bea8a8a61306c wolk-sources-4.11-r8.ebuild 2654 -MD5 19742ad3b3d401f7e50e1c05c35af771 wolk-sources-4.14-r5.ebuild 2224 +MD5 6cd03e46450214a601dc74ff35021055 wolk-sources-4.14-r6.ebuild 2263 +MD5 f493a32fb5f85f23b93fa901bda24098 wolk-sources-4.9-r13.ebuild 5783 MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476 MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635 MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065 MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424 -MD5 49b8fb6de609dcc985711120dfa0a509 files/digest-wolk-sources-4.9-r12 1400 MD5 21f3a4f186017d925067335e24db36a1 files/wolk-sources.CAN-2004-0109.patch 1877 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531 MD5 5bf9836a632a861728d33f9736bb7431 files/wolk-sources.CAN-2004-0133.patch 427 @@ -15,14 +14,17 @@ MD5 c9da1bc82b906f6abc648c056e7bf662 files/wolk-sources.FPULockup-53804.patch 35 MD5 dc18e982f8149588a291956481885a8c files/wolk-sources.CAN-2004-0495.patch 17549 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/wolk-sources.CAN-2004-0427.patch 460 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707 -MD5 823898399dbfae0de1c72688bc80a9f1 files/digest-wolk-sources-4.11-r8 312 MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350 +MD5 823898399dbfae0de1c72688bc80a9f1 files/digest-wolk-sources-4.11-r9 312 MD5 528da73c9e4a6fb017561e51dc0ab815 files/wolk-sources.CAN-2003-0643.patch 747 MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777 MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233 +MD5 60d25ff310fc6abfdce39ec9e47345af files/wolk-sources.CAN-2004-0685.patch 2809 MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893 +MD5 78191bfb63fdfd2714e57a8d3fb746c1 files/digest-wolk-sources-4.14-r6 168 MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414 -MD5 78191bfb63fdfd2714e57a8d3fb746c1 files/digest-wolk-sources-4.14-r5 168 +MD5 92f1b3aa68de326081b75653a77d64cf files/wolk-sources-4.9s.CAN-2004-0685.patch 2881 +MD5 49b8fb6de609dcc985711120dfa0a509 files/digest-wolk-sources-4.9-r13 1400 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/wolk-sources.CAN-2004-0177.patch 384 MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r8 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r9 index efedb836a1f8..efedb836a1f8 100644 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r8 +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r9 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r5 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r6 index bca87b6da2e8..bca87b6da2e8 100644 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r5 +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r6 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r12 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r13 index a34da13edabb..a34da13edabb 100644 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r12 +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r13 diff --git a/sys-kernel/wolk-sources/files/wolk-sources-4.9s.CAN-2004-0685.patch b/sys-kernel/wolk-sources/files/wolk-sources-4.9s.CAN-2004-0685.patch new file mode 100644 index 000000000000..77808162b2fb --- /dev/null +++ b/sys-kernel/wolk-sources/files/wolk-sources-4.9s.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/wolk-sources/files/wolk-sources.CAN-2004-0685.patch b/sys-kernel/wolk-sources/files/wolk-sources.CAN-2004-0685.patch new file mode 100644 index 000000000000..d1be834cc8a5 --- /dev/null +++ b/sys-kernel/wolk-sources/files/wolk-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/wolk-sources/wolk-sources-4.11-r8.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.11-r9.ebuild index 7fa5b5873e67..1684af335d49 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.11-r8.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.11-r9.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/wolk-sources/wolk-sources-4.11-r8.ebuild,v 1.1 2004/08/05 13:58:58 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r9.ebuild,v 1.1 2004/08/08 22:28:58 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -45,6 +45,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!" kernel_universal_unpack } diff --git a/sys-kernel/wolk-sources/wolk-sources-4.14-r5.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.14-r6.ebuild index fc3fc3503fd8..d773bbf83538 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.14-r5.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.14-r6.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/wolk-sources/wolk-sources-4.14-r5.ebuild,v 1.1 2004/08/05 13:58:58 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r6.ebuild,v 1.1 2004/08/08 22:28:58 plasmaroo Exp $ OKV="2.4.20" OKB="2.4" @@ -34,6 +34,7 @@ UNIPATCH_LIST=" ${FILESDIR}/${PN}.CAN-2004-0495.patch ${FILESDIR}/${PN}.CAN-2004-0497.patch ${FILESDIR}/${PN}.CAN-2004-0535.patch + ${FILESDIR}/${PN}.CAN-2004-0685.patch ${FILESDIR}/${PN}.FPULockup-53804.patch" #============================================================================ diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r12.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r13.ebuild index 4c5eb1110386..e9b2507222bc 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.9-r12.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r13.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/wolk-sources/wolk-sources-4.9-r12.ebuild,v 1.1 2004/08/05 13:58:58 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r13.ebuild,v 1.1 2004/08/08 22:28:58 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -90,7 +90,8 @@ 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}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" + epatch ${FILESDIR}/${PN}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!" + epatch ${FILESDIR}/${PN}-4.9s.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" kernel_universal_unpack } |