More updates. Two security fixes for 2.4.x sources missed in the last update round; Updated patches for cobalt support (loadable initrd, d-cache IDE/PIO fix); Patch for 2.6.5 to fix swap issues; build bug when building 2.6.5 w/ initrd support, and some minor cleanups.

22 files changed, 176 insertions, 101 deletions

diff --git a/sys-kernel/mips-sources/ChangeLog b/sys-kernel/mips-sources/ChangeLog
index 8c36b45e0f79..8246e77346f6 100644
--- a/sys-kernel/mips-sources/ChangeLog
+++ b/sys-kernel/mips-sources/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for sys-kernel/mips-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.37 2004/04/17 19:03:26 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/ChangeLog,v 1.38 2004/04/21 22:05:38 kumba Exp $
+
+*mips-sources-2.4.22-r12 (21 Apr 2004)
+
+  21 Apr 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/CAN-2004-0177-ext3_jbd.patch, +files/CAN-2004-0178-sbblaster.patch,
+  files/mipscvs-2.6.5-swapbug-fix.patch,
+  +files/mipscvs-2.6.5-unistd-linkage.patch, -mips-sources-2.4.21-r8.ebuild,
+  +mips-sources-2.4.21-r9.ebuild, -mips-sources-2.4.22-r11.ebuild,
+  +mips-sources-2.4.22-r12.ebuild, -mips-sources-2.4.23-r7.ebuild,
+  +mips-sources-2.4.23-r8.ebuild, -mips-sources-2.4.25-r1.ebuild,
+  +mips-sources-2.4.25-r2.ebuild, +mips-sources-2.4.26-r1.ebuild,
+  -mips-sources-2.4.26.ebuild, -mips-sources-2.6.3-r3.ebuild,
+  +mips-sources-2.6.3-r4.ebuild, -mips-sources-2.6.4-r1.ebuild,
+  +mips-sources-2.6.4-r2.ebuild, +mips-sources-2.6.5-r1.ebuild,
+  -mips-sources-2.6.5.ebuild:
+  More updates. Two security fixes for 2.4.x sources missed in the last update
+  round; Updated patches for cobalt support (loadable initrd, d-cache IDE/PIO
+  fix); Patch for 2.6.5 to fix swap issues; build bug when building 2.6.5 w/
+  initrd support, and some minor cleanups.
 
   16 Apr 2004; Joshua Kinard <kumba@gentoo.org>
   files/CAN-2004-0109-2.6-iso9660.patch:
diff --git a/sys-kernel/mips-sources/Manifest b/sys-kernel/mips-sources/Manifest
index 78f29b153278..52964b6f3a01 100644
--- a/sys-kernel/mips-sources/Manifest
+++ b/sys-kernel/mips-sources/Manifest
@@ -1,39 +1,42 @@
-MD5 a4626d2d46c2d3a4424fb10448518ea6 mips-sources-2.6.4-r1.ebuild 3510
-MD5 bfd293b8a15a21a278c19151f4e91e24 mips-sources-2.4.26.ebuild 1945
-MD5 d4300e458ff1e08a6f2248c31d6ee537 mips-sources-2.6.3-r3.ebuild 3513
-MD5 13358cf45663a752c9a7c5813ee144c6 mips-sources-2.4.25-r1.ebuild 2348
-MD5 683b1cd0aafc7913b90ec462abe1392a mips-sources-2.4.23-r7.ebuild 3303
-MD5 c2f495bd0df6f61c2f509b4ed74e0f4a mips-sources-2.4.22-r11.ebuild 2517
-MD5 fa18d2cbe25a224c2ad21e45b16e3dfe ChangeLog 12332
-MD5 c4190fc8a89f1ad1e19343453f6356bb mips-sources-2.4.21-r8.ebuild 2682
+MD5 bac303efaea867e12ba0e019e7c9b2bc ChangeLog 13380
 MD5 ad25a2a0b6ade60c13ad8040f3c319c6 metadata.xml 378
