From: Tim Yamin <plasmaroo@gentoo.org>
Date: Sat, 27 Nov 2004 20:57:40 +0000 (+0000)
Subject: Version bump for the AF_UNIX and a.out security vulnerabilities; bugs #72452 and... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa0d50c16f4749d491600cb22c68e3fc44938e8c;p=gentoo.git

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

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/Manifest b/sys-kernel/gentoo-sources/Manifest
index e7bffadc5a5a..436217961407 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,13 +1,12 @@
-MD5 c4618709686c1e4f4b1284255b25d209 gentoo-sources-2.4.27-r4.ebuild 902
-MD5 3215c65e60e83c4976ebcf5d659ca6d7 ChangeLog 25579
+MD5 2e1f7ffc0d74207bf67fc92231702d10 ChangeLog 26270
+MD5 802a110c5c94d0c22abe165d7a46355b gentoo-sources-2.4.26-r13.ebuild 1387
+MD5 36034719ed773564fc279c2445b29a1a gentoo-sources-2.4.22-r20.ebuild 2148
 MD5 91ea2908f17a4069774ffce01264df0c metadata.xml 354
-MD5 ba48ef413cfc74749ca6cbf7d214c30e gentoo-sources-2.4.28-r1.ebuild 774
-MD5 886b1cecbfd949520b9a62149a1d69d3 gentoo-sources-2.4.20-r28.ebuild 7577
-MD5 940de2ca16eb00d2ebcb8e607063a94f gentoo-sources-2.4.22-r19.ebuild 2069
-MD5 331a102f58de4510250019f2479c3691 gentoo-sources-2.4.25-r12.ebuild 1523
-MD5 578b00ab90a0713ca8c458c3f1c1d5dd gentoo-sources-2.4.26-r12.ebuild 1308
+MD5 47268f1733675f93d9c011929b3bb391 gentoo-sources-2.4.25-r13.ebuild 1602
+MD5 57b9beeb950f7238c5b9be809621db8f gentoo-sources-2.4.20-r29.ebuild 7777
+MD5 614fbf0b313f7c1774d4cca1fa057f94 gentoo-sources-2.4.27-r5.ebuild 981
+MD5 9db3a3ba1a5119c5d6a390e44233c27e gentoo-sources-2.4.28-r2.ebuild 828
 MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
-MD5 a1ea0b29ae36f749e1d26f5ceef9c0b7 files/digest-gentoo-sources-2.4.25-r12 305
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gentoo-sources-2.4.CAN-2004-0427.patch 460
 MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
 MD5 2f4db0083c0ed762c0af63f26812a68b files/gentoo-sources-2.4.20-fix-proc-mm.patch 1300
@@ -18,19 +17,20 @@ MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 134
 MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/gentoo-sources-2.4.CAN-2004-0178.patch 424
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/gentoo-sources-2.4.CAN-2004-0497.patch 707
+MD5 3bf139832981003e66e2b702515b2f1b files/digest-gentoo-sources-2.4.22-r20 308
 MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
+MD5 3a83764576b40cd440269b408dc12d26 files/digest-gentoo-sources-2.4.20-r29 316
 MD5 d4a740ae56c2049247083af387a22a85 files/gentoo-sources-2.4.CAN-2004-0394.patch 350
+MD5 b9a94233e1457787352e5f85e3e3582d files/gentoo-sources-2.4.binfmt_a.out.patch 2009
 MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch 1028
 MD5 dc18e982f8149588a291956481885a8c files/gentoo-sources-2.4.CAN-2004-0495.patch 17549
 MD5 a4cb2b30bc0ad5f4f3913a6ec2ddfe1a files/gentoo-sources-2.4.binfmt_elf.patch 2618
 MD5 528da73c9e4a6fb017561e51dc0ab815 files/gentoo-sources-2.4.CAN-2003-0643.patch 747
