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

[Clint Byrum]

SRU to lucid, identical to natty version.

Not sure about the patch revision.. since natty and lucid had the same version. Should it just be the exact same version as the one from natty rather than $VER.1 as I've done in the MP? Seems like that would be the case.

Please advise on that, otherwise it has been built and smoke tested on a lucid schroot. I did not repeat the entire test case as I do not have a lucid server to test on.

[lp:~clint-fewbar/ubuntu/lucid/ipvsadm/fix-activeconns-report]

8. By Clint Byrum on 2010-11-22

fixing version to be lower than natty

[Dustin Kirkland  (kirkland)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-10 07:35:04 +0000
+++ debian/changelog	2010-11-22 23:17:33 +0000
@@ -1,3 +1,10 @@
+ipvsadm (1:1.25.clean-1ubuntu0.1) lucid-proposed; urgency=low
+
+  * libipvs/libipvs.c: upstream patch (r64) to fix incorrect activeconns,
+    (Debian bug 574587), (LP: #663564)
+
+ -- Clint Byrum <[e-mail]>  Mon, 22 Nov 2010 15:13:04 -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-22 23:17:33 +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-22 23:17:33 +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),