Version bumps for kernel attribute vulnerabilities, bug #56479.

14 files changed, 53 insertions, 32 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index c48aea3fe140..06b1fa20fcf1 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.77 2004/07/08 22:27:30 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.78 2004/07/09 15:03:35 plasmaroo Exp $
+
+*gentoo-sources-2.4.26-r4 (09 Jul 2004)
+
+  09 Jul 2004; <plasmaroo@gentoo.org> -gentoo-sources-2.4.19-r17.ebuild,
+  +gentoo-sources-2.4.19-r18.ebuild, -gentoo-sources-2.4.20-r20.ebuild,
+  +gentoo-sources-2.4.20-r21.ebuild, -gentoo-sources-2.4.22-r12.ebuild,
+  +gentoo-sources-2.4.22-r13.ebuild, -gentoo-sources-2.4.25-r5.ebuild,
+  +gentoo-sources-2.4.25-r6.ebuild, -gentoo-sources-2.4.26-r3.ebuild,
+  -gentoo-sources-2.4.26-r4.ebuild, +gentoo-sources-2.4.26-r5.ebuild,
+  +files/gentoo-sources-2.4.CAN-2004-0497.patch:
+  Version bumps for kernel attribute vulnerabilities, bug #56479.
 
   08 Jul 2004; <plasmaroo@gentoo.org> :
   Version bump - FreeS/WAN is now replaced with OpenS/WAN.
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r17 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r18
index 19d991259834..19d991259834 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r17
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r18
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r20 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r21
index 0d9abd01d13b..0d9abd01d13b 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r20
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r21
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r12 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r13
index a564b8210a40..a564b8210a40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r12
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r13
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r5 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r6
index b1beb984fb40..b1beb984fb40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r5
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r6
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r3 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r3
deleted file mode 100644
index 7e8d028df131..000000000000
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 88d7aefa03c92739cb70298a0b486e2c linux-2.4.26.tar.bz2 30772389
-MD5 dc3fb1d8458682de8496a27b74e2859a gentoo-sources-2.4.26-r1.tar.bz2 1110843
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r4 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r5
index 9d4b3b51e408..9d4b3b51e408 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r4
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r5
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0497.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.CAN-2004-0497.patch
new file mode 100644
index 000000000000..9503e9efe57b
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.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/gentoo-sources/gentoo-sources-2.4.19-r17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r18.ebuild
index 59618fd0b51e..4927790fd168 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r17.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r18.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/gentoo-sources/gentoo-sources-2.4.19-r17.ebuild,v 1.2 2004/06/24 22:56:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r18.ebuild,v 1.1 2004/07/09 15:03:35 plasmaroo Exp $
 
 IUSE="build crypt xfs acpi4linux"
 
@@ -35,7 +35,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV/17/10}.tar.bz2"
+	 http://gentoo.lostlogicx.com/patches-${KV/18/10}.tar.bz2"
 KEYWORDS="x86 -ppc -sparc -amd64 -ia64"
 SLOT="${KV}"
 
@@ -43,7 +43,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/17/10}
+	cd ${KV/18/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
@@ -78,5 +78,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.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-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r20.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r21.ebuild
index 0fe027eea215..f91b758584d0 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r20.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r21.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/gentoo-sources/gentoo-sources-2.4.20-r20.ebuild,v 1.2 2004/06/24 22:56:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r21.ebuild,v 1.1 2004/07/09 15:03:35 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/r20/r14}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/r21/r14}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips"
@@ -40,7 +40,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/r20/r14}
+	cd ${WORKDIR}/${KV/r21/r14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if ! use aavm; then
@@ -137,6 +137,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.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-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.I2C_Limits.patch || die "Failed to patch the I2C i2cdev_ioctl() kmalloc() bug!"
 	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r12.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r13.ebuild
index f5d9edffd8e8..9b04a8887ae4 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r12.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r13.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/gentoo-sources/gentoo-sources-2.4.22-r12.ebuild,v 1.2 2004/06/24 22:56:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r13.ebuild,v 1.1 2004/07/09 15:03:35 plasmaroo Exp $
 
 ETYPE="sources"
 UNIPATCH_LIST="
@@ -16,9 +16,10 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
-	${DISTDIR}/gentoo-sources-${PVR/12/5}.patch.bz2"
+	${DISTDIR}/gentoo-sources-${PVR/13/5}.patch.bz2"
 
 inherit kernel-2
 detect_version
@@ -27,7 +28,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/12/5}.patch.bz2"
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/13/5}.patch.bz2"
 KEYWORDS="x86 -*"
 SLOT="${KV}"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r6.ebuild
index 568f68dc2192..61c2588ab92b 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r5.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-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/gentoo-sources/gentoo-sources-2.4.25-r5.ebuild,v 1.2 2004/06/24 22:56:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r6.ebuild,v 1.1 2004/07/09 15:03:35 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -16,6 +16,7 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
 	${DISTDIR}/${P}.patch.bz2"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r4.ebuild
deleted file mode 100644
index 1015ab06be39..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r4.ebuild
+++ /dev/null
@@ -1,16 +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/gentoo-sources/gentoo-sources-2.4.26-r4.ebuild,v 1.1 2004/07/08 22:27:30 plasmaroo Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-KEYWORDS="~x86"
-UNIPATCH_LIST="${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
-	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
-	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
-	${DISTDIR}/${P}-${PR}.tar.bz2"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${P}-${PR}.tar.bz2"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r5.ebuild
index 7ae3e284080c..5e89b09b52ef 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r3.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-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/gentoo-sources/gentoo-sources-2.4.26-r3.ebuild,v 1.3 2004/06/25 15:23:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r5.ebuild,v 1.1 2004/07/09 15:03:35 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -8,9 +8,10 @@ detect_version
 
 KEYWORDS="x86"
 UNIPATCH_LIST="${FILESDIR}/${PN}-2.4.CAN-2004-0495.patch
+	${FILESDIR}/${PN}-2.4.CAN-2004-0497.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0535.patch
 	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
-	${DISTDIR}/${P}-${PR/r3/r1}.tar.bz2"
+	${DISTDIR}/${P}-${PR/r5/r4}.tar.bz2"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${P}-${PR/r3/r1}.tar.bz2"
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${P}-${PR/r5/r4}.tar.bz2"