Version bump for kernel attribute vulnerabilities, bug #56479.

13 files changed, 46 insertions, 284 deletions

diff --git a/sys-kernel/ia64-sources/ChangeLog b/sys-kernel/ia64-sources/ChangeLog
index 9a784fed378a..6ded9c3786fc 100644
--- a/sys-kernel/ia64-sources/ChangeLog
+++ b/sys-kernel/ia64-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/ia64-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.17 2004/06/24 22:58:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ChangeLog,v 1.18 2004/07/09 15:35:50 plasmaroo Exp $
+
+*ia64-sources-2.4.24-r6 (09 Jul 2004)
+
+  09 Jul 2004; <plasmaroo@gentoo.org> -ia64-sources-2.4.22-r1.ebuild,
+  -ia64-sources-2.4.22-r2.ebuild, -ia64-sources-2.4.22.ebuild,
+  -ia64-sources-2.4.24-r4.ebuild, -ia64-sources-2.4.24-r5.ebuild,
+  +ia64-sources-2.4.24-r6.ebuild,
+  +files/ia64-sources-2.4.24.CAN-2004-0497.patch:
+  Version bump for kernel attribute vulnerabilities, bug #56479.
 
 *ia64-sources-2.4.24-r5 (24 Jun 2004)
 
diff --git a/sys-kernel/ia64-sources/Manifest b/sys-kernel/ia64-sources/Manifest
index 910b91a7a156..4654cc094522 100644
--- a/sys-kernel/ia64-sources/Manifest
+++ b/sys-kernel/ia64-sources/Manifest
@@ -1,25 +1,18 @@
-MD5 63a8873a0207c63168321ff042019e7e ia64-sources-2.4.24-r4.ebuild 3046
-MD5 7bcc8537c450bdf7897211f9a27d7b67 ia64-sources-2.4.22.ebuild 2377
-MD5 474c0f5705d6d417777c24f0beac52f5 ia64-sources-2.4.22-r2.ebuild 2381
-MD5 17c4364c7078ddb2ea43e1880d2fb0da ia64-sources-2.4.24-r5.ebuild 3232
-MD5 42293d581e51997a68af44f153c47262 ia64-sources-2.4.22-r1.ebuild 2381
-MD5 f917daa72025af5ba02e1eaba663dd84 ChangeLog 3161
+MD5 a51c4535f7247210c26080bd0b25c8fd ChangeLog 3550
+MD5 909a5a40ac3ecaf2c8649ce312683bd6 ia64-sources-2.4.24-r6.ebuild 3325
+MD5 174438d215b70cad5ffb00ca8123c062 files/ia64-sources-2.4.24.munmap.patch 837
+MD5 f3e36a8286727cbc47312bf4bf5f541e files/digest-ia64-sources-2.4.24-r6 144
+MD5 c460ea130cb4ae84a5063ba044e3ce72 files/ia64-sources-2.4.24.CAN-2004-0427.patch 460
 MD5 147fec50180ad91b6260fc7201dcb90f files/ia64-sources-2.4.24.CAN-2004-0010.patch 6050
-MD5 d4a740ae56c2049247083af387a22a85 files/ia64-sources-2.4.24.CAN-2004-0394.patch 350
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/ia64-sources-2.4.24.CAN-2004-0177.patch 384
 MD5 21f3a4f186017d925067335e24db36a1 files/ia64-sources-2.4.24.CAN-2004-0109.patch 1877
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/ia64-sources-2.4.24.CAN-2004-0178.patch 424
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/ia64-sources-2.4.24.CAN-2004-0497.patch 707
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/ia64-sources.rtc_fix.patch 7073
 MD5 9c816c892d6e3d3f0b7b77d3d503ab10 files/ia64-sources-2.4.24.CAN-2004-0075.patch 634
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/ia64-sources-2.4.24.CAN-2004-0178.patch 424
-MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22-r1 145
-MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22-r2 145
-MD5 f3e36a8286727cbc47312bf4bf5f541e files/digest-ia64-sources-2.4.24-r4 144
-MD5 f3e36a8286727cbc47312bf4bf5f541e files/digest-ia64-sources-2.4.24-r5 144
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 7e2b1e9a14d1cc3052d133b3d6015cde files/digest-ia64-sources-2.4.22 145
-MD5 174438d215b70cad5ffb00ca8123c062 files/ia64-sources-2.4.24.munmap.patch 837
+MD5 de75cfa969ed092578d9ddda6c5be334 files/ia64-sources-2.4.24.CAN-2004-0181.patch 1233
 MD5 0f66013f643c79c97fda489618a4e2fd files/ia64-sources-2.4.24.CAN-2004-0535.patch 476
