packages: kernel/kernel-aufs3.patch, kernel/kernel-vserver-2.3.patch - fix ...
arekm
arekm at pld-linux.org
Fri Aug 26 11:34:05 CEST 2011
Author: arekm Date: Fri Aug 26 09:34:05 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- fix --with rescuecd
---- Files affected:
packages/kernel:
kernel-aufs3.patch (1.1 -> 1.2) , kernel-vserver-2.3.patch (1.78 -> 1.79)
---- Diffs:
================================================================
Index: packages/kernel/kernel-aufs3.patch
diff -u packages/kernel/kernel-aufs3.patch:1.1 packages/kernel/kernel-aufs3.patch:1.2
--- packages/kernel/kernel-aufs3.patch:1.1 Wed Aug 24 13:37:36 2011
+++ packages/kernel/kernel-aufs3.patch Fri Aug 26 11:34:00 2011
@@ -259,11 +259,10 @@
index a93b3b7..024282c 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
-@@ -978,4 +978,4 @@ int cap_file_mmap(struct file *file, uns
+@@ -978,3 +978,4 @@ int cap_file_mmap(struct file *file, uns
}
return ret;
}
--
+EXPORT_SYMBOL(cap_file_mmap);
diff --git a/security/device_cgroup.c b/security/device_cgroup.c
index 1be6826..215278c 100644
================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.78 packages/kernel/kernel-vserver-2.3.patch:1.79
--- packages/kernel/kernel-vserver-2.3.patch:1.78 Tue Aug 23 13:09:51 2011
+++ packages/kernel/kernel-vserver-2.3.patch Fri Aug 26 11:34:00 2011
@@ -28213,11 +28213,6 @@
return -EPERM;
return 0;
}
-@@ -971,3 +978,4 @@ int cap_file_mmap(struct file *file, uns
- }
- return ret;
- }
-+
diff -NurpP --minimal linux-3.0.1/security/selinux/hooks.c linux-3.0.1-vs2.3.1-pre9/security/selinux/hooks.c
--- linux-3.0.1/security/selinux/hooks.c 2011-07-22 11:18:14.000000000 +0200
+++ linux-3.0.1-vs2.3.1-pre9/security/selinux/hooks.c 2011-06-15 02:40:14.000000000 +0200
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-aufs3.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.78&r2=1.79&f=u
More information about the pld-cvs-commit
mailing list