security update for #59378

15 files changed, 31 insertions, 517 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index f832c0f9beec..9393fc9af796 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.57 2004/07/22 12:10:12 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.58 2004/08/05 15:12:17 voxus Exp $
+
+*openmosix-sources-2.4.24-r2 (05 Aug 2004)
+
+  05 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -files/openmosix-sources-2.4.20.munmap.patch,
+  -files/openmosix-sources-2.4.20.rtc_fix.patch,
+  -files/openmosix-sources-2.4.22.crypto_fix.patch,
+  -files/openmosix-sources-2.4.22.pipe_bug.patch,
+  -files/openmosix-sources-2.4.22.rtc_fix.patch,
+  -files/openmosix-sources-2.4.22.signal_fix.patch,
+  -files/openmosix-sources.CAN-2004-0394.patch,
+  -files/openmosix-sources.CAN-2004-0427.patch,
+  -files/do_brk_fix.patch,
+  -openmosix-sources-2.4.22-r11.ebuild,
+  -openmosix-sources-2.4.24-r1.ebuild,
+  +openmosix-sources-2.4.24-r2.ebuild:
+  Security update, closes bug #59378.
+  .22 tree finally dropped.
 
 *openmosix-sources-2.4.26-r5 (22 Jul 2004)
 
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index 7411f086dbe6..1239722bf23f 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,17 +1,7 @@
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
-MD5 232d6474e5d6395ca8c981d1434bed1d openmosix-sources-2.4.22-r11.ebuild 1973
-MD5 e3c7357388c177a6c41cb8281c480cb1 openmosix-sources-2.4.24-r1.ebuild 1614
-MD5 edfce345bd87af0abc70496b3d3357d6 ChangeLog 9717
 MD5 3c4f99ce1405245504e8324ddf8c8925 openmosix-sources-2.4.26-r5.ebuild 1333
-MD5 199264742137ada4477d69f816dc5454 files/digest-openmosix-sources-2.4.22-r11 134
-MD5 b67048d6f05fa573fda67bdf7a264d0d files/digest-openmosix-sources-2.4.24-r1 136
-MD5 b86824eda82b7145748fffb251dc62d4 files/do_brk_fix.patch 472
-MD5 032ff70c5895cc1a2dfbe2a58ebde1f7 files/openmosix-sources-2.4.20.munmap.patch 819
-MD5 a61e57d5483a06f20da339d91f98fbb8 files/openmosix-sources-2.4.20.rtc_fix.patch 6769
-MD5 ec82894c1f49e075f00a952c78783119 files/openmosix-sources-2.4.22.crypto_fix.patch 485
-MD5 2d0ee073ca09e575523388ad5ac76b5a files/openmosix-sources-2.4.22.pipe_bug.patch 288
-MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/openmosix-sources-2.4.22.rtc_fix.patch 7073
-MD5 5be98093ca690daffaf11aa8b781776d files/openmosix-sources-2.4.22.signal_fix.patch 371
+MD5 8d0f72adc4670224f3d9d3d79dcdfdb0 openmosix-sources-2.4.24-r2.ebuild 1743
+MD5 9e7f8fa42feeddce22d788f9445c3abf ChangeLog 10423
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/openmosix-sources.CAN-2003-0985.patch 414
 MD5 bf2b609e8cab6460d220b1267db09826 files/openmosix-sources.CAN-2004-0001.patch 982
 MD5 147fec50180ad91b6260fc7201dcb90f files/openmosix-sources.CAN-2004-0010.patch 6050
@@ -19,9 +9,8 @@ MD5 21f3a4f186017d925067335e24db36a1 files/openmosix-sources.CAN-2004-0109.patch
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/openmosix-sources.CAN-2004-0177.patch 384
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/openmosix-sources.CAN-2004-0178.patch 424
 MD5 de75cfa969ed092578d9ddda6c5be334 files/openmosix-sources.CAN-2004-0181.patch 1233
