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

5 files changed, 37 insertions, 18 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/Manifest b/sys-kernel/ppc-sources/Manifest
index 408a41230063..1b05306df9c4 100644
--- a/sys-kernel/ppc-sources/Manifest
+++ b/sys-kernel/ppc-sources/Manifest
@@ -1,17 +1,18 @@
-MD5 7c1c3613231f423691c3188ac61ed716 ChangeLog 405
+MD5 a8d902c93258abe2d2bfd364e43ea016 ppc-sources-2.4.26-r1.ebuild 800
+MD5 6fca16ea36e80808de8770232b12ea92 ChangeLog 638
+MD5 30de447abf3b8033410bfd6999d5f06e ppc-sources-2.4.24-r4.ebuild 2443
 MD5 56a15df9612f7e4a07a0af134fa18ffd metadata.xml 231
 MD5 f2fa5591bf4881ab06bed0c68290a890 ppc-sources-2.4.23-r1.ebuild 2983
-MD5 30de447abf3b8033410bfd6999d5f06e ppc-sources-2.4.24-r4.ebuild 2443
-MD5 62c5e77c777e3b5efb9595688720db0c ppc-sources-2.4.26.ebuild 759
-MD5 005ef6759b490e05bd30edadd451bca0 files/digest-ppc-sources-2.4.23-r1 134
-MD5 98ac34ec29ab79b23d7aa45458c302e1 files/digest-ppc-sources-2.4.24-r4 136
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
 MD5 990ae6b085cb09866bfbb7d44076b8ce files/ppc-sources-2.4.22-r1.via-pmu.diff 907
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/ppc-sources-2.4.23.CAN-2003-0985.patch 414
-MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ppc-sources-2.4.23.rtc_fix.patch 7073
-MD5 147fec50180ad91b6260fc7201dcb90f files/ppc-sources-2.4.24.CAN-2004-0010.patch 6050
 MD5 21f3a4f186017d925067335e24db36a1 files/ppc-sources-2.4.24.CAN-2004-0109.patch 1877
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/ppc-sources-2.4.23.CAN-2003-0985.patch 414
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/ppc-sources-2.4.24.CAN-2004-0177.patch 384
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/ppc-sources-2.4.24.CAN-2004-0178.patch 424
+MD5 ea3523a550520965a412fb2e1758939c files/digest-ppc-sources-2.4.26-r1 144
+MD5 147fec50180ad91b6260fc7201dcb90f files/ppc-sources-2.4.24.CAN-2004-0010.patch 6050
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ppc-sources-2.4.23.rtc_fix.patch 7073
 MD5 174438d215b70cad5ffb00ca8123c062 files/ppc-sources-2.4.24.munmap.patch 837
-MD5 ea3523a550520965a412fb2e1758939c files/digest-ppc-sources-2.4.26 144
+MD5 d4a740ae56c2049247083af387a22a85 files/ppc-sources-2.4.26.CAN-2004-0394.patch 350
+MD5 98ac34ec29ab79b23d7aa45458c302e1 files/digest-ppc-sources-2.4.24-r4 136
+MD5 005ef6759b490e05bd30edadd451bca0 files/digest-ppc-sources-2.4.23-r1 134
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/ppc-sources-2.4.24.CAN-2004-0178.patch 424
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
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"