- up to 3.4.25

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index f644fb6afc7f53d6ed65fe2710e9b29e9facfd55..c00e62b2dfeda764e07f88db434e07f7442ffe43 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -24784,9 +24784,9 @@ diff -NurpP --minimal linux-3.4.24/net/ipv4/inet_diag.c linux-3.4.24-vs2.3.3.9/n
  
                        if (bc) {
 +                              /* TODO: lback */
-                               entry.saddr =
- #if IS_ENABLED(CONFIG_IPV6)
-                                       (entry.family == AF_INET6) ?
+                               inet_diag_req_addrs(sk, req, &entry);
+                               entry.dport = ntohs(ireq->rmt_port);
+ 
 @@ -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 3f5cdc67a521475549b00145ea4333eb8628e4d4..5238134a5c2c19f3130296e408022df23c6541e3 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -91,7 +91,7 @@
 
 %define                rel             1
 %define                basever         3.4
-%define                postver         .24
+%define                postver         .25
 
 # __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)
@@ -138,7 +138,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: 967f72983655e2479f951195953e8480
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:  3290598b53fd84f3023c2e57418a82ef
+# Patch0-md5:  67ffd6cbd7d8a6fe6db875f283d63369
 %endif
 
 Source3:       kernel-autoconf.h