- up to 3.0.24

- grsec needs updating

Changed files:
    kernel-vserver-2.3.patch -> 1.83.2.12
    kernel.spec -> 1.987.2.40

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 54eff54b1dc85484fdf75c7983054e5ffa7ba27c..86d686d614a39c7f9c74f6aca36b1a617277dd8b 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -730,9 +730,9 @@ diff -NurpP --minimal linux-3.0.21/arch/s390/kernel/ptrace.c linux-3.0.21-vs2.3.
 --- linux-3.0.21/arch/s390/kernel/ptrace.c     2012-02-15 01:04:19.000000000 +0100
 +++ linux-3.0.21-vs2.3.2.3/arch/s390/kernel/ptrace.c   2011-12-19 15:55:53.000000000 +0100
 @@ -20,6 +20,7 @@
- #include <linux/regset.h>
  #include <linux/tracehook.h>
  #include <linux/seccomp.h>
+ #include <linux/compat.h>
 +#include <linux/vs_base.h>
  #include <trace/syscall.h>
  #include <asm/compat.h>
@@ -14736,9 +14736,9 @@ diff -NurpP --minimal linux-3.0.21/kernel/fork.c linux-3.0.21-vs2.3.2.3/kernel/f
 --- linux-3.0.21/kernel/fork.c 2011-07-22 11:18:12.000000000 +0200
 +++ linux-3.0.21-vs2.3.2.3/kernel/fork.c       2011-06-10 22:21:02.000000000 +0200
 @@ -67,6 +67,10 @@
- #include <linux/user-return-notifier.h>
  #include <linux/oom.h>
  #include <linux/khugepaged.h>
+ #include <linux/signalfd.h>
 +#include <linux/vs_context.h>
 +#include <linux/vs_network.h>
 +#include <linux/vs_limit.h>

diff --git a/kernel.spec b/kernel.spec
index ac9d69f84385aaac080119d736dd4e2d1437d5e8..d38e596e3e8e13414a0118f9e365a20e1ef98a80 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,8 +93,8 @@
 %endif
 
 %define                basever         3.0
-%define                postver         .22
-%define                rel             2
+%define                postver         .24
+%define                rel             0.1
 
 %define                _enable_debug_packages                  0
 
@@ -140,7 +140,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: ecf932280e2441bdd992423ef3d55f8f
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:  56e1ef2134c60d2aaacdb25c3831a123
+# Patch0-md5:  73500c48851f07c4d8d2ee458cd78108
 %endif
 
 Source3:       kernel-autoconf.h