Fixed headers and added a patch to addres the mremap() security vulnerability, see bug #37292.

13 files changed, 58 insertions, 37 deletions

diff --git a/sys-kernel/ppc-development-sources/ChangeLog b/sys-kernel/ppc-development-sources/ChangeLog
index dad1be3df581..42e7eeeabe69 100644
--- a/sys-kernel/ppc-development-sources/ChangeLog
+++ b/sys-kernel/ppc-development-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/ppc-development-sources
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ChangeLog,v 1.15 2004/01/02 07:27:56 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ChangeLog,v 1.16 2004/01/08 17:15:16 plasmaroo Exp $
+
+  08 Jan 2004; <plasmaroo@gentoo.org>
+  ppc-development-sources-2.6.1_rc1-r1.ebuild,
+  files/ppc-development-sources.CAN-2003-0985.patch:
+  Added a patch to addres the mremap() security vulnerability, see bug #37292.
 
 *ppc-development-sources-2.6.1_rc1-r1 (02 Jan 2004)
 
diff --git a/sys-kernel/ppc-development-sources/Manifest b/sys-kernel/ppc-development-sources/Manifest
index 151ce6200251..c54833335cb1 100644
--- a/sys-kernel/ppc-development-sources/Manifest
+++ b/sys-kernel/ppc-development-sources/Manifest
@@ -1,22 +1,23 @@
+MD5 7cbe8fed244ad6a3e1527abf964eea8d ChangeLog 3419
+MD5 608078e776c1b748a5edfdca61b6173e ppc-development-sources-2.6.0_beta11-r1.ebuild 3011
+MD5 ba565792fff8cf2356c98c15b8bd89d8 ppc-development-sources-2.6.0-r1.ebuild 2972
 MD5 1c052e00eb39506aa1b54ec02045995a metadata.xml 504
-MD5 6f969af2f4dd809d414d1c12e32e5d12 ppc-development-sources-2.6.0_beta9-r3.ebuild 3008
-MD5 fdbc73ddb0ee0f3be98eb82f8a1ceca0 ppc-development-sources-2.6.0_beta9-r4.ebuild 3008
-MD5 b5b22006dd21a23ea9d554db0ddc8bcc ppc-development-sources-2.6.0_beta9-r5.ebuild 3008
-MD5 e5cc413fc3db833208e5d3e5203ed115 ChangeLog 3203
-MD5 17a03651dea8432293590067cb1b5a81 ppc-development-sources-2.6.0-r1.ebuild 2970
-MD5 c5b583557e82d2fc6226c6870da6e96b ppc-development-sources-2.6.0-r2.ebuild 2970
-MD5 b3a92d2cb51cac3c67c44b1d86cfed76 ppc-development-sources-2.6.0_beta10-r1.ebuild 3009
-MD5 2a9fa58292cac58555bd4de6178d24bb ppc-development-sources-2.6.0_beta11-r1.ebuild 3009
-MD5 834c0ba434d53c96abb5a11ef81d87df ppc-development-sources-2.6.0_beta11-r2.ebuild 3015
-MD5 fb69f265ba25ee9b377b6e74934f41e9 ppc-development-sources-2.6.0_beta11-r3.ebuild 3009
-MD5 f2191941864f4d0f1989ff4cc3c90dc2 ppc-development-sources-2.6.1_rc1-r1.ebuild 2955
-MD5 82c462ec939a497add3a635d399298d9 files/digest-ppc-development-sources-2.6.0_beta9-r3 146
-MD5 23355c925f3ea8c119c6dda82d6c8a68 files/digest-ppc-development-sources-2.6.0_beta9-r4 146
-MD5 67b76c684bfe83b8eebe1e76defbbb8a files/digest-ppc-development-sources-2.6.0_beta9-r5 146
-MD5 17d246e6d7366781c35bc702664ca234 files/digest-ppc-development-sources-2.6.0-r1 134
+MD5 4fac9ddbde02bd6bf1578b514f264682 ppc-development-sources-2.6.0_beta9-r4.ebuild 3010
+MD5 5ec889f22b32e88f3fc102fd0c9039cd ppc-development-sources-2.6.0_beta9-r3.ebuild 3010
+MD5 bdcf87fe68dbedbbfcd5a8a826aa83a4 ppc-development-sources-2.6.0_beta11-r3.ebuild 3011
+MD5 f0ff6bca5c479dd54a0fcd8964f07b17 ppc-development-sources-2.6.0_beta11-r2.ebuild 3017
+MD5 274d5422634214bb0a03d105104d4f9a ppc-development-sources-2.6.0_beta9-r5.ebuild 3010
+MD5 eec7c07dbcbb383fd1da396c445ae08e ppc-development-sources-2.6.1_rc1-r1.ebuild 3049
+MD5 e6fd094f536ae835bbfa08f9bebef3d7 ppc-development-sources-2.6.0-r2.ebuild 2972
+MD5 c878d5cf647b1f33c1366328e606aab1 ppc-development-sources-2.6.0_beta10-r1.ebuild 3011
+MD5 88b2606cc385bf080ac9759b801eb6aa files/digest-ppc-development-sources-2.6.1_rc1-r1 139
 MD5 b96c50e6586d2c6ae358ba83153c0edb files/digest-ppc-development-sources-2.6.0-r2 134
