From a2964d92e8ab2556a99274094e00c518fd913bdb Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 18 Nov 2009 10:46:15 +0000 Subject: [PATCH] Clifford Wolf: Subject: [PATCH 1/2] Updated linux (2.6.30.1) diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc index 38ebf61..238bd94 100644 [2009072617540010158] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9487 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.desc | 4 +- .../base/linux/linux26/80-ext23-suiddir.patch | 134 ------------------ package/base/linux/linux26/disable-broken.lst | 3 +- 3 files changed, 3 insertions(+), 138 deletions(-) delete mode 100644 package/base/linux/linux26/80-ext23-suiddir.patch diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc index 38ebf6121..238bd946e 100644 --- a/package/base/linux/linux.desc +++ b/package/base/linux/linux.desc @@ -50,8 +50,8 @@ #endif #if xpkg == linux26.* -[V] 2.6.28.8 -[D] 1774856722 linux-2.6.28.8.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/ +[V] 2.6.30.1 +[D] 2376680309 linux-2.6.30.1.tar.bz2 http://www.kernel.org/pub/linux/kernel/v2.6/ #endif [CD] for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done diff --git a/package/base/linux/linux26/80-ext23-suiddir.patch b/package/base/linux/linux26/80-ext23-suiddir.patch deleted file mode 100644 index d52cafc86..000000000 --- a/package/base/linux/linux26/80-ext23-suiddir.patch +++ /dev/null @@ -1,134 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/linux/linux26/80-ext23-suiddir.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./fs/ext3/ialloc.c.orig 2002-11-27 23:36:00.000000000 +0100 -+++ ./fs/ext3/ialloc.c 2003-01-13 09:50:38.000000000 +0100 -@@ -520,6 +520,13 @@ - mode |= S_ISGID; - } else - inode->i_gid = current->fsgid; -+#ifdef CONFIG_EXT3_FS_SUIDDIR -+ if (dir->i_mode & S_ISUID) { -+ mode |= (mode & 0700) >> 3; -+ if (S_ISDIR(mode)) -+ mode |= S_ISUID; -+ } -+#endif - inode->i_mode = mode; - - inode->i_ino = ino; ---- ./fs/ext2/ialloc.c.orig 2002-11-27 23:36:00.000000000 +0100 -+++ ./fs/ext2/ialloc.c 2003-01-13 09:50:38.000000000 +0100 -@@ -509,6 +509,13 @@ - mode |= S_ISGID; - } else - inode->i_gid = current->fsgid; -+#ifdef CONFIG_EXT2_FS_SUIDDIR -+ if (dir->i_mode & S_ISUID) { -+ mode |= (mode & 0700) >> 3; -+ if (S_ISDIR(mode)) -+ mode |= S_ISUID; -+ } -+#endif - inode->i_mode = mode; - - inode->i_ino = ino; ---- ./CREDITS.orig 2002-11-27 23:36:15.000000000 +0100 -+++ ./CREDITS 2003-01-13 09:50:46.000000000 +0100 -@@ -3346,6 +3346,8 @@ - E: god@clifford.at - W: http://www.clifford.at/ - D: Menuconfig/lxdialog improvement -+D: Initial Wacom Intuos USB Driver -+D: Ext[23]FS and Reiserfs SUID on directories extension - S: Foehrengasse 16 - S: A-2333 Leopoldsdorf b. Wien - S: Austria ---- ./fs/ext2/Kconfig.orig 2009-01-18 17:59:49.000000000 +0100 -+++ ./fs/ext2/Kconfig 2009-01-18 18:01:05.000000000 +0100 -@@ -53,3 +53,33 @@ - - If you do not use a block device that is capable of using this, - or if unsure, say N. -+ -+config EXT2_FS_SUIDDIR -+ bool "Ext2fs SUID on Directory Extension" -+ depends on EXT2_FS -+ help -+ As you might know, the SGID flag has a special function on -+ directories: files within that directories will be owned by -+ the same group that also owns the directory - which is useful -+ for creating directories which are shared between the members -+ of a group. -+ -+ But that only makes sense if the umask is set to give full -+ permissions to the group (e.g. 007 or 002). Noone would do that -+ if there is a system-wide 'users' group - so some distributions -+ add an extra group for every user which lets the /etc/group -+ file grow very fast and makes the admins life harder ... -+ -+ Activating this feture adds a function to the SUID flag on -+ directories, which usually has no function at all: -+ -+ If the SUID flag is set for a diectory, all new files in that -+ directory will get the same rights in the group-field as they -+ have in their user-field. So, if one sets both - SUID and SGID -+ - on a directory, it will also work with a umask like 022 or -+ 077 and there is no more need for an extra group for every user. -+ -+ Also, the SUID flag will be set to all subdirectories of a -+ SUID directory (as it is already now with the SGID flag on -+ directories). -+ ---- ./fs/ext3/Kconfig.orig 2009-01-18 18:01:10.000000000 +0100 -+++ ./fs/ext3/Kconfig 2009-01-18 18:02:09.000000000 +0100 -@@ -65,3 +65,33 @@ - - If you are not using a security module that requires using - extended attributes for file security labels, say N. -+ -+config EXT3_FS_SUIDDIR -+ bool "Ext3fs SUID on Directory Extension" -+ depends on EXT3_FS -+ help -+ As you might know, the SGID flag has a special function on -+ directories: files within that directories will be owned by -+ the same group that also owns the directory - which is useful -+ for creating directories which are shared between the members -+ of a group. -+ -+ But that only makes sense if the umask is set to give full -+ permissions to the group (e.g. 007 or 002). Noone would do that -+ if there is a system-wide 'users' group - so some distributions -+ add an extra group for every user which lets the /etc/group -+ file grow very fast and makes the admins life harder ... -+ -+ Activating this feture adds a function to the SUID flag on -+ directories, which usually has no function at all: -+ -+ If the SUID flag is set for a diectory, all new files in that -+ directory will get the same rights in the group-field as they -+ have in their user-field. So, if one sets both - SUID and SGID -+ - on a directory, it will also work with a umask like 022 or -+ 077 and there is no more need for an extra group for every user. -+ -+ Also, the SUID flag will be set to all subdirectories of a -+ SUID directory (as it is already now with the SGID flag on -+ directories). -+ diff --git a/package/base/linux/linux26/disable-broken.lst b/package/base/linux/linux26/disable-broken.lst index 688f25dff..b9ea77bec 100644 --- a/package/base/linux/linux26/disable-broken.lst +++ b/package/base/linux/linux26/disable-broken.lst @@ -24,6 +24,5 @@ CONFIG_EXAMPLE 2000-01-01 2.6.0 # example.o # do not remove the following entries unless you are really sure about it.. -CONFIG_BLK_DEV_UB 2005-05-07 2.6.9 # breaks usb-storage +# ..nothing broken atm.. -CONFIG_INPUT_EVBUG 2006-07-10 2.6.16 # pollutes dmesg