commit d3c70e43d2d3f90e5250b236da27183a1ed05745
Author: Jan Rękorajski <[email protected]>
Date: Tue Aug 11 21:39:11 2015 +0200
- 3.18.20
kernel-vserver-2.3.patch | 2 +-
kernel.spec | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index e863808..9a08881 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -70,9 +70,9 @@
%define have_pcmcia 0
%endif
-%define rel 2
+%define rel 1
%define basever 3.18
-%define postver .19
+%define postver .20
# define this to '-%{basever}' for longterm branch
%define versuffix -%{basever}
@@ -121,7 +121,7 @@ Source0:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
# Source0-md5: 9e854df51ca3fef8bfe566dbd7b89241
%if "%{postver}" != ".0"
Patch0:
http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz
-# Patch0-md5: fe3dee5b0a49ad30e76f56cc03ad0429
+# Patch0-md5: 483dc72613a4f67c856acb2208de3d86
%endif
Source1: kernel.sysconfig
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index 1f7aa6f..78c7a64 100644
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -13765,7 +13765,7 @@ diff -NurpP --minimal
linux-3.18.5/kernel/printk/printk.c linux-3.18.5-vs2.3.7.3
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
@@ -1270,12 +1271,9 @@ int do_syslog(int type, char __user *buf
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/d3c70e43d2d3f90e5250b236da27183a1ed05745
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
