Version bumped each version to one with the mremap/munmap vulnerability patch, and removed vulnerable releases. Bug #42024.

11 files changed, 58 insertions, 45 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index ca3f8f67859e..53cb4e4fcad0 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.33 2004/01/10 10:06:24 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.34 2004/02/18 23:09:16 plasmaroo Exp $
+
+*openmosix-sources-2.4.25 (18 Feb 2004)
+
+  18 Feb 2004; <plasmaroo@gentoo.org> openmosix-sources-2.4.20-r7.ebuild,
+  openmosix-sources-2.4.20-r8.ebuild, openmosix-sources-2.4.21-r2.ebuild,
+  openmosix-sources-2.4.21-r3.ebuild, openmosix-sources-2.4.22-r3.ebuild,
+  openmosix-sources-2.4.22-r4.ebuild, openmosix-sources-2.4.24.ebuild,
+  openmosix-sources-2.4.25.ebuild,
+  files/openmosix-sources-2.4.20.munmap.patch:
+  Version bumped each version to one with the mremap/munmap vulnerability patch,
+  and removed vulnerable releases. Bug #42024.
 
   10 Jan 2004; Michael Imhof <tantive@gentoo.org> openmosix-sources-2.4.22-r3.ebuild,
   files/openmosix-sources-2.4.22.crypto_fix.patch:
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r7 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r8
index 4300571b7e2a..4300571b7e2a 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r7
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.20-r8
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.21-r2 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.21-r3
index 6484c2c7bbcf..6484c2c7bbcf 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.21-r2
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.21-r3
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r3 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r4
index 25a77dcde136..25a77dcde136 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r3
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r4
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24
deleted file mode 100644
index 40401a74584f..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 fc993878f3c4238ce086b95afdf3b0e6 patch-2.4.24-om-20040116.bz2 228332
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.25 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.25
new file mode 100644
index 000000000000..90566d22796e
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.25
@@ -0,0 +1,2 @@
+MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
+MD5 f1b9ba746df5dd20fd851bc5827dc0c7 patch-2.4.25-om-20040218.bz2 225978
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.20.munmap.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.20.munmap.patch
new file mode 100644
index 000000000000..3c01b3447ec6
--- /dev/null
+++ b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.20.munmap.patch
@@ -0,0 +1,27 @@
+--- linux-2.4.20-openmosix-r8/mm/mremap.c~	2004-02-18 22:33:57.000000000 +0000
++++ linux-2.4.20-openmosix-r8/mm/mremap.c	2004-02-18 22:35:01.000000000 +0000
+@@ -266,7 +266,9 @@
+ 		if ((addr <= new_addr) && (addr+old_len) > new_addr)
+ 			goto out;
+ 
+-		do_munmap(current->mm, new_addr, new_len, 1);
++		ret = do_munmap(current->mm, new_addr, new_len);
++		if (ret && new_len)
++			goto out;
+ 	}
+ 
+ 	/*
+@@ -274,9 +276,11 @@
+ 	 * the unnecessary pages..
+ 	 * do_munmap does all the needed commit accounting
+ 	 */
+-	ret = addr;
+ 	if (old_len >= new_len) {
+-		do_munmap(current->mm, addr+new_len, old_len - new_len, 1);
++		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/openmosix-sources/openmosix-sources-2.4.20-r7.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r8.ebuild
index 8193b798c93f..16e2e4732428 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r7.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r8.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/openmosix-sources/openmosix-sources-2.4.20-r7.ebuild,v 1.2 2004/01/24 04:26:19 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.20-r8.ebuild,v 1.1 2004/02/18 23:09:16 plasmaroo Exp $
 
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -45,6 +45,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
 	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
 	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 
 	# Gentoo Linux uses /boot, so fix 'make install' to work properly
@@ -68,41 +69,13 @@ src_unpack() {
 	chmod -R a+r-w+X,u+w *
 }
 
-src_compile() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		yes "" | make oldconfig
-		echo "Ignore any errors from the yes command above."
-	fi
-}
-
 src_install() {
-	if [ "$ETYPE" = "sources" ]
-	then
-		dodir /usr/src
-		echo ">>> Copying sources..."
-		mv ${WORKDIR}/* ${D}/usr/src
-	else
-		#linux-headers
-		dodir /usr/include/linux
-		cp -ax ${S}/include/linux/* ${D}/usr/include/linux
-		rm -rf ${D}/usr/include/linux/modules
-		dodir /usr/include/asm
-		cp -ax ${S}/include/asm-i386/* ${D}/usr/include/asm
-	fi
-}
-
-pkg_preinst() {
-	if [ "$ETYPE" = "headers" ]
-	then
-		[ -L ${ROOT}usr/include/linux ] && rm ${ROOT}usr/include/linux
-		[ -L ${ROOT}usr/include/asm ] && rm ${ROOT}usr/include/asm
-		true
-	fi
+	dodir /usr/src
+	echo ">>> Copying sources..."
+	mv ${WORKDIR}/* ${D}/usr/src
 }
 
 pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
 	if [ ! -e ${ROOT}usr/src/linux ]
 	then
 		rm -f ${ROOT}usr/src/linux
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r2.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r3.ebuild
index 0412b4216016..5d31ab480907 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r2.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r3.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/openmosix-sources/openmosix-sources-2.4.21-r2.ebuild,v 1.1 2004/01/06 22:42:38 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.21-r3.ebuild,v 1.1 2004/02/18 23:09:16 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 #we use this next variable to avoid duplicating stuff on cvs
@@ -47,6 +47,7 @@ src_unpack() {
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
 	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
 	epatch ${FILESDIR}/${PN}-2.4.20.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
+	epatch ${FILESDIR}/${PN}-2.4.20.munmap.patch || die "Failed to apply munmap patch!"
 
 	# Gentoo Linux uses /boot, so fix 'make install' to work properly
 	cd ${S}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r3.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r4.ebuild
index fd51a3b16082..33cdc758b91f 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r3.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-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/openmosix-sources/openmosix-sources-2.4.22-r3.ebuild,v 1.2 2004/01/10 10:06:24 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r4.ebuild,v 1.1 2004/02/18 23:09:16 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -36,6 +36,7 @@ src_unpack() {
 
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
 	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
+	epatch ${FILESDIR}/${PN}-2.4.20.munmap.patch || die "Failed to apply munmap patch!"
 	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 	epatch ${FILESDIR}/${P}.crypto_fix.patch || die "Failed to patch crypto api!"
 
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.25.ebuild
index e5f8ecbc3d8f..3c2648b34b4b 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.25.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24.ebuild,v 1.1 2004/01/18 19:57:09 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.25.ebuild,v 1.1 2004/02/18 23:09:16 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
 inherit kernel
 
-OKV="2.4.24"
+OKV="2.4.25"
 [ "${PR}" == "r0" ] && KV=${PV/_/-}-openmosix || KV=${PV/_/-}-openmosix-${PR}
 EXTRAVERSION="`echo ${KV}|sed -e 's:[0-9]\+\.[0-9]\+\.[0-9]\+\(.*\):\1:'`"
 BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
@@ -15,24 +15,24 @@ S=${WORKDIR}/linux-${KV}
 # What's in this kernel?
 
 # INCLUDED:
-#   2.4.24, plus:
-#   2.4.24  openmosix-2.4.24-20040116 by tab
+#   2.4.25, plus:
+#   2.4.25  openmosix-2.4.25-20040218 by tab
 
 DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
 SRC_URI="http://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-http://tab.tuxfamily.org/download/openmosix/stable/patch-2.4.24-om-20040116.bz2"
+	 http://mcaserta.com/openmosix/testing/patch-2.4.25-om-20040218.bz2"
 PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
+HOMEPAGE="http://www.kernel.org/ http://www.openmosix.org/"
 LICENSE="GPL-2"
 SLOT="${KV}"
-KEYWORDS="-* ~x86"
+KEYWORDS="-* x86"
 
 src_unpack() {
 
 	unpack linux-${OKV}.tar.bz2
 	mv linux-${OKV} linux-${KV} || die
 	cd linux-${KV}
-	bzcat ${DISTDIR}/patch-2.4.24-om-20040116.bz2|patch -p1 || die "-openmosix patch failed"
+	bzcat ${DISTDIR}/patch-2.4.25-om-20040218.bz2 | patch -p1 || die "-openmosix patch failed"
 
 	kernel_universal_unpack