Author: sbellabes
Date: Tue Feb 6 15:22:48 2007
New Revision: 116775
Added:
packages/updates/2006.0/kernel-2.6/current/PATCHES/patches/DN78_proc_ip_conntrack.patch
Modified:
packages/updates/2006.0/kernel-2.6/current/SPECS/kernel-2.6.spec
Log:
Add fix for /proc/net/ip_conntrack (missing end of line)
Added:
packages/updates/2006.0/kernel-2.6/current/PATCHES/patches/DN78_proc_ip_conntrack.patch
==============================================================================
--- (empty file)
+++
packages/updates/2006.0/kernel-2.6/current/PATCHES/patches/DN78_proc_ip_conntrack.patch
Tue Feb 6 15:22:48 2007
@@ -0,0 +1,18 @@
+diff --exclude='*~' -urNp
linux-2.6.12/net/ipv4/netfilter/ip_conntrack_standalone.c
linux-2.6.12-fix_proc_ip_conntrack/net/ipv4/netfilter/ip_conntrack_standalone.c
+--- linux-2.6.12/net/ipv4/netfilter/ip_conntrack_standalone.c 2007-02-06
08:26:29.000000000 -0500
++++
linux-2.6.12-fix_proc_ip_conntrack/net/ipv4/netfilter/ip_conntrack_standalone.c
2007-02-06 08:29:09.000000000 -0500
+@@ -193,10 +193,13 @@ static int ct_seq_show(struct seq_file *
+ return -ENOSPC;
+
+ #ifdef CONFIG_IP_NF_CONNTRACK_RATE
+- if (seq_printf(s, "rate=%u\n", ip_conntrack_rate_get(&conntrack->rate)))
++ if (seq_printf(s, "rate=%u", ip_conntrack_rate_get(&conntrack->rate)))
+ return -ENOSPC;
+ #endif
+
++ if (seq_printf(s, "\n"))
++ return -ENOSPC;
++
+ return 0;
+ }
+
Modified: packages/updates/2006.0/kernel-2.6/current/SPECS/kernel-2.6.spec
==============================================================================
--- packages/updates/2006.0/kernel-2.6/current/SPECS/kernel-2.6.spec
(original)
+++ packages/updates/2006.0/kernel-2.6/current/SPECS/kernel-2.6.spec Tue Feb
6 15:22:48 2007
@@ -5,9 +5,9 @@
# if you try to understand kernel numbering, read docs/kernel_naming
%define sublevel 12
-%define mdkrelease 29
+%define mdkrelease 30
%define use_patch 0
-%define patchlevel uc1
+#define patchlevel uc1
%define devel_notice %{?patchlevel:NOTE: This is work-in-progress (WIP)
development kernel.}
# This is only to make life easier for people that creates derivated kernels
@@ -1367,14 +1367,14 @@
%endif
%changelog
-### REMOVE THE PATCHLEVEL DEFINITION ABOVE ###
-* Thu Jan 18 2007 Samir Bellabes <[EMAIL PROTECTED]> 2.6.12-29uc1mdk
+* Thu Jan 18 2007 Samir Bellabes <[EMAIL PROTECTED]> 2.6.12-30mdk
o Samir Bellabes <[EMAIL PROTECTED]>
- HP ML350 :
* UHCI: Increase port-reset completion delay for HP controllers
* cciss: Add support for pciid 0x3211
- x86_64: NUMA range fixes
- netfilter/ipset : fix garbage collector bug when flushing a iptree.
+ - netfilter: fix /proc/net/ip_conntrack
* Mon Jan 03 2007 Luiz Capitulino <[EMAIL PROTECTED]> 2.6.12-29mdk
o Luiz Capitulino <[EMAIL PROTECTED]>
