Author: arekm Date: Thu Oct 21 06:19:15 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fetch 2.6.36
---- Files affected:
packages/kernel:
kernel-ipvs-nfct.patch (1.4 -> 1.5) , kernel.spec (1.837 -> 1.838)
---- Diffs:
================================================================
Index: packages/kernel/kernel-ipvs-nfct.patch
diff -u packages/kernel/kernel-ipvs-nfct.patch:1.4
packages/kernel/kernel-ipvs-nfct.patch:1.5
--- packages/kernel/kernel-ipvs-nfct.patch:1.4 Sun May 23 15:21:00 2010
+++ packages/kernel/kernel-ipvs-nfct.patch Thu Oct 21 08:19:09 2010
@@ -722,7 +722,7 @@
-
/* drop old route */
skb_dst_drop(skb);
- skb_dst_set(skb, &rt->u.dst);
+ skb_dst_set(skb, &rt->dst);
+ if (!ip_vs_confirm_conntrack(skb, cp, NF_INET_LOCAL_IN))
+ goto tx_error_out;
================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.837 packages/kernel/kernel.spec:1.838
--- packages/kernel/kernel.spec:1.837 Wed Oct 20 21:27:27 2010
+++ packages/kernel/kernel.spec Thu Oct 21 08:19:09 2010
@@ -113,13 +113,13 @@
%define have_pcmcia 0
%endif
-%define basever 2.6.35
-%define postver .7
-%define rel 4
+%define basever 2.6.36
+%define postver %{nil}
+%define rel 0.1
%define _enable_debug_packages 0
-%define tuxonice_version 3.1.1.1
+%define tuxonice_version 3.2
%define netfilter_snap 20070806
%if %{with myown}
@@ -155,7 +155,7 @@
License: GPL v2
Group: Base/Kernel
Source0:
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{basever}.tar.bz2
-# Source0-md5: 091abeb4684ce03d1d936851618687b6
+# Source0-md5: 61f3739a73afb6914cb007f37fb09b62
%if "%{postver}" != "%{nil}"
Source1: http://www.kernel.org/pub/linux/kernel/v2.6/patch-%{version}.bz2
# Source1-md5: 6a00ec267b0100f20a3fa900b97a5b7f
@@ -1593,6 +1593,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.838 2010/10/21 06:19:09 arekm
+- fetch 2.6.36
+
Revision 1.837 2010/10/20 19:27:27 arekm
- rel 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-ipvs-nfct.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.837&r2=1.838&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