+MD5 17d246e6d7366781c35bc702664ca234 files/digest-ppc-development-sources-2.6.0-r1 134
 MD5 2562356d9d52640bf176789d8904a97f files/digest-ppc-development-sources-2.6.0_beta10-r1 148
 MD5 14fc5eb5e5d5099de26a4ce7d62f71c1 files/digest-ppc-development-sources-2.6.0_beta11-r1 148
+MD5 82c462ec939a497add3a635d399298d9 files/digest-ppc-development-sources-2.6.0_beta9-r3 146
 MD5 185cd118bcfbdb07f24af91e19c5859a files/digest-ppc-development-sources-2.6.0_beta11-r2 148
+MD5 23355c925f3ea8c119c6dda82d6c8a68 files/digest-ppc-development-sources-2.6.0_beta9-r4 146
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/ppc-development-sources.CAN-2003-0985.patch 414
+MD5 67b76c684bfe83b8eebe1e76defbbb8a files/digest-ppc-development-sources-2.6.0_beta9-r5 146
 MD5 6c4466baf773545ee83f71551bdda609 files/digest-ppc-development-sources-2.6.0_beta11-r3 148
-MD5 88b2606cc385bf080ac9759b801eb6aa files/digest-ppc-development-sources-2.6.1_rc1-r1 139
diff --git a/sys-kernel/ppc-development-sources/files/ppc-development-sources.CAN-2003-0985.patch b/sys-kernel/ppc-development-sources/files/ppc-development-sources.CAN-2003-0985.patch
new file mode 100644
index 000000000000..dacf6ed810f9
--- /dev/null
+++ b/sys-kernel/ppc-development-sources/files/ppc-development-sources.CAN-2003-0985.patch
@@ -0,0 +1,13 @@
+--- linux/mm/mremap.c.orig	2004-01-05 17:01:21.382104120 +0000
++++ linux/mm/mremap.c	2004-01-05 17:15:25.689749848 +0000
+@@ -315,6 +315,10 @@
+ 	old_len = PAGE_ALIGN(old_len);
+ 	new_len = PAGE_ALIGN(new_len);
+ 
++	/* Don't allow the degenerate cases */
++	if (!old_len || !new_len)
++		goto out;
++
+ 	/* new_addr is only valid if MREMAP_FIXED is specified */
+ 	if (flags & MREMAP_FIXED) {
+ 		if (new_addr & ~PAGE_MASK)
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r1.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r1.ebuild
index 48eeff09a9c9..e560212231cd 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r1.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r1.ebuild,v 1.2 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r1.ebuild,v 1.3 2004/01/08 17:15:16 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r2.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r2.ebuild
index 8f385e4371e1..6547ba2b39d6 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r2.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r2.ebuild,v 1.2 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0-r2.ebuild,v 1.3 2004/01/08 17:15:16 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta10-r1.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta10-r1.ebuild
index 11efc95f4ccd..afe56d28efb3 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta10-r1.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta10-r1.ebuild,v 1.2 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta10-r1.ebuild,v 1.3 2004/01/08 17:15:16 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r1.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r1.ebuild
index f8699afefcb0..6a54ae26b2b9 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r1.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r1.ebuild,v 1.2 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r1.ebuild,v 1.3 2004/01/08 17:15:16 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r2.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r2.ebuild
index ddc29cc091e6..6a5b11692d8e 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r2.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r2.ebuild,v 1.3 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r2.ebuild,v 1.4 2004/01/08 17:15:16 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r3.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r3.ebuild
index 08f4213846f0..1c2d50856759 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r3.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r3.ebuild,v 1.2 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta11-r3.ebuild,v 1.3 2004/01/08 17:15:17 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild
index f270113c40c6..86e929f7aa16 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild,v 1.5 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r3.ebuild,v 1.6 2004/01/08 17:15:17 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild
index 3c3f84f735f5..3da5a86d11b8 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild,v 1.4 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r4.ebuild,v 1.5 2004/01/08 17:15:17 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild
index 4e448e2139a8..138d58e83d40 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild,v 1.3 2003/12/29 01:29:28 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.0_beta9-r5.ebuild,v 1.4 2004/01/08 17:15:17 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
diff --git a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.1_rc1-r1.ebuild b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.1_rc1-r1.ebuild
index 074b55d97916..68dea9b8d6b4 100644
--- a/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.1_rc1-r1.ebuild
+++ b/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.1_rc1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.1_rc1-r1.ebuild,v 1.1 2004/01/02 07:27:56 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-development-sources/ppc-development-sources-2.6.1_rc1-r1.ebuild,v 1.2 2004/01/08 17:15:17 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -39,6 +39,8 @@ src_unpack() {
 	bzcat ${DISTDIR}/patches-${KV}.bz2 | patch -p1 || die "patch failed"
 	find . -iname "*~" | xargs rm 2> /dev/null
 
+	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+
 	# Gentoo Linux uses /boot, so fix 'make install' to work properly
 	# also fix the EXTRAVERSION
 	mv Makefile Makefile.orig