Merge lp:~clint-fewbar/ubuntu/natty/ipvsadm/fix-activeconns-report into lp:ubuntu/natty/ipvsadm

[Clint Byrum]

Tested, the patch fixes the problem on Maverick, and builds/works inside a natty schroot.

[Daniel Holbach (dholbach)]

Good work.

I took the liberty of adding information to the changelog about where the patch came from (r64 in upstream svn) and that the patch is also being discussed in Debian, so it's easier to find out when the package can be synced again.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-10 07:35:04 +0000
+++ debian/changelog	2010-11-17 07:35:31 +0000
@@ -1,3 +1,10 @@
+ipvsadm (1:1.25.clean-1ubuntu1) natty; urgency=low
+
+  * libipvs/libipvs.c: upstream patch to fix incorrect activeconns 
+    (LP: #663564)
+
+ -- Clint Byrum <[e-mail]>  Tue, 16 Nov 2010 15:25:39 -0800
+
 ipvsadm (1:1.25.clean-1) unstable; urgency=low
 
   * New upstream version (Closes: #540423)
 
=== modified file 'debian/control'
--- debian/control	2009-11-10 07:35:04 +0000
+++ debian/control	2010-11-17 07:35:31 +0000
@@ -1,7 +1,8 @@
 Source: ipvsadm
 Section: net
 Priority: extra
-Maintainer: Alexander Wirt <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Alexander Wirt <[e-mail]>
 Standards-Version: 3.8.3
 Build-Depends: debhelper (>= 5), libpopt-dev, po-debconf, libnl-dev
 
 
=== modified file 'libipvs/libipvs.c'
--- libipvs/libipvs.c	2009-11-10 07:35:04 +0000
+++ libipvs/libipvs.c	2010-11-17 07:35:31 +0000
@@ -747,7 +747,7 @@
 	d->entrytable[i].l_threshold = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_L_THRESH]);
 	d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_ACTIVE_CONNS]);
 	d->entrytable[i].inactconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_INACT_CONNS]);
-	d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
+	d->entrytable[i].persistconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
 	d->entrytable[i].af = d->af;
 
 	if (ipvs_parse_stats(&(d->entrytable[i].stats),