- 3.14.49

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index f9e31c6a5834196ac7051e094885b1a1a1d4f76c..54ceb61760b681d7f80a4ff8d6b4d9ba09ab5e6a 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -13797,7 +13797,7 @@ diff -NurpP --minimal linux-3.14.17/kernel/printk/printk.c linux-3.14.17-vs2.3.6
        if (syslog_action_restricted(type)) {
 -              if (capable(CAP_SYSLOG))
 +              if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
-                       return 0;
+                       goto ok;
                /*
                 * For historical reasons, accept CAP_SYS_ADMIN too, with
 @@ -1130,12 +1131,9 @@ int do_syslog(int type, char __user *buf

diff --git a/kernel.spec b/kernel.spec
index a25e53f8d678a7bae20cf47881554ef1bab9fdf5..a1593e701a246f13cd78b3ce68faa59783fffdbe 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,7 +70,7 @@
 
 %define                rel             1
 %define                basever         3.14
-%define                postver         .48
+%define                postver         .49
 
 %define                versuffix       -%{basever}
 
@@ -115,7 +115,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: b621207b3f6ecbb67db18b13258f8ea8
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5:  cf7cc4cea45c0b8905cada5069b9bfb0
+# Patch0-md5:  f8194dbf39db87909b5f0ba409d813c6
 %endif
 Source1:       kernel.sysconfig