added CAN-2004-0497

4 files changed, 36 insertions, 8 deletions

diff --git a/sys-kernel/selinux-sources/ChangeLog b/sys-kernel/selinux-sources/ChangeLog
index 9fc6350f5179..b33a39e54a4a 100644
--- a/sys-kernel/selinux-sources/ChangeLog
+++ b/sys-kernel/selinux-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/selinux-sources
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/ChangeLog,v 1.40 2004/06/29 18:00:43 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/ChangeLog,v 1.41 2004/07/11 21:10:34 method Exp $
+
+  11 Jul 2004; Joshua Brindle <method@gentoo.org>
+  selinux-sources-2.4.26-r2.ebuild:
+  added CAN-2004-0497
 
 *selinux-sources-2.4.26-r2 (29 Jun 2004)
 
diff --git a/sys-kernel/selinux-sources/Manifest b/sys-kernel/selinux-sources/Manifest
index bf454598abc7..ffb41dea1ba8 100644
--- a/sys-kernel/selinux-sources/Manifest
+++ b/sys-kernel/selinux-sources/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fe28d6a00314beecd8e684cf1950ada9 selinux-sources-2.4.26-r2.ebuild 672
-MD5 adcbb4dcb1cf953db4c096757420a0c3 ChangeLog 6395
+MD5 2a3ec05744bd2738b1b797d54db1e025 selinux-sources-2.4.26-r2.ebuild 720
+MD5 362a65b7071bf595061388795e8c2ac3 ChangeLog 6502
 MD5 f455fbb5d96167058282b93599457a4f metadata.xml 470
+MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/openmosix-sources.CAN-2004-0497.patch 707
 MD5 f126f17ae2035e3de8de69488bb75ae6 files/digest-selinux-sources-2.4.26-r2 145
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFA4a5WGFJQsIJWJy4RAqerAJ91b2F+ShkPu2WPyEmcjZmZqEjHqgCfcZkQ
-bgCnJGXEW5LzNbPiTDOfp8I=
-=+7Ag
+iD8DBQFA8a0JI9RrrOsOLvcRAqRIAJwLbAZJk2lRVn/8nZhbvgBgwz6IyACglOSl
+og318DUOUTl0OCxcqjkxfao=
+=S48w
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/selinux-sources/files/openmosix-sources.CAN-2004-0497.patch b/sys-kernel/selinux-sources/files/openmosix-sources.CAN-2004-0497.patch
new file mode 100644
index 000000000000..9503e9efe57b
--- /dev/null
+++ b/sys-kernel/selinux-sources/files/openmosix-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/selinux-sources/selinux-sources-2.4.26-r2.ebuild b/sys-kernel/selinux-sources/selinux-sources-2.4.26-r2.ebuild
index 355472b48d1a..61c84c568c51 100644
--- a/sys-kernel/selinux-sources/selinux-sources-2.4.26-r2.ebuild
+++ b/sys-kernel/selinux-sources/selinux-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/selinux-sources/selinux-sources-2.4.26-r2.ebuild,v 1.1 2004/06/29 18:00:43 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/selinux-sources/selinux-sources-2.4.26-r2.ebuild,v 1.2 2004/07/11 21:10:34 method Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -10,7 +10,7 @@ IUSE=""
 GPV_SRC="mirror://gentoo/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR}.tar.bz2"
 KEYWORDS="-* x86"
 
-UNIPATCH_LIST="${DISTDIR}/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR}.tar.bz2"
+UNIPATCH_LIST="${DISTDIR}/patches-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-selinux-${PR}.tar.bz2 ${FILESDIR}/openmosix-sources.CAN-2004-0497.patch"
 
 DESCRIPTION="Base ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} SELinux kernel"
 SRC_URI="${KERNEL_URI} ${GPV_SRC}"