- up to ubuntu extended kernel 3.5.7.6

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index a0ddfad66d1aabf9cf53e86153cd815c55fc417c..3da128ec89fdc5adb09cd1a6f0877002f50e7ada 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -14404,10 +14404,9 @@ diff -NurpP --minimal linux-3.5.4/kernel/fork.c linux-3.5.4-vs2.3.4.3/kernel/for
        mm_free_pgd(mm);
        free_mm(mm);
        return NULL;
-@@ -1161,6 +1170,8 @@ static struct task_struct *copy_process(
+@@ -1161,5 +1170,7 @@ static struct task_struct *copy_process(
        int retval;
        struct task_struct *p;
-       int cgroup_callbacks_done = 0;
 +      struct vx_info *vxi;
 +      struct nx_info *nxi;
  
@@ -24574,37 +24573,6 @@ diff -NurpP --minimal linux-3.5.4/net/ipv4/inet_diag.c linux-3.5.4-vs2.3.4.3/net
        r->idiag_state        = tw->tw_substate;
        r->idiag_timer        = 3;
        r->idiag_expires      = DIV_ROUND_UP(tmo * 1000, HZ);
-@@ -272,12 +276,14 @@ int inet_diag_dump_one_icsk(struct inet_
- 
-       err = -EINVAL;
-       if (req->sdiag_family == AF_INET) {
-+              /* TODO: lback */
-               sk = inet_lookup(&init_net, hashinfo, req->id.idiag_dst[0],
-                                req->id.idiag_dport, req->id.idiag_src[0],
-                                req->id.idiag_sport, req->id.idiag_if);
-       }
- #if IS_ENABLED(CONFIG_IPV6)
-       else if (req->sdiag_family == AF_INET6) {
-+              /* TODO: lback */
-               sk = inet6_lookup(&init_net, hashinfo,
-                                 (struct in6_addr *)req->id.idiag_dst,
-                                 req->id.idiag_dport,
-@@ -472,6 +478,7 @@ int inet_diag_bc_sk(const struct nlattr 
-       } else
- #endif
-       {
-+                      /* TODO: lback */
-               entry.saddr = &inet->inet_rcv_saddr;
-               entry.daddr = &inet->inet_daddr;
-       }
-@@ -570,6 +577,7 @@ static int inet_twsk_diag_dump(struct in
-               } else
- #endif
-               {
-+                      /* TODO: lback */
-                       entry.saddr = &tw->tw_rcv_saddr;
-                       entry.daddr = &tw->tw_daddr;
-               }
 @@ -615,8 +623,8 @@ static int inet_diag_fill_req(struct sk_
  
        r->id.idiag_sport = inet->inet_sport;
@@ -24616,14 +24584,6 @@ diff -NurpP --minimal linux-3.5.4/net/ipv4/inet_diag.c linux-3.5.4-vs2.3.4.3/net
        r->idiag_expires = jiffies_to_msecs(tmo);
        r->idiag_rqueue = 0;
        r->idiag_wqueue = 0;
-@@ -683,6 +691,7 @@ static int inet_diag_dump_reqs(struct sk
-                               continue;
- 
-                       if (bc) {
-+                              /* TODO: lback */
-                               entry.saddr =
- #if IS_ENABLED(CONFIG_IPV6)
-                                       (entry.family == AF_INET6) ?
 @@ -744,6 +753,8 @@ void inet_diag_dump_icsk(struct inet_has
                        sk_nulls_for_each(sk, node, &ilb->head) {
                                struct inet_sock *inet = inet_sk(sk);

diff --git a/kernel.spec b/kernel.spec
index c8ab148b603cc56d16880698fd3ea64ddce9a5ec..c6505898eaac464059010119e944c6f4d6b68bf7 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -92,6 +92,7 @@
 %define                rel             1
 %define                basever         3.5
 %define                postver         .7
+%define                ubver           .6
 
 # __alt_kernel is list of features, empty string if none set
 # _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -125,7 +126,7 @@ Summary(et.UTF-8):  Linuxi kernel (ehk operatsioonisüsteemi tuum)
 Summary(fr.UTF-8):     Le Kernel-Linux (La partie centrale du systeme)
 Summary(pl.UTF-8):     Jądro Linuksa
 Name:          kernel%{_alt_kernel}
-Version:       %{basever}%{postver}
+Version:       %{basever}%{postver}%{ubver}
 Release:       %{rel}
 Epoch:         3
 License:       GPL v2
@@ -133,9 +134,13 @@ Group:             Base/Kernel
 Source0:       http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 24153eaaa81dedc9481ada8cd9c3b83d
 %if "%{postver}" != ".0"
-Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
+Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{basever}%{postver}.bz2
 # Patch0-md5:  f908f8c222cf4a1988b8bf180df46bb2
 %endif
+%if "%{ubver}" != ""
+Patch1:                http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=commitdiff_plain;hp=v%{basever}%{postver};h=v%{basever}%{postver}%{ubver};/v%{basever}%{postver}%{ubver}.patch
+# Patch1-md5:  59dde3d506ce8c4f48104bb9e33d2aca
+%endif
 
 Source3:       kernel-autoconf.h
 Source4:       kernel-config.h
@@ -645,6 +650,9 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 %if "%{postver}" != ".0"
 %patch0 -p1
 %endif
+%if "%{ubver}" != ""
+%patch1 -p1
+%endif
 
 %if %{without vanilla}