[packages/kernel/LINUX_3_4] - up to 3.4.25

[baggins]

commit 39a6270a8928ec9c00b03266046735cf0ee7edf3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jan 13 20:40:56 2013 +0100

    - up to 3.4.25

 kernel-vserver-2.3.patch | 6 +++---
 kernel.spec              | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 3f5cdc6..5238134 100644
--- 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
diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index f644fb6..c00e62b 100644
--- 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);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/39a6270a8928ec9c00b03266046735cf0ee7edf3