Applied security fix from bug #47881

5 files changed, 49 insertions, 3 deletions

diff --git a/sys-kernel/pegasos-sources/ChangeLog b/sys-kernel/pegasos-sources/ChangeLog
index 1e2c5f189fed..9f3dd03bab07 100644
--- a/sys-kernel/pegasos-sources/ChangeLog
+++ b/sys-kernel/pegasos-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/pegasos-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-sources/ChangeLog,v 1.1 2004/05/07 12:20:40 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-sources/ChangeLog,v 1.2 2004/06/04 21:15:47 dholm Exp $
+
+*pegasos-sources-2.4.26-r1 (04 Jun 2004)
+
+  04 Jun 2004; David Holm <dholm@gentoo.org>
+  +files/pegasos-sources-2.4.26.CAN-2004-0394.patch,
+  +pegasos-sources-2.4.26-r1.ebuild:
+  Applied security fix from bug #47881.
 
 *pegasos-sources-2.4.26 (07 May 2004)
 
diff --git a/sys-kernel/pegasos-sources/Manifest b/sys-kernel/pegasos-sources/Manifest
index 6b5ee9ef1188..28351bd67d6f 100644
--- a/sys-kernel/pegasos-sources/Manifest
+++ b/sys-kernel/pegasos-sources/Manifest
@@ -1,4 +1,7 @@
-MD5 3d5b6866288db0d08f66695a26dbfe3b pegasos-sources-2.4.26.ebuild 761
+MD5 217e9d508a8026698066115ba434ac1d ChangeLog 603
 MD5 a768f20366d412feaf748b4ac46b046e metadata.xml 350
-MD5 db7a67bbf886b9fb31d662fccae62791 ChangeLog 385
+MD5 3d5b6866288db0d08f66695a26dbfe3b pegasos-sources-2.4.26.ebuild 761
+MD5 3d06e69712674408bf229ee9103e471c pegasos-sources-2.4.26-r1.ebuild 799
 MD5 ea3523a550520965a412fb2e1758939c files/digest-pegasos-sources-2.4.26 144
+MD5 02697adeefafe689775c7a2b0ba6dedb files/pegasos-sources-2.4.26.CAN-2004-0394.patch 465
+MD5 ea3523a550520965a412fb2e1758939c files/digest-pegasos-sources-2.4.26-r1 144
diff --git a/sys-kernel/pegasos-sources/files/digest-pegasos-sources-2.4.26-r1 b/sys-kernel/pegasos-sources/files/digest-pegasos-sources-2.4.26-r1
new file mode 100644
index 000000000000..2b90d62bed78
--- /dev/null
+++ b/sys-kernel/pegasos-sources/files/digest-pegasos-sources-2.4.26-r1
@@ -0,0 +1,2 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 fd4d82eef832f87127b85ddcc2f3bac9 pegpatches-2.4-26.1-base.tar.bz2 906564
diff --git a/sys-kernel/pegasos-sources/files/pegasos-sources-2.4.26.CAN-2004-0394.patch b/sys-kernel/pegasos-sources/files/pegasos-sources-2.4.26.CAN-2004-0394.patch
new file mode 100644
index 000000000000..937879bebb63
--- /dev/null
+++ b/sys-kernel/pegasos-sources/files/pegasos-sources-2.4.26.CAN-2004-0394.patch
@@ -0,0 +1,12 @@
+diff -Naur linux-2.4.26-pegasos.orig/kernel/panic.c linux-2.4.26-pegasos/kernel/panic.c
+--- linux-2.4.26-pegasos.orig/kernel/panic.c	2004-06-04 22:55:36.000000000 +0000
++++ linux-2.4.26-pegasos/kernel/panic.c	2004-06-04 22:59:21.000000000 +0000
+@@ -63,7 +63,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/pegasos-sources/pegasos-sources-2.4.26-r1.ebuild b/sys-kernel/pegasos-sources/pegasos-sources-2.4.26-r1.ebuild
new file mode 100644
index 000000000000..73344f260a86
--- /dev/null
+++ b/sys-kernel/pegasos-sources/pegasos-sources-2.4.26-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pegasos-sources/pegasos-sources-2.4.26-r1.ebuild,v 1.1 2004/06/04 21:15:47 dholm Exp $
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+# Version of gentoo patchset
+GPV=26.1
+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
+	${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"
+SRC_URI="${KERNEL_URI} ${GPV_SRC}"
+
+DEPEND="${DEPEND}"