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

8 files changed, 40 insertions, 16 deletions

diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 6794c3522ff6..637da2aae31c 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.43 2004/07/21 22:24:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.44 2004/08/05 11:41:32 plasmaroo Exp $
+
+*usermode-sources-2.4.24-r7 (05 Aug 2004)
+
+  05 Aug 2004; <plasmaroo@gentoo.org> -usermode-sources-2.4.24-r6.ebuild,
+  +usermode-sources-2.4.24-r7.ebuild, -usermode-sources-2.4.26-r3.ebuild,
+  +usermode-sources-2.4.26-r4.ebuild, -usermode-sources-2.6.6-r4.ebuild,
+  +usermode-sources-2.6.6-r5.ebuild:
+  Added a patch for the CAN-2004-0415 vulnerability, bug #59378.
 
   21 Jul 2004; <plasmaroo@gentoo.org> usermode-sources-2.6.6-r4.ebuild,
   +files/usermode-sources-2.6.6.CAN-2004-0495-0496.patch:
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index a4338b928d40..62d7f92c4396 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,25 +1,25 @@
-MD5 4a607173b3142b8dbe18a0913ddd6bfe ChangeLog 10601
-MD5 f02cf5f0a00762d227f7c913b0a41a5a usermode-sources-2.4.26-r3.ebuild 1958
-MD5 ec937ee516ab651055687bcaa75a67eb usermode-sources-2.4.24-r6.ebuild 2699
+MD5 1b3824eb37b19ed1597942adc991c622 ChangeLog 10968
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
-MD5 36facddf2f15a1dbffcfffccf95cd8fa usermode-sources-2.6.6-r4.ebuild 1039
+MD5 2e74564a212b1725a9bc305b1ea5f83a usermode-sources-2.6.6-r5.ebuild 1186
+MD5 d3c64053714dfb2cab801359503ffa20 usermode-sources-2.4.24-r7.ebuild 2896
+MD5 2009b6ed4620090db124b800ddb56660 usermode-sources-2.4.26-r4.ebuild 2168
 MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/usermode-sources-2.4.24.CAN-2004-0075.patch 634
 MD5 174438d215b70cad5ffb00ca8123c062 files/usermode-sources-2.4.24.munmap.patch 837
-MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r6 134
-MD5 288e26eaaaf3c35f214951caa52754ab files/digest-usermode-sources-2.6.6-r4 132
 MD5 02c062ec3a11a6a1498cdf0b1716c90a files/usermode-sources-2.6.6.FPULockup-53804.patch 895
 MD5 eb70acb35ba13daa4b1fda53cb61fc01 files/usermode-sources-2.6.6.CAN-2004-0495-0496.patch 23861
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/usermode-sources-2.4.24.CAN-2004-0427.patch 460
 MD5 147fec50180ad91b6260fc7201dcb90f files/usermode-sources-2.4.24.CAN-2004-0010.patch 6050
 MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
-MD5 df8bd0d5ef39221c9dec36a99223c690 files/digest-usermode-sources-2.4.26-r3 134
 MD5 8204afea1d572b49a4a80d8da4eef0c9 files/usermode-sources-2.6.CAN-2004-0596.patch 1033
 MD5 de75cfa969ed092578d9ddda6c5be334 files/usermode-sources-2.4.24.CAN-2004-0181.patch 1233
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/usermode-sources-2.4.24.CAN-2004-0178.patch 424
 MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
 MD5 39361f8d16b1fe5891aab62e92f8cd30 files/usermode-sources-2.6.IPTables-RDoS.patch 390
+MD5 23a31ff55169c3f9a2c391af8cb91cd9 files/digest-usermode-sources-2.4.26-r4 210
 MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476
 MD5 b738cb0120a32aa92cfcfdbd564dd21f files/usermode-sources-2.6.6.ProcPerms.patch 1368
+MD5 2cb392a6f9f8724f6a40b85afac9d47f files/digest-usermode-sources-2.4.24-r7 210
+MD5 df4521ac96bfad5fce730fda7300a611 files/digest-usermode-sources-2.6.6-r5 208
 MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/usermode-sources-2.4.24.CAN-2004-0177.patch 384
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r6 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r7
index 1afde5baa80a..ed8d13ee3405 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r6
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r7
@@ -1,2 +1,3 @@
 MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
 MD5 fd184531d88bea49f2ece7d68b4a997a uml-patch-2.4.24-1.bz2 189230