-MD5 11ae356674a257cc39ef08621118d13b mips-sources-2.6.5.ebuild 3445
-MD5 a361526659bf1585152b2c819e329941 files/mipscvs-2.4.23-makefile-inlinelimit.patch 1314
-MD5 07e4cd29df717318635019f6a3d2e72b files/mipscvs-2.4.21-no-page-align.patch 356
+MD5 fd9c5312c823ee53148a1c829d60fd5d mips-sources-2.4.26-r1.ebuild 2122
+MD5 9ce480aad39ba18d71910adf13cda367 mips-sources-2.6.3-r4.ebuild 3476
+MD5 7bffea7875310844dbd3be7259c790ff mips-sources-2.6.4-r2.ebuild 3473
+MD5 43bfebeea831c74fd77aa169bd8bfba8 mips-sources-2.6.5-r1.ebuild 3545
+MD5 dd2951c21f50fee5662f76c627dfcc4d mips-sources-2.4.21-r9.ebuild 2783
+MD5 4b38bf0b5c0a7b16df45ef3cabe75693 mips-sources-2.4.22-r12.ebuild 2618
+MD5 e4deeed065cc88e5028fd74ed3e27795 mips-sources-2.4.23-r8.ebuild 3404
+MD5 5992631e6b16d1fa8b47c96d6e27fc79 mips-sources-2.4.25-r2.ebuild 2503
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/CAN-2003-0961-do_brk.patch 242
+MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/CAN-2003-0985-mremap.patch 414
+MD5 147fec50180ad91b6260fc7201dcb90f files/CAN-2004-0010-ncpfs.patch 6050
+MD5 174438d215b70cad5ffb00ca8123c062 files/CAN-2004-0077-do_munmap.patch 837
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
+MD5 21f3a4f186017d925067335e24db36a1 files/CAN-2004-0109-2.4-iso9660.patch 1877
 MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/CAN-2004-0109-2.6-iso9660.patch 2072
+MD5 07e4cd29df717318635019f6a3d2e72b files/mipscvs-2.4.21-no-page-align.patch 356
+MD5 a1157e4d6d0ba95b7c76d55311830a05 files/mipscvs-2.4.22-no-page-align.patch 422
+MD5 801d19165cd75bdde5c1e156ca2320db files/mipscvs-2.4.23-no-page-align.patch 442
+MD5 764740b749fd1f81313aa941c55000ac files/mipscvs-2.4.25-no-page-align.patch 1013
 MD5 c65ca9f967d25e79aadfe387f7ce6fa3 files/mipscvs-2.6.x-no-page-align.patch 483
+MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
 MD5 1d8857f9bf884fc661beb87cc9d043d1 files/mipscvs-2.4.22-makefile-fix.patch 1873
-MD5 87d2e9f2c22fddaac6143dd399d51880 files/digest-mips-sources-2.6.5 299
-MD5 95ba3093147f4188db0ea4949e4317cf files/mipscvs-2.4.25-makefile-inlinelimit.patch 1588
 MD5 6ff178aa1398ac2347921194944376f8 files/mipscvs-2.4.23-makefile-fix.patch 1906
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/CAN-2003-0961-do_brk.patch 242
-MD5 1f646066ee81f7aea1f79a79e38a252d files/rtc-fixes.patch 2125
-MD5 cd121be6819ea6262be10f37000b85c1 files/digest-mips-sources-2.4.26 218
-MD5 0a3a1be2517b274c5a0c0748a437b6bd files/digest-mips-sources-2.4.21-r8 219
-MD5 5aa63a0a1f498866f08339bcbd33f8e3 files/digest-mips-sources-2.4.23-r7 426
-MD5 de2c00e2df9c2bf74e5c090ade2c23b0 files/digest-mips-sources-2.4.25-r1 217
-MD5 a1157e4d6d0ba95b7c76d55311830a05 files/mipscvs-2.4.22-no-page-align.patch 422
-MD5 214c73bd9aa640a54b52196c8f2c5433 files/digest-mips-sources-2.6.3-r3 299
-MD5 05353361dc9d89699a648d1db065d7f9 files/digest-mips-sources-2.6.4-r1 299
+MD5 a361526659bf1585152b2c819e329941 files/mipscvs-2.4.23-makefile-inlinelimit.patch 1314
 MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.25-makefile-fix.patch 428
