Added a patch for the CAN-2004-0415 vulnerability, bug #59378.

6 files changed, 23 insertions, 10 deletions

diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index 37d478d42209..e54c9122d5ea 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.30 2004/07/21 10:46:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.31 2004/08/05 12:03:02 plasmaroo Exp $
+
+*win4lin-sources-2.6.7-r4 (05 Aug 2004)
+
+  05 Aug 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.4.26-r3.ebuild,
+  +win4lin-sources-2.4.26-r4.ebuild, -win4lin-sources-2.6.7-r3.ebuild,
+  +win4lin-sources-2.6.7-r4.ebuild:
+  Added a patch for the CAN-2004-0415 vulnerability, bug #59378.
 
 *win4lin-sources-2.6.7-r3 (21 Jul 2004)
 
diff --git a/sys-kernel/win4lin-sources/Manifest b/sys-kernel/win4lin-sources/Manifest
index c7023749ab1d..cacfe0a0ed78 100644
--- a/sys-kernel/win4lin-sources/Manifest
+++ b/sys-kernel/win4lin-sources/Manifest
@@ -1,15 +1,15 @@
-MD5 6436f450419fb03d103ed61f7a5812a4 ChangeLog 6176
-MD5 cc7eec915f8e336912ab7478c9fe2980 win4lin-sources-2.4.26-r3.ebuild 1668
+MD5 59847d812b9014bcb487a22c48ac860a ChangeLog 6463
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 5348ab6cf44e5f78acdb7a27ff894349 win4lin-sources-2.6.7-r3.ebuild 1262
+MD5 6719196cf3b19ffde8fe32cf648ea30c win4lin-sources-2.6.7-r4.ebuild 1403
+MD5 f7218c783a8550ab7bb6fafd28ec5598 win4lin-sources-2.4.26-r4.ebuild 1865
 MD5 8204afea1d572b49a4a80d8da4eef0c9 files/win4lin-sources-2.6.CAN-2004-0596.patch 1033
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/win4lin-sources-2.4.26.FPULockup-53804.patch 354
-MD5 1592ee7b259c548cb746b366348c8db0 files/digest-win4lin-sources-2.4.26-r3 201
+MD5 57a8c410c25a71c974158ab331b65640 files/digest-win4lin-sources-2.4.26-r4 277
+MD5 6d3c92f001f307906b42c86de91d8fd0 files/digest-win4lin-sources-2.6.7-r4 283
 MD5 dc18e982f8149588a291956481885a8c files/win4lin-sources-2.4.26.CAN-2004-0495.patch 17549
 MD5 39361f8d16b1fe5891aab62e92f8cd30 files/win4lin-sources-2.6.IPTables-RDoS.patch 390
 MD5 d4a740ae56c2049247083af387a22a85 files/win4lin-sources-2.4.26.CAN-2004-0394.patch 350
 MD5 02c062ec3a11a6a1498cdf0b1716c90a files/win4lin-sources-2.6.6.FPULockup-53804.patch 895
-MD5 1e8874b17fc26f97caa7c1b287a22768 files/digest-win4lin-sources-2.6.7-r3 207
 MD5 0f66013f643c79c97fda489618a4e2fd files/win4lin-sources-2.4.26.CAN-2004-0535.patch 476
 MD5 95708646470a95668e8789cd415844ed files/win4lin-sources.CAN-2004-0497.patch 846
 MD5 b738cb0120a32aa92cfcfdbd564dd21f files/win4lin-sources-2.6.ProcPerms.patch 1368
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r3 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r4
index dcbdbe419bbc..2c48322d68cd 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r3
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r4
@@ -1,3 +1,4 @@
 MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
 MD5 32e4cda45fa0f090dffa157bc4504a4e mki-adapter.patch 181483
 MD5 e9bc95992e489a3f54aabef100e13fcf Kernel-Win4Lin3-2.4.26.patch 23600
+MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r3 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r4
index e3ba3bbce50d..bb24ec457f28 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r3
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r4
@@ -1,3 +1,4 @@
 MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
 MD5 45347c8bd1a1c791e9a12d1e09162f33 mki-adapter26_1_3_6.patch 127032
 MD5 e5b7ca075f0281509442913cbd09ca26 Kernel-Win4Lin3-2.6.7.patch 26620
+MD5 52996b643afbd6ed9ba38b9483c2cac3 linux-2.6.7-CAN-2004-0415.patch 112612
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r3.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r4.ebuild
index 066ad64c4aa1..a3d00866ed24 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r3.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r4.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/win4lin-sources/win4lin-sources-2.4.26-r3.ebuild,v 1.1 2004/07/09 17:45:30 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r4.ebuild,v 1.1 2004/08/05 12:03:02 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -16,7 +16,8 @@ S=${WORKDIR}/linux-${KV}
 DESCRIPTION="Full sources for the Linux kernel, with Win4Lin support."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://www.netraverse.com/member/downloads/files/mki-adapter.patch
-	 http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch"
+	 http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/"
 KEYWORDS="x86"
 SLOT="${KV}"
@@ -31,6 +32,7 @@ src_unpack() {
 	patch -Np1 -i ${DISTDIR}/mki-adapter.patch >/dev/null 2>&1 || die "Error: mki-adapter patch failed."
 	eend $?
 	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
 	epatch ${FILESDIR}/${P}.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}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r3.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r4.ebuild
index c5837f72e23f..761ec8a4a2d8 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r3.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r4.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/win4lin-sources/win4lin-sources-2.6.7-r3.ebuild,v 1.1 2004/07/21 10:46:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r4.ebuild,v 1.1 2004/08/05 12:03:02 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -10,6 +10,7 @@ MKI_VERSION='1_3_6'
 UNIPATCH_LIST="
 	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch
 	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
+	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
 	${FILESDIR}/${PN}.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch
 	${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch
@@ -20,7 +21,8 @@ S=${WORKDIR}/linux-${KV}
 DESCRIPTION="Full sources for the 2.6 of the Linux kernel with the Win4Lin patches"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
 	http://www.netraverse.com/member/downloads/files/mki-adapter26_${MKI_VERSION}.patch
-	http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch"
+	http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 KEYWORDS="x86 -*"
 SLOT="${KV}"