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

4 files changed, 26 insertions, 17 deletions

diff --git a/sys-kernel/gs-sources/ChangeLog b/sys-kernel/gs-sources/ChangeLog
index 7e0246a59914..386a29438fd4 100644
--- a/sys-kernel/gs-sources/ChangeLog
+++ b/sys-kernel/gs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/gs-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.47 2004/07/09 15:27:32 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.48 2004/08/04 22:21:24 plasmaroo Exp $
+
+*gs-sources-2.4.25_pre7-r9 (04 Aug 2004)
+
+  04 Aug 2004; <plasmaroo@gentoo.org> -gs-sources-2.4.25_pre7-r8.ebuild,
+  +gs-sources-2.4.25_pre7-r9.ebuild:
+  Added a patch for the CAN-2004-0415 vulnerability, bug #59378.
 
 *gs-sources-2.4.25_pre7-r8 (09 Jul 2004)
 
diff --git a/sys-kernel/gs-sources/Manifest b/sys-kernel/gs-sources/Manifest
index 8e7969bfba55..415e27453e7d 100644
--- a/sys-kernel/gs-sources/Manifest
+++ b/sys-kernel/gs-sources/Manifest
@@ -1,20 +1,20 @@
-MD5 67fec52aa94b46db3a29e64354ba616e gs-sources-2.4.25_pre7-r8.ebuild 3168
-MD5 ae6fdcfed726196a0efb1e5740021942 ChangeLog 8894
+MD5 ed56da3a1a4cef197c878d0e74abef17 ChangeLog 9112
 MD5 4df72e65b139d3e4c18bec81f3a561df metadata.xml 227
+MD5 0c55a2e6522382e14381c860a169086f gs-sources-2.4.25_pre7-r9.ebuild 3366
+MD5 517fc1b71501382d041ce0bdfe304511 files/00_3.5-useraddress.patch 7247
+MD5 21f3a4f186017d925067335e24db36a1 files/gs-sources.CAN-2004-0109.patch 1877
+MD5 174438d215b70cad5ffb00ca8123c062 files/gs-sources.munmap.patch 837
+MD5 d4a740ae56c2049247083af387a22a85 files/gs-sources.CAN-2004-0394.patch 350
 MD5 0f66013f643c79c97fda489618a4e2fd files/gs-sources.CAN-2004-0535.patch 476
-MD5 c9da1bc82b906f6abc648c056e7bf662 files/gs-sources.FPULockup-53804.patch 354
+MD5 de75cfa969ed092578d9ddda6c5be334 files/gs-sources.CAN-2004-0181.patch 1233
 MD5 dc18e982f8149588a291956481885a8c files/gs-sources.CAN-2004-0495.patch 17549
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gs-sources.CAN-2004-0177.patch 384
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/gs-sources.CAN-2004-0497.patch 707
 MD5 a3ec1083055b245758b2262dd2245145 files/pci.ids.patch 3376
-MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gs-sources.CAN-2004-0427.patch 460
-MD5 de75cfa969ed092578d9ddda6c5be334 files/gs-sources.CAN-2004-0181.patch 1233
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gs-sources.CAN-2003-0985.patch 414
-MD5 174438d215b70cad5ffb00ca8123c062 files/gs-sources.munmap.patch 837
-MD5 b1a5808ce9f7266bcca1f8de769ac9ac files/gs-sources.MKI.CompileFix.patch 445
-MD5 302215db36238af65fd57bd22db6d7ed files/digest-gs-sources-2.4.25_pre7-r8 147
-MD5 d4a740ae56c2049247083af387a22a85 files/gs-sources.CAN-2004-0394.patch 350
-MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/gs-sources.CAN-2004-0497.patch 707
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gs-sources.CAN-2004-0177.patch 384
 MD5 5bf9836a632a861728d33f9736bb7431 files/gs-sources.CAN-2004-0133.patch 427
-MD5 517fc1b71501382d041ce0bdfe304511 files/00_3.5-useraddress.patch 7247
-MD5 21f3a4f186017d925067335e24db36a1 files/gs-sources.CAN-2004-0109.patch 1877
+MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gs-sources.CAN-2004-0427.patch 460
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/gs-sources.CAN-2004-0178.patch 424
+MD5 351ec4910935b0191a59117f1ecfa561 files/digest-gs-sources-2.4.25_pre7-r9 223
+MD5 b1a5808ce9f7266bcca1f8de769ac9ac files/gs-sources.MKI.CompileFix.patch 445
+MD5 c9da1bc82b906f6abc648c056e7bf662 files/gs-sources.FPULockup-53804.patch 354
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r8 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r9
index f55b28665921..6e0a8e42bbb2 100644
--- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r8
+++ b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r9
@@ -1,2 +1,3 @@
 MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
 MD5 b495ed667a518227f82e76229b9f23e6 patches-2.4.25_pre7-gss-r1.tar.bz2 2475971
+MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
diff --git a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r8.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r9.ebuild
index 1e101fbbc33a..00a933a2cb41 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r8.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-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/gs-sources/gs-sources-2.4.25_pre7-r8.ebuild,v 1.2 2004/07/15 03:50:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r9.ebuild,v 1.1 2004/08/04 22:21:24 plasmaroo Exp $
 
 IUSE="crypt"
 
@@ -30,14 +30,15 @@ S=${WORKDIR}/linux-${KV}
 DESCRIPTION="This kernel stays up to date with current kernel -pre's, with recent ACPI,
 	EVMS, Win4Lin, aic79xx, Super FreeS/WAN, preempt, and various hardware fixes."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV/r8/r1}.tar.bz2"
+	 mirror://gentoo/patches-${KV/r9/r1}.tar.bz2
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.26-CAN-2004-0415.patch"
 KEYWORDS="x86 -ppc -sparc"
 SLOT="${KV}"
 
 src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
-	cd ${KV/r8/r1} || die
+	cd ${KV/r9/r1} || die
 	# Kill patches we aren't suppposed to use, don't worry about
 	# failures, if they aren't there that is a good thing!
 	# This is the ratified crypt USE flag, enables IPSEC and patch-int
@@ -59,6 +60,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${DISTDIR}/linux-2.4.26-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	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!"