- up to 2.6.31.1

Changed files:
    kernel-grsec_full.patch -> 1.16
    kernel.spec -> 1.711

diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 5bdc521d02d8ab529afb40b3137d905528aba087..d32684c65fea80decb235a2286ad60bad261e675 100644 (file)
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -9402,9 +9402,9 @@ diff -urNp linux-2.6.31/arch/x86/kernel/head_32.S linux-2.6.31/arch/x86/kernel/h
 +#ifdef CONFIG_SMP
 +      addl $__per_cpu_load,%ecx
 +#endif
-       subl $20, %ecx
        movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
        shrl $16, %ecx
+       movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
 @@ -457,10 +517,6 @@ is386:    movl $2,%ecx            # set MP
  #ifdef CONFIG_SMP
        movb ready, %cl

diff --git a/kernel.spec b/kernel.spec
index a0033f0eda47b9ae4dd1c5426dbd133c3fbaa839..29a762d4caa7fbb584691f760541046e2c2b88c5 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -111,8 +111,8 @@
 %endif
 
 %define                basever         2.6.31
-%define                postver         %{nil}
-%define                rel             0.4
+%define                postver         .1
+%define                rel             0.1
 
 %define                _enable_debug_packages                  0
 
@@ -156,7 +156,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
 # Source0-md5: 84c077a37684e4cbfa67b18154390d8a
 %if "%{postver}" != "%{nil}"
 Source1:       http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
-# Source1-md5: 47841c7ff5c81a7b349a79f2fa8e9138
+# Source1-md5: 43977a0a264dd7d173b6ef122c62fb20
 %endif
 
 Source3:       kernel-autoconf.h