Added a patch for the FPU-lockup issue; please see bug #58304 for details.

4 files changed, 20 insertions, 5 deletions

diff --git a/sys-kernel/gaming-sources/ChangeLog b/sys-kernel/gaming-sources/ChangeLog
index c618d6e9e489..b89f4c14ef68 100644
--- a/sys-kernel/gaming-sources/ChangeLog
+++ b/sys-kernel/gaming-sources/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/gaming-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.23 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/ChangeLog,v 1.24 2004/06/14 18:11:07 plasmaroo Exp $
+
+  14 Jun 2004; <plasmaroo@gentoo.org> :
+  Added a patch for the FPU-lockup issue; please see bug #58304 for details.
 
   31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   gaming-sources-2.4.20-r11.ebuild:
diff --git a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r11 b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r12
index bb133846e255..bb133846e255 100644
--- a/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r11
+++ b/sys-kernel/gaming-sources/files/digest-gaming-sources-2.4.20-r12
diff --git a/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.FPULockup-53804.patch b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.FPULockup-53804.patch
new file mode 100644
index 000000000000..1dd5ed87b520
--- /dev/null
+++ b/sys-kernel/gaming-sources/files/gaming-sources-2.4.20.FPULockup-53804.patch
@@ -0,0 +1,11 @@
+--- linux-2.4/include/asm-i386/i387.h	2004-06-13 20:06:05.044881328 +0100
++++ linux-2.4/include/asm-i386/i387.h	2004-06-13 20:25:42.836829736 +0100
+@@ -34,7 +34,7 @@
+ 
+ #define clear_fpu( tsk ) do { \
+ 	if ( tsk->flags & PF_USEDFPU ) { \
+-		asm volatile("fwait"); \
++		asm volatile("fnclex ; fwait"); \
+ 		tsk->flags &= ~PF_USEDFPU; \
+ 		stts(); \
+ 	} \
diff --git a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r11.ebuild b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r12.ebuild
index b4c651815f6b..d31c7d92b171 100644
--- a/sys-kernel/gaming-sources/gaming-sources-2.4.20-r11.ebuild
+++ b/sys-kernel/gaming-sources/gaming-sources-2.4.20-r12.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/gaming-sources/gaming-sources-2.4.20-r11.ebuild,v 1.2 2004/05/30 23:53:42 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gaming-sources/gaming-sources-2.4.20-r12.ebuild,v 1.1 2004/06/14 18:11:07 plasmaroo Exp $
 
 IUSE="build"
 
@@ -17,18 +17,18 @@ CKV="2.4.20-ck7"
 
 DESCRIPTION="Full sources for the Gentoo gaming-optimized kernel"
 HOMEPAGE="http://members.optusnet.com.au/ckolivas/kernel/"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/11/5}.tar.bz2 http://www.plumlocosoft.com/kernel/patches/2.4/${OKV}/linux-${CKV}.patch.bz2"
+SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2 mirror://gentoo/patches-${KV/12/5}.tar.bz2 http://www.plumlocosoft.com/kernel/patches/2.4/${OKV}/linux-${CKV}.patch.bz2"
 
 KEYWORDS="x86 -ppc"
 SLOT="${KV}"
 
 src_unpack() {
-	unpack linux-${OKV}.tar.bz2 patches-${KV/11/5}.tar.bz2
+	unpack linux-${OKV}.tar.bz2 patches-${KV/12/5}.tar.bz2
 	bzcat ${DISTDIR}/linux-${CKV}.patch.bz2 | patch -p0 || die "-ck patch failed"
 
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/11/5} || die
+	cd ${KV/12/5} || die
 	rm 98_nforce2_agp.patch # In -ck7
 	kernel_src_unpack
 
@@ -45,4 +45,5 @@ src_unpack() {
 	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
 	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
 	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
+	epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 }