-MD5 d4a740ae56c2049247083af387a22a85 files/openmosix-sources.CAN-2004-0394.patch 350
-MD5 c460ea130cb4ae84a5063ba044e3ce72 files/openmosix-sources.CAN-2004-0427.patch 460
 MD5 dc18e982f8149588a291956481885a8c files/openmosix-sources.CAN-2004-0495.patch 17549
 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
 MD5 0f66013f643c79c97fda489618a4e2fd files/openmosix-sources.CAN-2004-0535.patch 476
 MD5 040414ee404f92bc9085c442674605d4 files/digest-openmosix-sources-2.4.26-r5 147
+MD5 a9cd98f699342b66141ef055758ef329 files/digest-openmosix-sources-2.4.24-r2 212
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r11 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r11
deleted file mode 100644
index c3ed47ac2831..000000000000
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.22-r11
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 68224fe261b75cdfd84882df2ae6bb12 openMosix-2.4.22-3.bz2 249126
diff --git a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r1 b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r2
index 791a2ee3378a..b75fe69b673a 100644
--- a/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r1
+++ b/sys-kernel/openmosix-sources/files/digest-openmosix-sources-2.4.24-r2
@@ -1,2 +1,3 @@
 MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
 MD5 7327583ac763d8833499274caa7e4771 openMosix-2.4.24-om1.bz2 234126
