From 3eccde02d3e194ca779c86b6afccde54c3ba6da4 Mon Sep 17 00:00:00 2001
From: Tim Yamin <plasmaroo@gentoo.org>
Date: Sat, 20 Nov 2004 11:12:53 +0000
Subject: Version bump; updates binfmt_elf patch (bug #70681) and adds the
 smbfs security patch (bug #65877).

---
 sys-kernel/win4lin-sources/ChangeLog               | 17 +++-
 .../files/digest-win4lin-sources-2.4.26-r8         |  5 --
 .../files/digest-win4lin-sources-2.4.26-r9         |  5 ++
 .../files/digest-win4lin-sources-2.6.7-r8          |  5 --
 .../files/digest-win4lin-sources-2.6.7-r9          |  5 ++
 .../files/digest-win4lin-sources-2.6.9             |  3 -
 .../files/digest-win4lin-sources-2.6.9-r1          |  3 +
 .../files/win4lin-sources-2.4.26.binfmt_elf.patch  | 33 +++++---
 .../files/win4lin-sources-2.4.26.smbfs.patch       | 97 ++++++++++++++++++++++
 .../files/win4lin-sources-2.6.7.smbfs.patch        | 93 +++++++++++++++++++++
 .../files/win4lin-sources-2.6.9.binfmt_elf.patch   | 25 ++++--
 .../files/win4lin-sources-2.6.9.smbfs.patch        | 72 ++++++++++++++++
 .../files/win4lin-sources-2.6.binfmt_elf.patch     | 31 +++++--
 .../win4lin-sources-2.4.26-r8.ebuild               | 48 -----------
 .../win4lin-sources-2.4.26-r9.ebuild               | 49 +++++++++++
 .../win4lin-sources-2.6.7-r8.ebuild                | 41 ---------
 .../win4lin-sources-2.6.7-r9.ebuild                | 42 ++++++++++
 .../win4lin-sources-2.6.9-r1.ebuild                | 31 +++++++
 .../win4lin-sources/win4lin-sources-2.6.9.ebuild   | 30 -------
 19 files changed, 477 insertions(+), 158 deletions(-)
 delete mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r8
 create mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r9
 delete mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r8
 create mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r9
 delete mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9
 create mode 100644 sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9-r1
 create mode 100644 sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.smbfs.patch
 create mode 100644 sys-kernel/win4lin-sources/files/win4lin-sources-2.6.7.smbfs.patch
 create mode 100644 sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.smbfs.patch
 delete mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r8.ebuild
 create mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r9.ebuild
 delete mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r8.ebuild
 create mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r9.ebuild
 create mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r1.ebuild
 delete mode 100644 sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild

(limited to 'sys-kernel')

diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index 6b91e91d6bf4..906e660bb0ca 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.41 2004/11/15 18:07:41 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.42 2004/11/20 11:12:53 plasmaroo Exp $
+
+*win4lin-sources-2.6.9-r1 (20 Nov 2004)
+
+  20 Nov 2004; <plasmaroo@gentoo.org> -win4lin-sources-2.4.26-r8.ebuild,
+  +win4lin-sources-2.4.26-r9.ebuild, -win4lin-sources-2.6.7-r8.ebuild,
+  +win4lin-sources-2.6.7-r9.ebuild, +win4lin-sources-2.6.9-r1.ebuild,
+  -win4lin-sources-2.6.9.ebuild,
+  files/win4lin-sources-2.4.26.binfmt_elf.patch,
+  +files/win4lin-sources-2.4.26.smbfs.patch,
+  +files/win4lin-sources-2.6.7.smbfs.patch,
+  files/win4lin-sources-2.6.9.binfmt_elf.patch,
+  +files/win4lin-sources-2.6.9.smbfs.patch,
+  files/win4lin-sources-2.6.binfmt_elf.patch:
+  Version bump; updates binfmt_elf patch (bug #70681) and adds the smbfs
+  security patch (bug #65877).
 
 *win4lin-sources-2.6.9 (15 Nov 2004)
 
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r8 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r8
deleted file mode 100644
index 0299063fed16..000000000000
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r8
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 772931f7906d8b26f7e91be8c5813bee mki-adapter.patch 184602
-MD5 e9bc95992e489a3f54aabef100e13fcf Kernel-Win4Lin3-2.4.26.patch 23600
-MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
-MD5 d4c051e7c6062704be85192e25e2f5b2 linux-2.4.26-CAN-2004-0814.patch 81508
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r9 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r9
new file mode 100644
index 000000000000..0299063fed16
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r9
@@ -0,0 +1,5 @@
+MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
+MD5 772931f7906d8b26f7e91be8c5813bee mki-adapter.patch 184602
+MD5 e9bc95992e489a3f54aabef100e13fcf Kernel-Win4Lin3-2.4.26.patch 23600
+MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 linux-2.4.26-CAN-2004-0415.patch 90145
+MD5 d4c051e7c6062704be85192e25e2f5b2 linux-2.4.26-CAN-2004-0814.patch 81508
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r8 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r8
deleted file mode 100644
index 9e871718355b..000000000000
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r8
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
-MD5 45347c8bd1a1c791e9a12d1e09162f33 mki-adapter26_1_3_6.patch 127032
-MD5 e5b7ca075f0281509442913cbd09ca26 Kernel-Win4Lin3-2.6.7.patch 26620
-MD5 52996b643afbd6ed9ba38b9483c2cac3 linux-2.6.7-CAN-2004-0415.patch 112612
-MD5 c9c9ed2f30afd3750287953184100529 linux-2.6.7-CAN-2004-0814.patch 129565
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r9 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r9
new file mode 100644
index 000000000000..9e871718355b
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.7-r9
@@ -0,0 +1,5 @@
+MD5 a74671ea68b0e3c609e8785ed8497c14 linux-2.6.7.tar.bz2 35092228
+MD5 45347c8bd1a1c791e9a12d1e09162f33 mki-adapter26_1_3_6.patch 127032
+MD5 e5b7ca075f0281509442913cbd09ca26 Kernel-Win4Lin3-2.6.7.patch 26620
+MD5 52996b643afbd6ed9ba38b9483c2cac3 linux-2.6.7-CAN-2004-0415.patch 112612
+MD5 c9c9ed2f30afd3750287953184100529 linux-2.6.7-CAN-2004-0814.patch 129565
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9
deleted file mode 100644
index 12075686996a..000000000000
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
-MD5 e7710f224fc986d041c5b5dd50e619ac mki-adapter26_1_3_8.patch 127088
-MD5 f5494c6878eb693f1fa61c2022574777 Kernel-Win4Lin3-2.6.9.patch 25139
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9-r1 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9-r1
new file mode 100644
index 000000000000..12075686996a
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.9-r1
@@ -0,0 +1,3 @@
+MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
+MD5 e7710f224fc986d041c5b5dd50e619ac mki-adapter26_1_3_8.patch 127088
+MD5 f5494c6878eb693f1fa61c2022574777 Kernel-Win4Lin3-2.6.9.patch 25139
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.binfmt_elf.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.binfmt_elf.patch
index 534e4c064a52..9f4f44ee78f5 100644
--- a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.binfmt_elf.patch
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.binfmt_elf.patch
@@ -1,6 +1,7 @@
---- linux-2.4.27/fs/binfmt_elf.c	2004-11-10 12:25:16 -08:00
-+++ linux-2.4.27-plasmaroo/fs/binfmt_elf.c	2004-11-10 12:25:16 -08:00
-@@ -335,9 +335,12 @@
+diff -ur linux-2.4.27/fs/binfmt_elf.c linux-2.4.27.plasmaroo/fs/binfmt_elf.c
+--- linux-2.4.27/fs/binfmt_elf.c	2004-04-14 14:05:40.000000000 +0100
++++ linux-2.4.27.plasmaroo/fs/binfmt_elf.c	2004-11-19 21:30:26.745410824 +0000
+@@ -299,9 +299,12 @@
  		goto out;
  
  	retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size);
@@ -15,7 +16,7 @@
  
  	eppnt = elf_phdata;
  	for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) {
-@@ -532,8 +535,11 @@
+@@ -475,8 +478,11 @@
  		goto out;
  
  	retval = kernel_read(bprm->file, elf_ex.e_phoff, (char *) elf_phdata, size);
@@ -28,7 +29,17 @@
  		
  	files = current->files;		/* Refcounted so ok */
  	retval = unshare_files();
-@@ -580,8 +586,14 @@
+@@ -513,7 +519,8 @@
+ 			 */
+ 
+ 			retval = -ENOMEM;
+-			if (elf_ppnt->p_filesz > PATH_MAX)
++			if (elf_ppnt->p_filesz > PATH_MAX || 
++			    elf_ppnt->p_filesz == 0)
+ 				goto out_free_file;
+ 			elf_interpreter = (char *) kmalloc(elf_ppnt->p_filesz,
+ 							   GFP_KERNEL);
+@@ -523,8 +530,16 @@
  			retval = kernel_read(bprm->file, elf_ppnt->p_offset,
  					   elf_interpreter,
  					   elf_ppnt->p_filesz);
@@ -36,15 +47,17 @@
 +			if (retval != elf_ppnt->p_filesz) {
 +				if (retval >= 0)
 +					retval = -EIO;
- 				goto out_free_interp;
++				goto out_free_interp;
 +			}
 +			/* make sure path is NULL terminated */
-+			elf_interpreter[elf_ppnt->p_filesz - 1] = '\0';
++			retval = -EINVAL;
++			if (elf_interpreter[elf_ppnt->p_filesz - 1] != '\0')
+ 				goto out_free_interp;
 +
  			/* If the program interpreter is one of these two,
  			 * then assume an iBCS2 image. Otherwise assume
  			 * a native linux image.
-@@ -616,8 +628,11 @@
+@@ -543,8 +558,11 @@
  			if (IS_ERR(interpreter))
  				goto out_free_interp;
  			retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
@@ -56,8 +69,8 @@
 +			}
  
  			/* Get the exec headers */
- 			loc->interp_ex = *((struct exec *) bprm->buf);
-@@ -776,8 +791,10 @@
+ 			interp_ex = *((struct exec *) bprm->buf);
+@@ -682,8 +700,10 @@
  		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.smbfs.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.smbfs.patch
new file mode 100644
index 000000000000..63c5ba30403f
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.smbfs.patch
@@ -0,0 +1,97 @@
+diff -ur linux-2.4.27/fs/smbfs/proc.c linux-2.4.28/fs/smbfs/proc.c
+--- linux-2.4.27/fs/smbfs/proc.c	2004-11-12 19:32:24.000000000 +0000
++++ linux-2.4.28/fs/smbfs/proc.c	2004-11-19 20:18:27.000000000 +0000
+@@ -1289,10 +1289,12 @@
+ 	data_len = WVAL(buf, 1);
+ 
+ 	/* we can NOT simply trust the data_len given by the server ... */
+-	if (data_len > server->packet_size - (buf+3 - server->packet)) {
+-		printk(KERN_ERR "smb_proc_read: invalid data length!! "
+-		       "%d > %d - (%p - %p)\n",
+-		       data_len, server->packet_size, buf+3, server->packet);
++	if (data_len > count ||
++		(buf+3 - server->packet) + data_len > server->packet_size) {
++		printk(KERN_ERR "smb_proc_read: invalid data length/offset!! "
++		       "%d > %d || (%p - %p) + %d > %d\n",
++		       data_len, count,
++		       buf+3, server->packet, data_len, server->packet_size);
+ 		result = -EIO;
+ 		goto out;
+ 	}
+@@ -1378,10 +1380,12 @@
+ 	buf = smb_base(server->packet) + data_off;
+ 
+ 	/* we can NOT simply trust the info given by the server ... */
+-	if (data_len > server->packet_size - (buf - server->packet)) {
+-		printk(KERN_ERR "smb_proc_read: invalid data length!! "
+-		       "%d > %d - (%p - %p)\n",
+-		       data_len, server->packet_size, buf, server->packet);
++	if (data_len > count ||
++		(buf - server->packet) + data_len > server->packet_size) {
++		printk(KERN_ERR "smb_proc_readX: invalid data length/offset!! "
++		       "%d > %d || (%p - %p) + %d > %d\n",
++		       data_len, count,
++		       buf, server->packet, data_len, server->packet_size);
+ 		result = -EIO;
+ 		goto out;
+ 	}
+diff -ur linux-2.4.27/fs/smbfs/sock.c linux-2.4.28/fs/smbfs/sock.c
+--- linux-2.4.27/fs/smbfs/sock.c	2004-11-12 19:32:24.000000000 +0000
++++ linux-2.4.28/fs/smbfs/sock.c	2004-11-19 20:18:27.000000000 +0000
+@@ -571,7 +571,11 @@
+ 					parm_disp, parm_offset, parm_count,
+ 					data_disp, data_offset, data_count);
+ 				*parm  = base + parm_offset;
++				if (*parm - inbuf + parm_tot > server->packet_size)
++					goto out_bad_parm;
+ 				*data  = base + data_offset;
++				if (*data - inbuf + data_tot > server->packet_size)
++					goto out_bad_data;
+ 				goto success;
+ 			}
+ 
+@@ -591,6 +595,8 @@
+ 			rcv_buf = smb_vmalloc(buf_len);
+ 			if (!rcv_buf)
+ 				goto out_no_mem;
++			memset(rcv_buf, 0, buf_len);
++			
+ 			*parm = rcv_buf;
+ 			*data = rcv_buf + total_p;
+ 		} else if (data_tot > total_d || parm_tot > total_p)
+@@ -598,8 +604,12 @@
+ 
+ 		if (parm_disp + parm_count > total_p)
+ 			goto out_bad_parm;
++		if (parm_offset + parm_count > server->packet_size)	
++			goto out_bad_parm;
+ 		if (data_disp + data_count > total_d)
+ 			goto out_bad_data;
++		if (data_offset + data_count > server->packet_size)	
++			goto out_bad_data;
+ 		memcpy(*parm + parm_disp, base + parm_offset, parm_count);
+ 		memcpy(*data + data_disp, base + data_offset, data_count);
+ 
+@@ -610,8 +620,11 @@
+ 		 * Check whether we've received all of the data. Note that
+ 		 * we use the packet totals -- total lengths might shrink!
+ 		 */
+-		if (data_len >= data_tot && parm_len >= parm_tot)
++		if (data_len >= data_tot && parm_len >= parm_tot) {
++			data_len = data_tot;
++			parm_len = parm_tot;
+ 			break;
++		}
+ 	}
+ 
+ 	/*
+@@ -625,6 +638,9 @@
+ 		server->packet = rcv_buf;
+ 		rcv_buf = inbuf;
+ 	} else {
++		if (parm_len + data_len > buf_len)
++			goto out_data_grew;
++
+ 		PARANOIA("copying data, old size=%d, new size=%u\n",
+ 			 server->packet_size, buf_len);
+ 		memcpy(inbuf, rcv_buf, parm_len + data_len);
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.7.smbfs.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.7.smbfs.patch
new file mode 100644
index 000000000000..99401cf93a0e
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.7.smbfs.patch
@@ -0,0 +1,93 @@
+diff -urN linux-2.6.8.1/fs/smbfs/proc.c linux-2.6.8.1.plasmaroo/fs/smbfs/proc.c
+--- linux-2.6.8.1/fs/smbfs/proc.c	2004-08-24 17:15:57.000000000 +1000
++++ linux-2.6.8.1.plasmaroo/fs/smbfs/proc.c	2004-11-06 11:27:20.000000000 +1100
+@@ -1427,9 +1427,9 @@
+ 	 * So we must first calculate the amount of padding used by the server.
+ 	 */
+ 	data_off -= hdrlen;
+-	if (data_off > SMB_READX_MAX_PAD) {
+-		PARANOIA("offset is larger than max pad!\n");
+-		PARANOIA("%d > %d\n", data_off, SMB_READX_MAX_PAD);
++	if (data_off > SMB_READX_MAX_PAD || data_off < 0) {
++		PARANOIA("offset is larger than SMB_READX_MAX_PAD or negative!\n");
++		PARANOIA("%d > %d || %d < 0\n", data_off, SMB_READX_MAX_PAD, data_off);
+ 		req->rq_rlen = req->rq_bufsize + 1;
+ 		return;
+ 	}
+diff -urN linux-2.6.8.1/fs/smbfs/request.c linux-2.6.8.1.plasmaroo/fs/smbfs/request.c
+--- linux-2.6.8.1/fs/smbfs/request.c	2004-11-06 11:27:51.000000000 +1100
++++ linux-2.6.8.1.plasmaroo/fs/smbfs/request.c	2004-11-06 11:27:20.000000000 +1100
+@@ -588,6 +588,10 @@
+ 	data_count  = WVAL(inbuf, smb_drcnt);
+ 
+ 	/* Modify offset for the split header/buffer we use */
++	if (data_offset < hdrlen)
++		goto out_bad_data;
++	if (parm_offset < hdrlen)
++		goto out_bad_parm;
+ 	data_offset -= hdrlen;
+ 	parm_offset -= hdrlen;
+ 
+@@ -607,6 +611,10 @@
+ 		req->rq_lparm = parm_count;
+ 		req->rq_data = req->rq_buffer + data_offset;
+ 		req->rq_parm = req->rq_buffer + parm_offset;
++		if (parm_offset + parm_count > req->rq_rlen)
++			goto out_bad_parm;
++		if (data_offset + data_count > req->rq_rlen)
++			goto out_bad_data;
+ 		return 0;
+ 	}
+ 
+@@ -634,6 +642,7 @@
+ 		req->rq_trans2buffer = smb_kmalloc(buf_len, GFP_NOFS);
+ 		if (!req->rq_trans2buffer)
+ 			goto out_no_mem;
++		memset(req->rq_trans2buffer, 0, buf_len);
+ 
+ 		req->rq_parm = req->rq_trans2buffer;
+ 		req->rq_data = req->rq_trans2buffer + parm_tot;
+@@ -643,8 +652,12 @@
+ 
+ 	if (parm_disp + parm_count > req->rq_total_parm)
+ 		goto out_bad_parm;
++	if (parm_offset + parm_count > req->rq_rlen)
++		goto out_bad_parm;
+ 	if (data_disp + data_count > req->rq_total_data)
+ 		goto out_bad_data;
++	if (data_offset + data_count > req->rq_rlen)
++		goto out_bad_data;
+ 
+ 	inbuf = req->rq_buffer;
+ 	memcpy(req->rq_parm + parm_disp, inbuf + parm_offset, parm_count);
+@@ -657,8 +670,11 @@
+ 	 * Check whether we've received all of the data. Note that
+ 	 * we use the packet totals -- total lengths might shrink!
+ 	 */
+-	if (req->rq_ldata >= data_tot && req->rq_lparm >= parm_tot)
++	if (req->rq_ldata >= data_tot && req->rq_lparm >= parm_tot) {
++		req->rq_ldata = data_tot;
++		req->rq_lparm = parm_tot;
+ 		return 0;
++	}
+ 	return 1;
+ 
+ out_too_long:
+@@ -676,13 +692,13 @@
+ 	req->rq_errno = -EIO;
+ 	goto out;
+ out_bad_parm:
+-	printk(KERN_ERR "smb_trans2: invalid parms, disp=%d, cnt=%d, tot=%d\n",
+-	       parm_disp, parm_count, parm_tot);
++	printk(KERN_ERR "smb_trans2: invalid parms, disp=%d, cnt=%d, tot=%d, ofs=%d\n",
++	       parm_disp, parm_count, parm_tot, parm_offset);
+ 	req->rq_errno = -EIO;
+ 	goto out;
+ out_bad_data:
+-	printk(KERN_ERR "smb_trans2: invalid data, disp=%d, cnt=%d, tot=%d\n",
+-	       data_disp, data_count, data_tot);
++	printk(KERN_ERR "smb_trans2: invalid data, disp=%d, cnt=%d, tot=%d, ofs=%d\n",
++	       data_disp, data_count, data_tot, data_offset);
+ 	req->rq_errno = -EIO;
+ out:
+ 	return req->rq_errno;
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.binfmt_elf.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.binfmt_elf.patch
index c4cc8a82d3fb..a836201deca1 100644
--- a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.binfmt_elf.patch
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.binfmt_elf.patch
@@ -1,5 +1,6 @@
---- linux-2.6.9/fs/binfmt_elf.c	2004-11-10 12:25:16 -08:00
-+++ linux-2.6.9-plasmaroo/fs/binfmt_elf.c	2004-11-10 12:25:16 -08:00
+diff -ur linux-2.6.9/fs/binfmt_elf.c linux-2.6.9.plasmaroo/fs/binfmt_elf.c
+--- linux-2.6.9/fs/binfmt_elf.c	2004-10-24 14:58:48.000000000 +0100
++++ linux-2.6.9.plasmaroo/fs/binfmt_elf.c	2004-11-19 20:11:36.000000000 +0000
 @@ -335,9 +335,12 @@
  		goto out;
  
@@ -28,7 +29,17 @@
  
  	files = current->files;		/* Refcounted so ok */
  	retval = unshare_files();
-@@ -580,8 +586,14 @@
+@@ -570,7 +576,8 @@
+ 			 */
+ 
+ 			retval = -ENOMEM;
+-			if (elf_ppnt->p_filesz > PATH_MAX)
++			if (elf_ppnt->p_filesz > PATH_MAX || 
++			    elf_ppnt->p_filesz == 0)
+ 				goto out_free_file;
+ 			elf_interpreter = (char *) kmalloc(elf_ppnt->p_filesz,
+ 							   GFP_KERNEL);
+@@ -580,8 +587,16 @@
  			retval = kernel_read(bprm->file, elf_ppnt->p_offset,
  					   elf_interpreter,
  					   elf_ppnt->p_filesz);
@@ -39,12 +50,14 @@
  				goto out_free_interp;
 +			}
 +			/* make sure path is NULL terminated */
