Security bumps for the CAN-2004-0495 and CAN-2004-0535 vulnerabilities.

7 files changed, 29 insertions, 16 deletions

diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 945356eae8fc..f00c4d085c43 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -1,6 +1,8 @@
-MD5 ba782f4400fe3e7ea16a1e30b6fdabfb hardened-sources-2.4.26-r1.ebuild 1027
-MD5 4fa55aaaca767f5a32a6ab625b2b0f22 ChangeLog 7908
+MD5 9d2cb53645bab9251de6404c76e14954 hardened-sources-2.4.26-r2.ebuild 1023
+MD5 80204c4fc9f000aa1d7043edf17cdd7f ChangeLog 8197
 MD5 0a473e60c059cb41c96a6bbcbff84769 metadata.xml 459
+MD5 0f66013f643c79c97fda489618a4e2fd files/2.4.26-CAN-2004-0535.patch 476
+MD5 dc18e982f8149588a291956481885a8c files/2.4.26-CAN-2004-0495.patch 17549
 MD5 5fd02bd0257e7bad717354021bcba268 files/2.4.26-signal-race.patch 469
 MD5 8850fb5244d9d10736d95a85f3c5b3f1 files/2.4.26-CAN-2004-0394.patch 448
-MD5 5909f277c9e29d7d8eb744e84d74b034 files/digest-hardened-sources-2.4.26-r1 145
+MD5 5909f277c9e29d7d8eb744e84d74b034 files/digest-hardened-sources-2.4.26-r2 145
diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index 50f88701303d..7060e33252eb 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/usermode-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.37 2004/06/24 23:01:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.38 2004/06/29 17:28:39 plasmaroo Exp $
+
+*usermode-sources-2.4.24-r5 (29 Jun 2004)
+
+  29 Jun 2004; <plasmaroo@gentoo.org> -usermode-sources-2.4.24-r4.ebuild,
+  +usermode-sources-2.4.24-r5.ebuild, -usermode-sources-2.4.26-r1.ebuild,
+  +usermode-sources-2.4.26-r2.ebuild:
+  Security bumps for the CAN-2004-0495 and CAN-2004-0535 vulnerabilities.
 
 *usermode-sources-2.4.24-r4 (15 Jun 2004)
 
diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 23ed9eb34e1d..4ab9de3c4424 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,19 +1,19 @@
-MD5 42fe746384619c2eeb47bcaaa45ee434 usermode-sources-2.4.26-r1.ebuild 1654
-MD5 a4cd8ea69576205489fd4833214ecc41 usermode-sources-2.4.24-r4.ebuild 2401
 MD5 767f8b3b46cef5acf384953a120300a7 usermode-sources-2.6.6-r1.ebuild 835
-MD5 17b5d4149e0f742e5afd4e6340d14264 ChangeLog 9056
+MD5 feb704360681158c261a3d5b91c3e28e ChangeLog 9361
+MD5 bdc320694b696c490e79334c05a037d6 usermode-sources-2.4.26-r2.ebuild 1851
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
+MD5 e414b2e930ee6446164f0bccf16b42df usermode-sources-2.4.24-r5.ebuild 2598
+MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/usermode-sources-2.4.24.CAN-2004-0075.patch 634
+MD5 174438d215b70cad5ffb00ca8123c062 files/usermode-sources-2.4.24.munmap.patch 837
 MD5 02c062ec3a11a6a1498cdf0b1716c90a files/usermode-sources-2.6.6.FPULockup-53804.patch 895
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/usermode-sources-2.4.24.CAN-2004-0427.patch 460
-MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r4 134
-MD5 df8bd0d5ef39221c9dec36a99223c690 files/digest-usermode-sources-2.4.26-r1 134
-MD5 de75cfa969ed092578d9ddda6c5be334 files/usermode-sources-2.4.24.CAN-2004-0181.patch 1233
-MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
 MD5 147fec50180ad91b6260fc7201dcb90f files/usermode-sources-2.4.24.CAN-2004-0010.patch 6050
+MD5 2f7e35e02cfe97af5e6e49bf84614b42 files/digest-usermode-sources-2.4.24-r5 134
 MD5 288e26eaaaf3c35f214951caa52754ab files/digest-usermode-sources-2.6.6-r1 132
+MD5 de75cfa969ed092578d9ddda6c5be334 files/usermode-sources-2.4.24.CAN-2004-0181.patch 1233
+MD5 df8bd0d5ef39221c9dec36a99223c690 files/digest-usermode-sources-2.4.26-r2 134
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/usermode-sources-2.4.24.CAN-2004-0178.patch 424
 MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
+MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/usermode-sources-2.4.24.CAN-2004-0177.patch 384
 MD5 21f3a4f186017d925067335e24db36a1 files/usermode-sources-2.4.24.CAN-2004-0109.patch 1877
-MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/usermode-sources-2.4.24.CAN-2004-0075.patch 634
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/usermode-sources-2.4.24.CAN-2004-0178.patch 424
-MD5 174438d215b70cad5ffb00ca8123c062 files/usermode-sources-2.4.24.munmap.patch 837
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r4 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r5
index 1afde5baa80a..1afde5baa80a 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r4
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.24-r5
diff --git a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r1 b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r2
index 97aed2c6379a..97aed2c6379a 100644
--- a/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r1
+++ b/sys-kernel/usermode-sources/files/digest-usermode-sources-2.4.26-r2
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.24-r4.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.24-r5.ebuild
index f68933cee405..78a685db4392 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.24-r4.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.24-r5.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/usermode-sources/usermode-sources-2.4.24-r4.ebuild,v 1.2 2004/06/24 23:01:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.24-r5.ebuild,v 1.1 2004/06/29 17:28:39 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -39,6 +39,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.26.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r1.ebuild b/sys-kernel/usermode-sources/usermode-sources-2.4.26-r2.ebuild
index 91769cdd3f49..e3652695c957 100644
--- a/sys-kernel/usermode-sources/usermode-sources-2.4.26-r1.ebuild
+++ b/sys-kernel/usermode-sources/usermode-sources-2.4.26-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/usermode-sources/usermode-sources-2.4.26-r1.ebuild,v 1.2 2004/06/24 23:01:41 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/usermode-sources-2.4.26-r2.ebuild,v 1.1 2004/06/29 17:28:39 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel eutils
@@ -31,6 +31,8 @@ src_unpack() {
 	mv linux-${PV} ${S} && cd ${S}
 	epatch ${DISTDIR}/${UML_PATCH}.bz2
 	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 	kernel_universal_unpack
 }