-MD5 39404cc05cb940b5daa59d3cb382825e files/mipscvs-2.6.5-swapbug-fix.patch 1137
+MD5 95ba3093147f4188db0ea4949e4317cf files/mipscvs-2.4.25-makefile-inlinelimit.patch 1588
+MD5 1f646066ee81f7aea1f79a79e38a252d files/rtc-fixes.patch 2125
+MD5 008eff91c704bd23097666a1cd94ada3 files/mipscvs-2.6.5-swapbug-fix.patch 1329
+MD5 db1aaa77e691906f3857e54e363c4ff4 files/mipscvs-2.6.5-unistd-linkage.patch 515
+MD5 9d52d43f6353c028c44315b0c997e44c files/digest-mips-sources-2.4.21-r9 219
+MD5 5667cbf8a220acc2f2cfa330cdccaa40 files/digest-mips-sources-2.4.22-r12 218
+MD5 e764098f38d0318340f87718f10b540f files/digest-mips-sources-2.4.23-r8 426
+MD5 5c6bf5770bf59976861382f45bdeb7ff files/digest-mips-sources-2.4.25-r2 217
+MD5 232aadbd2c4bcf3ab20f89ee90bf9d95 files/digest-mips-sources-2.6.3-r4 299
 MD5 fbb6766828584e454bf053286aad6207 files/mipscvs-2.4.26-makefile-fix.patch 428
-MD5 174438d215b70cad5ffb00ca8123c062 files/CAN-2004-0077-do_munmap.patch 837
-MD5 93f8e3701539d6699921e4becaa72f2d files/digest-mips-sources-2.4.22-r11 218
-MD5 147fec50180ad91b6260fc7201dcb90f files/CAN-2004-0010-ncpfs.patch 6050
-MD5 21f3a4f186017d925067335e24db36a1 files/CAN-2004-0109-2.4-iso9660.patch 1877
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 764740b749fd1f81313aa941c55000ac files/mipscvs-2.4.25-no-page-align.patch 1013
-MD5 054c3c8e9c8804a13c79d01ec52793ed files/mipscvs-2.4.21-makefile-fix.patch 915
-MD5 801d19165cd75bdde5c1e156ca2320db files/mipscvs-2.4.23-no-page-align.patch 442
-MD5 5e4b24d4c540af721c5bc7e3ad77f40b files/CAN-2003-0985-mremap.patch 414
+MD5 497365345d8a39da49a8bd2495a17d8c files/digest-mips-sources-2.6.4-r2 299
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/CAN-2004-0178-sbblaster.patch 424
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/CAN-2004-0177-ext3_jbd.patch 384
+MD5 eb9f26d678449f22ce5b7c00762eeb91 files/digest-mips-sources-2.6.5-r1 299
+MD5 098807e58d4f8bc7efcaea114ba28fcd files/digest-mips-sources-2.4.26-r1 218
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0177-ext3_jbd.patch b/sys-kernel/mips-sources/files/CAN-2004-0177-ext3_jbd.patch
new file mode 100644
index 000000000000..da6b7e190685
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0177-ext3_jbd.patch
@@ -0,0 +1,10 @@
+--- linux-2.4.26-pre3/fs/jbd/journal.c	2004-02-18 05:36:31.000000000 -0800
++++ linux-2.4.26-pre4/fs/jbd/journal.c	2004-03-16 09:59:36.000000000 -0800
+@@ -671,6 +671,7 @@
+ 
+ 	bh = getblk(journal->j_dev, blocknr, journal->j_blocksize);
+ 	lock_buffer(bh);
++	memset(bh->b_data, 0, journal->j_blocksize);
+ 	BUFFER_TRACE(bh, "return this buffer");
+ 	return journal_add_journal_head(bh);
+ }
diff --git a/sys-kernel/mips-sources/files/CAN-2004-0178-sbblaster.patch b/sys-kernel/mips-sources/files/CAN-2004-0178-sbblaster.patch
new file mode 100644
index 000000000000..19e57268c2fa
--- /dev/null
+++ b/sys-kernel/mips-sources/files/CAN-2004-0178-sbblaster.patch
@@ -0,0 +1,11 @@
+--- linux-2.4.26-pre2/drivers/sound/sb_audio.c	2002-02-25 11:38:06.000000000 -0800
++++ linux-2.4.26-pre3/drivers/sound/sb_audio.c	2004-03-13 07:43:23.000000000 -0800
+@@ -879,7 +879,7 @@
+ 			c -= locallen; p += locallen;
+ 		}
+ 		/* used = ( samples * 16 bits size ) */
+-		*used = len << 1;
++		*used =  max_in  > ( max_out << 1) ? (max_out << 1) : max_in;
+ 		/* returned = ( samples * 8 bits size ) */
+ 		*returned = len;
+ 	}
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r8 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r9
index 3f39217453fa..e4b6432b4fe2 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r8
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.21-r9
@@ -1,3 +1,3 @@
 MD5 f51e12efa18bb828cf57d9d4a81b2fb1 linux-2.4.21.tar.bz2 28533733
 MD5 aea17fa0a6fc0bef9847b8713d4c3923 mipscvs-2.4.21-20030803.diff.bz2 1011871
-MD5 e9f1fc32ddf4e91fb34d9eea6543fa89 cobalt-patches-24xx-1.0.tar.bz2 3628
+MD5 bd9732ff25e9a83fa1392111e3dfbe90 cobalt-patches-24xx-1.2.tar.bz2 6425
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r11 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r12
index 3183414cbd71..5609bcd9f6e0 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r11
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.22-r12
@@ -1,3 +1,3 @@
 MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
 MD5 d82efc4684e5b4f1b64092d9adaac7e8 mipscvs-2.4.22-20031015.diff.bz2 239716
-MD5 e9f1fc32ddf4e91fb34d9eea6543fa89 cobalt-patches-24xx-1.0.tar.bz2 3628
+MD5 bd9732ff25e9a83fa1392111e3dfbe90 cobalt-patches-24xx-1.2.tar.bz2 6425
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r7 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r8
index 57d39098851a..c4b788198c8b 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r7
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.23-r8
@@ -1,6 +1,6 @@
 MD5 642af5ab5e1fc63685fde85e9ae601e4 linux-2.4.23.tar.bz2 29832609
 MD5 6a0568d481238976d8c4cbc208492580 mipscvs-2.4.23-20031128.diff.bz2 286782
-MD5 e9f1fc32ddf4e91fb34d9eea6543fa89 cobalt-patches-24xx-1.0.tar.bz2 3628
+MD5 b436247b06504364cad0ef214d2a8ccd cobalt-patches-24xx-1.3.tar.bz2 5609
 MD5 2230e5482efd34a9bae1cc05cd9d3b2c xfs-2.4.23-split-only.bz2 652627
 MD5 0723db65569d1eaa5de4584e5b10fe87 xfs-2.4.23-split-kernel.bz2 11561
 MD5 879b21c543189704146d9a3ff99af3c2 xfs-2.4.23-split-acl.bz2 2290
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r2
index 0b8c1a6edbd7..bb37c137f1e2 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.25-r2
@@ -1,3 +1,3 @@
 MD5 5fc8e9f43fa44ac29ddf9a9980af57d8 linux-2.4.25.tar.bz2 30626548
 MD5 10b3bc2866a95e483f19093c980d9786 mipscvs-2.4.25-20040222.diff.bz2 89680
-MD5 3164a83e10562b34fa250fd9b892b5b2 cobalt-patches-24xx-1.1.tar.bz2 3831
+MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26 b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r1
index 56fe0e2954a4..6f818deaa2b8 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.4.26-r1
@@ -1,3 +1,3 @@
 MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
 MD5 020f2e4ce6cf97c40365440b7a9de0bf mipscvs-2.4.26-20040415.diff.bz2 194397
-MD5 3164a83e10562b34fa250fd9b892b5b2 cobalt-patches-24xx-1.1.tar.bz2 3831
+MD5 18ad839cec259e123f743432dca994e3 cobalt-patches-24xx-1.4.tar.bz2 5809
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r3 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r4
index a0320a067ca2..5beb44a2464c 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r3
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.3-r4
@@ -1,4 +1,4 @@
 MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622
 MD5 efdd8b6bfb00d1a1e7b6c71014460c89 mipscvs-2.6.3-20040305.diff.bz2 840150
