Version bump for kernel attribute vulnerabilities, bug #56479.

5 files changed, 50 insertions, 19 deletions

diff --git a/sys-kernel/gs-sources/ChangeLog b/sys-kernel/gs-sources/ChangeLog
index 41bae4791f08..7e0246a59914 100644
--- a/sys-kernel/gs-sources/ChangeLog
+++ b/sys-kernel/gs-sources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-kernel/gs-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.46 2004/06/29 22:12:57 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/ChangeLog,v 1.47 2004/07/09 15:27:32 plasmaroo Exp $
+
+*gs-sources-2.4.25_pre7-r8 (09 Jul 2004)
+
+  09 Jul 2004; <plasmaroo@gentoo.org> -gs-sources-2.4.25_pre7-r7.ebuild,
+  +gs-sources-2.4.25_pre7-r8.ebuild, +files/gs-sources.CAN-2004-0497.patch:
+  Version bump for kernel attribute vulnerabilities, bug #56479.
 
   29 Jun 2004; Daniel Drake <dsd@gentoo.org> gs-sources-2.4.25_pre7-r7.ebuild:
   Fix installation path
diff --git a/sys-kernel/gs-sources/Manifest b/sys-kernel/gs-sources/Manifest
index 4aa7bf486c9c..4ccce7a3d151 100644
--- a/sys-kernel/gs-sources/Manifest
+++ b/sys-kernel/gs-sources/Manifest
@@ -1,19 +1,20 @@
-MD5 575779d0e0312a7856f29c427b312d25 gs-sources-2.4.25_pre7-r7.ebuild 3063
-MD5 b4b996a7add0c6a8e914819e052350fa ChangeLog 8631
+MD5 ae6fdcfed726196a0efb1e5740021942 ChangeLog 8894
 MD5 4df72e65b139d3e4c18bec81f3a561df metadata.xml 227
+MD5 1f1d0ea14e1207111b69e2e82d4859cb gs-sources-2.4.25_pre7-r8.ebuild 3175
+MD5 517fc1b71501382d041ce0bdfe304511 files/00_3.5-useraddress.patch 7247
+MD5 21f3a4f186017d925067335e24db36a1 files/gs-sources.CAN-2004-0109.patch 1877
+MD5 174438d215b70cad5ffb00ca8123c062 files/gs-sources.munmap.patch 837
+MD5 d4a740ae56c2049247083af387a22a85 files/gs-sources.CAN-2004-0394.patch 350
 MD5 0f66013f643c79c97fda489618a4e2fd files/gs-sources.CAN-2004-0535.patch 476
-MD5 c9da1bc82b906f6abc648c056e7bf662 files/gs-sources.FPULockup-53804.patch 354
+MD5 de75cfa969ed092578d9ddda6c5be334 files/gs-sources.CAN-2004-0181.patch 1233
 MD5 dc18e982f8149588a291956481885a8c files/gs-sources.CAN-2004-0495.patch 17549
+MD5 302215db36238af65fd57bd22db6d7ed files/digest-gs-sources-2.4.25_pre7-r8 147
+MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gs-sources.CAN-2004-0177.patch 384
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/gs-sources.CAN-2004-0497.patch 707
 MD5 a3ec1083055b245758b2262dd2245145 files/pci.ids.patch 3376
-MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gs-sources.CAN-2004-0427.patch 460
-MD5 de75cfa969ed092578d9ddda6c5be334 files/gs-sources.CAN-2004-0181.patch 1233
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gs-sources.CAN-2003-0985.patch 414
-MD5 174438d215b70cad5ffb00ca8123c062 files/gs-sources.munmap.patch 837
-MD5 b1a5808ce9f7266bcca1f8de769ac9ac files/gs-sources.MKI.CompileFix.patch 445
-MD5 302215db36238af65fd57bd22db6d7ed files/digest-gs-sources-2.4.25_pre7-r7 147
-MD5 d4a740ae56c2049247083af387a22a85 files/gs-sources.CAN-2004-0394.patch 350
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/gs-sources.CAN-2004-0177.patch 384
 MD5 5bf9836a632a861728d33f9736bb7431 files/gs-sources.CAN-2004-0133.patch 427
-MD5 517fc1b71501382d041ce0bdfe304511 files/00_3.5-useraddress.patch 7247
-MD5 21f3a4f186017d925067335e24db36a1 files/gs-sources.CAN-2004-0109.patch 1877
+MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gs-sources.CAN-2004-0427.patch 460
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/gs-sources.CAN-2004-0178.patch 424
+MD5 b1a5808ce9f7266bcca1f8de769ac9ac files/gs-sources.MKI.CompileFix.patch 445
+MD5 c9da1bc82b906f6abc648c056e7bf662 files/gs-sources.FPULockup-53804.patch 354
diff --git a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r7 b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r8
index f55b28665921..f55b28665921 100644
--- a/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r7
+++ b/sys-kernel/gs-sources/files/digest-gs-sources-2.4.25_pre7-r8
diff --git a/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0497.patch b/sys-kernel/gs-sources/files/gs-sources.CAN-2004-0497.patch
new file mode 100644
index 000000000000..9503e9efe57b
--- /dev/null
+++ b/sys-kernel/gs-sources/files/gs-sources.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/gs-sources/gs-sources-2.4.25_pre7-r7.ebuild b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r8.ebuild
index 6e69423b17be..2754e43a9bcf 100644
--- a/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r7.ebuild
+++ b/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r8.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/gs-sources/gs-sources-2.4.25_pre7-r7.ebuild,v 1.5 2004/06/29 22:12:57 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gs-sources/gs-sources-2.4.25_pre7-r8.ebuild,v 1.1 2004/07/09 15:27:32 plasmaroo Exp $
 
 IUSE="build crypt"
 
@@ -19,9 +19,9 @@ ETYPE="sources"
 
 inherit kernel eutils
 PROVIDE="virtual/linux-sources virtual/winkernel"
-OKV=2.4.24
-EXTRAVERSION=_pre7-gss-r7
-KV=2.4.25_pre7-gss-r7
+OKV='2.4.24'
+EXTRAVERSION="_pre7-gss-${PR}"
+KV="2.4.25_pre7-gss-${PR}"
 S=${WORKDIR}/linux-${KV}
 
 # Documentation on the patches contained in this kernel will be installed
@@ -30,14 +30,14 @@ S=${WORKDIR}/linux-${KV}
 DESCRIPTION="This kernel stays up to date with current kernel -pre's, with recent ACPI,
 	EVMS, Win4Lin, aic79xx, Super FreeS/WAN, preempt, and various hardware fixes."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 mirror://gentoo/patches-${KV/r7/r1}.tar.bz2"
+	 mirror://gentoo/patches-${KV/r8/r1}.tar.bz2"
 KEYWORDS="x86 -ppc -sparc"
 SLOT="${KV}"
 
 src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
-	cd ${KV/r7/r1} || die
+	cd ${KV/r8/r1} || die
 	# Kill patches we aren't suppposed to use, don't worry about
 	# failures, if they aren't there that is a good thing!
 	# This is the ratified crypt USE flag, enables IPSEC and patch-int
@@ -61,6 +61,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0495.patch || die "Failed to add the CAN-2004-0495 patch!"
+	epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
 	epatch ${FILESDIR}/${PN}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 	epatch ${FILESDIR}/${PN}.MKI.CompileFix.patch || die "Failed to apply MKI compilefix patch!"