Ubuntu
ipvsadm package

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

  1. Natty (11.04)
  2. fix-activeconns-report
  3. Merge into natty
Proposed by Clint Byrum
Status: Merged
Merged at revision: 7
Proposed branch: lp:~clint-fewbar/ubuntu/natty/ipvsadm/fix-activeconns-report
Merge into: lp:ubuntu/natty/ipvsadm
Diff against target: 41 lines (+10/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+2/-1)
libipvs/libipvs.c (+1/-1)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/natty/ipvsadm/fix-activeconns-report
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+41033@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-11-10 07:35:04 +0000
3+++ debian/changelog 2010-11-17 07:35:31 +0000
4@@ -1,3 +1,10 @@
5+ipvsadm (1:1.25.clean-1ubuntu1) natty; urgency=low
6+
7+ * libipvs/libipvs.c: upstream patch to fix incorrect activeconns
8+ (LP: #663564)
9+
10+ -- Clint Byrum <clint@ubuntu.com> Tue, 16 Nov 2010 15:25:39 -0800
11+
12 ipvsadm (1:1.25.clean-1) unstable; urgency=low
13
14 * New upstream version (Closes: #540423)
15
16=== modified file 'debian/control'
17--- debian/control 2009-11-10 07:35:04 +0000
18+++ debian/control 2010-11-17 07:35:31 +0000
19@@ -1,7 +1,8 @@
20 Source: ipvsadm
21 Section: net
22 Priority: extra
23-Maintainer: Alexander Wirt <formorer@debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Alexander Wirt <formorer@debian.org>
26 Standards-Version: 3.8.3
27 Build-Depends: debhelper (>= 5), libpopt-dev, po-debconf, libnl-dev
28
29
30=== modified file 'libipvs/libipvs.c'
31--- libipvs/libipvs.c 2009-11-10 07:35:04 +0000
32+++ libipvs/libipvs.c 2010-11-17 07:35:31 +0000
33@@ -747,7 +747,7 @@
34 d->entrytable[i].l_threshold = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_L_THRESH]);
35 d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_ACTIVE_CONNS]);
36 d->entrytable[i].inactconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_INACT_CONNS]);
37- d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
38+ d->entrytable[i].persistconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
39 d->entrytable[i].af = d->af;
40
41 if (ipvs_parse_stats(&(d->entrytable[i].stats),

Subscribers

People subscribed via source and target branches

to all changes: