Version bump; bugs #47881 and #51619.

8 files changed, 32 insertions, 123 deletions

diff --git a/sys-kernel/vserver-sources/ChangeLog b/sys-kernel/vserver-sources/ChangeLog
index 417f5fb1e0e7..0b61300a122e 100644
--- a/sys-kernel/vserver-sources/ChangeLog
+++ b/sys-kernel/vserver-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/vserver-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.6 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/ChangeLog,v 1.7 2004/06/02 16:35:55 plasmaroo Exp $
+
+*vserver-sources-2.4.26.1.3.9 (02 Jun 2004)
+
+  02 Jun 2004; <plasmaroo@gentoo.org> -vserver-sources-2.4.25.1.3.8-r2.ebuild,
+  +vserver-sources-2.4.26.1.3.9.ebuild,
+  +files/vserver-sources-2.4.26.1.3.9.CAN-2004-0394.patch:
+  Version bump; bugs #47881 and #51619.
 
   31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   vserver-sources-2.4.25.1.3.8-r2.ebuild:
@@ -8,7 +15,7 @@
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   vserver-sources-2.4.25.1.3.8-r2.ebuild:
-  Add inherit eutils
+  Add inherit eutils.
 
 *vserver-sources-2.4.25.1.3.8-r2 (17 Apr 2004)
 
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r2 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r2
deleted file mode 100644
index 051653be757b..000000000000
--- a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.25.1.3.8-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 2294321ace3b6190b17522720e88727e linux-vserver-1.3.8.tar.bz2 42455
diff --git a/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9 b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9
new file mode 100644
index 000000000000..e4741e15a0e6
--- /dev/null
+++ b/sys-kernel/vserver-sources/files/digest-vserver-sources-2.4.26.1.3.9
@@ -0,0 +1,2 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 19c74eacff165c675bae637d50116369 linux-vserver-1.3.9.tar.bz2 52523
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0109.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0109.patch
deleted file mode 100644
index d02b51c57fc6..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0109.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- linux/fs/isofs/rock.c.orig
-+++ linux/fs/isofs/rock.c
-@@ -14,6 +14,7 @@
- #include <linux/slab.h>
- #include <linux/pagemap.h>
- #include <linux/smp_lock.h>
-+#include <asm/page.h>
- 
- #include "rock.h"
- 
-@@ -419,7 +420,7 @@
-   return 0;
- }
- 
--static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr)
-+static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit)
- {
- 	int slen;
- 	int rootflag;
-@@ -431,16 +432,25 @@
- 		rootflag = 0;
- 		switch (slp->flags & ~1) {
- 		case 0:
-+			if (slp->len > plimit - rpnt)
-+				return NULL;
- 			memcpy(rpnt, slp->text, slp->len);
- 			rpnt+=slp->len;
- 			break;
-+		case 2:
-+			if (rpnt >= plimit)
-+				return NULL;
-+			*rpnt++='.';
-+			break;
- 		case 4:
-+			if (2 > plimit - rpnt)
-+				return NULL;
- 			*rpnt++='.';
--			/* fallthru */
--		case 2:
- 			*rpnt++='.';
- 			break;
- 		case 8:
-+			if (rpnt >= plimit)
-+				return NULL;
- 			rootflag = 1;
- 			*rpnt++='/';
- 			break;
-@@ -457,17 +467,23 @@
- 			 * If there is another SL record, and this component
- 			 * record isn't continued, then add a slash.
- 			 */
--			if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1))
-+			if ((!rootflag) && (rr->u.SL.flags & 1) &&
-+			    !(oldslp->flags & 1)) {
-+				if (rpnt >= plimit)
-+					return NULL;
- 				*rpnt++='/';
-+			}
- 			break;
- 		}
- 
- 		/*
- 		 * If this component record isn't continued, then append a '/'.
- 		 */
--		if (!rootflag && !(oldslp->flags & 1))
-+		if (!rootflag && !(oldslp->flags & 1)) {
-+			if (rpnt >= plimit)
-+				return NULL;
- 			*rpnt++='/';
--
-+		}
- 	}
- return rpnt;
- }
-@@ -548,7 +564,10 @@
- 			CHECK_SP(goto out);
- 			break;
- 		case SIG('S', 'L'):
--			rpnt = get_symlink_chunk(rpnt, rr);
-+			rpnt = get_symlink_chunk(rpnt, rr,
-+						 link + (PAGE_SIZE - 1));
-+			if (rpnt == NULL)
-+				goto out;
- 			break;
- 		case SIG('C', 'E'):
- 			/* This tells is if there is a continuation record */
-
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch
deleted file mode 100644
index da6b7e190685..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0177.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- linux-2.4.26-pre3/fs/jbd/journal.c	2004-02-18 05:36:31.000000000 -0800
-+++ linux-2.4.26-pre4/fs/jbd/journal.c	2004-03-16 09:59:36.000000000 -0800
-@@ -671,6 +671,7 @@
- 
- 	bh = getblk(journal->j_dev, blocknr, journal->j_blocksize);
- 	lock_buffer(bh);
-+	memset(bh->b_data, 0, journal->j_blocksize);
- 	BUFFER_TRACE(bh, "return this buffer");
- 	return journal_add_journal_head(bh);
- }
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch
deleted file mode 100644
index 19e57268c2fa..000000000000
--- a/sys-kernel/vserver-sources/files/vserver-sources-2.4.25.1.3.8.CAN-2004-0178.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.26-pre2/drivers/sound/sb_audio.c	2002-02-25 11:38:06.000000000 -0800
-+++ linux-2.4.26-pre3/drivers/sound/sb_audio.c	2004-03-13 07:43:23.000000000 -0800
-@@ -879,7 +879,7 @@
- 			c -= locallen; p += locallen;
- 		}
- 		/* used = ( samples * 16 bits size ) */
--		*used = len << 1;
-+		*used =  max_in  > ( max_out << 1) ? (max_out << 1) : max_in;
- 		/* returned = ( samples * 8 bits size ) */
- 		*returned = len;
- 	}
diff --git a/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0394.patch b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/vserver-sources/files/vserver-sources-2.4.26.1.3.9.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/vserver-sources/vserver-sources-2.4.25.1.3.8-r2.ebuild b/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9.ebuild
index d601e121cd52..4f0097d16a09 100644
--- a/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r2.ebuild
+++ b/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.4.25.1.3.8-r2.ebuild,v 1.3 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/vserver-sources/vserver-sources-2.4.26.1.3.9.ebuild,v 1.1 2004/06/02 16:35:55 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
-OKV=2.4.25
-KV=2.4.25
+OKV=2.4.26
+KV=2.4.26
 
