Version bumps; closes bugs #47881, #48200, and #49976. Old versions removed.

13 files changed, 62 insertions, 304 deletions

diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index 4e962443edcf..8cef3eedee33 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,18 +1,25 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.22 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.23 2004/06/01 17:47:24 plasmaroo Exp $
+
+*win4lin-sources-2.4.26 (01 Jun 2004)
+
+  01 Jun 2004; <plasmaroo@gentoo.org> +win4lin-sources-2.4.26.ebuild,
+  +win4lin-sources-2.6.6.ebuild:
+  Version bumps; closes bugs #47881, #48200, and #49976. Old versions
+  removed.
 
   31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   win4lin-sources-2.4.25-r2.ebuild, win4lin-sources-2.6.5-r1.ebuild:
-  Masked win4lin-sources-2.6.5-r1.ebuild broken for ppc
+  Masked win4lin-sources-2.6.5-r1.ebuild broken for ppc.
 
   31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   win4lin-sources-2.4.25-r2.ebuild:
-  Masked win4lin-sources-2.4.25-r2.ebuild broken for ppc
+  Masked win4lin-sources-2.4.25-r2.ebuild broken for ppc.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   win4lin-sources-2.4.25-r2.ebuild:
-  Add inherit eutils
+  Add inherit eutils.
 
 *win4lin-sources-2.4.25-r2 (17 Apr 2004)
 
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r2 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r2
deleted file mode 100644
index 3df65a061aca..000000000000
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.25-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
-MD5 32e4cda45fa0f090dffa157bc4504a4e mki-adapter.patch 181483
-MD5 2e32d8f11d9ed98f919934fb8b705369 Kernel-Win4Lin3-2.4.25.patch 23600
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26
new file mode 100644
index 000000000000..dcbdbe419bbc
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26
@@ -0,0 +1,3 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 32e4cda45fa0f090dffa157bc4504a4e mki-adapter.patch 181483
+MD5 e9bc95992e489a3f54aabef100e13fcf Kernel-Win4Lin3-2.4.26.patch 23600
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.5-r1 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.5-r1
deleted file mode 100644
index 97653e192582..000000000000
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611
-MD5 aa98c4f41bcce5be5ab3763f6534288b mki-adapter26_1_3_4.patch 126302
-MD5 32578c28c4bb1b8c76ff84c3e474d52e Kernel-Win4Lin3-2.6.5.patch 26576
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.6 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.6
new file mode 100644
index 000000000000..837b6e3ee5e7
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.6
@@ -0,0 +1,3 @@
+MD5 5218790bc3db41e77a7422969639a9ad linux-2.6.6.tar.bz2 34896138
+MD5 f6441536878683503a56407ebee7fa09 mki-adapter26_1_3_5.patch 126571
+MD5 6343eab684e59e7105bb633f60bd6604 Kernel-Win4Lin3-2.6.6.patch 26547
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0109.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0109.patch
deleted file mode 100644
index d02b51c57fc6..000000000000
--- a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.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/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0177.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0177.patch
deleted file mode 100644
index da6b7e190685..000000000000
--- a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.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/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0178.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.CAN-2004-0178.patch
deleted file mode 100644
index 19e57268c2fa..000000000000
--- a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.25.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/win4lin-sources/files/win4lin-sources-2.4.26.CAN-2004-0394.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.CAN-2004-0394.patch
new file mode 100644
index 000000000000..273f1a52046f
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-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/win4lin-sources/files/win4lin-sources-2.6.5.CAN-2004-0109.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.5.CAN-2004-0109.patch
deleted file mode 100644
index d7726c2e5aaf..000000000000
--- a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.5.CAN-2004-0109.patch
+++ /dev/null
@@ -1,88 +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 <linux/buffer_head.h>
-+#include <asm/page.h>
- 
- #include "rock.h"
-@@ -419,7 +420,7 @@ int parse_rock_ridge_inode_internal(stru
-   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 @@ static char *get_symlink_chunk(char *rpn
- 		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 @@ static char *get_symlink_chunk(char *rpn
- 			 * 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 @@ static int rock_ridge_symlink_readpage(s
- 			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/win4lin-sources/win4lin-sources-2.4.25-r2.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26.ebuild
index 232f7d3ba8d4..0b6e80eea5b8 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r2.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.25-r2.ebuild,v 1.3 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.26.ebuild,v 1.1 2004/06/01 17:47:24 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 IUSE=""
 ETYPE="sources"
 inherit kernel eutils
-OKV="2.4.25"
-KV="2.4.25-win4lin-${PR}"
-EXTRAVERSION="-win4lin-${PR}"
+OKV="2.4.26"
+KV="2.4.26-win4lin"
+EXTRAVERSION="-win4lin"
 
 S=${WORKDIR}/linux-${KV}
 
@@ -18,7 +18,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://www.netraverse.com/member/downloads/files/mki-adapter.patch
 	 http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch"
 HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/"
-KEYWORDS="x86 -ppc"
+KEYWORDS="~x86"
 SLOT="${KV}"
 
 src_unpack() {
@@ -27,10 +27,10 @@ src_unpack() {
 
 	cd linux-${KV}
 	epatch ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch || die "Error: Win4Lin3 patch failed."
+	ebegin 'Applying mki-adapter.patch'
 	patch -Np1 -i ${DISTDIR}/mki-adapter.patch >/dev/null 2>&1 || die "Error: mki-adapter patch failed."
-	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!"
+	eend $?
+	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.5-r1.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.5-r1.ebuild
deleted file mode 100644
index 08689f8a974c..000000000000
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.5-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.5-r1.ebuild,v 1.4 2004/05/30 23:53:42 pvdabeel Exp $
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-inherit eutils
-
-OKV=${PV}
-KV=${PV}-win4lin-r1
-S=${WORKDIR}/linux-${OKV}
-
-ETYPE="sources"
-DESCRIPTION="Full sources for the Development Branch of the Linux kernel"
-IUSE=""
-
-SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
-	 http://www.netraverse.com/member/downloads/files/mki-adapter26_1_3_4.patch
-	 http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch"
-
-HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="x86 -ppc"
-PROVIDE="virtual/linux-sources virtual/alsa"
-
-if [ $ETYPE = "sources" ] && [ -z "`use build`" ]
-then
-	DEPEND=">=sys-devel/binutils-2.11.90.0.31"
-	RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl
-		 sys-devel/make
-		 sys-apps/module-init-tools"
-fi
-
-[ -z "$LINUX_HOSTCFLAGS" ] && LINUX_HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include"
-
-src_unpack() {
-	cd ${WORKDIR}
-	unpack linux-${OKV}.tar.bz2
-	cd ${S}
-
-	epatch ${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch || die "Error: Failed to appky Win4Lin3 patch!"
-	ebegin "Applying mki-adapter26_1_3_4.patch"
-	patch -Np1 -i ${DISTDIR}/mki-adapter26_1_3_4.patch > /dev/null 2>&1 || die "Error: Failed to apply mki-adapter patch!"
-	eend $?
-	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to patch CAN-2004-0109 vulnerability!"
-
-	unset ARCH
-	# Sometimes we have icky kernel symbols; this seems to get rid of them
-	make mrproper || die
-
-	# Fix silly permissions in tarball
-	cd ${WORKDIR}
-	chown -R 0:0 *
-	chmod -R a+r-w+X,u+w *
-}
-
-src_install() {
-
-	dodir /usr/src
-	echo ">>> Copying sources..."
-	mv ${WORKDIR}/linux-${OKV} ${WORKDIR}/linux-${KV}
-	mv ${WORKDIR}/* ${D}/usr/src
-
-}
-
-pkg_postinst() {
-
-	[ ! -e "${ROOT}usr/src/linux-beta" ] && ln -sf linux-${OKV} ${ROOT}/usr/src/linux-beta
-	[ ! -e "${ROOT}usr/src/linux" ] && ln -sf linux-${OKV} ${ROOT}/usr/src/linux
-	mkdir -p ${ROOT}sys
-
-	echo
-	ewarn "Please note that ptyfs support has been removed from devfs"
-	ewarn "and you have to compile it in now, or else you will get"
-	ewarn "errors when trying to open a pty. The option is:"
-	ewarn "File systems -> Pseudo filesystems -> /dev/pts filesystem."
-	echo
-	ewarn "Also, note that you must compile in support for"
-	ewarn "input devices (Input device support->Input devices),"
-	ewarn "the virtual terminal (Character Devices->Virtual terminal),"
-	ewarn "vga_console (Graphics Support->Console...->VGA text console)"
-	ewarn "and the vt_console (Character Devices->Support for console...)."
-	ewarn "Otherwise, you will get the dreaded \"Uncompressing the Kernel\""
-	ewarn "error."
-	echo
-	ewarn "PLEASE NOTE THIS IS NOT OFFICIALLY SUPPORTED BY GENTOO!"
-	sleep 5
-	echo
-
-}
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.6.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.6.ebuild
new file mode 100644
index 000000000000..0a2b14dc89a9
--- /dev/null
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.6.ebuild,v 1.1 2004/06/01 17:47:24 plasmaroo Exp $
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+MKI_VERSION='1_3_5'
+UNIPATCH_LIST="
+	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch
+	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch"
+
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Full sources for the 2.6 of the Linux kernel with the Win4Lin patches"
+SRC_URI="mirror://kernel/linux/kernel/v2.6/linux-${OKV}.tar.bz2
+	http://www.netraverse.com/member/downloads/files/mki-adapter26_1_3_5.patch
+	http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch"
+KEYWORDS="x86 -*"
+SLOT="${KV}"
+
+K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
+existing bug. Only create a new bug if you have not found one that matches
+your issue. It is best to do an advanced search as the initial search has a
+very low yield. Please assign your bugs to x86-kernel@gentoo.org."