+MD5 d02d09295f2ccf5f8738a005ba37bf0b files/digest-gentoo-sources-2.4.28-r2 229
 MD5 751d36c76691a7cab7c5bb48ca2ac092 files/gentoo-sources-2.4.26-OpenSWAN-CompileFix.patch 1447
 MD5 d96fe98630a0a160723a67e4ca93dcff files/gentoo-sources-2.4.20-grsec-datasize_fix.patch 1421
-MD5 d1561fff7fcca1dd43d5bb8fe2fed05a files/digest-gentoo-sources-2.4.26-r12 306
-MD5 3bf139832981003e66e2b702515b2f1b files/digest-gentoo-sources-2.4.22-r19 308
 MD5 de75cfa969ed092578d9ddda6c5be334 files/gentoo-sources-2.4.CAN-2004-0181.patch 1233
 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
-MD5 82d1f62153165d59f018e37f19a25d64 files/digest-gentoo-sources-2.4.27-r4 229
 MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/gentoo-sources-2.4.20-rtc_fix.patch 6769
 MD5 2b3ddb8b8b15f8da35ade38544b57857 files/gentoo-sources-2.4.XDRWrapFix.patch 1499
@@ -38,18 +38,20 @@ MD5 147fec50180ad91b6260fc7201dcb90f files/gentoo-sources-2.4.CAN-2004-0010.patc
 MD5 60d25ff310fc6abfdce39ec9e47345af files/gentoo-sources-2.4.CAN-2004-0685.patch 2809
 MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/gentoo-sources-2.4.smbfs.patch 3434
+MD5 b0a1f80aff51d6601e8924329023b241 files/gentoo-sources-2.4.AF_UNIX.patch 515
 MD5 5bf9836a632a861728d33f9736bb7431 files/gentoo-sources-2.4.CAN-2004-0133.patch 427
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gentoo-sources-2.4.22-rtc_fix.patch 7073
-MD5 3a83764576b40cd440269b408dc12d26 files/digest-gentoo-sources-2.4.20-r28 316
+MD5 d1561fff7fcca1dd43d5bb8fe2fed05a files/digest-gentoo-sources-2.4.26-r13 306
 MD5 0f66013f643c79c97fda489618a4e2fd files/gentoo-sources-2.4.CAN-2004-0535.patch 476
 MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
-MD5 d02d09295f2ccf5f8738a005ba37bf0b files/digest-gentoo-sources-2.4.28-r1 229
 MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
 MD5 e30386f1121b1197396ed9082eae7dcb files/gentoo-sources-2.4.I2C_Limits.patch 1037
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/gentoo-sources-2.4.FPULockup-53804.patch 354
 MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
+MD5 a1ea0b29ae36f749e1d26f5ceef9c0b7 files/digest-gentoo-sources-2.4.25-r13 305
 MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
 MD5 394bae02a20af95fc9d320f6cea3834e files/gentoo-sources-2.4.22-kmsgdump.patch 887
+MD5 82d1f62153165d59f018e37f19a25d64 files/digest-gentoo-sources-2.4.27-r5 229
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gentoo-sources-2.4.CAN-2004-0177.patch 384
 MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/gentoo-sources-2.4.22-CAN-2004-0075.patch 634
 MD5 92f1b3aa68de326081b75653a77d64cf files/gentoo-sources-2.4.20-CAN-2004-0685.patch 2881
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
similarity index 100%
rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r28
rename to 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
similarity index 100%
rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r19
rename to 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
similarity index 100%
rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r12
rename to 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
similarity index 100%
rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r12
rename to 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
similarity index 100%
rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.27-r4
rename to 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
similarity index 100%
rename from sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.28-r1
rename to 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
similarity index 96%
rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r28.ebuild
rename to 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
similarity index 86%
rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r19.ebuild
rename to 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
similarity index 88%
rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r12.ebuild
rename to 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
similarity index 80%
rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r12.ebuild
rename to 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
similarity index 72%
rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.27-r4.ebuild
rename to 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
similarity index 71%
rename from sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r1.ebuild
rename to 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"