Added the patch for the mremap/munmap vulnerability. Bug #42024. Also masked older redundant versions of ppc-sources as "ppc".

10 files changed, 122 insertions, 14 deletions

diff --git a/sys-kernel/ppc-sources/ChangeLog b/sys-kernel/ppc-sources/ChangeLog
index aa87cdd0d79d..f33c44c7b136 100644
--- a/sys-kernel/ppc-sources/ChangeLog
+++ b/sys-kernel/ppc-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/ppc-sources
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.34 2004/01/08 18:50:38 plasmaroo Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ChangeLog,v 1.35 2004/02/19 09:44:38 plasmaroo Exp $
+
+*ppc-sources-2.4.24-r1 (19 Feb 2004)
+
+  19 Feb 2004; <plasmaroo@gentoo.org> ppc-sources-2.4.24-r1.ebuild,
+  files/ppc-sources-2.4.24.munmap.patch:
+  Added the patch for the mremap/munmap vulnerability. Bug #42024.
 
 *ppc-sources-2.4.23-r1 (08 Jan 2004)
 
diff --git a/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.24-r1 b/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.24-r1
new file mode 100644
index 000000000000..8cd5b99bfd6e
--- /dev/null
+++ b/sys-kernel/ppc-sources/files/digest-ppc-sources-2.4.24-r1
@@ -0,0 +1,2 @@
+MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
+MD5 a91a17fa04615c5bf56ab4b43c0b49a3 patch-2.4.24-benh0.bz2 213717
diff --git a/sys-kernel/ppc-sources/files/ppc-sources-2.4.24.munmap.patch b/sys-kernel/ppc-sources/files/ppc-sources-2.4.24.munmap.patch
new file mode 100644
index 000000000000..e120b35b7adb
--- /dev/null
+++ b/sys-kernel/ppc-sources/files/ppc-sources-2.4.24.munmap.patch
@@ -0,0 +1,27 @@
+diff -ur linux-2.4.25-rc3/mm/mremap.c linux-2.4.25-rc4/mm/mremap.c
+--- linux-2.4.25-rc3/mm/mremap.c	2004-02-18 13:56:01.000000000 +0000
++++ linux-2.4.25-rc4/mm/mremap.c	2004-02-18 13:49:08.000000000 +0000
+@@ -258,16 +258,20 @@
+ 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ 			goto out;
+ 
+-		do_munmap(current->mm, new_addr, new_len);
++		ret = do_munmap(current->mm, new_addr, new_len);
++		if (ret && new_len)
++			goto out;
+ 	}
+ 
+ 	/*
+ 	 * Always allow a shrinking remap: that just unmaps
+ 	 * the unnecessary pages..
+ 	 */
+-	ret = addr;
+ 	if (old_len >= new_len) {
+-		do_munmap(current->mm, addr+new_len, old_len - new_len);
++		ret = do_munmap(current->mm, addr+new_len, old_len - new_len);
++		if (ret && old_len != new_len)
++			goto out;
++		ret = addr;
+ 		if (!(flags & MREMAP_FIXED) || (new_addr == addr))
+ 			goto out;
+ 	}
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild
index 78e46ec1c6e8..e7d3b8af95a3 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-sources/ppc-sources-2.4.20-r4.ebuild,v 1.7 2004/01/08 06:22:58 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.20-r4.ebuild,v 1.8 2004/02/19 09:44:38 plasmaroo Exp $
 
 IUSE="build crypt"
 
@@ -35,7 +35,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://cvs.gentoo.org/~kain/ppc/patches-${KV}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
-KEYWORDS="-x86 ~ppc -sparc -alpha"
+KEYWORDS="-x86 ppc -sparc -alpha"
 DEPEND=">=sys-devel/binutils-2.11.90.0.31 app-admin/addpatches"
 RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl >=sys-apps/modutils-2.4.2 sys-devel/make"
 
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild
index 758b0043a142..198949a7e1fb 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-sources/ppc-sources-2.4.21-r1.ebuild,v 1.5 2004/01/08 06:22:58 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.21-r1.ebuild,v 1.6 2004/02/19 09:44:38 plasmaroo Exp $
 
 IUSE="build crypt"
 
@@ -34,7 +34,7 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	mirror://gentoo/patches-${KV}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
-KEYWORDS="-x86 ~ppc -sparc -alpha -hppa -mips -arm"
+KEYWORDS="-x86 ppc -sparc -alpha -hppa -mips -arm"
 SLOT="${KV}"
 
 
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
index 90132819517f..4240f5d7695e 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-sources/ppc-sources-2.4.22-r1.ebuild,v 1.6 2004/01/08 06:22:58 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.22-r1.ebuild,v 1.7 2004/02/19 09:44:38 plasmaroo Exp $
 
 IUSE=""
 
@@ -21,7 +21,7 @@ DESCRIPTION="PowerPC kernel tree based on benh's patches, -r corresponds to ben{
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://www.kernel.org/pub/linux/kernel/people/benh/patch-${OKV}-${MY_R}.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/benh/"
-KEYWORDS="-x86 ~ppc -sparc -alpha"
+KEYWORDS="-x86 ppc -sparc -alpha"
 PROVIDE="virtual/linux-sources"
 LICENSE="GPL-2"
 SLOT="${KV}"
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.23-r1.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.23-r1.ebuild
index 2b8af4272a49..992f39f7be05 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.23-r1.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.23-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-sources/ppc-sources-2.4.23-r1.ebuild,v 1.1 2004/01/08 18:50:38 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.23-r1.ebuild,v 1.2 2004/02/19 09:44:38 plasmaroo Exp $
 
 # Whats in this kernel?
 #