-+			elf_interpreter[elf_ppnt->p_filesz - 1] = '\0';
++			retval = -EINVAL;
++			if (elf_interpreter[elf_ppnt->p_filesz - 1] != '\0')
++				goto out_free_interp;
 +
  			/* If the program interpreter is one of these two,
  			 * then assume an iBCS2 image. Otherwise assume
  			 * a native linux image.
-@@ -616,8 +628,11 @@
+@@ -616,8 +631,11 @@
  			if (IS_ERR(interpreter))
  				goto out_free_interp;
  			retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
@@ -57,7 +70,7 @@
  
  			/* Get the exec headers */
  			loc->interp_ex = *((struct exec *) bprm->buf);
-@@ -776,8 +791,10 @@
+@@ -776,8 +794,10 @@
  		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.smbfs.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.smbfs.patch
new file mode 100644
index 000000000000..f10cfedfab16
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.smbfs.patch
@@ -0,0 +1,72 @@
+diff -urN linux-2.6.8.1/fs/smbfs/proc.c linux-2.6.8.1.plasmaroo/fs/smbfs/proc.c
+--- linux-2.6.8.1/fs/smbfs/proc.c	2004-08-24 17:15:57.000000000 +1000
++++ linux-2.6.8.1.plasmaroo/fs/smbfs/proc.c	2004-11-06 11:27:20.000000000 +1100
+@@ -1427,9 +1427,9 @@
+ 	 * So we must first calculate the amount of padding used by the server.
+ 	 */
+ 	data_off -= hdrlen;
+-	if (data_off > SMB_READX_MAX_PAD) {
+-		PARANOIA("offset is larger than max pad!\n");
+-		PARANOIA("%d > %d\n", data_off, SMB_READX_MAX_PAD);
++	if (data_off > SMB_READX_MAX_PAD || data_off < 0) {
++		PARANOIA("offset is larger than SMB_READX_MAX_PAD or negative!\n");
++		PARANOIA("%d > %d || %d < 0\n", data_off, SMB_READX_MAX_PAD, data_off);
+ 		req->rq_rlen = req->rq_bufsize + 1;
+ 		return;
+ 	}
+diff -urN linux-2.6.8.1/fs/smbfs/request.c linux-2.6.8.1.plasmaroo/fs/smbfs/request.c
+--- linux-2.6.8.1/fs/smbfs/request.c	2004-11-06 11:27:51.000000000 +1100
++++ linux-2.6.8.1.plasmaroo/fs/smbfs/request.c	2004-11-06 11:27:20.000000000 +1100
+@@ -588,6 +588,10 @@
+ 	data_count  = WVAL(inbuf, smb_drcnt);
+ 
+ 	/* Modify offset for the split header/buffer we use */
++	if (data_offset < hdrlen)
++		goto out_bad_data;
++	if (parm_offset < hdrlen)
++		goto out_bad_parm;
+ 	data_offset -= hdrlen;
+ 	parm_offset -= hdrlen;
+ 
+@@ -607,6 +611,10 @@
+ 		req->rq_lparm = parm_count;
+ 		req->rq_data = req->rq_buffer + data_offset;
+ 		req->rq_parm = req->rq_buffer + parm_offset;
++		if (parm_offset + parm_count > req->rq_rlen)
++			goto out_bad_parm;
++		if (data_offset + data_count > req->rq_rlen)
++			goto out_bad_data;
+ 		return 0;
+ 	}
+
+@@ -643,8 +652,12 @@
+ 
+ 	if (parm_disp + parm_count > req->rq_total_parm)
+ 		goto out_bad_parm;
++	if (parm_offset + parm_count > req->rq_rlen)
++		goto out_bad_parm;
+ 	if (data_disp + data_count > req->rq_total_data)
+ 		goto out_bad_data;
++	if (data_offset + data_count > req->rq_rlen)
++		goto out_bad_data;
+ 
+ 	inbuf = req->rq_buffer;
+ 	memcpy(req->rq_parm + parm_disp, inbuf + parm_offset, parm_count);
+@@ -676,13 +692,13 @@
+ 	req->rq_errno = -EIO;
+ 	goto out;
+ out_bad_parm:
+-	printk(KERN_ERR "smb_trans2: invalid parms, disp=%d, cnt=%d, tot=%d\n",
+-	       parm_disp, parm_count, parm_tot);
++	printk(KERN_ERR "smb_trans2: invalid parms, disp=%d, cnt=%d, tot=%d, ofs=%d\n",
++	       parm_disp, parm_count, parm_tot, parm_offset);
+ 	req->rq_errno = -EIO;
+ 	goto out;
+ out_bad_data:
+-	printk(KERN_ERR "smb_trans2: invalid data, disp=%d, cnt=%d, tot=%d\n",
+-	       data_disp, data_count, data_tot);
++	printk(KERN_ERR "smb_trans2: invalid data, disp=%d, cnt=%d, tot=%d, ofs=%d\n",
++	       data_disp, data_count, data_tot, data_offset);
+ 	req->rq_errno = -EIO;
+ out:
+ 	return req->rq_errno;
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.binfmt_elf.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.binfmt_elf.patch
index 9ca23675f25d..87d05e7b5fa4 100644
--- a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.binfmt_elf.patch
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.binfmt_elf.patch
@@ -1,6 +1,7 @@
---- linux-2.6.7-uc0-r8/fs/binfmt_elf.c	2004-11-12 11:50:08 -08:00
-+++ linux-2.6.7-uc0-r8-plasmaroo/fs/binfmt_elf.c	2004-11-12 11:50:08 -08:00
-@@ -335,9 +335,12 @@
+diff -ur linux-2.6.8.1/fs/binfmt_elf.c linux-2.6.8.1.plasmaroo/fs/binfmt_elf.c
+--- linux-2.6.8.1/fs/binfmt_elf.c	2004-08-14 11:55:23.000000000 +0100
++++ linux-2.6.8.1.plasmaroo/fs/binfmt_elf.c	2004-11-19 23:07:08.375429000 +0000
+@@ -334,9 +334,12 @@
  		goto out;
  
  	retval = kernel_read(interpreter,interp_elf_ex->e_phoff,(char *)elf_phdata,size);
