commit da63233c001f096b137f067346d991397f8e7703
Author: Jan Rękorajski <[email protected]>
Date: Tue Aug 4 21:16:41 2015 +0200
- 3.14.49
kernel-vserver-2.3.patch | 2 +-
kernel.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index a25e53f..a1593e7 100644
--- 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
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index f9e31c6..54ceb61 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/da63233c001f096b137f067346d991397f8e7703
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
