Added security patches and removed old pre-release - see bug #37317 and bug #37292.

8 files changed, 210 insertions, 85 deletions

diff --git a/sys-kernel/aa-sources/ChangeLog b/sys-kernel/aa-sources/ChangeLog
index ff336340533d..44422fc10501 100644
--- a/sys-kernel/aa-sources/ChangeLog
+++ b/sys-kernel/aa-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/aa-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.22 2003/12/09 23:24:36 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.23 2004/01/05 22:22:56 plasmaroo Exp $
+
+  05 Jan 2004; <plasmaroo@gentoo.org> aa-sources-2.4.23-r1.ebuild, files/...
+  Removed the old pre-release and added the 2.4.24 security patches. 
+  Please see bug #37292.
 
   09 Dec 2003; <plasmaroo@gentoo.org> aa-sources-2.4.23-r1.ebuild:
   Added a fix for the XFS support in aa-sources as a bug from upstream seems to
diff --git a/sys-kernel/aa-sources/Manifest b/sys-kernel/aa-sources/Manifest
index a555873cc4a0..f3c8602337b3 100644
--- a/sys-kernel/aa-sources/Manifest
+++ b/sys-kernel/aa-sources/Manifest
@@ -1,9 +1,9 @@
-MD5 a547ad6de1f6afdf0f76dd3db52b38c0 ChangeLog 3500
-MD5 890152c8c910a763918bcdd83076ab23 aa-sources-2.4.23_pre6-r3.ebuild 2292
+MD5 450b5ae6a727d1e64b4d49c954cd3b86 ChangeLog 3673
 MD5 399eb7607b8f1f3f597e93566b1bda7c metadata.xml 453
-MD5 ed5a6a71c91d45a0bcc7dc64ffb57c7e aa-sources-2.4.23-r1.ebuild 2092
-MD5 f52db1359783589e6bff683234f18ebf aa-sources-2.4.22-r1.ebuild 2195
-MD5 c2babe65706f8f06078eb30bd36d0cd5 files/digest-aa-sources-2.4.23_pre6-r3 197
+MD5 e491a0304e0cdbf73730cc2247b2f5ef aa-sources-2.4.23-r1.ebuild 2177
+MD5 4fb7a65c142a66df2c4f92829145ecba aa-sources-2.4.22-r1.ebuild 2200
+MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/aa-sources-2.4.23.rtc_fix.patch 7073
+MD5 d641cd49ae63ca2989672d2209691bb5 files/aa-sources-2.4.23.CAN-2003-0985.patch 414
 MD5 017a713155afe3e4b9c5672eef0bc959 files/digest-aa-sources-2.4.22-r1 126
 MD5 fcfb3fc100621b77d191f86b66dd810a files/aa-sources-2.4.22-ide-scsi-missing-sym-fix.patch 465
 MD5 23188d802797d56fc9b4a55f3b1d3b31 files/digest-aa-sources-2.4.23-r1 126
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild
index 9b309c0f5cd6..b65bae286bf7 100644
--- a/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild
+++ b/sys-kernel/aa-sources/aa-sources-2.4.22-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/aa-sources/aa-sources-2.4.22-r1.ebuild,v 1.5 2003/12/01 22:16:40 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.22-r1.ebuild,v 1.6 2004/01/05 22:22:57 plasmaroo Exp $
 
 IUSE="build"
 
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.23-r1.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.23-r1.ebuild
index 748e80ce22d0..9b71220952fb 100644
--- a/sys-kernel/aa-sources/aa-sources-2.4.23-r1.ebuild
+++ b/sys-kernel/aa-sources/aa-sources-2.4.23-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/aa-sources/aa-sources-2.4.23-r1.ebuild,v 1.2 2003/12/09 23:24:36 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.23-r1.ebuild,v 1.3 2004/01/05 22:22:57 plasmaroo Exp $
 
 IUSE="build"
 