@@ -15,7 +16,7 @@
  
  	eppnt = elf_phdata;
  	for (i=0; i<interp_elf_ex->e_phnum; i++, eppnt++) {
-@@ -532,8 +535,11 @@
+@@ -523,8 +526,11 @@
  		goto out;
  
  	retval = kernel_read(bprm->file, elf_ex.e_phoff, (char *) elf_phdata, size);
@@ -28,7 +29,17 @@
  
  	files = current->files;		/* Refcounted so ok */
  	retval = unshare_files();
-@@ -580,8 +586,14 @@
+@@ -561,7 +567,8 @@
+ 			 */
+ 
+ 			retval = -ENOMEM;
+-			if (elf_ppnt->p_filesz > PATH_MAX)
++			if (elf_ppnt->p_filesz > PATH_MAX || 
++			    elf_ppnt->p_filesz == 0)
+ 				goto out_free_file;
+ 			elf_interpreter = (char *) kmalloc(elf_ppnt->p_filesz,
+ 							   GFP_KERNEL);
+@@ -571,8 +578,16 @@
  			retval = kernel_read(bprm->file, elf_ppnt->p_offset,
  					   elf_interpreter,
  					   elf_ppnt->p_filesz);
@@ -39,12 +50,14 @@
  				goto out_free_interp;
 +			}
 +			/* make sure path is NULL terminated */
