Version bump for the AF_UNIX and a.out security vulnerabilities; bugs #72452 and #72317.

15 files changed, 133 insertions, 22 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 5969e088fd48..7982063c70f6 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.95 2004/11/20 16:45:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.96 2004/11/27 20:57:39 plasmaroo Exp $
+
+*gentoo-sources-2.4.20-r29 (27 Nov 2004)
+
+  27 Nov 2004; <plasmaroo@gentoo.org> -gentoo-sources-2.4.20-r28.ebuild,
+  +gentoo-sources-2.4.20-r29.ebuild, -gentoo-sources-2.4.22-r19.ebuild,
+  +gentoo-sources-2.4.22-r20.ebuild, -gentoo-sources-2.4.25-r12.ebuild,
+  +gentoo-sources-2.4.25-r13.ebuild, -gentoo-sources-2.4.26-r12.ebuild,
+  +gentoo-sources-2.4.26-r13.ebuild, -gentoo-sources-2.4.27-r4.ebuild,
+  +gentoo-sources-2.4.27-r5.ebuild, -gentoo-sources-2.4.28-r1.ebuild,
+  +gentoo-sources-2.4.28-r2.ebuild, +files/gentoo-sources-2.4.AF_UNIX.patch,
+  +files/gentoo-sources-2.4.binfmt_a.out.patch:
+  Version bump for the AF_UNIX and a.out security vulnerabilities; bugs #72452
+  and #72317.
 
 *gentoo-sources-2.4.26-r12 (20 Nov 2004)
 
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r28 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r29
index cf24929f42e8..cf24929f42e8 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r28
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r29
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r19 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r20
index ae62b02192ec..ae62b02192ec 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r19
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r20
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r12 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r13
index ddf72226d1b3..ddf72226d1b3 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r12
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r13
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r12 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r13
index 33596a1b91ba..33596a1b91ba 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r12
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r13
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.27-r4 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.27-r5
index cb0002e288c5..cb0002e288c5 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.27-r4
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.27-r5
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r1 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r2
index 400db3a891d3..400db3a891d3 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r1
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r2
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.AF_UNIX.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.AF_UNIX.patch
new file mode 100644
index 000000000000..6ced78404a2d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.AF_UNIX.patch
@@ -0,0 +1,24 @@
+--- linux-2.4.27/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
++++ linux-2.4.28/net/unix/af_unix.c	2004-11-24 08:23:21 -08:00
+@@ -1403,9 +1403,11 @@
+ 
+ 	msg->msg_namelen = 0;
+ 
++	down(&sk->protinfo.af_unix.readsem);
++
+ 	skb = skb_recv_datagram(sk, flags, noblock, &err);
+ 	if (!skb)
+-		goto out;
++		goto out_unlock;
+ 
+ 	wake_up_interruptible(&sk->protinfo.af_unix.peer_wait);
+ 
+@@ -1449,6 +1451,8 @@
+ 
+ out_free:
+ 	skb_free_datagram(sk,skb);
++out_unlock:
++	up(&sk->protinfo.af_unix.readsem);
+ out:
+ 	return err;
+ }
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.binfmt_a.out.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.binfmt_a.out.patch
new file mode 100644
index 000000000000..4644ae28bce4
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.binfmt_a.out.patch
@@ -0,0 +1,63 @@
+diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c
+--- linux-2.4.28/fs/exec.c	2004-04-15 10:44:45 -07:00
++++ linux-2.4.28.plasmaroo/fs/exec.c	2004-11-12 12:02:40 -08:00
+@@ -342,6 +342,7 @@ int setup_arg_pages(struct linux_binprm 
+ 	
+ 	down_write(&current->mm->mmap_sem);
+ 	{
++		struct vm_area_struct *vma;
+ 		mpnt->vm_mm = current->mm;
+ 		mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
+ 		mpnt->vm_end = STACK_TOP;
+@@ -351,6 +352,12 @@ int setup_arg_pages(struct linux_binprm 
+ 		mpnt->vm_pgoff = 0;
+ 		mpnt->vm_file = NULL;
+ 		mpnt->vm_private_data = (void *) 0;
++		vma = find_vma(current->mm, mpnt->vm_start);
++		if (vma) {
++			up_write(&current->mm->mmap_sem);
++			kmem_cache_free(vm_area_cachep, mpnt);
++			return -ENOMEM;
++		}
+ 		insert_vm_struct(current->mm, mpnt);
+ 		current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+ 	} 
+diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c
+--- linux-2.4.28/fs/binfmt_aout.c	2002-02-04 23:54:04 -08:00
++++ linux-2.4.28.plasmaroo/fs/binfmt_aout.c	2004-11-12 11:55:14 -08:00
+@@ -39,13 +39,18 @@ static struct linux_binfmt aout_format =
+ 	NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE
+ };
+ 
+-static void set_brk(unsigned long start, unsigned long end)
++#define BAD_ADDR(x)	((unsigned long)(x) >= TASK_SIZE)
++
++static int set_brk(unsigned long start, unsigned long end)
+ {
+ 	start = PAGE_ALIGN(start);
+ 	end = PAGE_ALIGN(end);
+-	if (end <= start)
+-		return;
+-	do_brk(start, end - start);
++	if (end > start) {
++		unsigned long addr = do_brk(start, end - start);
++		if (BAD_ADDR(addr))
++			return addr;
++	}
++	return 0;
+ }
+ 
+ /*
+@@ -405,7 +410,11 @@ static int load_aout_binary(struct linux
+ beyond_if:
+ 	set_binfmt(&aout_format);
+ 
+-	set_brk(current->mm->start_brk, current->mm->brk);
++	retval = set_brk(current->mm->start_brk, current->mm->brk);
++	if (retval < 0) {
++		send_sig(SIGKILL, current, 0);
++		return retval;
++	}
+ 
+ 	retval = setup_arg_pages(bprm); 
+ 	if (retval < 0) { 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r28.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r29.ebuild
index 96f996351ec3..0148cfa68f03 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r28.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r29.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r28.ebuild,v 1.1 2004/11/20 16:45:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r29.ebuild,v 1.1 2004/11/27 20:57:39 plasmaroo Exp $
 
 IUSE="aavm crypt evms2 usagi"
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV}.tar.bz2
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/29/28}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0415.patch
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
@@ -42,7 +42,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV}
+	cd ${WORKDIR}/${KV/r29/r28}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if ! use aavm; then
@@ -151,6 +151,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!"
 	epatch ${FILESDIR}/${PN}-2.4.binfmt_elf.patch || die "Failed to apply the binfmt_elf patch!"
 	epatch ${FILESDIR}/${P}-smbfs.patch || die "Failed to apply the SMBFS patch!"
+	epatch ${FILESDIR}/${PN}-2.4.AF_UNIX.patch || die "Failed to apply the AF_UNIX patch!"
+	epatch ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch || die "Failed to apply the binfmt_a.out patch!"
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r19.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r20.ebuild
index f6b08e34135a..6e2a4d115342 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r19.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r19.ebuild,v 1.1 2004/11/20 16:45:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r20.ebuild,v 1.1 2004/11/27 20:57:39 plasmaroo Exp $
 
 ETYPE="sources"
 
@@ -9,7 +9,7 @@ detect_version
 
 UNIPATCH_STRICTORDER='Y'
 UNIPATCH_LIST="
-	${DISTDIR}/gentoo-sources-${PVR/19/5}.patch.bz2
+	${DISTDIR}/gentoo-sources-${PVR/20/5}.patch.bz2
 	${FILESDIR}/${PN}-2.4.munmap.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0001.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0010.patch
@@ -30,13 +30,15 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
 	${FILESDIR}/${PN}-2.4.XDRWrapFix.patch
 	${FILESDIR}/${PN}-2.4.binfmt_elf.patch
-	${FILESDIR}/${PN}-2.4.20-smbfs.patch"
+	${FILESDIR}/${PN}-2.4.20-smbfs.patch
+	${FILESDIR}/${PN}-2.4.AF_UNIX.patch
+	${FILESDIR}/${PN}-2.4.binfmt_a.out.patch"
 
 S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/19/5}.patch.bz2
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/20/5}.patch.bz2
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
 	http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch"
 KEYWORDS="x86 -*"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r13.ebuild
index 41ed782042a9..837a2638b082 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r12.ebuild,v 1.1 2004/11/20 16:45:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r13.ebuild,v 1.1 2004/11/27 20:57:39 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -29,7 +29,9 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.binfmt_elf.patch
 	${FILESDIR}/${PN}-2.4.smbfs.patch
 	${DISTDIR}/linux-2.4.26-CAN-2004-0415.patch
-	${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch"
+	${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch
+	${FILESDIR}/${PN}-2.4.AF_UNIX.patch
+	${FILESDIR}/${PN}-2.4.binfmt_a.out.patch"
 
 DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~livewire/${P}.patch.bz2
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r13.ebuild
index 134ba22304bd..e006b39ffa1b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r12.ebuild,v 1.1 2004/11/20 16:45:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r13.ebuild,v 1.1 2004/11/27 20:57:39 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -11,7 +11,7 @@ IUSE=''
 
 UNIPATCH_STRICTORDER='Y'
 UNIPATCH_LIST="
-	${DISTDIR}/${PF/r12/r6}.tar.bz2
+	${DISTDIR}/${PF/r13/r6}.tar.bz2
 	${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
@@ -23,9 +23,11 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.binfmt_elf.patch
 	${FILESDIR}/${PN}-2.4.smbfs.patch
 	${DISTDIR}/linux-${OKV}-CAN-2004-0415.patch
-	${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch"
+	${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch
+	${FILESDIR}/${PN}-2.4.AF_UNIX.patch
+	${FILESDIR}/${PN}-2.4.binfmt_a.out.patch"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r12/r6}.tar.bz2
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r13/r6}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-${OKV}-CAN-2004-0415.patch
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-2.4.22-CAN-2004-0814.patch"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.27-r4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.27-r5.ebuild
index a4cf2310ff24..e110180e81e7 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.27-r4.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.27-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.27-r4.ebuild,v 1.1 2004/11/20 16:45:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.27-r5.ebuild,v 1.1 2004/11/27 20:57:39 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -10,14 +10,16 @@ KEYWORDS="~x86 -ppc"
 IUSE=''
 
 UNIPATCH_STRICTORDER='Y'
-UNIPATCH_LIST="${DISTDIR}/${PF/r4/r1}.tar.bz2
+UNIPATCH_LIST="${DISTDIR}/${PF/r5/r1}.tar.bz2
 	${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch
 	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
 	${FILESDIR}/${PN}-2.4.XDRWrapFix.patch
 	${FILESDIR}/${PN}-2.4.binfmt_elf.patch
-	${FILESDIR}/${PN}-2.4.smbfs.patch"
+	${FILESDIR}/${PN}-2.4.smbfs.patch
+	${FILESDIR}/${PN}-2.4.AF_UNIX.patch
+	${FILESDIR}/${PN}-2.4.binfmt_a.out.patch"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r4/r1}.tar.bz2
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r5/r1}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-2.4.22-CAN-2004-0814.patch"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r2.ebuild
index 627644b8534e..be683d4194bd 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r1.ebuild,v 1.1 2004/11/17 22:45:10 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r2.ebuild,v 1.1 2004/11/27 20:57:39 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -10,10 +10,11 @@ KEYWORDS="~x86 -ppc"
 IUSE=''
 
 UNIPATCH_STRICTORDER='Y'
-UNIPATCH_LIST="${DISTDIR}/${PF}.tar.bz2
+UNIPATCH_LIST="${DISTDIR}/${PF/r2/r1}.tar.bz2
 	${DISTDIR}/${PN}-2.4.22-CAN-2004-0814.patch
-	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch"
+	${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
+	${FILESDIR}/${PN}-2.4.binfmt_a.out.patch"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF}.tar.bz2
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r2/r1}.tar.bz2
 	 http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-2.4.22-CAN-2004-0814.patch"