Bump with CVE-2004-1058 backport fix and cleanup

(Portage version: 2.0.54)

7 files changed, 16 insertions, 121 deletions

diff --git a/sys-kernel/sparc-sources/ChangeLog b/sys-kernel/sparc-sources/ChangeLog
index d61d75cf2303..b5a4e8bb89ab 100644
--- a/sys-kernel/sparc-sources/ChangeLog
+++ b/sys-kernel/sparc-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/sparc-sources
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.93 2006/01/08 11:39:36 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/ChangeLog,v 1.94 2006/02/02 19:56:09 gustavoz Exp $
+
+*sparc-sources-2.4.32-r2 (02 Feb 2006)
+
+  02 Feb 2006; Gustavo Zacarias <gustavoz@gentoo.org>
+  -files/2.4-sparc64-ramdisk64.patch, -files/blade1500.patch,
+  -sparc-sources-2.4.30.ebuild, +sparc-sources-2.4.32-r2.ebuild:
+  Bump with CVE-2004-1058 backport fix and cleanup
 
   08 Jan 2006; Christian Birchinger <joker@gentoo.org>
   sparc-sources-2.4.32-r1.ebuild:
diff --git a/sys-kernel/sparc-sources/Manifest b/sys-kernel/sparc-sources/Manifest
index 2ed7ec1916f1..8330c2c30053 100644
--- a/sys-kernel/sparc-sources/Manifest
+++ b/sys-kernel/sparc-sources/Manifest
@@ -1,14 +1,12 @@
-MD5 945ca63f2f148574ef13ad39be91ba9c ChangeLog 15795
-MD5 0cae39dcfb06422e094da7e364e67c33 files/2.4-sparc64-ramdisk64.patch 2558
-MD5 ac8d8bb55e33fd4113aaecc98591f533 files/blade1500.patch 1480
-MD5 3af0404d78ae35f6d5b8731fa1758016 files/digest-sparc-sources-2.4.30 140
+MD5 4384cadb3b3aa5f916ba1e9c5a1a847a ChangeLog 16068
 MD5 d3e6638242e53a9457d91b5e5bf1c648 files/digest-sparc-sources-2.4.31 140
 MD5 4066f3c14b801909fca3c83f3d72c564 files/digest-sparc-sources-2.4.31-r2 143
 MD5 ebfaec00da0d69c9285d596fde4f3e4f files/digest-sparc-sources-2.4.32 140
 MD5 eee027de244eb496c69e8955fb178a70 files/digest-sparc-sources-2.4.32-r1 143
+MD5 f473bbbb717ca6c5f07465e3d83df2ae files/digest-sparc-sources-2.4.32-r2 143
 MD5 6706a601c155869440dcb544e3759a04 metadata.xml 381
-MD5 47d259829b113b4c5210820eb981b569 sparc-sources-2.4.30.ebuild 1195
 MD5 e407e459359f12334ffbefd2ec40823d sparc-sources-2.4.31-r2.ebuild 1201
 MD5 5717b5d7466eb1fdc0556f693ebce473 sparc-sources-2.4.31.ebuild 1195
 MD5 432e18c7124bdeb7e47ca2765abdea9f sparc-sources-2.4.32-r1.ebuild 1198
+MD5 81653689d934aedb2ca06a2b52e87a36 sparc-sources-2.4.32-r2.ebuild 1083
 MD5 8866c1c8549bf7279d06fa8522be085a sparc-sources-2.4.32.ebuild 1195