-## idea: after the kernel-version (2.4.25) we append the vs-version (e.g. 1.3.8) to
-## get 2.4.25.1.3.8 that is globbed out here:
-EXTRAVERSION="-vs${PV#*.*.*.}-${PR}"
+## idea: after the kernel-version (2.4.26) we append the vs-version (e.g. 1.3.9) to
+## get 2.4.25.1.3.9 that is globbed out here:
+EXTRAVERSION="-vs${PV#*.*.*.}"
 VEXTRAVERSION="-vs${PV#*.*.*.}"
 
+
 S=${WORKDIR}/linux-${KV}
 # What's in this kernel?
 
 # INCLUDED:
-# stock 2.4.25 kernel sources (or newer)
-# devel-version of vsever-patch: 1.3.8 (or newer)
+# stock 2.4.26 kernel sources (or newer)
+# devel-version of vsever-patch: 1.3.9 (or newer)
 
 DESCRIPTION="Linux kernel with DEVEL version ctx-/vserver-patch"
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
@@ -36,9 +37,7 @@ src_unpack() {
 
 	cd linux-${KV}${EXTRAVERSION}
 	epatch ${WORKDIR}/patch-${KV}${VEXTRAVERSION}.diff
-	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0178 patch!"
 
 	kernel_universal_unpack
 }