-+			elf_interpreter[elf_ppnt->p_filesz - 1] = '\0';
++			retval = -EINVAL;
++			if (elf_interpreter[elf_ppnt->p_filesz - 1] != '\0')
++				goto out_free_interp;
 +
  			/* If the program interpreter is one of these two,
  			 * then assume an iBCS2 image. Otherwise assume
  			 * a native linux image.
-@@ -616,8 +628,11 @@
+@@ -607,8 +622,11 @@
  			if (IS_ERR(interpreter))
  				goto out_free_interp;
  			retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE);
@@ -56,8 +69,8 @@
 +			}
  
  			/* Get the exec headers */
- 			loc->interp_ex = *((struct exec *) bprm->buf);
-@@ -776,8 +791,10 @@
+ 			interp_ex = *((struct exec *) bprm->buf);
+@@ -765,8 +783,10 @@
  		}
  
  		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags);
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r8.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r8.ebuild
deleted file mode 100644
index 0c8843472b02..000000000000
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r8.ebuild,v 1.1 2004/11/12 20:30:32 plasmaroo Exp $
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-IUSE=""
-ETYPE="sources"
-inherit kernel eutils
-OKV="2.4.26"
-EXTRAVERSION="-win4lin-${PR}"
-KV="2.4.26${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-DESCRIPTION="Full sources for the Linux kernel, with Win4Lin support."
-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
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0814.patch"
-HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/"
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-
-	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."
-	eend $?
-	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
-	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
-	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
-	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch || die "Failed to add the CAN-2004-0814 patch!"
-	epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
-	epatch ${FILESDIR}/${P}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
-	epatch ${FILESDIR}/${P}.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!"
-	epatch ${FILESDIR}/${P}.binfmt_elf.patch || die "Failed to apply the binfmt_elf patch!"
-
-	kernel_universal_unpack
-}
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r9.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r9.ebuild
new file mode 100644
index 000000000000..3f0735b0f652
--- /dev/null
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r9.ebuild,v 1.1 2004/11/20 11:12:53 plasmaroo Exp $
+
+# OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+IUSE=""
+ETYPE="sources"
+inherit kernel eutils
+OKV="2.4.26"
+EXTRAVERSION="-win4lin-${PR}"
+KV="2.4.26${EXTRAVERSION}"
+
+S=${WORKDIR}/linux-${KV}
+
+DESCRIPTION="Full sources for the Linux kernel, with Win4Lin support."
+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
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0814.patch"
+HOMEPAGE="http://www.kernel.org/ http://www.netraverse.com/"
+KEYWORDS="x86"
+SLOT="${KV}"
+
+src_unpack() {
+	unpack linux-${OKV}.tar.bz2
+	mv linux-${OKV} linux-${KV} || die
+
+	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."
+	eend $?
+	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch || die "Failed to add the CAN-2004-0415 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
+	epatch ${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch || die "Failed to add the CAN-2004-0814 patch!"
+	epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
+	epatch ${FILESDIR}/${P}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!"
+	epatch ${FILESDIR}/${P}.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!"
+	epatch ${FILESDIR}/${P}.binfmt_elf.patch || die "Failed to apply the binfmt_elf patch!"
+	epatch ${FILESDIR}/${P}.smbfs.patch || die "Failed to apply the SMBFS patch!"
+
+	kernel_universal_unpack
+}
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r8.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r8.ebuild
deleted file mode 100644
index dd07e00a400c..000000000000
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r8.ebuild,v 1.1 2004/11/12 20:30:32 plasmaroo Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-MKI_VERSION='1_3_6'
-UNIPATCH_LIST="
-	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
-	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
-	${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch
-	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch:1
-	${FILESDIR}/${PN}.CAN-2004-0497.patch
-	${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch
-	${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch
-	${FILESDIR}/${PN}-2.6.ProcPerms.patch
-	${FILESDIR}/${PN}-2.6.cmdlineLeak.patch
-	${FILESDIR}/${PN}-2.6.CAN-2004-0816.patch
-	${FILESDIR}/${PN}-2.6.devPtmx.patch
-	${FILESDIR}/${PN}-2.6.binfmt_elf.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_${MKI_VERSION}.patch
-	http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
-	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0814.patch"
-
-# Best to keep "~x86" until Win4Lin-5.1.10 is in the tree and stable;
-# bug #55587.
-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."
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r9.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r9.ebuild
new file mode 100644
index 000000000000..5ae437c455b9
--- /dev/null
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r9.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.7-r9.ebuild,v 1.1 2004/11/20 11:12:53 plasmaroo Exp $
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+MKI_VERSION='1_3_6'
+UNIPATCH_LIST="
+	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
+	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
+	${DISTDIR}/linux-${OKV}-CAN-2004-0814.patch
+	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch:1
+	${FILESDIR}/${PN}.CAN-2004-0497.patch
+	${FILESDIR}/${PN}-2.6.CAN-2004-0596.patch
+	${FILESDIR}/${PN}-2.6.IPTables-RDoS.patch
+	${FILESDIR}/${PN}-2.6.ProcPerms.patch
+	${FILESDIR}/${PN}-2.6.cmdlineLeak.patch
+	${FILESDIR}/${PN}-2.6.CAN-2004-0816.patch
+	${FILESDIR}/${PN}-2.6.devPtmx.patch
+	${FILESDIR}/${PN}-2.6.binfmt_elf.patch
+	${FILESDIR}/${P}.smbfs.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_${MKI_VERSION}.patch
+	http://www.netraverse.com/member/downloads/files/Kernel-Win4Lin3-${OKV}.patch
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
+	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0814.patch"
+
+# Best to keep "~x86" until Win4Lin-5.1.10 is in the tree and stable;
+# bug #55587.
+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."
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r1.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r1.ebuild
new file mode 100644
index 000000000000..12342f7d38d2
--- /dev/null
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.9-r1.ebuild,v 1.1 2004/11/20 11:12:53 plasmaroo Exp $
+
+ETYPE="sources"
+inherit kernel-2
+detect_version
+
+MKI_VERSION='1_3_8'
+UNIPATCH_LIST="
+	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
+	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch:1
+	${FILESDIR}/${PN}-2.6.9.binfmt_elf.patch
+	${FILESDIR}/${P}.smbfs.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
+	ftp://ftp.netraverse.com/pub/testing/kernel/patches/mki-adapter26_${MKI_VERSION}.patch
+	ftp://ftp.netraverse.com/pub/testing/kernel/patches/Kernel-Win4Lin3-${OKV}.patch"
+
+# Best to keep "~x86" until Win4Lin-5.1.10 is in the tree and stable;
+# bug #55587.
+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."
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild
deleted file mode 100644
index 447d2b5187fb..000000000000
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.9.ebuild,v 1.1 2004/11/15 18:07:41 genstef Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-MKI_VERSION='1_3_8'
-UNIPATCH_LIST="
-	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
-	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch:1
-	${FILESDIR}/${PN}-2.6.9.binfmt_elf.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
-	ftp://ftp.netraverse.com/pub/testing/kernel/patches/mki-adapter26_${MKI_VERSION}.patch
-	ftp://ftp.netraverse.com/pub/testing/kernel/patches/Kernel-Win4Lin3-${OKV}.patch"
-
-# Best to keep "~x86" until Win4Lin-5.1.10 is in the tree and stable;
-# bug #55587.
-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."
-- 
cgit v1.2.3-65-gdbad