diff --git a/sys-kernel/sparc-sources/files/2.4-sparc64-ramdisk64.patch b/sys-kernel/sparc-sources/files/2.4-sparc64-ramdisk64.patch
deleted file mode 100644
index 4548dda47d5a..000000000000
--- a/sys-kernel/sparc-sources/files/2.4-sparc64-ramdisk64.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -Nura linux-2.4.29/arch/sparc64/kernel/head.S linux-2.4.29-sparc64-ramdisk64-rollback/arch/sparc64/kernel/head.S
---- linux-2.4.29/arch/sparc64/kernel/head.S	2004-11-17 08:54:21.000000000 -0300
-+++ linux-2.4.29-sparc64-ramdisk64-rollback/arch/sparc64/kernel/head.S	2005-02-24 18:30:47.000000000 -0300
-@@ -50,7 +50,7 @@
-  */
-         .global root_flags, ram_flags, root_dev
-         .global sparc_ramdisk_image, sparc_ramdisk_size
--	.global sparc_ramdisk_image64
-+	.globl	silo_args
- 
-         .ascii  "HdrS"
-         .word   LINUX_VERSION_CODE
-@@ -61,7 +61,7 @@
- 	 * 0x0202 : Supports kernel params string
- 	 * 0x0201 : Supports reboot_command
- 	 */
--	.half   0x0301          /* HdrS version */
-+	.half   0x0300          /* HdrS version */
- 
- root_flags:
-         .half   1
-@@ -75,8 +75,6 @@
-         .word   0
-         .xword  reboot_command
- 	.xword	bootstr_info
--sparc_ramdisk_image64:
--	.xword	0
- 	.word	_end
- 
- 	/* We must be careful, 32-bit OpenBOOT will get confused if it
-diff -Nura linux-2.4.29/arch/sparc64/mm/init.c linux-2.4.29-sparc64-ramdisk64-rollback/arch/sparc64/mm/init.c
---- linux-2.4.29/arch/sparc64/mm/init.c	2004-11-17 08:54:21.000000000 -0300
-+++ linux-2.4.29-sparc64-ramdisk64-rollback/arch/sparc64/mm/init.c	2005-02-24 18:35:09.000000000 -0300
-@@ -63,7 +63,6 @@
- unsigned long mmu_context_bmap[CTX_BMAP_SLOTS];
- 
- /* Initial ramdisk setup */
--extern unsigned long sparc_ramdisk_image64;
- extern unsigned int sparc_ramdisk_image;
- extern unsigned int sparc_ramdisk_size;
- 
-@@ -1252,12 +1251,10 @@
- 
- #ifdef CONFIG_BLK_DEV_INITRD
- 	/* Now have to check initial ramdisk, so that bootmap does not overwrite it */
--	if (sparc_ramdisk_image || sparc_ramdisk_image64) {
--		unsigned long ramdisk_image = sparc_ramdisk_image ?
--			sparc_ramdisk_image : sparc_ramdisk_image64;
--		if (ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)
--			ramdisk_image -= KERNBASE;
--		initrd_start = ramdisk_image + phys_base;
-+	if (sparc_ramdisk_image) {
-+		if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE)
-+			sparc_ramdisk_image -= KERNBASE;
-+		initrd_start = sparc_ramdisk_image + phys_base;
- 		initrd_end = initrd_start + sparc_ramdisk_size;
- 		if (initrd_end > end_of_phys_memory) {
- 			printk(KERN_CRIT "initrd extends beyond end of memory "
-@@ -1360,7 +1357,7 @@
- 	if ((real_end > ((unsigned long)KERNBASE + 0x400000)))
- 		bigkernel = 1;
- #ifdef CONFIG_BLK_DEV_INITRD
--	if (sparc_ramdisk_image || sparc_ramdisk_image64)
-+	if (sparc_ramdisk_image)
- 		real_end = (PAGE_ALIGN(real_end) + PAGE_ALIGN(sparc_ramdisk_size));
- #endif
- 
diff --git a/sys-kernel/sparc-sources/files/blade1500.patch b/sys-kernel/sparc-sources/files/blade1500.patch
deleted file mode 100644
index 7cd6c0317c98..000000000000
--- a/sys-kernel/sparc-sources/files/blade1500.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-#   2005/03/02 14:12:47-08:00 davem@nuts.davemloft.net 
-#   [SPARC64]: Accept 'm5823' clock chip as seen on SB1500.
-#   
-#   Signed-off-by: David S. Miller <davem@davemloft.net>
-# 
-# arch/sparc64/kernel/time.c
-#   2005/03/02 14:12:26-08:00 davem@nuts.davemloft.net +5 -2
-#   [SPARC64]: Accept 'm5823' clock chip as seen on SB1500.
-# 
-diff -Nru a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
---- a/arch/sparc64/kernel/time.c	2005-03-02 14:13:06 -08:00
-+++ b/arch/sparc64/kernel/time.c	2005-03-02 14:13:06 -08:00
-@@ -770,6 +770,7 @@
- 		    strcmp(model, "mk48t59") &&
- 		    strcmp(model, "m5819") &&
- 		    strcmp(model, "m5819p") &&
-+		    strcmp(model, "m5823") &&
- 		    strcmp(model, "ds1287")) {
- 			if (cbus != NULL) {
- 				prom_printf("clock_probe: Central bus lacks timer chip.\n");
-@@ -829,7 +830,8 @@
- 
- 			if (!strcmp(model, "ds1287") ||
- 			    !strcmp(model, "m5819") ||
--			    !strcmp(model, "m5819p")) {
-+			    !strcmp(model, "m5819p") ||
-+			    !strcmp(model, "m5823")) {
- 				ds1287_regs = edev->resource[0].start;
- 			} else {
- 				mstk48t59_regs = edev->resource[0].start;
-@@ -850,7 +852,8 @@
- 			}
- 			if (!strcmp(model, "ds1287") ||
- 			    !strcmp(model, "m5819") ||
--			    !strcmp(model, "m5819p")) {
-+			    !strcmp(model, "m5819p") ||
-+			    !strcmp(model, "m5823")) {
- 				ds1287_regs = isadev->resource.start;
- 			} else {
- 				mstk48t59_regs = isadev->resource.start;
diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.30 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.30
deleted file mode 100644
index 2520057c215c..000000000000
--- a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.30
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75d8ce40a3668603017cd186909efe8d linux-2.4.30.tar.bz2 31136728
-MD5 24cb6598570fba47752fbbe5cf472ff5 patches-2.4.30-sparc.tar.bz2 182571
diff --git a/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.32-r2 b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.32-r2
new file mode 100644
index 000000000000..e1e5c4224d18
--- /dev/null
+++ b/sys-kernel/sparc-sources/files/digest-sparc-sources-2.4.32-r2
@@ -0,0 +1,2 @@
+MD5 38f4d0830e95a20f4bfed17622d5557c linux-2.4.32.tar.bz2 31132159
+MD5 4d75cea27ad97af34028789da0961674 patches-2.4.32-sparc-r2.tar.bz2 183974
diff --git a/sys-kernel/sparc-sources/sparc-sources-2.4.30.ebuild b/sys-kernel/sparc-sources/sparc-sources-2.4.32-r2.ebuild
index 78521825a3d9..2dfb1c888171 100644
--- a/sys-kernel/sparc-sources/sparc-sources-2.4.30.ebuild
+++ b/sys-kernel/sparc-sources/sparc-sources-2.4.32-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.30.ebuild,v 1.2 2005/04/22 13:12:18 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/sparc-sources/sparc-sources-2.4.32-r2.ebuild,v 1.1 2006/02/02 19:56:09 gustavoz Exp $
 
 ETYPE="sources"
 IUSE="livecd ultra1"
@@ -11,7 +11,7 @@ PATCH_BASE="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}${EXTRAVERSION}"
 
 SSV_URI="mirror://gentoo/patches-${PATCH_BASE}.tar.bz2"
 
-KEYWORDS="-* sparc"
+KEYWORDS="-* ~sparc"
 DESCRIPTION="Full sources for the Gentoo Sparc Linux kernel"
 UNIPATCH_LIST="${DISTDIR}/patches-${PATCH_BASE}.tar.bz2"
 SRC_URI="${KERNEL_URI} ${SSV_URI}"