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

6 files changed, 24 insertions, 10 deletions

diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog
index 6720065fd27c..8653488e4b4c 100644
--- a/sys-kernel/uclinux-sources/ChangeLog
+++ b/sys-kernel/uclinux-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/uclinux-sources
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.15 2004/07/21 10:36:49 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.16 2004/08/05 11:15:48 plasmaroo Exp $
+
+*uclinux-sources-2.6.7_p0-r4 (05 Aug 2004)
+
+  05 Aug 2004; <plasmaroo@gentoo.org> -uclinux-sources-2.4.26_p0-r3.ebuild,
+  +uclinux-sources-2.4.26_p0-r4.ebuild, -uclinux-sources-2.6.7_p0-r3.ebuild,
+  +uclinux-sources-2.6.7_p0-r4.ebuild:
+  Added a patch for the CAN-2004-0415 vulnerability, bug #59378.
 
 *uclinux-sources-2.6.7_p0-r3 (21 Jul 2004)
 
diff --git a/sys-kernel/uclinux-sources/Manifest b/sys-kernel/uclinux-sources/Manifest
index 7123424a9d38..0d657389b26b 100644
--- a/sys-kernel/uclinux-sources/Manifest
+++ b/sys-kernel/uclinux-sources/Manifest
@@ -1,14 +1,14 @@
-MD5 69fed18907ed937c2f873c3a59a56fa8 ChangeLog 4150
-MD5 0e9d3aaad072e469b66534950b500f67 uclinux-sources-2.4.26_p0-r3.ebuild 1725
+MD5 b33499234effdfb0784938f7c317c94f ChangeLog 4452
 MD5 f3fa6c474b8727f8215534b7fc9c93ba metadata.xml 304
-MD5 1b6a9a3cb3e11d68e83c8a140c9c7b75 uclinux-sources-2.6.7_p0-r3.ebuild 1679
+MD5 6e97f5b833e09b11f7b418c44388095f uclinux-sources-2.4.26_p0-r4.ebuild 1928
+MD5 1f5de08f653a9c02ad677bb808cd67c3 uclinux-sources-2.6.7_p0-r4.ebuild 1875
 MD5 dc18e982f8149588a291956481885a8c files/uclinux-sources-2.4.26_p0.CAN-2004-0495.patch 17549
-MD5 62306f42a51f255b1d9cd1597cefa926 files/digest-uclinux-sources-2.4.26_p0-r3 139
 MD5 d4a740ae56c2049247083af387a22a85 files/uclinux-sources-2.4.26_p0.CAN-2004-0394.patch 350
-MD5 51b7d703355037eac400cf789769f9c7 files/digest-uclinux-sources-2.6.7_p0-r3 135
 MD5 0f66013f643c79c97fda489618a4e2fd files/uclinux-sources-2.4.26_p0.CAN-2004-0535.patch 476
 MD5 95708646470a95668e8789cd415844ed files/uclinux-sources.CAN-2004-0497.patch 846
+MD5 68a561b1216380268e96d2fcea905cd2 files/digest-uclinux-sources-2.4.26_p0-r4 225
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch 354
 MD5 39361f8d16b1fe5891aab62e92f8cd30 files/uclinux-sources-2.6.IPTables-RDoS.patch 390
 MD5 b738cb0120a32aa92cfcfdbd564dd21f files/uclinux-sources-2.6.ProcPerms.patch 1368
 MD5 8204afea1d572b49a4a80d8da4eef0c9 files/uclinux-sources-2.6.CAN-2004-0596.patch 1033
+MD5 c72fc64f2fd878daf2c62d998239c803 files/digest-uclinux-sources-2.6.7_p0-r4 211
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r3 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r4
index 130b229c980e..756581fa999d 100644
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r3
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r4
@@ -1,2 +1,3 @@
 MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
 MD5 8c2a75543abe268ff71d59c85b7607ac uClinux-2.4.26-uc0.diff.gz 4062854
+MD5 dd070e146fc1938fef307386976eb87e uclinux-sources-2.4.26-CAN-2004-0415.patch 90160
diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r3 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r4
index a0d14dcb41a9..2f8ad3b4942c 100644
--- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r3
+++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.7_p0-r4
@@ -1,2 +1,3 @@
 MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
 MD5 9f8265eee2179199a81e0a00268eb1a6 linux-2.6.7-uc0.patch.gz 184811
+MD5 52996b643afbd6ed9ba38b9483c2cac3 linux-2.6.7-CAN-2004-0415.patch 112612
diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r3.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r4.ebuild
index 2620c467454c..1e256cdecad8 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r3.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r4.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r3.ebuild,v 1.1 2004/07/09 16:25:39 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r4.ebuild,v 1.1 2004/08/05 11:15:48 plasmaroo Exp $
 
 IUSE=""
 
 ETYPE="sources"
 inherit kernel eutils
 OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
+POV="${PN}-${OKV}"
 
 EXTRAVERSION="uc${PV/*_p/}"
 [ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
@@ -27,7 +28,8 @@ MY_P=linux-${PV/_p/-uc}
 S=${WORKDIR}/linux-${KV}
 DESCRIPTION="uCLinux kernel patches for CPUs without MMUs"
 SRC_URI="mirror://kernel/v${MMV}/linux-${OKV}.tar.bz2
-	http://www.uclinux.org/pub/uClinux/uClinux-${MMV}.x/${MY_P/linux/${base}}.${patch}.gz"
+	http://www.uclinux.org/pub/uClinux/uClinux-${MMV}.x/${MY_P/linux/${base}}.${patch}.gz
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${POV}-CAN-2004-0415.patch"
 
 HOMEPAGE="http://www.uclinux.org/"
 KEYWORDS="~x86 -ppc"
@@ -45,6 +47,7 @@ src_unpack() {
 	rm ../${MY_P/linux/${base}}.${patch}
 
 	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${DISTDIR}/${POV}-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/uclinux-sources/uclinux-sources-2.6.7_p0-r3.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild
index 33acd9c29bb2..e5c1a7aea97c 100644
--- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r3.ebuild
+++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-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/uclinux-sources/uclinux-sources-2.6.7_p0-r3.ebuild,v 1.1 2004/07/21 10:36:49 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.7_p0-r4.ebuild,v 1.1 2004/08/05 11:15:48 plasmaroo Exp $
 
 IUSE=""
 
@@ -27,7 +27,8 @@ MY_P=linux-${PV/_p/-uc}
 S=${WORKDIR}/linux-${KV}
 DESCRIPTION="uCLinux kernel patches for CPUs without MMUs"
 SRC_URI="mirror://kernel/v${MMV}/linux-${OKV}.tar.bz2
-	http://www.uclinux.org/pub/uClinux/uClinux-${MMV}.x/${MY_P/linux/${base}}.${patch}.gz"
+	http://www.uclinux.org/pub/uClinux/uClinux-${MMV}.x/${MY_P/linux/${base}}.${patch}.gz
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 
 HOMEPAGE="http://www.uclinux.org/"
 KEYWORDS="~x86 -ppc"
@@ -39,6 +40,7 @@ src_unpack() {
 
 	cd linux-${KV}
 	epatch ../${MY_P/linux/${base}}.${patch} || die "Failed to apply uClinux patch!"
+	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch || die "Failed to apply the CAN-2004-0596 security patch!"
 	epatch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch || die "Failed to apply the IPTables RDoS security patch!"