Added the CAN-2004-0394 patch; bug #47881.

4 files changed, 25 insertions, 7 deletions

diff --git a/sys-kernel/ppc-sources/ChangeLog b/sys-kernel/ppc-sources/ChangeLog
index e5500ef0dd56..9987de549512 100644
--- a/sys-kernel/ppc-sources/ChangeLog
+++ b/sys-kernel/ppc-sources/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for sys-kernel/ppc-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.42 2004/05/30 22:57:34 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.43 2004/06/04 18:02:44 plasmaroo Exp $
 
-* ppc-sources <pvdabeel@gentoo.org> :
-  ppc-sources is the 2.4 vanilla tree + benh + pegasos 
+*ppc-sources-2.4.26-r1 (04 Jun 2004)
 
-* ppc-sources-2.4.19 <pvdabeel@gentoo.org> :
-  First official ppc kernel release
+  04 Jun 2004; <plasmaroo@gentoo.org> +ppc-sources-2.4.26-r1.ebuild,
+  -ppc-sources-2.4.26.ebuild, +files/ppc-sources-2.4.26.CAN-2004-0394.patch:
+  Added the CAN-2004-0394 patch; bug #47881.
+
+* ppc-sources <pvdabeel@gentoo.org>:
+  ppc-sources is now the 2.4 vanilla tree + benh + pegasos.
+
+* ppc-sources-2.4.19 <pvdabeel@gentoo.org>:
+  First official PPC kernel release.
diff --git a/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.26 b/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.26-r1
index 2b90d62bed78..2b90d62bed78 100644
--- a/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.26
+++ b/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.26-r1
diff --git a/sys-kernel/ppc-sources/files/ppc-sources-2.4.26.CAN-2004-0394.patch b/sys-kernel/ppc-sources/files/ppc-sources-2.4.26.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/ppc-sources/files/ppc-sources-2.4.26.CAN-2004-0394.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.22-oM3-orig/kernel/panic.c	Tue Mar 30 15:37:18 2004
++++ linux-2.4.22-oM3-mod/kernel/panic.c	Mon May 17 18:44:01 2004
+@@ -51,7 +51,7 @@
+ 
+ 	bust_spinlocks(1);
+ 	va_start(args, fmt);
+-	vsprintf(buf, fmt, args);
++	vsnprintf(buf, sizeof(buf), fmt, args);
+ 	va_end(args);
+ 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
+ 	if (in_interrupt())
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.26.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.26-r1.ebuild
index a7481d1f0967..5aa44c0cccc8 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.26.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.26-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.26.ebuild,v 1.1 2004/05/30 22:57:34 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.26-r1.ebuild,v 1.1 2004/06/04 18:02:44 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -12,7 +12,8 @@ GPV_SRC="mirror://gentoo/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
 
 KEYWORDS="-* ppc"
 
-UNIPATCH_LIST="${DISTDIR}/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}-base.tar.bz2
+	${FILESDIR}/${P}.CAN-2004-0394.patch"
 UNIPATCH_DOCS="${WORKDIR}/patches/pegpatches-${KV_MAJOR}.${KV_MINOR}-${GPV}/0000_README"
 
 DESCRIPTION="Full sources including the Pegasos patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"