refresh vs patch against latest upstream release (aka. vs2.3.0.36.29.4 --> vs2.3...

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 1a1dde9..e89ad65 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -665,8 +665,7 @@ Source79: config-debug-rhel
 Source80: config-generic-rhel
 Source81: config-powerpc64
 
-Patch1: patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff
-Patch2: linux-2.6-220-delta-ptrace-fix01.patch
+Patch1: patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.6.diff
 Patch3: linux-2.6-250-ipsets.patch
 Patch4: linux-2.6-510-ipod.patch
 Patch5: linux-2.6-521-packet-tagging.patch
@@ -961,8 +960,7 @@ cp %{SOURCE15} %{SOURCE1} %{SOURCE16} %{SOURCE17} %{SOURCE18} .
 make -f %{SOURCE20} VERSION=%{version} configs
 
 #### Planet-Lab ####
-ApplyPatch patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff
-ApplyPatch linux-2.6-220-delta-ptrace-fix01.patch
+ApplyPatch patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.6.diff
 ApplyPatch linux-2.6-250-ipsets.patch
 ApplyPatch linux-2.6-510-ipod.patch
 ApplyPatch linux-2.6-521-packet-tagging.patch

diff --git a/linux-2.6-220-delta-ptrace-fix01.patch b/linux-2.6-220-delta-ptrace-fix01.patch
deleted file mode 100644 (file)
index 2a5f20e..0000000
--- a/linux-2.6-220-delta-ptrace-fix01.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4e28b8762c95422c3f182452aeca4b250064593c Mon Sep 17 00:00:00 2001
-From: S.Çağlar Onur <caglar@cs.princeton.edu>
-Date: Tue, 7 Dec 2010 11:05:15 -0500
-Subject: [PATCH] linux-2.6-220-delta-ptrace-fix01.patch
-
----
- kernel/ptrace.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/kernel/ptrace.c b/kernel/ptrace.c
-index 3c924b9..94c03dd 100644
---- a/kernel/ptrace.c
-+++ b/kernel/ptrace.c
-@@ -59,7 +59,7 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
-               dumpable = get_dumpable(task->mm);
-       if (!dumpable && !capable(CAP_SYS_PTRACE))
-               return -EPERM;
--      if (!vx_check(task->xid, VS_ADMIN_P|VS_IDENT))
-+      if (!vx_check(task->xid, VS_WATCH_P | VS_IDENT))
-               return -EPERM;
-       if (!vx_check(task->xid, VS_IDENT) &&
-               !task_vx_flags(task, VXF_STATE_ADMIN, 0))
--- 
-1.5.4.3
-

diff --git a/linux-2.6-523-raw-sockets.patch b/linux-2.6-523-raw-sockets.patch
index f24ebd8..196045e 100644 (file)
--- a/linux-2.6-523-raw-sockets.patch
+++ b/linux-2.6-523-raw-sockets.patch
@@ -63,7 +63,7 @@ index 9e8942b..1c0b4a5 100644
 +++ b/net/ipv4/af_inet.c
 @@ -332,6 +332,9 @@ lookup_protocol:
        if ((protocol == IPPROTO_ICMP) &&
-               nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
+               nx_capable(CAP_NET_RAW, NXC_RAW_ICMP))
                goto override;
 +      if (sock->type == SOCK_RAW &&
 +              nx_capable(CAP_NET_RAW, NXC_RAW_SOCKET))

diff --git a/sources b/sources
index d540e49..59aa04c 100644 (file)
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 c56a2812e3b36d2535f09c486126f9c86d525414  http://build.planet-lab.org/third-party/kernel-2.6.32-71.18.2.el6.src.rpm
-22d196bf39618825b2350c24f6836440bb2a8743  http://build.planet-lab.org/third-party/patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.4.diff
+4ac4b28b82a22ca76cd505693f0afb0f9ede2351  http://build.planet-lab.org/third-party/patch-2.6.32-71.18.2.el6-vs2.3.0.36.29.6.diff