@@ -61,5 +61,8 @@ src_unpack() {
 	bzcat ${DISTDIR}/${KV/-}.bz2|patch -p1 || die "-aa patch failed"
 	sed -e '51i \				   qsort.o \\' -i fs/xfs/support/Makefile
 
+	epatch ${FILESDIR}/${P}.CAN-2003-0985.patch
+	epatch ${FILESDIR}/${P}.rtc_fix.patch
+
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.23_pre6-r3.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.23_pre6-r3.ebuild
deleted file mode 100644
index 309584fc1fa8..000000000000
--- a/sys-kernel/aa-sources/aa-sources-2.4.23_pre6-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.23_pre6-r3.ebuild,v 1.3 2003/12/02 20:11:19 iggy Exp $
-
-IUSE="build"
-
-# OKV=original kernel version, KV=patched kernel version.  
-
-ETYPE="sources"
-
-inherit kernel
-
-# AAV=andrea arcangeli release version
-AAV=aa${PR/r/}
-# KV=patched kernel version
-KV="${PV/_/-}${AAV}"
-# OKV=original kernel version as provided by ebuild
-OKV="`echo ${KV} | cut -d- -f1`"
-# OKVLAST=(working) last digit of OKV
-OKVLAST="`echo ${OKV} | cut -d. -f3`"
-# OKVLASTPR=the previous kernel version (for a marcelo pre/rc release)
-OKVLASTPR="`expr ${OKVLAST} - 1`"
-# If _ isn't there, then it's a stable+ac, otherwise last-stable+pre/rc+ac
-PRERC="`echo ${PV}|grep \_`"
-
-# Other working variables
-S=${WORKDIR}/linux-${KV}
-EXTRAVERSION="`echo ${KV}|sed -e 's:[^-]*\(-.*$\):\1:'`"
-BASE="`echo ${KV}|sed -e s:${EXTRAVERSION}::`"
-
-# If it's a last-stable+pre/rc+aa (marcelo), we need to handle it differently
-# ourkernel is the stable kernel we'll be working with (previous or current)
-if [ ${PRERC} ]; then
-	OURKERNEL="2.4.${OKVLASTPR}"
-	SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
-		mirror://kernel/linux/kernel/people/andrea/kernels/v2.4/${KV/-}.bz2
-		mirror://kernel/linux/kernel/v2.4/testing/patch-${PV/_/-}.bz2"
-else
-	OURKERNEL="2.4.${OKVLAST}"
-	SRC_URI="mirror://kernel//linux/kernel/v2.4/linux-${OURKERNEL}.tar.bz2
-		mirror://kernel/linux/kernel/people/andrea/kernels/v2.4/${KV/-}.bz2"
-fi
-
-
-DESCRIPTION="Full sources for Andrea Arcangeli's Linux kernel"
-KEYWORDS="x86"
-SLOT="${KV}"
-
-src_unpack() {
-	sleep 1
-	unpack linux-${OURKERNEL}.tar.bz2
-	mv linux-${OURKERNEL} linux-${KV} || die
-
-	cd linux-${KV}
-
-	# if we need a pre/rc patch, then use it
-	if [ ${PRERC} ]; then
-		bzcat ${DISTDIR}/patch-${PV/_/-}.bz2|patch -p1 || die "-marcelo patch failed"
-	fi
-
-	bzcat ${DISTDIR}/${KV/-}.bz2|patch -p1 || die "-aa patch failed"
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	echo ; echo ; echo -e "\a"
-	ewarn "This patch has some experimental stuff in it, so use it with caution."
-	ewarn "A cool new feature is runtime Hz changing: try specifying \"desktop\""
-	ewarn "on the boot command line."
-	echo ; echo ; echo
-}
diff --git a/sys-kernel/aa-sources/files/aa-sources-2.4.23.CAN-2003-0985.patch b/sys-kernel/aa-sources/files/aa-sources-2.4.23.CAN-2003-0985.patch
new file mode 100644
index 000000000000..bacef69f02f8
--- /dev/null
+++ b/sys-kernel/aa-sources/files/aa-sources-2.4.23.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/aa-sources/files/aa-sources-2.4.23.rtc_fix.patch b/sys-kernel/aa-sources/files/aa-sources-2.4.23.rtc_fix.patch
new file mode 100644
index 000000000000..76a663c6e89d
--- /dev/null
+++ b/sys-kernel/aa-sources/files/aa-sources-2.4.23.rtc_fix.patch
@@ -0,0 +1,180 @@
+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/aa-sources/files/digest-aa-sources-2.4.23_pre6-r3 b/sys-kernel/aa-sources/files/digest-aa-sources-2.4.23_pre6-r3
deleted file mode 100644
index b8e8666a923b..000000000000
--- a/sys-kernel/aa-sources/files/digest-aa-sources-2.4.23_pre6-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 5d3d72bdf8699dd90f6e7f72def20ef5 2.4.23pre6aa3.bz2 2030281
-MD5 57bf8b832116992801d877fe38dc47bf patch-2.4.23-pre6.bz2 1648589