Bug#775407: unblock: pmacct/1.5.0-4

[Bernd Zeimetz <bzed@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package pmacct

1.5.0-4 ships a fix for a regression which was introduced
in the 1.5 series of pmacct: ipv6 accounting
using network files - which is a very common case - was
broken and fixed by upstream with the used patch.

pmacct (1.5.0-4) unstable; urgency=medium

  * [d7df1811] Fix identification of dummy entry.
    Upstream commit dff5ca21847d799759de27e8fd080e1f7a04cc30 (Closes: #775330)

 -- Bernd Zeimetz <bzed@debian.org>  Wed, 14 Jan 2015 10:42:30 +0100


patch is attached.



unblock pmacct/1.5.0-4


thanks,

bernd

-- 
 Bernd Zeimetz                            Debian GNU/Linux Developer
 http://bzed.de                                http://www.debian.org
 GPG Fingerprint: ECA1 E3F2 8E11 2432 D485  DD95 EB36 171A 6FF9 435F

diff --git a/debian/changelog b/debian/changelog
index 1ba0d1c..1765453 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pmacct (1.5.0-4) unstable; urgency=medium
+
+  * [d7df1811] Fix identification of dummy entry.
+    Upstream commit dff5ca21847d799759de27e8fd080e1f7a04cc30 (Closes: #775330)
+
+ -- Bernd Zeimetz <bzed@debian.org>  Wed, 14 Jan 2015 10:42:30 +0100
+
 pmacct (1.5.0-3) unstable; urgency=medium
 
   * [e9cf7671] Add Homepage and Vcs information.
diff --git a/debian/patches/ip_dummy_masknum_fix b/debian/patches/ip_dummy_masknum_fix
new file mode 100644
index 0000000..6da2696
--- /dev/null
+++ b/debian/patches/ip_dummy_masknum_fix
@@ -0,0 +1,37 @@
+Taken from upstream
+
+commit dff5ca21847d799759de27e8fd080e1f7a04cc30
+Author: paolo <paolo>
+Date:   Tue Jan 13 13:43:24 2015 +0000
+
+    * fix, net_aggr.c: identification of dummy entry now based on masknum only.
+      Thanks to Bernd Zeimetz for his support resolving the issue.
+
+--- a/src/net_aggr.c
++++ b/src/net_aggr.c
+@@ -1,6 +1,6 @@
+ /*
+     pmacct (Promiscuous mode IP Accounting package)
+-    pmacct is Copyright (C) 2003-2014 by Paolo Lucente
++    pmacct is Copyright (C) 2003-2015 by Paolo Lucente
+ */
+ 
+ /*
+@@ -464,7 +464,7 @@ struct networks_table_entry *binsearch(s
+ 
+   ret = networks_cache_search(nc, &addr); 
+   if (ret) {
+-    if (!ret->mask && ret->masknum) return NULL; /* dummy entry identification */
++    if (ret->masknum == 255) return NULL; /* dummy entry identification */
+     else return ret;
+   }
+ 
+@@ -1792,7 +1792,7 @@ struct networks6_table_entry *binsearch6
+   
+   ret = networks_cache_search6(nc, addr);
+   if (ret) {
+-    if (!ret->mask && ret->masknum) return NULL; /* dummy entry identification */
++    if (ret->masknum == 255) return NULL; /* dummy entry identification */
+     else return ret;
+   }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 68dcd47..b4f6aee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-syslog-format-security
 af_link.patch
+ip_dummy_masknum_fix