+MD5 7e0e9f3d57bcc1b1bb7900ada383c129 linux-2.4.23-CAN-2004-0415.patch 89319
diff --git a/sys-kernel/openmosix-sources/files/do_brk_fix.patch b/sys-kernel/openmosix-sources/files/do_brk_fix.patch
deleted file mode 100644
index 4d187c4a74b5..000000000000
--- a/sys-kernel/openmosix-sources/files/do_brk_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru linux-2.4.22-openmosix-r1/mm/mmap.c linux-2.4.22-openmosix-r1.fixed/mm/mmap.c
---- linux-2.4.22-openmosix-r1/mm/mmap.c	2003-12-02 11:45:58.000000000 -0600
-+++ linux-2.4.22-openmosix-r1.fixed/mm/mmap.c	2003-12-02 11:53:34.868028290 -0600
-@@ -1391,6 +1391,9 @@
- 	if (!len)
- 		return addr;
- 
-+	if ((addr + len) > TASK_SIZE || (addr + len) < addr)
-+		return -EINVAL;
-+
- #ifdef CONFIG_MOSIX
- 	if(current->mosix.dflags & DDEPUTY)
- 		return(mosix_deputy_brk(addr, len));
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
deleted file mode 100644
index d2cf4f4303f4..000000000000
--- a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.20.munmap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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, 1);
-+		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, 1);
-+		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/files/openmosix-sources-2.4.20.rtc_fix.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.20.rtc_fix.patch
deleted file mode 100644
index 10e9c228d6d2..000000000000
--- a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.20.rtc_fix.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -ur linux-2.4.20-wolk4.9s/arch/cris/drivers/ds1302.c linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/ds1302.c
---- linux-2.4.20-wolk4.9s/arch/cris/drivers/ds1302.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/ds1302.c	2004-01-05 23:41:44.000000000 +0000
-@@ -315,6 +315,7 @@
- 		{
- 			struct rtc_time rtc_tm;
- 						
-+			memset(&rtc_tm, 0, sizeof (struct rtc_time));
- 			get_rtc_time(&rtc_tm);						
- 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
- 				return -EFAULT;	
-diff -ur linux-2.4.20-wolk4.9s/arch/cris/drivers/pcf8563.c linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/pcf8563.c
---- linux-2.4.20-wolk4.9s/arch/cris/drivers/pcf8563.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/cris/drivers/pcf8563.c	2004-01-05 23:42:22.000000000 +0000
-@@ -174,6 +174,7 @@
- 			{
- 				struct rtc_time tm;
- 
-+				memset(&tm, 0, sizeof (struct rtc_time));
- 				get_rtc_time(&tm);
- 
- 				if (copy_to_user((struct rtc_time *) arg, &tm, sizeof(struct rtc_time))) {
-diff -ur linux-2.4.20-wolk4.9s/arch/m68k/bvme6000/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/bvme6000/rtc.c
---- linux-2.4.20-wolk4.9s/arch/m68k/bvme6000/rtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/bvme6000/rtc.c	2004-01-05 23:43:15.000000000 +0000
-@@ -54,6 +54,7 @@
- 		/* Ensure clock and real-time-mode-register are accessible */
- 		msr = rtc->msr & 0xc0;
- 		rtc->msr = 0x40;
-+		memset(&wtime, 0, sizeof (struct rtc_time));
- 		do {
- 			wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
- 			wtime.tm_min =  BCD2BIN(rtc->bcd_min);
-diff -ur linux-2.4.20-wolk4.9s/arch/m68k/mvme16x/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/mvme16x/rtc.c
---- linux-2.4.20-wolk4.9s/arch/m68k/mvme16x/rtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/m68k/mvme16x/rtc.c	2004-01-05 23:44:02.000000000 +0000
-@@ -52,6 +52,7 @@
- 		cli();
- 		/* Ensure clock and real-time-mode-register are accessible */
- 		rtc->ctrl = RTC_READ;
-+		memset(&wtime, 0, sizeof (struct rtc_time));
- 		wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
- 		wtime.tm_min =  BCD2BIN(rtc->bcd_min);
- 		wtime.tm_hour = BCD2BIN(rtc->bcd_hr);
-diff -ur linux-2.4.20-wolk4.9s/arch/mips/sgi-ip27/ip27-rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/mips/sgi-ip27/ip27-rtc.c
---- linux-2.4.20-wolk4.9s/arch/mips/sgi-ip27/ip27-rtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/mips/sgi-ip27/ip27-rtc.c	2004-01-05 23:48:34.000000000 +0000
-@@ -84,6 +84,7 @@
- 	switch (cmd) {
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&wtime);
- 		break;
- 	}
-diff -ur linux-2.4.20-wolk4.9s/arch/ppc64/kernel/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/arch/ppc64/kernel/rtc.c
---- linux-2.4.20-wolk4.9s/arch/ppc64/kernel/rtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/arch/ppc64/kernel/rtc.c	2004-01-05 23:44:34.000000000 +0000
-@@ -96,6 +96,7 @@
- 	switch (cmd) {
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		ppc_md.get_rtc_time(&wtime);
- 		break;
- 	}
-diff -ur linux-2.4.20-wolk4.9s/drivers/char/efirtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/efirtc.c
---- linux-2.4.20-wolk4.9s/drivers/char/efirtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/efirtc.c	2004-01-05 23:47:53.000000000 +0000
-@@ -118,6 +118,7 @@
- static void
- convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime)
- {
-+	memset(wtime, 0, sizeof(struct rtc_time));
- 	wtime->tm_sec  = eft->second;
- 	wtime->tm_min  = eft->minute;
- 	wtime->tm_hour = eft->hour;
-diff -ur linux-2.4.20-wolk4.9s/drivers/char/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/rtc.c
---- linux-2.4.20-wolk4.9s/drivers/char/rtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/char/rtc.c	2004-01-05 23:52:43.000000000 +0000
-@@ -370,6 +370,7 @@
- 		 * tm_min, and tm_sec values are filled in.
- 		 */
- 
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_alm_time(&wtime);
- 		break; 
- 	}
-@@ -417,6 +418,7 @@
- 	}
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&wtime);
- 		break;
- 	}
-diff -ur linux-2.4.20-wolk4.9s/drivers/hil/hp_sdc_rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/hil/hp_sdc_rtc.c
---- linux-2.4.20-wolk4.9s/drivers/hil/hp_sdc_rtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/hil/hp_sdc_rtc.c	2004-01-05 23:53:36.000000000 +0000
-@@ -561,6 +561,7 @@
-         }
-         case RTC_ALM_READ:      /* Read the present alarm time */
-         {
-+		memset(&ttime, 0, sizeof(struct timeval));
- 		if (hp_sdc_rtc_read_mt(&ttime)) return -EFAULT;
-                 break;
-         }
-@@ -609,6 +610,7 @@
-         }
-         case RTC_RD_TIME:       /* Read the time/date from RTC  */
-         {
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		if (hp_sdc_rtc_read_bbrtc(&wtime)) return -EFAULT;
-                 break;
-         }
-diff -ur linux-2.4.20-wolk4.9s/drivers/macintosh/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/macintosh/rtc.c
---- linux-2.4.20-wolk4.9s/drivers/macintosh/rtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/macintosh/rtc.c	2004-01-05 23:54:15.000000000 +0000
-@@ -64,6 +64,7 @@
- 	case RTC_RD_TIME:
- 		if (ppc_md.get_rtc_time)
- 		{
-+			memset(&rtc_tm, 0, sizeof(struct rtc_time));
- 			get_rtc_time(&rtc_tm);
- 
- 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
-diff -ur linux-2.4.20-wolk4.9s/drivers/sbus/char/rtc.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/sbus/char/rtc.c
---- linux-2.4.20-wolk4.9s/drivers/sbus/char/rtc.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/sbus/char/rtc.c	2004-01-05 23:54:43.000000000 +0000
-@@ -89,6 +89,7 @@
- 	switch (cmd)
- 	{
- 	case RTCGET:
-+		memset(&rtc_tm, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&rtc_tm);
- 
- 		if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
-diff -ur linux-2.4.20-wolk4.9s/drivers/sgi/char/ds1286.c linux-2.4.20-wolk4.9s.plasmaroo/drivers/sgi/char/ds1286.c
---- linux-2.4.20-wolk4.9s/drivers/sgi/char/ds1286.c	2004-01-05 23:33:45.000000000 +0000
-+++ linux-2.4.20-wolk4.9s.plasmaroo/drivers/sgi/char/ds1286.c	2004-01-05 23:47:25.000000000 +0000
-@@ -174,6 +174,7 @@
- 		 * tm_min, and tm_sec values are filled in.
- 		 */
- 
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		ds1286_get_alm_time(&wtime);
- 		break;
- 	}
-@@ -216,6 +217,7 @@
- 	}
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		ds1286_get_time(&wtime);
- 		break;
- 	}
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.crypto_fix.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.crypto_fix.patch
deleted file mode 100644
index c016248e94d4..000000000000
--- a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.crypto_fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- linux-2.4.22-openmosix-r3/Makefile.orig	2004-01-08 00:03:51.000000000 +0100
-+++ linux-2.4.22-openmosix-r3/Makefile	2004-01-07 20:16:46.000000000 +0100
-@@ -132,9 +132,9 @@
- LIBS		=$(TOPDIR)/lib/lib.a
- ifdef CONFIG_MOSIX
- CORE_FILES	+= $(TOPDIR)/hpc/hpc.o
--SUBDIRS		=hpc kernel drivers mm fs net ipc lib
-+SUBDIRS		=hpc kernel drivers mm fs net ipc lib crypto
- else
--SUBDIRS		=kernel drivers mm fs net ipc lib
-+SUBDIRS		=kernel drivers mm fs net ipc lib crypto
- endif
- 
- DRIVERS-n :=
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.pipe_bug.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.pipe_bug.patch
deleted file mode 100644
index 4c7dc47fd0f8..000000000000
--- a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.pipe_bug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mm/filemap.c	2004-06-14 23:15:29.000000000 +0400
-+++ mm/filemap.c.fixed	2004-06-16 10:48:32.000000000 +0400
-@@ -3226,7 +3226,7 @@
- 	err = written ? written : status;
- out:
- 
--	up(&inode->i_sem);
-+//	up(&inode->i_sem); <- it's a pipe-bug
- 	return err;
- fail_write:
- 	status = -EFAULT;
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.rtc_fix.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.rtc_fix.patch
deleted file mode 100644
index 76a663c6e89d..000000000000
--- a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.rtc_fix.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -urN linux-2.4.23/arch/cris/drivers/ds1302.c linux-2.4.24/arch/cris/drivers/ds1302.c
---- linux-2.4.23/arch/cris/drivers/ds1302.c	2003-08-25 04:44:39.000000000 -0700
-+++ linux-2.4.24/arch/cris/drivers/ds1302.c	2004-01-05 05:53:56.000000000 -0800
-@@ -346,6 +346,7 @@
- 		{
- 			struct rtc_time rtc_tm;
- 						
-+			memset(&rtc_tm, 0, sizeof (struct rtc_time));
- 			get_rtc_time(&rtc_tm);						
- 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
- 				return -EFAULT;	
-diff -urN linux-2.4.23/arch/cris/drivers/pcf8563.c linux-2.4.24/arch/cris/drivers/pcf8563.c
---- linux-2.4.23/arch/cris/drivers/pcf8563.c	2003-08-25 04:44:39.000000000 -0700
-+++ linux-2.4.24/arch/cris/drivers/pcf8563.c	2004-01-05 05:53:56.000000000 -0800
-@@ -220,6 +220,7 @@
- 		{
- 			struct rtc_time tm;
- 
-+			memset(&tm, 0, sizeof (struct rtc_time));
- 			get_rtc_time(&tm);
- 
- 			if (copy_to_user((struct rtc_time *) arg, &tm, sizeof tm)) {
-diff -urN linux-2.4.23/arch/m68k/bvme6000/rtc.c linux-2.4.24/arch/m68k/bvme6000/rtc.c
---- linux-2.4.23/arch/m68k/bvme6000/rtc.c	2003-06-13 07:51:31.000000000 -0700
-+++ linux-2.4.24/arch/m68k/bvme6000/rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -54,6 +54,7 @@
- 		/* Ensure clock and real-time-mode-register are accessible */
- 		msr = rtc->msr & 0xc0;
- 		rtc->msr = 0x40;
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		do {
- 			wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
- 			wtime.tm_min =  BCD2BIN(rtc->bcd_min);
-diff -urN linux-2.4.23/arch/m68k/mvme16x/rtc.c linux-2.4.24/arch/m68k/mvme16x/rtc.c
---- linux-2.4.23/arch/m68k/mvme16x/rtc.c	2003-06-13 07:51:31.000000000 -0700
-+++ linux-2.4.24/arch/m68k/mvme16x/rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -52,6 +52,7 @@
- 		cli();
- 		/* Ensure clock and real-time-mode-register are accessible */
- 		rtc->ctrl = RTC_READ;
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
- 		wtime.tm_min =  BCD2BIN(rtc->bcd_min);
- 		wtime.tm_hour = BCD2BIN(rtc->bcd_hr);
-diff -urN linux-2.4.23/arch/ppc64/kernel/rtc.c linux-2.4.24/arch/ppc64/kernel/rtc.c
---- linux-2.4.23/arch/ppc64/kernel/rtc.c	2003-06-13 07:51:32.000000000 -0700
-+++ linux-2.4.24/arch/ppc64/kernel/rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -96,6 +96,7 @@
- 	switch (cmd) {
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		ppc_md.get_rtc_time(&wtime);
- 		break;
- 	}
-diff -urN linux-2.4.23/drivers/acorn/char/i2c.c linux-2.4.24/drivers/acorn/char/i2c.c
---- linux-2.4.23/drivers/acorn/char/i2c.c	2003-08-25 04:44:40.000000000 -0700
-+++ linux-2.4.24/drivers/acorn/char/i2c.c	2004-01-05 05:53:56.000000000 -0800
-@@ -166,6 +166,7 @@
- 		break;
- 
- 	case RTC_RD_TIME:
-+		memset(&rtctm, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&rtc_raw, &year);
- 		rtctm.tm_sec  = rtc_raw.secs;
- 		rtctm.tm_min  = rtc_raw.mins;
-diff -urN linux-2.4.23/drivers/char/ds1286.c linux-2.4.24/drivers/char/ds1286.c
---- linux-2.4.23/drivers/char/ds1286.c	2003-08-25 04:44:41.000000000 -0700
-+++ linux-2.4.24/drivers/char/ds1286.c	2004-01-05 05:53:56.000000000 -0800
-@@ -173,7 +173,7 @@
- 		 * means "don't care" or "match all". Only the tm_hour,
- 		 * tm_min, and tm_sec values are filled in.
- 		 */
--
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		ds1286_get_alm_time(&wtime);
- 		break;
- 	}
-@@ -216,6 +216,7 @@
- 	}
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		ds1286_get_time(&wtime);
- 		break;
- 	}
-diff -urN linux-2.4.23/drivers/char/efirtc.c linux-2.4.24/drivers/char/efirtc.c
---- linux-2.4.23/drivers/char/efirtc.c	2003-06-13 07:51:32.000000000 -0700
-+++ linux-2.4.24/drivers/char/efirtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -118,6 +118,7 @@
- static void
- convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime)
- {
-+	memset(wtime, 0, sizeof(struct rtc_time));
- 	wtime->tm_sec  = eft->second;
- 	wtime->tm_min  = eft->minute;
- 	wtime->tm_hour = eft->hour;
-diff -urN linux-2.4.23/drivers/char/ip27-rtc.c linux-2.4.24/drivers/char/ip27-rtc.c
---- linux-2.4.23/drivers/char/ip27-rtc.c	2003-08-25 04:44:41.000000000 -0700
-+++ linux-2.4.24/drivers/char/ip27-rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -83,6 +83,7 @@
- 	switch (cmd) {
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&wtime);
- 		break;
- 	}
-diff -urN linux-2.4.23/drivers/char/mips_rtc.c linux-2.4.24/drivers/char/mips_rtc.c
---- linux-2.4.23/drivers/char/mips_rtc.c	2003-08-25 04:44:41.000000000 -0700
-+++ linux-2.4.24/drivers/char/mips_rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -82,6 +82,7 @@
- 
- 	switch (cmd) {
- 	case RTC_RD_TIME:	/* Read the time/date from RTC  */
-+		memset(&rtc_tm, 0, sizeof(struct rtc_time));
- 		curr_time = rtc_get_time();
- 		to_tm(curr_time, &rtc_tm);
- 		rtc_tm.tm_year -= 1900;
-diff -urN linux-2.4.23/drivers/char/rtc.c linux-2.4.24/drivers/char/rtc.c
---- linux-2.4.23/drivers/char/rtc.c	2003-11-28 10:26:20.000000000 -0800
-+++ linux-2.4.24/drivers/char/rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -362,7 +362,7 @@
- 		 * means "don't care" or "match all". Only the tm_hour,
- 		 * tm_min, and tm_sec values are filled in.
- 		 */
--
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_alm_time(&wtime);
- 		break; 
- 	}
-@@ -406,6 +406,7 @@
- 	}
- 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
- 	{
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&wtime);
- 		break;
- 	}
-diff -urN linux-2.4.23/drivers/hil/hp_sdc_rtc.c linux-2.4.24/drivers/hil/hp_sdc_rtc.c
---- linux-2.4.23/drivers/hil/hp_sdc_rtc.c	2003-06-13 07:51:33.000000000 -0700
-+++ linux-2.4.24/drivers/hil/hp_sdc_rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -561,6 +561,7 @@
-         }
-         case RTC_ALM_READ:      /* Read the present alarm time */
-         {
-+		memset(&ttime, 0, sizeof(struct timeval));
- 		if (hp_sdc_rtc_read_mt(&ttime)) return -EFAULT;
-                 break;
-         }
-@@ -609,6 +610,7 @@
-         }
-         case RTC_RD_TIME:       /* Read the time/date from RTC  */
-         {
-+		memset(&wtime, 0, sizeof(struct rtc_time));
- 		if (hp_sdc_rtc_read_bbrtc(&wtime)) return -EFAULT;
-                 break;
-         }
-diff -urN linux-2.4.23/drivers/macintosh/rtc.c linux-2.4.24/drivers/macintosh/rtc.c
---- linux-2.4.23/drivers/macintosh/rtc.c	2002-02-25 11:37:58.000000000 -0800
-+++ linux-2.4.24/drivers/macintosh/rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -64,6 +64,7 @@
- 	case RTC_RD_TIME:
- 		if (ppc_md.get_rtc_time)
- 		{
-+			memset(&rtc_tm, 0, sizeof(struct rtc_time));
- 			get_rtc_time(&rtc_tm);
- 
- 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
-diff -urN linux-2.4.23/drivers/sbus/char/rtc.c linux-2.4.24/drivers/sbus/char/rtc.c
---- linux-2.4.23/drivers/sbus/char/rtc.c	2001-10-10 23:42:47.000000000 -0700
-+++ linux-2.4.24/drivers/sbus/char/rtc.c	2004-01-05 05:53:56.000000000 -0800
-@@ -89,6 +89,7 @@
- 	switch (cmd)
- 	{
- 	case RTCGET:
-+		memset(&rtc_tm, 0, sizeof(struct rtc_time));
- 		get_rtc_time(&rtc_tm);
- 
- 		if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.signal_fix.patch b/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.signal_fix.patch
deleted file mode 100644
index e4055140f4b2..000000000000
--- a/sys-kernel/openmosix-sources/files/openmosix-sources-2.4.22.signal_fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.26/include/asm-i386/i387.h.signal-race	2004-06-14 09:58:10.000000000 +0200
-+++ linux-2.4.26/include/asm-i386/i387.h	2004-06-14 17:05:32.000000000 +0200
-@@ -35,7 +35,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/openmosix-sources/files/openmosix-sources.CAN-2004-0394.patch b/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-0394.patch
deleted file mode 100644
index 273f1a52046f..000000000000
--- a/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-0394.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.4.22-oM3-orig/kernel/panic.c	Tue Mar 30 15:37:18 2004
-+++ linux-2.4.22-oM3-mod/kernel/panic.c	Mon May 17 18:44:01 2004
-@@ -51,7 +51,7 @@
- 
- 	bust_spinlocks(1);
- 	va_start(args, fmt);
--	vsprintf(buf, fmt, args);
-+	vsnprintf(buf, sizeof(buf), fmt, args);
- 	va_end(args);
- 	printk(KERN_EMERG "Kernel panic: %s\n",buf);
- 	if (in_interrupt())
diff --git a/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-0427.patch b/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-0427.patch
deleted file mode 100644
index ddc9610f67f8..000000000000
--- a/sys-kernel/openmosix-sources/files/openmosix-sources.CAN-2004-0427.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nar -U 4 linux-2.4.25/kernel/fork.c linux-2.4.25-new/kernel/fork.c
---- linux-2.4.25/kernel/fork.c	2004-02-18 05:36:32.000000000 -0800
-+++ linux-2.4.25-new/kernel/fork.c	2004-04-07 17:43:29.000000000 -0700
-@@ -825,8 +825,10 @@
- bad_fork_cleanup_namespace:
- 	exit_namespace(p);
- bad_fork_cleanup_mm:
- 	exit_mm(p);
-+	if (p->active_mm)
-+		mmdrop(p->active_mm);
- bad_fork_cleanup_sighand:
- 	exit_sighand(p);
- bad_fork_cleanup_fs:
- 	exit_fs(p); /* blocking */
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r11.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r11.ebuild
deleted file mode 100644
index 1b63fa5ffe3a..000000000000
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.22-r11.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# 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-r11.ebuild,v 1.2 2004/07/15 03:54:35 agriffis Exp $
-#OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-ETYPE="sources"
-inherit kernel eutils
-
-OKV="2.4.22"
-[ "${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}::`"
-S=${WORKDIR}/linux-${KV}
-
-# What's in this kernel?
-
-# INCLUDED:
-#   2.4.22, plus:
-#   2.4.22  openmosix-2.4.22-3
-#			various security patches
-
-DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/openmosix/openMosix-2.4.22-3.bz2"
-PROVIDE="virtual/linux-sources"
-HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
-LICENSE="GPL-2"
-SLOT="${KV}"
-KEYWORDS="-* x86"
-IUSE=""
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	mv linux-${OKV} linux-${KV} || die
-	cd linux-${KV}
-	bzcat ${DISTDIR}/openMosix-2.4.22-3.bz2|patch -p1 || die "-openmosix patch failed"
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() 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}.signal_fix.patch || die "Failed to patch signal.c vulnerability."
-	epatch ${FILESDIR}/${P}.pipe_bug.patch || die "Failed to patch pipe-bug."
-
-	for n in `ls ${FILESDIR}/${PN}.CAN-*`;
-	do
-		epatch $n || die "Failed to add " $n;
-	done
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	[ "$ETYPE" = "headers" ] && return
-	if [ ! -e ${ROOT}usr/src/linux ]
-	then
-		rm -f ${ROOT}usr/src/linux
-		ln -sf linux-${KV} ${ROOT}/usr/src/linux
-	fi
-}
diff --git a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r1.ebuild b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r2.ebuild
index cb7b53daeddc..1903bdafa26d 100644
--- a/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r1.ebuild
+++ b/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-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/openmosix-sources/openmosix-sources-2.4.24-r1.ebuild,v 1.2 2004/07/15 03:54:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/openmosix-sources-2.4.24-r2.ebuild,v 1.1 2004/08/05 15:12:17 voxus Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -22,7 +22,8 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo openMosix Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://sourceforge/openmosix/openMosix-${OKV}-${OMV}.bz2"
+mirror://sourceforge/openmosix/openMosix-${OKV}-${OMV}.bz2
+http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/linux-2.4.23-CAN-2004-0415.patch"
 PROVIDE="virtual/linux-sources"
 HOMEPAGE="http://www.kernel.org/ http://www.gentoo.org/ http://www.openmosix.org/"
 LICENSE="GPL-2"
@@ -34,13 +35,16 @@ src_unpack() {
 	unpack linux-${OKV}.tar.bz2
 	mv linux-${OKV} linux-${KV} || die
 	cd linux-${KV}
-	bzcat ${DISTDIR}/openMosix-${OKV}-${OMV}.bz2|patch -p1 || die "-openmosix patch failed"
 
-	for n in `ls ${FILESDIR}/${PN}.CAN-* | egrep -v \(CAN-2004-0394\|CAN-2004-0427\)`;
+	epatch ${DISTDIR}/openMosix-${OKV}-${OMV}.bz2 || die "openMosix patch failed"
+
+	for n in `ls ${FILESDIR}/${PN}.CAN-*`;
 	do
 		epatch $n || die "Failed to add " $n;
 	done
 
+	epatch ${DISTDIR}/linux-2.4.23-CAN-2004-0415.patch || die "Failed to add CAN-2004-0415"
+
 	kernel_universal_unpack
 }