-MD5 5e82d54ca68ca993309b3f331e31d855 cobalt-patches-26xx-1.1.tar.bz2 6534
+MD5 903eb25c173eb8e3dcd20c0dd66d152a cobalt-patches-26xx-1.3.tar.bz2 7341
 MD5 9f0061615a95c9e31f30b2b7dacd23ef ip32-iluxa-minpatchset-20040229.diff.bz2 1409
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r1 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r2
index b4021ba1d5e5..1a5fc819e2ad 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r1
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.4-r2
@@ -1,4 +1,4 @@
 MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912
 MD5 99f597693cc1ea2f3fe162600405f32f mipscvs-2.6.4-20040311.diff.bz2 437306
-MD5 4cc61e272d77d85f778e4a59b88ba462 cobalt-patches-26xx-1.2.tar.bz2 6767
+MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
 MD5 9f0061615a95c9e31f30b2b7dacd23ef ip32-iluxa-minpatchset-20040229.diff.bz2 1409
diff --git a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5 b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r1
index b1656d19ce32..c1a0ce95b671 100644
--- a/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5
+++ b/sys-kernel/mips-sources/files/digest-mips-sources-2.6.5-r1
@@ -1,4 +1,4 @@
 MD5 9a76bf64c1151369b250f967d83077aa linux-2.6.5.tar.bz2 34684611
 MD5 f40e319434975c7b46258f97c3eb1264 mipscvs-2.6.5-20040412.diff.bz2 498372
-MD5 4cc61e272d77d85f778e4a59b88ba462 cobalt-patches-26xx-1.2.tar.bz2 6767
+MD5 62fa5bbee1bcb8b93e41a73abede8132 cobalt-patches-26xx-1.4.tar.bz2 7596
 MD5 99ae243d80acc8692115f58ab2210c25 ip32-iluxa-minpatchset-20040402.diff.bz2 2260
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch
index 3abafca9f40c..9a0452e41446 100644
--- a/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch
+++ b/sys-kernel/mips-sources/files/mipscvs-2.6.5-swapbug-fix.patch
@@ -1,27 +1,28 @@
-diff -urN linux.cvs/include/asm-mips/pgtable-32.h linux.pdh/include/asm-mips/pgtable-32.h
---- linux.cvs/include/asm-mips/pgtable-32.h	2004-03-11 16:46:57.000000000 +0000
-+++ linux.pdh/include/asm-mips/pgtable-32.h	2004-04-15 19:22:17.000000000 +0100
-@@ -208,7 +208,7 @@
- #define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 10) })
+diff -urN include/asm-mips/pgtable-32.h include/asm-mips/pgtable-32.h
+--- include/asm-mips/pgtable-32.h	2004-03-11 16:46:57.000000000 +0000
++++ include/asm-mips/pgtable-32.h	2004-04-17 09:06:02.000000000 +0100
+@@ -203,14 +203,18 @@
+ /* Swap entries must have VALID and GLOBAL bits cleared. */
+ #if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
+ 
+-#define __swp_type(x)		(((x).val >> 1) & 0x7f)
+-#define __swp_offset(x)		((x).val >> 10)
+-#define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 10) })
++/* offset is limited to 17 bits (512MB @ 4K page) */
++/* VALID & GLOBAL are bits 9 & 8 */
++#define __swp_type(x)		(((x).val >> 10) & 0x1f)
++#define __swp_offset(x)		((x).val >> 15)
++#define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 10) | ((offset) << 15) })
  #else
  
 -#define __swp_type(x)		(((x).val >> 1) & 0x1f)
-+#define __swp_type(x)		(((x).val >> 1) & 0x07)
- #define __swp_offset(x)		((x).val >> 8)
- #define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 8) })
+-#define __swp_offset(x)		((x).val >> 8)
+-#define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 1) | ((offset) << 8) })
++/* offset is limited to 19 bits (2GB @ 4K page) */
++/* VALID & GLOBAL are bits 7 & 6 */
++#define __swp_type(x)		(((x).val >> 8) & 0x1f)
++#define __swp_offset(x)		((x).val >> 13)
++#define __swp_entry(type,offset)	((swp_entry_t) { ((type) << 8) | ((offset) << 13) })
  #endif
