Hello community,
here is the log from the commit of package kernel-source
checked in at Wed Mar 12 19:44:19 CET 2008.
--------
--- kernel-source/kernel-debug.changes 2008-03-12 11:51:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/kernel-debug.changes 2008-03-12 18:18:07.218050000 +0100
@@ -1,0 +2,26 @@
+Wed Mar 12 18:25:38 CET 2008 - gregkh@suse.de
+
+- Enabled CONFIG_UNUSED_SYMBOLS for now. It will be disabled
+ after the next openSUSE alpha release. It is being enabled
+ for now to let some kmp packages still work while their
+ maintainers are working to update them with the 2.6.25
+ kernel changes.
+
+-------------------------------------------------------------------
+Wed Mar 12 18:09:37 CET 2008 - gregkh@suse.de
+
+- refresh patches to apply cleanly
+
+-------------------------------------------------------------------
+Wed Mar 12 17:17:13 CET 2008 - gregkh@suse.de
+
+- update to 2.6.25-rc5-git2
+
+-------------------------------------------------------------------
+Wed Mar 12 12:07:50 CET 2008 - sassmann@suse.de
+
+- patches.arch/ppc-ps3-rename-wireless-interface.patch:
+ rename ps3 wireless interface from eth? to wlan? for better
+ handling in udev
+
+-------------------------------------------------------------------
kernel-default.changes: same change
kernel-dummy.changes: same change
kernel-kdump.changes: same change
kernel-pae.changes: same change
kernel-ppc64.changes: same change
kernel-ps3.changes: same change
kernel-s390.changes: same change
kernel-source.changes: same change
kernel-syms.changes: same change
kernel-vanilla.changes: same change
kernel-xen.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kernel-debug.spec ++++++
--- /var/tmp/diff_new_pack.FZ7621/_old 2008-03-12 19:39:59.000000000 +0100
+++ /var/tmp/diff_new_pack.FZ7621/_new 2008-03-12 19:39:59.000000000 +0100
@@ -44,7 +44,7 @@
Name: kernel-debug
Summary: A Debug Version of the Kernel
Version: 2.6.25
-Release: 2
+Release: 3
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -177,7 +177,7 @@
-Source Timestamp: 2008/03/12 09:25:35 UTC
+Source Timestamp: 2008/03/12 17:16:01 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -256,7 +256,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <
-Source Timestamp: 2008/03/12 09:25:35 UTC
+Source Timestamp: 2008/03/12 17:16:01 UTC
%install
rm -rf %buildroot
@@ -40,6 +40,20 @@
%defattr(-, root, root)
/etc/dummy
%changelog
+* Wed Mar 12 2008 gregkh@suse.de
+- Enabled CONFIG_UNUSED_SYMBOLS for now. It will be disabled
+ after the next openSUSE alpha release. It is being enabled
+ for now to let some kmp packages still work while their
+ maintainers are working to update them with the 2.6.25
+ kernel changes.
+* Wed Mar 12 2008 gregkh@suse.de
+- refresh patches to apply cleanly
+* Wed Mar 12 2008 gregkh@suse.de
+- update to 2.6.25-rc5-git2
+* Wed Mar 12 2008 sassmann@suse.de
+- patches.arch/ppc-ps3-rename-wireless-interface.patch:
+ rename ps3 wireless interface from eth? to wlan? for better
+ handling in udev
* Wed Mar 12 2008 jbeulich@novell.com
- Update Xen patches to 2.6.25-rc5 and c/s 471.
- patches.xen/xen3-aslr-i386-and-x86_64-randomize-brk.patch:
++++++ kernel-kdump.spec ++++++
--- /var/tmp/diff_new_pack.FZ7621/_old 2008-03-12 19:40:00.000000000 +0100
+++ /var/tmp/diff_new_pack.FZ7621/_new 2008-03-12 19:40:00.000000000 +0100
@@ -44,7 +44,7 @@
Name: kernel-kdump
Summary: kernel for kdump
Version: 2.6.25
-Release: 2
+Release: 3
License: GPL v2 or later
Group: System/Kernel
AutoReqProv: on
@@ -176,7 +176,7 @@
-Source Timestamp: 2008/03/12 09:25:35 UTC
+Source Timestamp: 2008/03/12 17:16:01 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -255,7 +255,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <
see /usr/src/linux/CREDITS for more details.
-Source Timestamp: 2008/03/12 09:25:35 UTC
+Source Timestamp: 2008/03/12 17:16:01 UTC
%prep
if ! [ -e %_sourcedir/linux-2.6.24.tar.bz2 ]; then
@@ -267,7 +267,7 @@
EOF
%endif
cat >> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs < %_builddir/%{name}-%{version}/.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <> ../.rpm-defs <inode_post_setxattr(dentry, mnt, name, value, size, flags);
}
@@ -98,7 +98,7 @@
int security_inode_listxattr(struct dentry *dentry)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2655,7 +2655,8 @@ static void selinux_inode_post_setxattr(
+@@ -2666,7 +2666,8 @@ static void selinux_inode_post_setxattr(
return;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-link.diff new/patches.apparmor/security-link.diff
--- old/patches.apparmor/security-link.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-link.diff 2008-03-12 18:17:10.000000000 +0100
@@ -29,7 +29,7 @@
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -317,8 +317,10 @@ struct request_sock;
+@@ -337,8 +337,10 @@ static inline void security_free_mnt_opt
* @inode_link:
* Check permission before creating a new hard link to a file.
* @old_dentry contains the dentry structure for an existing link to the file.
@@ -40,7 +40,7 @@
* Return 0 if permission is granted.
* @inode_unlink:
* Check the permission to remove a hard link to a file.
-@@ -1276,8 +1278,9 @@ struct security_operations {
+@@ -1295,8 +1297,9 @@ struct security_operations {
char **name, void **value, size_t *len);
int (*inode_create) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
@@ -52,7 +52,7 @@
int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
int (*inode_symlink) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, const char *old_name);
-@@ -1541,8 +1544,9 @@ int security_inode_init_security(struct
+@@ -1560,8 +1563,9 @@ int security_inode_init_security(struct
char **name, void **value, size_t *len);
int security_inode_create(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
@@ -64,7 +64,7 @@
int security_inode_unlink(struct inode *dir, struct dentry *dentry);
int security_inode_symlink(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, const char *old_name);
-@@ -1858,8 +1862,10 @@ static inline int security_inode_create
+@@ -1907,8 +1911,10 @@ static inline int security_inode_create
}
static inline int security_inode_link (struct dentry *old_dentry,
@@ -78,7 +78,7 @@
}
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -290,8 +290,10 @@ static int dummy_inode_create (struct in
+@@ -292,8 +292,10 @@ static int dummy_inode_create (struct in
return 0;
}
@@ -93,7 +93,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -353,12 +353,14 @@ int security_inode_create(struct inode *
+@@ -360,12 +360,14 @@ int security_inode_create(struct inode *
return security_ops->inode_create(dir, dentry, mnt, mode);
}
@@ -113,7 +113,7 @@
int security_inode_unlink(struct inode *dir, struct dentry *dentry)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2436,11 +2436,16 @@ static int selinux_inode_create(struct i
+@@ -2447,11 +2447,16 @@ static int selinux_inode_create(struct i
return may_create(dir, dentry, SECCLASS_FILE);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-listxattr.diff new/patches.apparmor/security-listxattr.diff
--- old/patches.apparmor/security-listxattr.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-listxattr.diff 2008-03-12 18:17:10.000000000 +0100
@@ -28,7 +28,7 @@
error = -EOPNOTSUPP;
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -423,7 +423,7 @@ struct request_sock;
+@@ -443,7 +443,7 @@ static inline void security_free_mnt_opt
* Return 0 if permission is granted.
* @inode_listxattr:
* Check permission before obtaining the list of extended attribute
@@ -37,7 +37,7 @@
* Return 0 if permission is granted.
* @inode_removexattr:
* Check permission before removing the extended attribute
-@@ -1314,7 +1314,7 @@ struct security_operations {
+@@ -1333,7 +1333,7 @@ struct security_operations {
size_t size, int flags);
int (*inode_getxattr) (struct dentry *dentry, struct vfsmount *mnt,
char *name);
@@ -46,7 +46,7 @@
int (*inode_removexattr) (struct dentry *dentry, char *name);
int (*inode_need_killpriv) (struct dentry *dentry);
int (*inode_killpriv) (struct dentry *dentry);
-@@ -1585,7 +1585,7 @@ void security_inode_post_setxattr(struct
+@@ -1604,7 +1604,7 @@ void security_inode_post_setxattr(struct
int flags);
int security_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
char *name);
@@ -55,7 +55,7 @@
int security_inode_removexattr(struct dentry *dentry, char *name);
int security_inode_need_killpriv(struct dentry *dentry);
int security_inode_killpriv(struct dentry *dentry);
-@@ -1988,7 +1988,8 @@ static inline int security_inode_getxatt
+@@ -2037,7 +2037,8 @@ static inline int security_inode_getxatt
return 0;
}
@@ -67,7 +67,7 @@
}
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -394,7 +394,7 @@ static int dummy_inode_getxattr (struct
+@@ -396,7 +396,7 @@ static int dummy_inode_getxattr (struct
return 0;
}
@@ -78,7 +78,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -483,11 +483,11 @@ int security_inode_getxattr(struct dentr
+@@ -490,11 +490,11 @@ int security_inode_getxattr(struct dentr
return security_ops->inode_getxattr(dentry, mnt, name);
}
@@ -94,7 +94,7 @@
int security_inode_removexattr(struct dentry *dentry, char *name)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2661,7 +2661,7 @@ static int selinux_inode_getxattr (struc
+@@ -2672,7 +2672,7 @@ static int selinux_inode_getxattr (struc
return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-mkdir.diff new/patches.apparmor/security-mkdir.diff
--- old/patches.apparmor/security-mkdir.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-mkdir.diff 2008-03-12 18:17:11.000000000 +0100
@@ -28,7 +28,7 @@
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -336,6 +336,7 @@ struct request_sock;
+@@ -356,6 +356,7 @@ static inline void security_free_mnt_opt
* associated with inode strcture @dir.
* @dir containst the inode structure of parent of the directory to be created.
* @dentry contains the dentry structure of new directory.
@@ -36,7 +36,7 @@
* @mode contains the mode of new directory.
* Return 0 if permission is granted.
* @inode_rmdir:
-@@ -1277,7 +1278,8 @@ struct security_operations {
+@@ -1296,7 +1297,8 @@ struct security_operations {
int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
int (*inode_symlink) (struct inode *dir,
struct dentry *dentry, const char *old_name);
@@ -46,7 +46,7 @@
int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
int mode, dev_t dev);
-@@ -1541,7 +1543,8 @@ int security_inode_link(struct dentry *o
+@@ -1560,7 +1562,8 @@ int security_inode_link(struct dentry *o
int security_inode_unlink(struct inode *dir, struct dentry *dentry);
int security_inode_symlink(struct inode *dir, struct dentry *dentry,
const char *old_name);
@@ -56,7 +56,7 @@
int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
int security_inode_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev);
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
-@@ -1872,6 +1875,7 @@ static inline int security_inode_symlink
+@@ -1921,6 +1924,7 @@ static inline int security_inode_symlink
static inline int security_inode_mkdir (struct inode *dir,
struct dentry *dentry,
@@ -66,7 +66,7 @@
return 0;
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -308,7 +308,7 @@ static int dummy_inode_symlink (struct i
+@@ -310,7 +310,7 @@ static int dummy_inode_symlink (struct i
}
static int dummy_inode_mkdir (struct inode *inode, struct dentry *dentry,
@@ -77,7 +77,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -376,11 +376,12 @@ int security_inode_symlink(struct inode
+@@ -383,11 +383,12 @@ int security_inode_symlink(struct inode
return security_ops->inode_symlink(dir, dentry, old_name);
}
@@ -94,7 +94,7 @@
int security_inode_rmdir(struct inode *dir, struct dentry *dentry)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2461,7 +2461,8 @@ static int selinux_inode_symlink(struct
+@@ -2472,7 +2472,8 @@ static int selinux_inode_symlink(struct
return may_create(dir, dentry, SECCLASS_LNK_FILE);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-mknod.diff new/patches.apparmor/security-mknod.diff
--- old/patches.apparmor/security-mknod.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-mknod.diff 2008-03-12 18:17:11.000000000 +0100
@@ -28,7 +28,7 @@
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -351,6 +351,7 @@ struct request_sock;
+@@ -371,6 +371,7 @@ static inline void security_free_mnt_opt
* and not this hook.
* @dir contains the inode structure of parent of the new file.
* @dentry contains the dentry structure of the new file.
@@ -36,7 +36,7 @@
* @mode contains the mode of the new file.
* @dev contains the device number.
* Return 0 if permission is granted.
-@@ -1282,7 +1283,7 @@ struct security_operations {
+@@ -1301,7 +1302,7 @@ struct security_operations {
struct vfsmount *mnt, int mode);
int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
@@ -45,7 +45,7 @@
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry);
int (*inode_readlink) (struct dentry *dentry);
-@@ -1546,7 +1547,8 @@ int security_inode_symlink(struct inode
+@@ -1565,7 +1566,8 @@ int security_inode_symlink(struct inode
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
@@ -55,7 +55,7 @@
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry);
int security_inode_readlink(struct dentry *dentry);
-@@ -1889,6 +1891,7 @@ static inline int security_inode_rmdir (
+@@ -1938,6 +1940,7 @@ static inline int security_inode_rmdir (
static inline int security_inode_mknod (struct inode *dir,
struct dentry *dentry,
@@ -65,7 +65,7 @@
return 0;
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -319,7 +319,7 @@ static int dummy_inode_rmdir (struct ino
+@@ -321,7 +321,7 @@ static int dummy_inode_rmdir (struct ino
}
static int dummy_inode_mknod (struct inode *inode, struct dentry *dentry,
@@ -76,7 +76,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -391,11 +391,12 @@ int security_inode_rmdir(struct inode *d
+@@ -398,11 +398,12 @@ int security_inode_rmdir(struct inode *d
return security_ops->inode_rmdir(dir, dentry);
}
@@ -93,7 +93,7 @@
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2472,11 +2472,12 @@ static int selinux_inode_rmdir(struct in
+@@ -2483,11 +2483,12 @@ static int selinux_inode_rmdir(struct in
return may_link(dir, dentry, MAY_RMDIR);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-readlink.diff new/patches.apparmor/security-readlink.diff
--- old/patches.apparmor/security-readlink.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-readlink.diff 2008-03-12 18:17:11.000000000 +0100
@@ -28,7 +28,7 @@
error = inode->i_op->readlink(nd.path.dentry,
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -366,6 +366,7 @@ struct request_sock;
+@@ -386,6 +386,7 @@ static inline void security_free_mnt_opt
* @inode_readlink:
* Check the permission to read the symbolic link.
* @dentry contains the dentry structure for the file link.
@@ -36,7 +36,7 @@
* Return 0 if permission is granted.
* @inode_follow_link:
* Check permission to follow a symbolic link when looking up a pathname.
-@@ -1287,7 +1288,7 @@ struct security_operations {
+@@ -1306,7 +1307,7 @@ struct security_operations {
struct vfsmount *mnt, int mode, dev_t dev);
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry);
@@ -45,7 +45,7 @@
int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
int (*inode_permission) (struct inode *inode, int mask, struct nameidata *nd);
int (*inode_setattr) (struct dentry *dentry, struct vfsmount *mnt,
-@@ -1552,7 +1553,7 @@ int security_inode_mknod(struct inode *d
+@@ -1571,7 +1572,7 @@ int security_inode_mknod(struct inode *d
struct vfsmount *mnt, int mode, dev_t dev);
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry);
@@ -54,7 +54,7 @@
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd);
int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd);
int security_inode_setattr(struct dentry *dentry, struct vfsmount *mnt,
-@@ -1907,7 +1908,8 @@ static inline int security_inode_rename
+@@ -1956,7 +1957,8 @@ static inline int security_inode_rename
return 0;
}
@@ -66,7 +66,7 @@
}
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -332,7 +332,7 @@ static int dummy_inode_rename (struct in
+@@ -334,7 +334,7 @@ static int dummy_inode_rename (struct in
return 0;
}
@@ -77,7 +77,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -409,11 +409,11 @@ int security_inode_rename(struct inode *
+@@ -416,11 +416,11 @@ int security_inode_rename(struct inode *
new_dir, new_dentry);
}
@@ -93,7 +93,7 @@
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2491,7 +2491,7 @@ static int selinux_inode_rename(struct i
+@@ -2502,7 +2502,7 @@ static int selinux_inode_rename(struct i
return may_rename(old_inode, old_dentry, new_inode, new_dentry);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-removexattr.diff new/patches.apparmor/security-removexattr.diff
--- old/patches.apparmor/security-removexattr.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-removexattr.diff 2008-03-12 18:17:11.000000000 +0100
@@ -29,7 +29,7 @@
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -58,7 +58,7 @@ extern int cap_bprm_set_security (struct
+@@ -52,7 +52,7 @@ extern int cap_bprm_set_security (struct
extern void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe);
extern int cap_bprm_secureexec(struct linux_binprm *bprm);
extern int cap_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt, char *name, void *value, size_t size, int flags);
@@ -38,7 +38,7 @@
extern int cap_inode_need_killpriv(struct dentry *dentry);
extern int cap_inode_killpriv(struct dentry *dentry);
extern int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
-@@ -1315,7 +1315,8 @@ struct security_operations {
+@@ -1334,7 +1334,8 @@ struct security_operations {
int (*inode_getxattr) (struct dentry *dentry, struct vfsmount *mnt,
char *name);
int (*inode_listxattr) (struct dentry *dentry, struct vfsmount *mnt);
@@ -48,7 +48,7 @@
int (*inode_need_killpriv) (struct dentry *dentry);
int (*inode_killpriv) (struct dentry *dentry);
int (*inode_getsecurity)(const struct inode *inode, const char *name, void **buffer, bool alloc);
-@@ -1586,7 +1587,8 @@ void security_inode_post_setxattr(struct
+@@ -1605,7 +1606,8 @@ void security_inode_post_setxattr(struct
int security_inode_getxattr(struct dentry *dentry, struct vfsmount *mnt,
char *name);
int security_inode_listxattr(struct dentry *dentry, struct vfsmount *mnt);
@@ -58,7 +58,7 @@
int security_inode_need_killpriv(struct dentry *dentry);
int security_inode_killpriv(struct dentry *dentry);
int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc);
-@@ -1994,9 +1996,10 @@ static inline int security_inode_listxat
+@@ -2043,9 +2045,10 @@ static inline int security_inode_listxat
return 0;
}
@@ -85,7 +85,7 @@
if (!capable(CAP_SETFCAP))
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -399,7 +399,8 @@ static int dummy_inode_listxattr (struct
+@@ -401,7 +401,8 @@ static int dummy_inode_listxattr (struct
return 0;
}
@@ -97,7 +97,7 @@
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
--- a/security/security.c
+++ b/security/security.c
-@@ -490,11 +490,12 @@ int security_inode_listxattr(struct dent
+@@ -497,11 +497,12 @@ int security_inode_listxattr(struct dent
return security_ops->inode_listxattr(dentry, mnt);
}
@@ -114,7 +114,7 @@
int security_inode_need_killpriv(struct dentry *dentry)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2666,7 +2666,8 @@ static int selinux_inode_listxattr (stru
+@@ -2677,7 +2677,8 @@ static int selinux_inode_listxattr (stru
return dentry_has_perm(current, NULL, dentry, FILE__GETATTR);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-rename.diff new/patches.apparmor/security-rename.diff
--- old/patches.apparmor/security-rename.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-rename.diff 2008-03-12 18:17:11.000000000 +0100
@@ -39,7 +39,7 @@
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -364,8 +364,10 @@ struct request_sock;
+@@ -384,8 +384,10 @@ static inline void security_free_mnt_opt
* Check for permission to rename a file or directory.
* @old_dir contains the inode structure for parent of the old link.
* @old_dentry contains the dentry structure of the old link.
@@ -50,7 +50,7 @@
* Return 0 if permission is granted.
* @inode_readlink:
* Check the permission to read the symbolic link.
-@@ -1294,7 +1296,9 @@ struct security_operations {
+@@ -1313,7 +1315,9 @@ struct security_operations {
int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode, dev_t dev);
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
@@ -61,7 +61,7 @@
int (*inode_readlink) (struct dentry *dentry, struct vfsmount *mnt);
int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
int (*inode_permission) (struct inode *inode, int mask, struct nameidata *nd);
-@@ -1562,7 +1566,8 @@ int security_inode_rmdir(struct inode *d
+@@ -1581,7 +1585,8 @@ int security_inode_rmdir(struct inode *d
int security_inode_mknod(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode, dev_t dev);
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
@@ -71,7 +71,7 @@
int security_inode_readlink(struct dentry *dentry, struct vfsmount *mnt);
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd);
int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd);
-@@ -1916,8 +1921,10 @@ static inline int security_inode_mknod (
+@@ -1965,8 +1970,10 @@ static inline int security_inode_mknod (
static inline int security_inode_rename (struct inode *old_dir,
struct dentry *old_dentry,
@@ -85,7 +85,7 @@
}
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -330,8 +330,10 @@ static int dummy_inode_mknod (struct ino
+@@ -332,8 +332,10 @@ static int dummy_inode_mknod (struct ino
static int dummy_inode_rename (struct inode *old_inode,
struct dentry *old_dentry,
@@ -99,7 +99,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -404,13 +404,14 @@ int security_inode_mknod(struct inode *d
+@@ -411,13 +411,14 @@ int security_inode_mknod(struct inode *d
}
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
@@ -119,7 +119,7 @@
int security_inode_readlink(struct dentry *dentry, struct vfsmount *mnt)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2492,8 +2492,12 @@ static int selinux_inode_mknod(struct in
+@@ -2503,8 +2503,12 @@ static int selinux_inode_mknod(struct in
return may_create(dir, dentry, inode_mode_to_security_class(mode));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-rmdir.diff new/patches.apparmor/security-rmdir.diff
--- old/patches.apparmor/security-rmdir.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-rmdir.diff 2008-03-12 18:17:11.000000000 +0100
@@ -28,7 +28,7 @@
if (!error)
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -346,6 +346,7 @@ struct request_sock;
+@@ -366,6 +366,7 @@ static inline void security_free_mnt_opt
* Check the permission to remove a directory.
* @dir contains the inode structure of parent of the directory to be removed.
* @dentry contains the dentry structure of directory to be removed.
@@ -36,7 +36,7 @@
* Return 0 if permission is granted.
* @inode_mknod:
* Check permissions when creating a special file (or a socket or a fifo
-@@ -1286,7 +1287,8 @@ struct security_operations {
+@@ -1305,7 +1306,8 @@ struct security_operations {
struct vfsmount *mnt, const char *old_name);
int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
@@ -46,7 +46,7 @@
int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode, dev_t dev);
int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
-@@ -1552,7 +1554,8 @@ int security_inode_symlink(struct inode
+@@ -1571,7 +1573,8 @@ int security_inode_symlink(struct inode
struct vfsmount *mnt, const char *old_name);
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
@@ -56,7 +56,7 @@
int security_inode_mknod(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode, dev_t dev);
int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
-@@ -1893,7 +1896,8 @@ static inline int security_inode_mkdir (
+@@ -1942,7 +1945,8 @@ static inline int security_inode_mkdir (
}
static inline int security_inode_rmdir (struct inode *dir,
@@ -68,7 +68,7 @@
}
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -315,7 +315,8 @@ static int dummy_inode_mkdir (struct ino
+@@ -317,7 +317,8 @@ static int dummy_inode_mkdir (struct ino
return 0;
}
@@ -80,7 +80,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -386,11 +386,12 @@ int security_inode_mkdir(struct inode *d
+@@ -393,11 +393,12 @@ int security_inode_mkdir(struct inode *d
return security_ops->inode_mkdir(dir, dentry, mnt, mode);
}
@@ -97,7 +97,7 @@
int security_inode_mknod(struct inode *dir, struct dentry *dentry,
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2473,7 +2473,8 @@ static int selinux_inode_mkdir(struct in
+@@ -2484,7 +2484,8 @@ static int selinux_inode_mkdir(struct in
return may_create(dir, dentry, SECCLASS_DIR);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-setattr.diff new/patches.apparmor/security-setattr.diff
--- old/patches.apparmor/security-setattr.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-setattr.diff 2008-03-12 18:17:11.000000000 +0100
@@ -35,7 +35,7 @@
(ia_valid & ATTR_GID && attr->ia_gid != inode->i_gid))
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -386,6 +386,7 @@ struct request_sock;
+@@ -406,6 +406,7 @@ static inline void security_free_mnt_opt
* file attributes change (such as when a file is truncated, chown/chmod
* operations, transferring disk quotas, etc).
* @dentry contains the dentry structure for the file.
@@ -43,7 +43,7 @@
* @attr is the iattr structure containing the new file attributes.
* Return 0 if permission is granted.
* @inode_getattr:
-@@ -1285,7 +1286,8 @@ struct security_operations {
+@@ -1304,7 +1305,8 @@ struct security_operations {
int (*inode_readlink) (struct dentry *dentry);
int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);
int (*inode_permission) (struct inode *inode, int mask, struct nameidata *nd);
@@ -53,7 +53,7 @@
int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);
void (*inode_delete) (struct inode *inode);
int (*inode_setxattr) (struct dentry *dentry, char *name, void *value,
-@@ -1547,7 +1549,8 @@ int security_inode_rename(struct inode *
+@@ -1566,7 +1568,8 @@ int security_inode_rename(struct inode *
int security_inode_readlink(struct dentry *dentry);
int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd);
int security_inode_permission(struct inode *inode, int mask, struct nameidata *nd);
@@ -63,7 +63,7 @@
int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry);
void security_inode_delete(struct inode *inode);
int security_inode_setxattr(struct dentry *dentry, char *name,
-@@ -1913,6 +1916,7 @@ static inline int security_inode_permiss
+@@ -1962,6 +1965,7 @@ static inline int security_inode_permiss
}
static inline int security_inode_setattr (struct dentry *dentry,
@@ -73,7 +73,7 @@
return 0;
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -348,7 +348,8 @@ static int dummy_inode_permission (struc
+@@ -350,7 +350,8 @@ static int dummy_inode_permission (struc
return 0;
}
@@ -85,7 +85,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -428,11 +428,12 @@ int security_inode_permission(struct ino
+@@ -435,11 +435,12 @@ int security_inode_permission(struct ino
return security_ops->inode_permission(inode, mask, nd);
}
@@ -102,7 +102,7 @@
int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2521,11 +2521,12 @@ static int selinux_inode_permission(stru
+@@ -2532,11 +2532,12 @@ static int selinux_inode_permission(stru
file_mask_to_av(inode->i_mode, mask), NULL);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-setxattr.diff new/patches.apparmor/security-setxattr.diff
--- old/patches.apparmor/security-setxattr.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-setxattr.diff 2008-03-12 18:17:11.000000000 +0100
@@ -38,7 +38,7 @@
} else if (!strncmp(name, XATTR_SECURITY_PREFIX,
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -57,7 +57,7 @@ extern void cap_capset_set (struct task_
+@@ -51,7 +51,7 @@ extern void cap_capset_set (struct task_
extern int cap_bprm_set_security (struct linux_binprm *bprm);
extern void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe);
extern int cap_bprm_secureexec(struct linux_binprm *bprm);
@@ -47,7 +47,7 @@
extern int cap_inode_removexattr(struct dentry *dentry, char *name);
extern int cap_inode_need_killpriv(struct dentry *dentry);
extern int cap_inode_killpriv(struct dentry *dentry);
-@@ -412,11 +412,11 @@ struct request_sock;
+@@ -432,11 +432,11 @@ static inline void security_free_mnt_opt
* inode.
* @inode_setxattr:
* Check permission before setting the extended attributes
@@ -61,7 +61,7 @@
* @inode_getxattr:
* Check permission before obtaining the extended attributes
* identified by @name for @dentry.
-@@ -1306,9 +1306,11 @@ struct security_operations {
+@@ -1325,9 +1325,11 @@ struct security_operations {
struct iattr *attr);
int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);
void (*inode_delete) (struct inode *inode);
@@ -76,7 +76,7 @@
size_t size, int flags);
int (*inode_getxattr) (struct dentry *dentry, char *name);
int (*inode_listxattr) (struct dentry *dentry);
-@@ -1575,10 +1577,11 @@ int security_inode_setattr(struct dentry
+@@ -1594,10 +1596,11 @@ int security_inode_setattr(struct dentry
struct iattr *attr);
int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry);
void security_inode_delete(struct inode *inode);
@@ -92,7 +92,7 @@
int security_inode_getxattr(struct dentry *dentry, char *name);
int security_inode_listxattr(struct dentry *dentry);
int security_inode_removexattr(struct dentry *dentry, char *name);
-@@ -1963,14 +1966,18 @@ static inline int security_inode_getattr
+@@ -2012,14 +2015,18 @@ static inline int security_inode_getattr
static inline void security_inode_delete (struct inode *inode)
{ }
@@ -130,7 +130,7 @@
if (!capable(CAP_SETFCAP))
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -370,8 +370,9 @@ static void dummy_inode_delete (struct i
+@@ -372,8 +372,9 @@ static void dummy_inode_delete (struct i
return;
}
@@ -142,7 +142,7 @@
{
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
-@@ -380,7 +381,9 @@ static int dummy_inode_setxattr (struct
+@@ -382,7 +383,9 @@ static int dummy_inode_setxattr (struct
return 0;
}
@@ -155,7 +155,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -457,20 +457,22 @@ void security_inode_delete(struct inode
+@@ -464,20 +464,22 @@ void security_inode_delete(struct inode
security_ops->inode_delete(inode);
}
@@ -186,7 +186,7 @@
int security_inode_getxattr(struct dentry *dentry, char *name)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2578,7 +2578,9 @@ static int selinux_inode_setotherxattr(s
+@@ -2589,7 +2589,9 @@ static int selinux_inode_setotherxattr(s
return dentry_has_perm(current, NULL, dentry, FILE__SETATTR);
}
@@ -197,7 +197,7 @@
{
struct task_security_struct *tsec = current->security;
struct inode *inode = dentry->d_inode;
-@@ -2627,7 +2629,9 @@ static int selinux_inode_setxattr(struct
+@@ -2638,7 +2640,9 @@ static int selinux_inode_setxattr(struct
&ad);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-symlink.diff new/patches.apparmor/security-symlink.diff
--- old/patches.apparmor/security-symlink.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-symlink.diff 2008-03-12 18:17:11.000000000 +0100
@@ -28,7 +28,7 @@
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -329,6 +329,7 @@ struct request_sock;
+@@ -349,6 +349,7 @@ static inline void security_free_mnt_opt
* Check the permission to create a symbolic link to a file.
* @dir contains the inode structure of parent directory of the symbolic link.
* @dentry contains the dentry structure of the symbolic link.
@@ -36,7 +36,7 @@
* @old_name contains the pathname of file.
* Return 0 if permission is granted.
* @inode_mkdir:
-@@ -1277,8 +1278,8 @@ struct security_operations {
+@@ -1296,8 +1297,8 @@ struct security_operations {
int (*inode_link) (struct dentry *old_dentry,
struct inode *dir, struct dentry *new_dentry);
int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
@@ -47,7 +47,7 @@
int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
-@@ -1543,7 +1544,7 @@ int security_inode_link(struct dentry *o
+@@ -1562,7 +1563,7 @@ int security_inode_link(struct dentry *o
struct dentry *new_dentry);
int security_inode_unlink(struct inode *dir, struct dentry *dentry);
int security_inode_symlink(struct inode *dir, struct dentry *dentry,
@@ -56,7 +56,7 @@
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, int mode);
int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
-@@ -1870,6 +1871,7 @@ static inline int security_inode_unlink
+@@ -1919,6 +1920,7 @@ static inline int security_inode_unlink
static inline int security_inode_symlink (struct inode *dir,
struct dentry *dentry,
@@ -66,7 +66,7 @@
return 0;
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -302,7 +302,7 @@ static int dummy_inode_unlink (struct in
+@@ -304,7 +304,7 @@ static int dummy_inode_unlink (struct in
}
static int dummy_inode_symlink (struct inode *inode, struct dentry *dentry,
@@ -77,7 +77,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -369,11 +369,11 @@ int security_inode_unlink(struct inode *
+@@ -376,11 +376,11 @@ int security_inode_unlink(struct inode *
}
int security_inode_symlink(struct inode *dir, struct dentry *dentry,
@@ -93,7 +93,7 @@
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2456,7 +2456,8 @@ static int selinux_inode_unlink(struct i
+@@ -2467,7 +2467,8 @@ static int selinux_inode_unlink(struct i
return may_link(dir, dentry, MAY_UNLINK);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-unlink.diff new/patches.apparmor/security-unlink.diff
--- old/patches.apparmor/security-unlink.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-unlink.diff 2008-03-12 18:17:11.000000000 +0100
@@ -28,7 +28,7 @@
}
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -326,6 +326,7 @@ struct request_sock;
+@@ -346,6 +346,7 @@ static inline void security_free_mnt_opt
* Check the permission to remove a hard link to a file.
* @dir contains the inode structure of parent directory of the file.
* @dentry contains the dentry structure for file to be unlinked.
@@ -36,7 +36,7 @@
* Return 0 if permission is granted.
* @inode_symlink:
* Check the permission to create a symbolic link to a file.
-@@ -1282,7 +1283,8 @@ struct security_operations {
+@@ -1301,7 +1302,8 @@ struct security_operations {
int (*inode_link) (struct dentry *old_dentry, struct vfsmount *old_mnt,
struct inode *dir, struct dentry *new_dentry,
struct vfsmount *new_mnt);
@@ -46,7 +46,7 @@
int (*inode_symlink) (struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, const char *old_name);
int (*inode_mkdir) (struct inode *dir, struct dentry *dentry,
-@@ -1549,7 +1551,8 @@ int security_inode_create(struct inode *
+@@ -1568,7 +1570,8 @@ int security_inode_create(struct inode *
int security_inode_link(struct dentry *old_dentry, struct vfsmount *old_mnt,
struct inode *dir, struct dentry *new_dentry,
struct vfsmount *new_mnt);
@@ -56,7 +56,7 @@
int security_inode_symlink(struct inode *dir, struct dentry *dentry,
struct vfsmount *mnt, const char *old_name);
int security_inode_mkdir(struct inode *dir, struct dentry *dentry,
-@@ -1874,7 +1877,8 @@ static inline int security_inode_link (s
+@@ -1923,7 +1926,8 @@ static inline int security_inode_link (s
}
static inline int security_inode_unlink (struct inode *dir,
@@ -68,7 +68,7 @@
}
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -298,7 +298,8 @@ static int dummy_inode_link (struct dent
+@@ -300,7 +300,8 @@ static int dummy_inode_link (struct dent
return 0;
}
@@ -80,7 +80,7 @@
}
--- a/security/security.c
+++ b/security/security.c
-@@ -363,11 +363,12 @@ int security_inode_link(struct dentry *o
+@@ -370,11 +370,12 @@ int security_inode_link(struct dentry *o
new_dentry, new_mnt);
}
@@ -97,7 +97,7 @@
int security_inode_symlink(struct inode *dir, struct dentry *dentry,
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2451,11 +2451,12 @@ static int selinux_inode_link(struct den
+@@ -2462,11 +2462,12 @@ static int selinux_inode_link(struct den
return may_link(dir, old_dentry, MAY_LINK);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/security-xattr-file.diff new/patches.apparmor/security-xattr-file.diff
--- old/patches.apparmor/security-xattr-file.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/security-xattr-file.diff 2008-03-12 18:17:11.000000000 +0100
@@ -273,7 +273,7 @@
}
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -57,8 +57,8 @@ extern void cap_capset_set (struct task_
+@@ -51,8 +51,8 @@ extern void cap_capset_set (struct task_
extern int cap_bprm_set_security (struct linux_binprm *bprm);
extern void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe);
extern int cap_bprm_secureexec(struct linux_binprm *bprm);
@@ -284,7 +284,7 @@
extern int cap_inode_need_killpriv(struct dentry *dentry);
extern int cap_inode_killpriv(struct dentry *dentry);
extern int cap_task_post_setuid (uid_t old_ruid, uid_t old_euid, uid_t old_suid, int flags);
-@@ -1307,16 +1307,18 @@ struct security_operations {
+@@ -1326,16 +1326,18 @@ struct security_operations {
int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);
void (*inode_delete) (struct inode *inode);
int (*inode_setxattr) (struct dentry *dentry, struct vfsmount *mnt,
@@ -307,7 +307,7 @@
int (*inode_need_killpriv) (struct dentry *dentry);
int (*inode_killpriv) (struct dentry *dentry);
int (*inode_getsecurity)(const struct inode *inode, const char *name, void **buffer, bool alloc);
-@@ -1580,15 +1582,17 @@ int security_inode_setattr(struct dentry
+@@ -1599,15 +1601,17 @@ int security_inode_setattr(struct dentry
int security_inode_getattr(struct vfsmount *mnt, struct dentry *dentry);
void security_inode_delete(struct inode *inode);
int security_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt,
@@ -329,7 +329,7 @@
int security_inode_need_killpriv(struct dentry *dentry);
int security_inode_killpriv(struct dentry *dentry);
int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc);
-@@ -1972,9 +1976,10 @@ static inline void security_inode_delete
+@@ -2021,9 +2025,10 @@ static inline void security_inode_delete
static inline int security_inode_setxattr (struct dentry *dentry,
struct vfsmount *mnt, char *name,
@@ -342,7 +342,7 @@
}
static inline void security_inode_post_setxattr (struct dentry *dentry,
-@@ -1985,21 +1990,24 @@ static inline void security_inode_post_s
+@@ -2034,21 +2039,24 @@ static inline void security_inode_post_s
{ }
static inline int security_inode_getxattr (struct dentry *dentry,
@@ -412,7 +412,7 @@
if (!capable(CAP_SETFCAP))
--- a/security/dummy.c
+++ b/security/dummy.c
-@@ -372,7 +372,7 @@ static void dummy_inode_delete (struct i
+@@ -374,7 +374,7 @@ static void dummy_inode_delete (struct i
static int dummy_inode_setxattr (struct dentry *dentry, struct vfsmount *mnt,
char *name, void *value, size_t size,
@@ -421,7 +421,7 @@
{
if (!strncmp(name, XATTR_SECURITY_PREFIX,
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
-@@ -389,18 +389,20 @@ static void dummy_inode_post_setxattr (s
+@@ -391,18 +391,20 @@ static void dummy_inode_post_setxattr (s
}
static int dummy_inode_getxattr (struct dentry *dentry,
@@ -447,7 +447,7 @@
sizeof(XATTR_SECURITY_PREFIX) - 1) &&
--- a/security/security.c
+++ b/security/security.c
-@@ -458,12 +458,13 @@ void security_inode_delete(struct inode
+@@ -465,12 +465,13 @@ void security_inode_delete(struct inode
}
int security_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt,
@@ -463,7 +463,7 @@
}
void security_inode_post_setxattr(struct dentry *dentry, struct vfsmount *mnt,
-@@ -472,30 +473,32 @@ void security_inode_post_setxattr(struct
+@@ -479,30 +480,32 @@ void security_inode_post_setxattr(struct
{
if (unlikely(IS_PRIVATE(dentry->d_inode)))
return;
@@ -505,7 +505,7 @@
int security_inode_need_killpriv(struct dentry *dentry)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -2580,7 +2580,7 @@ static int selinux_inode_setotherxattr(s
+@@ -2591,7 +2591,7 @@ static int selinux_inode_setotherxattr(s
static int selinux_inode_setxattr(struct dentry *dentry, struct vfsmount *mnt,
char *name, void *value, size_t size,
@@ -514,7 +514,7 @@
{
struct task_security_struct *tsec = current->security;
struct inode *inode = dentry->d_inode;
-@@ -2656,18 +2656,20 @@ static void selinux_inode_post_setxattr(
+@@ -2667,18 +2667,20 @@ static void selinux_inode_post_setxattr(
}
static int selinux_inode_getxattr (struct dentry *dentry, struct vfsmount *mnt,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/sysctl-pathname.diff new/patches.apparmor/sysctl-pathname.diff
--- old/patches.apparmor/sysctl-pathname.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/sysctl-pathname.diff 2008-03-12 18:17:11.000000000 +0100
@@ -62,7 +62,7 @@
void __user *newval, size_t newlen)
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
-@@ -1678,40 +1678,15 @@ static int selinux_capable(struct task_s
+@@ -1695,40 +1695,15 @@ static int selinux_capable(struct task_s
static int selinux_sysctl_get_sid(ctl_table *table, u16 tclass, u32 *sid)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.apparmor/vfs-notify_change.diff new/patches.apparmor/vfs-notify_change.diff
--- old/patches.apparmor/vfs-notify_change.diff 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.apparmor/vfs-notify_change.diff 2008-03-12 18:17:11.000000000 +0100
@@ -356,7 +356,7 @@
int (*check_acl)(struct inode *, int));
--- a/mm/filemap.c
+++ b/mm/filemap.c
-@@ -1649,7 +1649,7 @@ int __remove_suid(struct path *path, int
+@@ -1648,7 +1648,7 @@ int __remove_suid(struct path *path, int
struct iattr newattrs;
newattrs.ia_valid = ATTR_FORCE | kill;
++++++ patches.arch.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.arch/ppc-ps3-rename-wireless-interface.patch new/patches.arch/ppc-ps3-rename-wireless-interface.patch
--- old/patches.arch/ppc-ps3-rename-wireless-interface.patch 1970-01-01 01:00:00.000000000 +0100
+++ new/patches.arch/ppc-ps3-rename-wireless-interface.patch 2008-03-12 13:31:52.000000000 +0100
@@ -0,0 +1,27 @@
+Subject: rename wireless iface from eth to wlan
+The gelic driver uses two net interfaces, one for ethernet and the
+other for wireless. They share same MAC address and use 'eth' prefix
+for the name.
+As udev uses the MAC address to check uniqueness, this is
+somewhat problematic. So change the prefix of the network interface
+name for the wireless so that udev can have an easy way to distinguish
+interfaces.
+
+From: Masakazu Mokuno
+Signed-off-by: Stefan Assmann
+
+---
+ drivers/net/ps3_gelic_wireless.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/ps3_gelic_wireless.c
++++ b/drivers/net/ps3_gelic_wireless.c
+@@ -2389,6 +2389,8 @@ static struct net_device *gelic_wl_alloc
+ if (!netdev)
+ return NULL;
+
++ strcpy(netdev->name, "wlan%d");
++
+ port = netdev_priv(netdev);
+ port->netdev = netdev;
+ port->card = card;
++++++ patches.drivers.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-add-waits-for-govault new/patches.drivers/libata-add-waits-for-govault
--- old/patches.drivers/libata-add-waits-for-govault 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.drivers/libata-add-waits-for-govault 2008-03-12 18:17:11.000000000 +0100
@@ -17,7 +17,7 @@
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -3660,6 +3660,8 @@ static int ata_bus_softreset(struct ata_
+@@ -3661,6 +3661,8 @@ static int ata_bus_softreset(struct ata_
unsigned long deadline)
{
struct ata_ioports *ioaddr = &ap->ioaddr;
@@ -26,7 +26,7 @@
DPRINTK("ata%u: bus reset via SRST\n", ap->print_id);
-@@ -3673,11 +3675,22 @@ static int ata_bus_softreset(struct ata_
+@@ -3674,11 +3676,22 @@ static int ata_bus_softreset(struct ata_
/* wait a while before checking status */
ata_wait_after_reset(ap, deadline);
@@ -50,7 +50,7 @@
return -ENODEV;
return ata_bus_post_reset(ap, devmask, deadline);
-@@ -3925,7 +3938,9 @@ int ata_std_prereset(struct ata_link *li
+@@ -3926,7 +3939,9 @@ int ata_std_prereset(struct ata_link *li
}
/* Wait for !BSY if the controller can wait for the first D2H
@@ -61,7 +61,7 @@
*/
if (!(link->flags & ATA_LFLAG_SKIP_D2H_BSY) && !ata_link_offline(link)) {
rc = ata_wait_ready(ap, deadline);
-@@ -3934,6 +3949,14 @@ int ata_std_prereset(struct ata_link *li
+@@ -3935,6 +3950,14 @@ int ata_std_prereset(struct ata_link *li
"(errno=%d), forcing hardreset\n", rc);
ehc->i.action |= ATA_EH_HARDRESET;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.drivers/libata-unlock-hpa-by-default new/patches.drivers/libata-unlock-hpa-by-default
--- old/patches.drivers/libata-unlock-hpa-by-default 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.drivers/libata-unlock-hpa-by-default 2008-03-12 18:17:12.000000000 +0100
@@ -12,7 +12,7 @@
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
-@@ -125,7 +125,7 @@ int libata_fua = 0;
+@@ -126,7 +126,7 @@ int libata_fua = 0;
module_param_named(fua, libata_fua, int, 0444);
MODULE_PARM_DESC(fua, "FUA support (0=off, 1=on)");
++++++ patches.fixes.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patches.fixes/seccomp-disable-tsc-option new/patches.fixes/seccomp-disable-tsc-option
--- old/patches.fixes/seccomp-disable-tsc-option 2008-03-05 20:15:13.000000000 +0100
+++ new/patches.fixes/seccomp-disable-tsc-option 2008-03-12 18:17:12.000000000 +0100
@@ -19,7 +19,7 @@
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
-@@ -1053,6 +1053,18 @@ config SECCOMP
+@@ -1050,6 +1050,18 @@ config SECCOMP
If unsure, say Y. Only embedded should say N here.
++++++ patches.kernel.org.tar.bz2 ++++++
kernel-source/patches.kernel.org.tar.bz2 /mounts/work_src_done/STABLE/kernel-source/patches.kernel.org.tar.bz2 differ: byte 11, line 1
++++++ patches.rpmify.tar.bz2 ++++++
++++++ patches.rt.tar.bz2 ++++++
++++++ patches.suse.tar.bz2 ++++++
++++ 67434 lines of diff (skipped)
++++++ patches.uml.tar.bz2 ++++++
++++++ patches.xen.tar.bz2 ++++++
++++ 35960 lines of diff (skipped)
++++++ series.conf ++++++
--- kernel-source/series.conf 2008-03-12 11:51:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/kernel-source/series.conf 2008-03-12 18:17:39.262032000 +0100
@@ -28,7 +28,7 @@
# Send separate patches upstream if you find a problem...
########################################################
patches.kernel.org/patch-2.6.25-rc5
- patches.kernel.org/patch-2.6.25-rc5-git1
+ patches.kernel.org/patch-2.6.25-rc5-git2
########################################################
# Build fixes that apply to the vanilla kernel too.
@@ -135,6 +135,8 @@
# PS3
########################################################
+ patches.arch/ppc-ps3-rename-wireless-interface.patch
+
########################################################
# S/390
########################################################
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org