Subject: linux 3.14.49 and patch-3.14.33-vs2.3.6.15.diff
From: Corey Wright <undefined@pobox.com>
Date: Fri, 7 Aug 2015 08:27:05 -0500
Fri, 7 Aug 2015 08:27:05 -0500
patch-3.14.33-vs2.3.6.15.diff fails to apply to linux 3.14.49 in two places,
one previously reported [1] with linux 3.14.40, and a new one introduced with
linux 3.14.49.

upstream changed some code involving CAP_SYSLOG which doesn't directly affect
the linux-vserver patch, but changed the patch's context (adjacent source
code) and confused patch as to where to apply the associated patch hunk.

step-by-step process:
1. apply patch-3.14.33-vs2.3.6.15.diff to linux-3.14.49
2. apply linked patch-3.14.33-40-vs2.3.6.15.diff [2] to linux-3.14.49
3. apply attached patch-3.14.33-49-vs2.3.6.15.diff to linux-3.14.49

[1] http://archives.linux-vserver.org/201504/0013.html
[2]
http://archives.linux-vserver.org/201504/att-0013/patch-3.14.33-40-vs2.3.6.15.diff

corey
--
undefined@pobox.com


upstream commit broke linux-vserver patch hunk context
http://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/?h=linux-3.14.y&id=75be724f4edfc8fd51303a47c214dec2c29f8e08

diff -urNpd linux-3.14.49-vs2.3.6.15~/kernel/printk/printk.c linux-3.14.49-vs2.3.6.15/kernel/printk/printk.c
--- linux-3.14.49-vs2.3.6.15~/kernel/printk/printk.c	2015-08-04 09:26:16.161704336 -0500
+++ linux-3.14.49-vs2.3.6.15/kernel/printk/printk.c	2015-08-06 10:02:40.699559935 -0500
@@ -387,7 +387,7 @@ static int check_syslog_permissions(int
 		goto ok;
 
 	if (syslog_action_restricted(type)) {
-		if (capable(CAP_SYSLOG))
+		if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
 			goto ok;
 		/*
 		 * For historical reasons, accept CAP_SYS_ADMIN too, with