+MD5 d4a740ae56c2049247083af387a22a85 files/ia64-sources-2.4.24.CAN-2004-0394.patch 350
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/ia64-sources-2.4.24.CAN-2004-0177.patch 384
 MD5 dc18e982f8149588a291956481885a8c files/ia64-sources-2.4.24.CAN-2004-0495.patch 17549
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/ia64-sources.CAN-2003-0985.patch 414
-MD5 c460ea130cb4ae84a5063ba044e3ce72 files/ia64-sources-2.4.24.CAN-2004-0427.patch 460
-MD5 de75cfa969ed092578d9ddda6c5be334 files/ia64-sources-2.4.24.CAN-2004-0181.patch 1233
+MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
diff --git a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22 b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22
deleted file mode 100644
index 78b743a49a91..000000000000
--- a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 ba3fef66e7963d1876c0f27ae3181cc3 linux-2.4.22-ia64-030909.diff.bz2 567208
diff --git a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22-r1 b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22-r1
deleted file mode 100644
index 78b743a49a91..000000000000
--- a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 ba3fef66e7963d1876c0f27ae3181cc3 linux-2.4.22-ia64-030909.diff.bz2 567208
diff --git a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22-r2 b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22-r2
deleted file mode 100644
index 78b743a49a91..000000000000
--- a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.22-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 75dc85149b06ac9432106b8941eb9f7b linux-2.4.22.tar.bz2 29528612
-MD5 ba3fef66e7963d1876c0f27ae3181cc3 linux-2.4.22-ia64-030909.diff.bz2 567208
diff --git a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r5 b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r5
deleted file mode 100644
index 2af043964e41..000000000000
--- a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 1e055c42921b2396a559d84df4c3d9aa linux-2.4.24.tar.bz2 29837818
-MD5 e62d6b4be335b6dbafc535c59833cd1e linux-2.4.24-ia64-040109.diff.bz2 69525
diff --git a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r4 b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r6
index 2af043964e41..2af043964e41 100644
--- a/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r4
+++ b/sys-kernel/ia64-sources/files/digest-ia64-sources-2.4.24-r6
diff --git a/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0497.patch b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0497.patch
new file mode 100644
index 000000000000..9503e9efe57b
--- /dev/null
+++ b/sys-kernel/ia64-sources/files/ia64-sources-2.4.24.CAN-2004-0497.patch
@@ -0,0 +1,23 @@
+# ChangeSet
+#
+# fs/attr.c
+#   2004/07/03 18:28:30-03:00 marcelo@logos.cnet +1 -0
+#   Thomas Biege: Fix missing DAC check on sys_chown
+# 
+# fs/attr.c
+#   2004/07/03 19:28:29-03:00 marcelo@logos.cnet +1 -1
+#   Add missing bracket to inode_change_ok() fix
+# 
+diff -Nru a/fs/attr.c b.plasmaroo/fs/attr.c
+--- a/fs/attr.c	2004-07-08 17:05:20 -07:00
++++ b.plasmaroo/fs/attr.c	2004-07-08 17:05:20 -07:00
+@@ -35,7 +35,8 @@
+ 
+ 	/* Make sure caller can chgrp. */
+ 	if ((ia_valid & ATTR_GID) &&
+-	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid) &&
++	    (current->fsuid != inode->i_uid ||
++	    (!in_group_p(attr->ia_gid) && attr->ia_gid != inode->i_gid)) &&
+ 	    !capable(CAP_CHOWN))
+ 		goto error;
+ 
diff --git a/sys-kernel/ia64-sources/ia64-sources-2.4.22-r1.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.22-r1.ebuild
deleted file mode 100644
index 6ff98a2d6008..000000000000
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.22-r1.ebuild
+++ /dev/null
@@ -1,62 +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/ia64-sources/ia64-sources-2.4.22-r1.ebuild,v 1.4 2004/06/24 22:58:19 agriffis Exp $
-
-IUSE=""
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
-
-#MYCSET="1.1063.2.37-to-1.1088"
-MYSNAPSHOT="030909"
-DESCRIPTION="Full sources for the Gentoo Kernel."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://kernel/linux/kernel/ports/ia64/v2.4/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2"
-
-HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
-LICENSE="GPL-2"
-KEYWORDS="-* ia64"
-SLOT="${KV}"
-
-src_unpack() {
-
-	unpack linux-${OKV}.tar.bz2
-	cd ${WORKDIR}
-	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
-	cd ${WORKDIR}/linux-${KV}
-#	[ ! -e ${DISTDIR}/cset-${MYCSET}.txt.gz ] && die "patch file not found"
-#	cat ${DISTDIR}/cset-${MYCSET}.txt.gz | gzip -d | patch -f -p1
-	[ ! -e ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 ] && die "patch not found"
-	cat ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 | bzip2 -d | patch -f -p1
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-}
diff --git a/sys-kernel/ia64-sources/ia64-sources-2.4.22-r2.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.22-r2.ebuild
deleted file mode 100644
index e8f38b0b5000..000000000000
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.22-r2.ebuild
+++ /dev/null
@@ -1,62 +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/ia64-sources/ia64-sources-2.4.22-r2.ebuild,v 1.3 2004/06/24 22:58:19 agriffis Exp $
-
-IUSE=""
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
-
-#MYCSET="1.1063.2.37-to-1.1088"
-MYSNAPSHOT="030909"
-DESCRIPTION="Full sources for the Gentoo Kernel."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://kernel/linux/kernel/ports/ia64/v2.4/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2"
-
-HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
-LICENSE="GPL-2"
-KEYWORDS="-* ia64"
-SLOT="${KV}"
-
-src_unpack() {
-
-	unpack linux-${OKV}.tar.bz2
-	cd ${WORKDIR}
-	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
-	cd ${WORKDIR}/linux-${KV}
-#	[ ! -e ${DISTDIR}/cset-${MYCSET}.txt.gz ] && die "patch file not found"
-#	cat ${DISTDIR}/cset-${MYCSET}.txt.gz | gzip -d | patch -f -p1
-	[ ! -e ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 ] && die "patch not found"
-	cat ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 | bzip2 -d | patch -f -p1
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-}
diff --git a/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild
deleted file mode 100644
index 5143ebb6f3d6..000000000000
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.22.ebuild
+++ /dev/null
@@ -1,61 +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/ia64-sources/ia64-sources-2.4.22.ebuild,v 1.8 2004/06/24 22:58:19 agriffis Exp $
-
-IUSE=""
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
-
-#MYCSET="1.1063.2.37-to-1.1088"
-MYSNAPSHOT="030909"
-DESCRIPTION="Full sources for the Gentoo Kernel."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://kernel/linux/kernel/ports/ia64/v2.4/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2"
-
-HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
-LICENSE="GPL-2"
-KEYWORDS="-* ia64"
-SLOT="${KV}"
-
-src_unpack() {
-	unpack linux-${OKV}.tar.bz2
-	cd ${WORKDIR}
-	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
-	cd ${WORKDIR}/linux-${KV}
-#	[ ! -e ${DISTDIR}/cset-${MYCSET}.txt.gz ] && die "patch file not found"
-#	cat ${DISTDIR}/cset-${MYCSET}.txt.gz | gzip -d | patch -f -p1
-	[ ! -e ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 ] && die "patch not found"
-	cat ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 | bzip2 -d | patch -f -p1
-
-	epatch ${FILESDIR}/do_brk_fix.patch || die "Failed to patch do_brk() vulnerability!"
-	epatch ${FILESDIR}/${PN}.CAN-2003-0985.patch || die "Failed to patch mremap() vulnerability!"
-	epatch ${FILESDIR}/${PN}.rtc_fix.patch || die "Failed to patch RTC vulnerabilities!"
-
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-}
diff --git a/sys-kernel/ia64-sources/ia64-sources-2.4.24-r4.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.24-r4.ebuild
deleted file mode 100644
index 4b48911cc22f..000000000000
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.24-r4.ebuild
+++ /dev/null
@@ -1,70 +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/ia64-sources/ia64-sources-2.4.24-r4.ebuild,v 1.2 2004/06/24 22:58:19 agriffis Exp $
-
-IUSE=""
-
-# OKV=original kernel version, KV=patched kernel version.  They can be the same.
-
-# Kernel ebuilds using the kernel.eclass can remove any patch that you
-# do not want to apply by simply setting the KERNEL_EXCLUDE shell
-# variable to the string you want to exclude (for instance
-# KERNEL_EXCLUDE="evms" would not patch any patches whose names match
-# *evms*).  Kernels are only tested in the default configuration, but
-# this may be useful if you know that a particular patch is causing a
-# conflict with a patch you personally want to apply, or some other
-# similar situation.
-
-ETYPE="sources"
-
-inherit kernel eutils
-OKV="`echo ${PV}|sed -e 's:^\([0-9]\+\.[0-9]\+\.[0-9]\+\).*:\1:'`"
-EXTRAVERSION="-${PN/-*/}"
-[ ! "${PR}" == "r0" ] && EXTRAVERSION="${EXTRAVERSION}-${PR}"
-KV="${OKV}${EXTRAVERSION}"
-
-S=${WORKDIR}/linux-${KV}
-
-# Documentation on the patches contained in this kernel will be installed
-# to /usr/share/doc/gentoo-sources-${PV}/patches.txt.gz
-
-#MYCSET="1.1063.2.37-to-1.1088"
-MYSNAPSHOT="040109"
-DESCRIPTION="Full sources for the Gentoo Kernel."
-SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-mirror://kernel/linux/kernel/ports/ia64/v2.4/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2"
-
-HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
-LICENSE="GPL-2"
-KEYWORDS="-* ~ia64"
-SLOT="${KV}"
-
-src_unpack() {
-
-	unpack linux-${OKV}.tar.bz2
-	cd ${WORKDIR}
-	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
-	cd ${WORKDIR}/linux-${KV}
-#	[ ! -e ${DISTDIR}/cset-${MYCSET}.txt.gz ] && die "patch file not found"
-#	cat ${DISTDIR}/cset-${MYCSET}.txt.gz | gzip -d | patch -f -p1
-	[ ! -e ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 ] && die "patch not found"
-	cat ${DISTDIR}/linux-${OKV}-ia64-${MYSNAPSHOT}.diff.bz2 | bzip2 -d | patch -f -p1
-
-	# 2.4.24 includes the do_brk, mremap and rtc fixes, so those
-	# patches aren't needed (29 Jan 2004 agriffis)
-
-	epatch ${FILESDIR}/${P}.munmap.patch || die "Failed to apply munmap patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0010.patch || die "Failed to add the CAN-2004-0010 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0075.patch || die "Failed to add the CAN-2004-0075 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0109.patch || die "Failed to add the CAN-2004-0109 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0177.patch || die "Failed to add the CAN-2004-0177 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0178.patch || die "Failed to add the CAN-2004-0178 patch!"
-	epatch ${FILESDIR}/${P}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
-	epatch ${FILESDIR}/${P}.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!"
-	kernel_universal_unpack
-}
-
-pkg_postinst() {
-	kernel_pkg_postinst
-}
diff --git a/sys-kernel/ia64-sources/ia64-sources-2.4.24-r5.ebuild b/sys-kernel/ia64-sources/ia64-sources-2.4.24-r6.ebuild
index f577b7e60304..e47794052c97 100644
--- a/sys-kernel/ia64-sources/ia64-sources-2.4.24-r5.ebuild
+++ b/sys-kernel/ia64-sources/ia64-sources-2.4.24-r6.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/ia64-sources/ia64-sources-2.4.24-r5.ebuild,v 1.2 2004/06/24 22:58:19 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ia64-sources/ia64-sources-2.4.24-r6.ebuild,v 1.1 2004/07/09 15:35:50 plasmaroo Exp $
 
 IUSE=""
 
@@ -40,7 +40,6 @@ KEYWORDS="-* ~ia64"
 SLOT="${KV}"
 
 src_unpack() {
-
 	unpack linux-${OKV}.tar.bz2
 	cd ${WORKDIR}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
@@ -63,6 +62,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.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}/${P}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${P}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	kernel_universal_unpack
 }