+MD5 7e0e9f3d57bcc1b1bb7900ada383c129 linux-2.4.23-CAN-2004-0415.patch 89319
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r3 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r4
index 97aed2c6379a..d4d898ba4b14 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r3
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r4
@@ -1,2 +1,3 @@
 MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
 MD5 e4fbac714d28cd9bcc877dfcfd5bfe57 uml-patch-2.4.26-1.bz2 204818
+MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r4 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r5
index 97a9c9ea6e86..101ddaeed671 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r4
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.6.6-r5
@@ -1,2 +1,3 @@
 MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
 MD5 ac6131657b587aba2d306d3708142ec6 uml-patch-2.6.6-1.bz2 104357
+MD5 a2a7d84919dd8f11766166ff75e40ac9 linux-2.6.6-CAN-2004-0415.patch 113158
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.24-r6.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.24-r7.ebuild
index 3db2e0c36e0c..8e415766e6fc 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.24-r6.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.24-r7.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/usermode-sources/usermode-sources-2.4.24-r6.ebuild,v 1.2 2004/07/15 05:28:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.24-r7.ebuild,v 1.1 2004/08/05 11:41:32 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -9,7 +9,8 @@ UML_PATCH="uml-patch-2.4.24-1"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
-	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
+	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.23-CAN-2004-0415.patch"
 HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="${PV}-${PR}"
@@ -39,6 +40,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.26.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${DISTDIR}/linux-2.4.23-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.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!"
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r3.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r4.ebuild
index f6c8acac0dfb..3ba7aa24c047 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r3.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r4.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26-r3.ebuild,v 1.2 2004/07/15 05:28:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26-r4.ebuild,v 1.1 2004/08/05 11:41:32 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
 
-UML_PATCH="uml-patch-2.4.26-1"
+OKV='2.4.26'
+UML_PATCH='uml-patch-2.4.26-1'
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${PV}.tar.bz2
-	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
+	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
 LICENSE="GPL-2"
 SLOT="${PV}-${PR}"
@@ -32,6 +34,7 @@ src_unpack() {
 	mv linux-${PV} ${S} && cd ${S}
 	epatch ${DISTDIR}/${UML_PATCH}.bz2
 	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}/${PN}-2.4.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}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r4.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r5.ebuild
index 23bc75a7c179..476dc61e4595 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.6.6-r4.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.6.6-r5.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/usermode-sources/usermode-sources-2.6.6-r4.ebuild,v 1.2 2004/07/21 22:24:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.6.6-r5.ebuild,v 1.1 2004/08/05 11:41:32 plasmaroo Exp $
 
 K_NOUSENAME="yes"
 ETYPE="sources"
@@ -13,11 +13,19 @@ KV="${OKV}${EXTRAVERSION}"
 S="${WORKDIR}/linux-${KV}"
 IUSE=""
 
-UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2 ${FILESDIR}/${PN}.CAN-2004-0497.patch ${FILESDIR}/${P}.FPULockup-53804.patch ${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch ${FILESDIR}/${P}.ProcPerms.patch ${FILESDIR}/${P}.CAN-2004-0495-0496.patch ${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch"
+UNIPATCH_LIST="${DISTDIR}/${UML_PATCH}.bz2
+	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
+	${FILESDIR}/${PN}.CAN-2004-0497.patch
+	${FILESDIR}/${P}.FPULockup-53804.patch
+	${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch
+	${FILESDIR}/${P}.ProcPerms.patch
+	${FILESDIR}/${P}.CAN-2004-0495-0496.patch
+	${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch"
 
 DESCRIPTION="Full (vanilla) sources for the User Mode Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${PV}.tar.bz2
-	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2"
+	mirror://sourceforge/user-mode-linux/${UML_PATCH}.bz2
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch"
 HOMEPAGE="http://www.kernel.org/ http://user-mode-linux.sourceforge.net"
 SLOT="${KV}"
 KEYWORDS="~x86 ~ppc"