-diff -urN linux.cvs/include/linux/swap.h linux.pdh/include/linux/swap.h
---- linux.cvs/include/linux/swap.h	2004-03-01 14:06:13.000000000 +0000
-+++ linux.pdh/include/linux/swap.h	2004-04-15 19:30:31.000000000 +0100
-@@ -11,7 +11,11 @@
-  * on 32-bit-pgoff_t architectures.  And that assumes that the architecture packs
-  * the type/offset into the pte as 5/27 as well.
-  */
-+#ifdef CONFIG_MIPS
-+#define MAX_SWAPFILES_SHIFT	3
-+#else
- #define MAX_SWAPFILES_SHIFT	5
-+#endif
- #define MAX_SWAPFILES		(1 << MAX_SWAPFILES_SHIFT)
  
- #ifdef __KERNEL__
+ #define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })
diff --git a/sys-kernel/mips-sources/files/mipscvs-2.6.5-unistd-linkage.patch b/sys-kernel/mips-sources/files/mipscvs-2.6.5-unistd-linkage.patch
new file mode 100644
index 000000000000..bdb90b51abd9
--- /dev/null
+++ b/sys-kernel/mips-sources/files/mipscvs-2.6.5-unistd-linkage.patch
@@ -0,0 +1,15 @@
+===================================================================
+RCS file: /home/cvs/linux/include/asm-mips/unistd.h,v
+retrieving revision 1.59
+retrieving revision 1.60
+diff -u -p -r1.59 -r1.60
+--- linux/include/asm-mips/unistd.h	2004/04/08 15:40:01	1.59
++++ linux/include/asm-mips/unistd.h	2004/04/16 22:51:13	1.60
+@@ -1049,6 +1049,7 @@ type name (atype a,btype b,ctype c,dtype
+ 
+ #include <linux/compiler.h>
+ #include <linux/types.h>
++#include <linux/linkage.h>
+ #include <asm/ptrace.h>
+ #include <asm/sim.h>
+
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.21-r9.ebuild
index 4938430a0c2f..4f22bc77a5f4 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.21-r8.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.21-r9.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/mips-sources/mips-sources-2.4.21-r8.ebuild,v 1.2 2004/04/16 06:03:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.21-r9.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
 
 
 # Version Data
@@ -8,7 +8,7 @@ OKV=${PV/_/-}
 CVSDATE="20030803"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.0"
+COBALTPATCHVER="1.2"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -70,6 +70,8 @@ src_unpack() {
 		epatch ${FILESDIR}/CAN-2004-0010-ncpfs.patch
 		epatch ${FILESDIR}/CAN-2004-0077-do_munmap.patch
 		epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
+		epatch ${FILESDIR}/CAN-2004-0177-ext3_jbd.patch
+		epatch ${FILESDIR}/CAN-2004-0178-sbblaster.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.22-r12.ebuild
index 9bfc0ef6937a..4cc27a931cdf 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.22-r11.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.22-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/mips-sources/mips-sources-2.4.22-r11.ebuild,v 1.2 2004/04/16 06:03:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.22-r12.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
 
 
 # Version Data
@@ -8,7 +8,7 @@ OKV=${PV/_/-}
 CVSDATE="20031015"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.0"
+COBALTPATCHVER="1.2"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -66,6 +66,8 @@ src_unpack() {
 		epatch ${FILESDIR}/CAN-2004-0010-ncpfs.patch
 		epatch ${FILESDIR}/CAN-2004-0077-do_munmap.patch
 		epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
+		epatch ${FILESDIR}/CAN-2004-0177-ext3_jbd.patch
+		epatch ${FILESDIR}/CAN-2004-0178-sbblaster.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.23-r8.ebuild
index 0f8552ef4e46..a8184ea888d2 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.23-r7.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.23-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/mips-sources/mips-sources-2.4.23-r7.ebuild,v 1.2 2004/04/16 06:03:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.23-r8.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
 
 
 # Version Data
@@ -8,7 +8,7 @@ OKV=${PV/_/-}
 CVSDATE="20031128"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.0"
+COBALTPATCHVER="1.3"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -82,6 +82,8 @@ src_unpack() {
 		epatch ${FILESDIR}/CAN-2004-0010-ncpfs.patch
 		epatch ${FILESDIR}/CAN-2004-0077-do_munmap.patch
 		epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
+		epatch ${FILESDIR}/CAN-2004-0177-ext3_jbd.patch
+		epatch ${FILESDIR}/CAN-2004-0178-sbblaster.patch
 	eend
 
 	# Cobalt Patches
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.25-r2.ebuild
index 54b8a7ad3a75..15b887ec0a46 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.25-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.25-r2.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/mips-sources/mips-sources-2.4.25-r1.ebuild,v 1.2 2004/04/16 06:03:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.25-r2.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
 
 
 # Version Data
@@ -8,7 +8,7 @@ OKV=${PV/_/-}
 CVSDATE="20040222"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.1"
+COBALTPATCHVER="1.4"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -57,7 +57,12 @@ src_unpack() {
 	epatch ${FILESDIR}/mipscvs-${OKV}-no-page-align.patch
 
 	# Security Fixes
-	epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
+	echo -e ""
+		ebegin "Applying Security Fixes"
+		epatch ${FILESDIR}/CAN-2004-0109-2.4-iso9660.patch
+		epatch ${FILESDIR}/CAN-2004-0177-ext3_jbd.patch
+		epatch ${FILESDIR}/CAN-2004-0178-sbblaster.patch
+	eend
 
 	# Cobalt Patches
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
diff --git a/sys-kernel/mips-sources/mips-sources-2.4.26.ebuild b/sys-kernel/mips-sources/mips-sources-2.4.26-r1.ebuild
index 9324db5355a8..7cdcbfce3b8c 100644
--- a/sys-kernel/mips-sources/mips-sources-2.4.26.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.4.26-r1.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/mips-sources/mips-sources-2.4.26.ebuild,v 1.1 2004/04/16 06:03:36 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.4.26-r1.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
 
 
 # Version Data
@@ -8,7 +8,7 @@ OKV=${PV/_/-}
 CVSDATE="20040415"
 EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
-COBALTPATCHVER="1.1"
+COBALTPATCHVER="1.4"
 
 # Miscellaneous stuff
 S=${WORKDIR}/linux-${OKV}-${CVSDATE}
@@ -53,6 +53,8 @@ src_unpack() {
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""
 		einfo ">>> Patching kernel for Cobalt support ..."
+		mkdir ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/skip
+		mv ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/08* ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/skip
 		for x in ${WORKDIR}/cobalt-patches-24xx-${COBALTPATCHVER}/*.patch; do
 			epatch ${x}
 		done
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.3-r3.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild
index 6fc1c2898088..0ef6aa2df3ce 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.3-r3.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.3-r4.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/mips-sources/mips-sources-2.6.3-r3.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.3-r4.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040305"
-COBALTPATCHVER="1.1"
+COBALTPATCHVER="1.3"
 IP32DIFFDATE="20040229"
 [ "${USE_IP32}" = "yes" ] && EXTRAVERSION="-mipscvs-${CVSDATE}-ip32" || EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -44,13 +44,13 @@ pkg_setup() {
 	# See if we're on a cobalt system (must use the cobalt-mips profile)
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""
-		ewarn "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
-		ewarn "systems that are still using the old Cobalt bootloader.  In"
-		ewarn "order to boot a 2.6 kernel on Cobalt systems, you must be using"
-		ewarn "Peter Horton's new bootloader, which does not have the kernel"
-		ewarn "size limitation that the older bootloader has.  As of this"
-		ewarn "ebuild revision, this bootloader is not in portage, and 2.6"
-		ewarn "support on cobalt should be regarded as HIGHLY experimental."
+		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
+		einfo "systems that are still using the old Cobalt bootloader.  In"
+		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
+		einfo "Peter Horton's new bootloader, which does not have the kernel"
+		einfo "size limitation that the older bootloader has.  If you want"
+		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
+		einfo "installed and setup."
 		echo -e ""
 	fi
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.4-r1.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild
index 1f7cf9f0daad..c4cd4d4849af 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.4-r1.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.4-r2.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/mips-sources/mips-sources-2.6.4-r1.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.4-r2.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040311"
-COBALTPATCHVER="1.2"
+COBALTPATCHVER="1.4"
 IP32DIFFDATE="20040229"
 [ "${USE_IP32}" = "yes" ] && EXTRAVERSION="-mipscvs-${CVSDATE}-ip32" || EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -41,13 +41,13 @@ pkg_setup() {
 	# See if we're on a cobalt system (must use the cobalt-mips profile)
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""
-		ewarn "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
-		ewarn "systems that are still using the old Cobalt bootloader.  In"
-		ewarn "order to boot a 2.6 kernel on Cobalt systems, you must be using"
-		ewarn "Peter Horton's new bootloader, which does not have the kernel"
-		ewarn "size limitation that the older bootloader has.  As of this"
-		ewarn "ebuild revision, this bootloader is not in portage, and 2.6"
-		ewarn "support on cobalt should be regarded as HIGHLY experimental."
+		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
+		einfo "systems that are still using the old Cobalt bootloader.  In"
+		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
+		einfo "Peter Horton's new bootloader, which does not have the kernel"
+		einfo "size limitation that the older bootloader has.  If you want"
+		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
+		einfo "installed and setup."
 		echo -e ""
 	fi
 
diff --git a/sys-kernel/mips-sources/mips-sources-2.6.5.ebuild b/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild
index f79417265f12..d3dbd287c13c 100644
--- a/sys-kernel/mips-sources/mips-sources-2.6.5.ebuild
+++ b/sys-kernel/mips-sources/mips-sources-2.6.5-r1.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/mips-sources/mips-sources-2.6.5.ebuild,v 1.1 2004/04/16 01:25:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mips-sources/mips-sources-2.6.5-r1.ebuild,v 1.1 2004/04/21 22:05:38 kumba Exp $
 
 
 # Version Data
 OKV=${PV/_/-}
 CVSDATE="20040412"
-COBALTPATCHVER="1.2"
+COBALTPATCHVER="1.4"
 IP32DIFFDATE="20040402"
 [ "${USE_IP32}" = "yes" ] && EXTRAVERSION="-mipscvs-${CVSDATE}-ip32" || EXTRAVERSION="-mipscvs-${CVSDATE}"
 KV="${OKV}${EXTRAVERSION}"
@@ -41,13 +41,13 @@ pkg_setup() {
 	# See if we're on a cobalt system (must use the cobalt-mips profile)
 	if [ "${PROFILE_ARCH}" = "cobalt" ]; then
 		echo -e ""
-		ewarn "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
-		ewarn "systems that are still using the old Cobalt bootloader.  In"
-		ewarn "order to boot a 2.6 kernel on Cobalt systems, you must be using"
-		ewarn "Peter Horton's new bootloader, which does not have the kernel"
-		ewarn "size limitation that the older bootloader has.  As of this"
-		ewarn "ebuild revision, this bootloader is not in portage, and 2.6"
-		ewarn "support on cobalt should be regarded as HIGHLY experimental."
+		einfo "Please keep in mind that the 2.6 kernel will NOT boot on Cobalt"
+		einfo "systems that are still using the old Cobalt bootloader.  In"
+		einfo "order to boot a 2.6 kernel on Cobalt systems, you must be using"
+		einfo "Peter Horton's new bootloader, which does not have the kernel"
+		einfo "size limitation that the older bootloader has.  If you want"
+		einfo "to use the newer bootloader, make sure you have sys-boot/colo"
+		einfo "installed and setup."
 		echo -e ""
 	fi
 
@@ -73,6 +73,9 @@ src_unpack() {
 	# Bug in 2.6.5 that triggers a kernel oops when swap is activated
 	epatch ${FILESDIR}/mipscvs-${OKV}-swapbug-fix.patch
 
+	# Bug in 2.6.5 in which an include was left out of unistd.h (breaks initrd)
+	epatch ${FILESDIR}/mipscvs-${OKV}-unistd-linkage.patch
+
 	# Security Fixes
 	epatch ${FILESDIR}/CAN-2004-0109-2.6-iso9660.patch