@@ -48,7 +48,7 @@ DESCRIPTION="PowerPC kernel tree based on benh's patches, -r corresponds to ben{
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://www.kernel.org/pub/linux/kernel/people/benh/patch-${OKV}-${MY_R}.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/benh/"
-KEYWORDS="-x86 ~ppc -sparc -alpha"
+KEYWORDS="-x86 ppc -sparc -alpha"
 PROVIDE="virtual/linux-sources"
 LICENSE="GPL-2"
 SLOT="${KV}"
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.23.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.23.ebuild
index 386ad365ec5e..2ec9c882ee14 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.23.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.23.ebuild
@@ -1,6 +1,6 @@
 # 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-sources/ppc-sources-2.4.23.ebuild,v 1.2 2004/01/08 06:22:58 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.23.ebuild,v 1.3 2004/02/19 09:44:38 plasmaroo Exp $
 
 # Whats in this kernel?
 #
@@ -47,7 +47,7 @@ DESCRIPTION="PowerPC kernel tree based on benh's patches, -r corresponds to ben{
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
 	 http://www.kernel.org/pub/linux/kernel/people/benh/patch-${OKV}-${MY_R/3/2}.bz2"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/benh/"
-KEYWORDS="-x86 ~ppc -sparc -alpha"
+KEYWORDS="-x86 ppc -sparc -alpha"
 PROVIDE="virtual/linux-sources"
 LICENSE="GPL-2"
 SLOT="${KV}"
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.24-r1.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.24-r1.ebuild
new file mode 100644
index 000000000000..aed6c3779874
--- /dev/null
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.24-r1.ebuild
@@ -0,0 +1,73 @@
+# 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-sources/ppc-sources-2.4.24-r1.ebuild,v 1.1 2004/02/19 09:44:38 plasmaroo Exp $
+#OKV=original kernel version, KV=patched kernel version.  They can be the same.
+
+ETYPE="sources"
+inherit kernel
+
+OKV="2.4.24"
+
+EXTRAVERSION="`echo ${PV}-benh0-${PR} | \
+	sed -e 's/[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\)/\1/'`"
+
+KV=${PV}-benh0-${PR}
+AV=${PV}-benh0
+S=${WORKDIR}/linux-${KV}
+
+inherit eutils
+
+
+DESCRIPTION="Full sources for the linux kernel 2.4.24 with benh's patchset"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
+		mirror://gentoo/patch-${AV}.bz2
+		http://dev.gentoo.org/~trance/stuff/patch-${AV}.bz2"
+
+KEYWORDS="ppc -ppc64"
+DEPEND=">=sys-devel/binutils-2.11.90.0.31"
+RDEPEND=">=sys-libs/ncurses-5.2 dev-lang/perl virtual/modutils sys-devel/make"
+
+SLOT=${KV}
+PROVIDE="virtual/linux-sources"
+
+src_unpack() {
+	cd ${WORKDIR}
+	unpack linux-${OKV}.tar.bz2
+
+	mv linux-${OKV} ${PF}
+	cd ${PF}
+	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
+	bzcat ${DISTDIR}/patch-${AV}.bz2 | patch -p1 || die "patch failed"
+	find . -iname "*~" | xargs rm 2> /dev/null
+
+	# Gentoo Linux uses /boot, so fix 'make install' to work properly
+	# also fix the EXTRAVERSION
+	mv Makefile Makefile.orig
+	sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
+		-e "s:^\(EXTRAVERSION =\).*:\1 ${EXTRAVERSION}:" \
+			Makefile.orig >Makefile || die # test, remove me if Makefile ok
+	rm Makefile.orig
+
+	cd ${WORKDIR}/${PF}
+	MY_ARCH=${ARCH}
+	unset ARCH
+
+	# Sometimes we have icky kernel symbols; this seems to get rid of them
+	make mrproper || die "make mrproper died"
+	ARCH=${MY_ARCH}
+}
+
+src_install() {
+	dodir /usr/src
+	echo ">>> Copying sources..."
+	mv ${WORKDIR}/* ${D}/usr/src
+}
+pkg_postinst() {
+	if [ ! -e ${ROOT}usr/src/linux ]
+	then
+		ln -sf ${PF} ${ROOT}/usr/src/linux
+	fi
+
+	ewarn "XFS file system support is not included in this kernel"
+	echo
+}
diff --git a/sys-kernel/ppc-sources/ppc-sources-2.4.24.ebuild b/sys-kernel/ppc-sources/ppc-sources-2.4.24.ebuild
index ac00ce395773..0731737ace2e 100644
--- a/sys-kernel/ppc-sources/ppc-sources-2.4.24.ebuild
+++ b/sys-kernel/ppc-sources/ppc-sources-2.4.24.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-sources/ppc-sources-2.4.24.ebuild,v 1.3 2004/01/15 09:20:12 trance Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ppc-sources/ppc-sources-2.4.24.ebuild,v 1.4 2004/02/19 09:44:38 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"