Bug#728291: pu: package iftop/1.0~pre2-4~deb7u1

[Markus Koschany <apo@gambaru.de>]

On 30.10.2013 12:13, Adam D. Barratt wrote:
[...]
>> The other important changes include a stricter versioned dependency
>> on debhelper
>> (>= 9) and a switch to source format 3.0 for applying the new patch
>> without further changes.
> 
> I'm afraid that neither of these is appropriate for an update to stable.
> 
> If the package does not have an existing patch system, then the changes
> should simply be applied directly; some maintainers find it helpful to
> maintain a patch file as part of the source package in such cases, even
> though it is not applied as part of the package build process.

I see. I have applied the patch directly and reverted the commits for
the updated debhelper dependency, source format 3.0 and the change for
the Standards-Version.

The updated debdiff is attached.

Regards,

Markus




diff -u iftop-1.0~pre2/debian/changelog iftop-1.0~pre2/debian/changelog
--- iftop-1.0~pre2/debian/changelog
+++ iftop-1.0~pre2/debian/changelog
@@ -1,3 +1,26 @@
+iftop (1.0~pre2-4~deb7u1) stable; urgency=low
+
+  * Rebuild for Wheezy.
+  * Apply only the required changes to fix bug #677141. Revert commits
+    580ac7d, b881f79, 66bb584.
+
+ -- Markus Koschany <apo@gambaru.de>  Wed, 30 Oct 2013 12:48:10 +0100
+
+iftop (1.0~pre2-4) unstable; urgency=low
+
+  * [488690e] New Maintainer. (Closes: #726549)
+  * [06096f6] Add memory-leak.patch.
+     - Fix a memory leak in resolver.c. The struct addr_storage was allocated
+       but never freed if dns resolution was turned off. Thanks to Olivier
+       Allard-Jacquin for the report and patch. (Closes: #677141)
+  * [ab3dd6a] Update VCS-fields.
+     - Move packaging to Git repository at collab-maint.
+  * [580ac7d] Require debhelper >= 9 for compat level 9. (Closes: #693754)
+  * [b881f79] Switch to source format 3.0 (quilt).
+  * [66bb584] Bump Standards-Version to 3.9.4, no changes.
+
+ -- Markus Koschany <apo@gambaru.de>  Sat, 19 Oct 2013 11:26:10 +0200
+
 iftop (1.0~pre2-3) unstable; urgency=low
 
   * Enable hardening buildflags in debian/rules (Closes: #675849)
diff -u iftop-1.0~pre2/debian/control iftop-1.0~pre2/debian/control
--- iftop-1.0~pre2/debian/control
+++ iftop-1.0~pre2/debian/control
@@ -1,12 +1,12 @@
 Source: iftop
 Section: net
 Priority: optional
-Maintainer: Alexander Reichle-Schmehl <tolimar@debian.org>
+Maintainer: Markus Koschany <apo@gambaru.de>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, libncurses5-dev, libpcap0.8-dev
 Standards-Version: 3.9.3
 Homepage: http://www.ex-parrot.com/~pdw/iftop/
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/iftop/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/iftop/
+Vcs-Git: git://anonscm.debian.org/collab-maint/iftop.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/iftop.git
 
 Package: iftop
 Architecture: any
only in patch2:
unchanged:
--- iftop-1.0~pre2.orig/resolver.c
+++ iftop-1.0~pre2/resolver.c
@@ -472,15 +472,15 @@
     int added = 0;
     struct addr_storage *raddr;
 
-    raddr = malloc(sizeof *raddr);
-    memset(raddr, 0, sizeof *raddr);
-    raddr->af = af;
-    raddr->len = (af == AF_INET ? sizeof(struct in_addr)
-                  : sizeof(struct in6_addr));
-    memcpy(&raddr->addr, addr, raddr->len);
-
     if(options.dnsresolution == 1) {
 
+        raddr = malloc(sizeof *raddr);
+        memset(raddr, 0, sizeof *raddr);
+        raddr->af = af;
+        raddr->len = (af == AF_INET ? sizeof(struct in_addr)
+                  : sizeof(struct in6_addr));
+        memcpy(&raddr->addr, addr, raddr->len);
+
         pthread_mutex_lock(&resolver_queue_mutex);
 
         if(hash_find(ns_hash, raddr, u_hostname.void_pp) == HASH_STATUS_OK) {

Attachment: signature.asc
Description: OpenPGP digital signature