--- iftop-0.17.orig/debian/iftop.docs +++ iftop-0.17/debian/iftop.docs @@ -0,0 +1 @@ +TODO --- iftop-0.17.orig/debian/control +++ iftop-0.17/debian/control @@ -0,0 +1,31 @@ +Source: iftop +Section: net +Priority: optional +Maintainer: Daniel Baumann +Build-Depends: debhelper (>= 7), quilt, autotools-dev, libncurses5-dev, libpcap0.8-dev +Standards-Version: 3.8.0 +Homepage: http://www.ex-parrot.com/~pdw/iftop/ +Vcs-Browser: http://git.debian.net/?p=debian/iftop.git +Vcs-Git: git://git.debian.net/git/debian/iftop.git + +Package: iftop +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: displays bandwidth usage information on an network interface + iftop does for network usage what top(1) does for CPU usage. It listens to + network traffic on a named interface and displays a table of current bandwidth + usage by pairs of hosts. Handy for answering the question "Why is my Internet + link so slow?". + +Package: iftop-dbg +Section: devel +Priority: extra +Architecture: any +Depends: iftop (= ${binary:Version}) +Description: displays bandwidth usage information on an network interface (debug) + iftop does for network usage what top(1) does for CPU usage. It listens to + network traffic on a named interface and displays a table of current bandwidth + usage by pairs of hosts. Handy for answering the question "Why is my Internet + link so slow?". + . + This package contains the debugging symbols. --- iftop-0.17.orig/debian/compat +++ iftop-0.17/debian/compat @@ -0,0 +1 @@ +7 --- iftop-0.17.orig/debian/rules +++ iftop-0.17/debian/rules @@ -0,0 +1,64 @@ +#!/usr/bin/make -f + +include /usr/share/quilt/quilt.make + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + rm -f config.guess config.sub + + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +config.status: configure patch + dh_testdir + +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif + + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + +build: build-stamp +build-stamp: config.status + dh_testdir + + $(MAKE) + + touch build-stamp + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/iftop install + +binary: binary-arch + +binary-arch: install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_strip --dbg-package=iftop-dbg + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-indep: + +.PHONY: clean build install binary binary-arch binary-indep --- iftop-0.17.orig/debian/copyright +++ iftop-0.17/debian/copyright @@ -0,0 +1,46 @@ +Authors: + Paul Warren + Chris Lightfoot +Download: http://www.ex-parrot.com/~pdw/iftop/download/ + +Files: * +Copyright: + (C) 2002-2004 Paul Warren + (C) 2002-2004 Chris Lightfoot +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: debian/* +Copyright: 2005-2009 Daniel Baumann +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. --- iftop-0.17.orig/debian/changelog +++ iftop-0.17/debian/changelog @@ -0,0 +1,200 @@ +iftop (0.17-10) unstable; urgency=low + + * Applying patch from Marcin Kryczek to make displaying of top bar and + screen consistent regarding bits and bytes mode (Closes: #513243). + * Adding note in manpage about always using bits when specifying max- + bandwith, regardless if the option to display in bytes was choosen, + thanks to Nathan Stratton Treadway . + + -- Daniel Baumann Tue, 27 Jan 2009 17:51:00 +0100 + +iftop (0.17-9) unstable; urgency=low + + * Reordering compiler flags in configure call. + * Correcting indenting in copyright file. + * Updatingto debhelper 7. + * Updating to standards 3.8.0. + * Updating vcs fields in control file. + * Using patch-stamp rather than patch in rules file. + * Replacing obsolete dh_clean -k with dh_prep. + * Prefixing debhelper files with package name. + * Using quilt rather than dpatch. + * Updating year in copyright file. + * Updating rules to current state of the art. + * Updating manpage patch in order to fix yet another typo in the manpage, + thanks to Serafeim Zanikolas (Closes: #512886). + * Sorting build-depends. + + -- Daniel Baumann Sun, 25 Jan 2009 00:05:00 +0100 + +iftop (0.17-8) unstable; urgency=low + + * Adding debug package. + + -- Daniel Baumann Wed, 16 Apr 2008 13:52:00 +0200 + +iftop (0.17-7) unstable; urgency=low + + * Reordering rules file. + * Removing config.guess and config.sub from debian branch. + * Removing watch file. + * Removing useless REAMDE from docs file. + * Rewriting copyright file in machine-interpretable format. + * Adding vcs fields in control file. + * Updating package to debhelper 6. + * Removing useless whitespaces in changelog file. + + -- Daniel Baumann Wed, 16 Apr 2008 13:39:00 +0200 + +iftop (0.17-6) unstable; urgency=low + + * Bumped policy version. + * Using new homepage field in control. + * Don't hide make errors in clean target of rules. + + -- Daniel Baumann Sun, 23 Dec 2007 15:55:00 +0100 + +iftop (0.17-5) unstable; urgency=low + + * Applied patch from Eric Cooper to fix -b option + (Closes: #445991). + + -- Daniel Baumann Tue, 9 Oct 2007 21:19:00 +0200 + +iftop (0.17-4) unstable; urgency=low + + * Minor cleanups. + * Bumped package to debhelper 5. + + -- Daniel Baumann Tue, 1 May 2007 13:45:00 +0200 + +iftop (0.17-3) unstable; urgency=low + + * Updated build-depends, moving libpcap-dev to libpcap0.8-dev + (Closes: #386904). + + -- Daniel Baumann Mon, 11 Sep 2006 09:09:00 +0200 + +iftop (0.17-2) unstable; urgency=low + + * New email address. + * Bumped policy version. + + -- Daniel Baumann Thu, 6 Jul 2006 08:48:00 +0200 + +iftop (0.17-1) unstable; urgency=low + + * New upstream release. + * Fixed manpage typos (Closes: #360205). + + -- Daniel Baumann Sat, 22 Apr 2006 17:04:00 +0100 + +iftop (0.16-5) unstable; urgency=low + + * Added patch to fix crash on arm (Closes: #351293). + + -- Daniel Baumann Sat, 4 Feb 2006 12:13:00 +0100 + +iftop (0.16-4) unstable; urgency=low + + * Added patch to fix drives line going crazy if order is frozen + (Closes: #315734). + + -- Daniel Baumann Mon, 5 Dec 2005 23:07:00 +0100 + +iftop (0.16-3) unstable; urgency=low + + * Added patch to fix armeb specific bug of structure size (Closes: #336212). + + -- Daniel Baumann Thu, 3 Nov 2005 22:45:00 +0200 + +iftop (0.16-2) unstable; urgency=low + + * New maintainer (Closes: #335917). + * Redone debian/ based on new debhelper templates: + - added watch file. + - bumped to new policy. + - config.{guess,sub} are now updated via diff.gz (Closes: #333825). + - added patch to fix manpage and usage string for -N and -F options + (Closes: #335203). + + -- Daniel Baumann Wed, 26 Oct 2005 23:08:00 +0200 + +iftop (0.16-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Tue, 6 Apr 2004 20:37:45 -0400 + +iftop (0.15-2) unstable; urgency=low + + * Fix -N and -n options (Closes: #228643) + Thanks to Klaus Sperner . + + -- christophe barbe Mon, 19 Jan 2004 21:03:05 -0500 + +iftop (0.15-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Sat, 15 Nov 2003 14:43:29 -0500 + +iftop (0.13-1) unstable; urgency=low + + * New upstream. + * iftop moved in /usr/sbin (Closes: #185285). + + -- christophe barbe Fri, 25 Jul 2003 17:32:38 -0400 + +iftop (0.11-2) unstable; urgency=low + + * Move DH_COMPAT in debian/compat. + * Bump Standards-Version up to 3.5.9. + + -- christophe barbe Thu, 3 Apr 2003 20:41:17 -0500 + +iftop (0.11-1) unstable; urgency=low + + * New upstream. + * Authors took into account some Flawfinder reports (Closes: #168542). + + -- christophe barbe Sun, 12 Jan 2003 18:31:04 -0500 + +iftop (0.10-1) unstable; urgency=low + + * New Upstream. + + -- christophe barbe Tue, 29 Oct 2002 18:35:13 -0500 + +iftop (0.9-1) unstable; urgency=low + + * New Upstream (closes: #166036). + + -- christophe barbe Wed, 23 Oct 2002 09:25:10 -0400 + +iftop (0.7-1) unstable; urgency=low + + * New buildable upstream release (unlike 0.6). + + -- christophe barbe Thu, 29 Aug 2002 13:35:15 -0400 + +iftop (0.5-1) unstable; urgency=low + + * New Upstream release. + * Exit nicely when running as non-root (Closes: #157168). + * Better interface selection (Closes: #157176). + + -- christophe barbe Mon, 26 Aug 2002 15:54:14 -0400 + +iftop (0.4-2) unstable; urgency=low + + * Rebuilt with new libpcap to remove dependency on libpcap0, which I + got removed from unstable by accident. (closes: #156217). + + -- christophe barbe Sun, 11 Aug 2002 16:27:00 -0400 + +iftop (0.4-1) unstable; urgency=low + + * Initial Release (closes: #151413). + + -- christophe barbe Sat, 29 Jun 2002 17:43:41 -0400 --- iftop-0.17.orig/debian/patches/series +++ iftop-0.17/debian/patches/series @@ -0,0 +1,6 @@ +01-manpage.patch +02-armeb.patch +03-frozen-order.patch +04-arm.patch +05-bar-display.patch +06-bar-bytes.patch --- iftop-0.17.orig/debian/patches/04-arm.patch +++ iftop-0.17/debian/patches/04-arm.patch @@ -0,0 +1,19 @@ +Author: Joey Hess +Description: Fixes crash on arm. + +diff -Naurp iftop.orig/cfgfile.c iftop/cfgfile.c +--- iftop.orig/cfgfile.c 2008-09-07 23:53:08.000000000 +0000 ++++ iftop/cfgfile.c 2009-01-24 22:58:11.000000000 +0000 +@@ -45,9 +45,9 @@ stringmap config; + extern options_t options ; + + int is_cfgdirective_valid(const char *s) { +- char **t; +- for (t = config_directives; *t != NULL; ++t) +- if (strcmp(s, *t) == 0) return 1; ++ int t; ++ for (t = 0; config_directives[t] != NULL; t++) ++ if (strcmp(s, config_directives[t]) == 0) return 1; + return 0; + } + --- iftop-0.17.orig/debian/patches/02-armeb.patch +++ iftop-0.17/debian/patches/02-armeb.patch @@ -0,0 +1,15 @@ +Author: Lennert Buytenhek +Description: Fixes armeb specific bug. + +diff -Naurp iftop.orig/ether.h iftop/ether.h +--- iftop.orig/ether.h 2008-09-07 23:53:08.000000000 +0000 ++++ iftop/ether.h 2009-01-24 22:57:23.000000000 +0000 +@@ -12,7 +12,7 @@ struct ether_header { + u_int8_t ether_dhost[ETHER_ADDR_LEN]; + u_int8_t ether_shost[ETHER_ADDR_LEN]; + u_int16_t ether_type; +-}; ++} __attribute__((packed)); + + struct vlan_8021q_header { + u_int16_t priority_cfi_vid; --- iftop-0.17.orig/debian/patches/03-frozen-order.patch +++ iftop-0.17/debian/patches/03-frozen-order.patch @@ -0,0 +1,14 @@ +Author: Max Alekseyev +Description: Fix frozen order drives line totals crazy. + +diff -Naurp iftop.orig/ui.c iftop/ui.c +--- iftop.orig/ui.c 2008-09-07 23:53:08.000000000 +0000 ++++ iftop/ui.c 2009-01-24 22:57:57.000000000 +0000 +@@ -446,6 +446,7 @@ void screen_hash_clear() { + hash_node_type* n = NULL; + while(hash_next_item(screen_hash, &n) == HASH_STATUS_OK) { + host_pair_line* hpl = (host_pair_line*)n->rec; ++ hpl->total_recv = hpl->total_sent = 0; + memset(hpl->recv, 0, sizeof(hpl->recv)); + memset(hpl->sent, 0, sizeof(hpl->sent)); + } --- iftop-0.17.orig/debian/patches/05-bar-display.patch +++ iftop-0.17/debian/patches/05-bar-display.patch @@ -0,0 +1,15 @@ +Author: Eric Cooper +Description: The -b option doesn't turn off the bar display as the man page says it should (Closes: #445991). + +diff -Naurp iftop.orig/options.c iftop/options.c +--- iftop.orig/options.c 2008-09-07 23:53:08.000000000 +0000 ++++ iftop/options.c 2009-01-24 22:58:21.000000000 +0000 +@@ -302,7 +302,7 @@ void options_read_args(int argc, char ** + break; + + case 'b': +- config_set_string("show-bars", "true"); ++ config_set_string("show-bars", "false"); + break; + + case 'B': --- iftop-0.17.orig/debian/patches/01-manpage.patch +++ iftop-0.17/debian/patches/01-manpage.patch @@ -0,0 +1,40 @@ +Author: A. Costa +Description: Fixes a few typos. + +diff -Naurp iftop.orig/iftop.8 iftop/iftop.8 +--- iftop.orig/iftop.8 2008-09-08 01:53:08.000000000 +0200 ++++ iftop/iftop.8 2009-01-27 17:50:12.000000000 +0100 +@@ -25,7 +25,7 @@ By default, \fBiftop\fP will look up the + finds in packets. This can cause substantial traffic of itself, and may result + in a confusing display. You may wish to suppress display of DNS traffic by + using filter code such as \fBnot port domain\fP, or switch it off entirely, +-by using the \fB-n\fP option or by pressing \fBR\fP when the program is running. ++by using the \fB-n\fP option or by pressing \fBn\fP when the program is running. + + By default, \fBiftop\fP counts all IP packets that pass through the filter, and + the direction of the packet is determined according to the direction the packet +@@ -43,7 +43,7 @@ Ignore ethernet broadcast packets. + Count web traffic only, unless it is being directed through a local web cache. + .TP + \fBicmp\fP +-How much bandwith are users wasting trying to figure out why the network is ++How much bandwidth are users wasting trying to figure out why the network is + slow? + + .SH OPTIONS +@@ -229,13 +229,13 @@ Sets which column is used to sort the di + Controls the appearance of each item in the display. + .TP + \fBshow-totals:\fP \fI(yes|no)\fP +-Shows cummulative total for each item. ++Shows cumulative total for each item. + .TP + \fBlog-scale:\fP \fI(yes|no)\fP + Use a logarithmic scale for bar graphs. + .TP + \fBmax-bandwidth:\fP \fIbw\fP +-Fixes the maximum for the bar graph scale to \fIbw\fP, e.g. "10M" ++Fixes the maximum for the bar graph scale to \fIbw\fP, e.g. "10M". Note that the value has to always be in bits, regardless if the option to display in bytes has been choosen. + .TP + \fBnet-filter:\fP \fInet/mask\fP + Defines an IP network boundary for determining packet direction. --- iftop-0.17.orig/debian/patches/06-bar-bytes.patch +++ iftop-0.17/debian/patches/06-bar-bytes.patch @@ -0,0 +1,15 @@ +Author: Marcin Kryczek +Description: Connection rates are displayed in bytes, but the top bar is graduated in bits. + +diff -Naurp iftop.orig/ui.c iftop/ui.c +--- iftop.orig/ui.c 2008-09-08 01:53:08.000000000 +0200 ++++ iftop/ui.c 2009-01-27 17:44:50.000000000 +0100 +@@ -263,7 +263,7 @@ static void draw_bar_scale(int* y) { + char s[40], *p; + int x; + /* This 1024 vs 1000 stuff is just plain evil */ +- readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, 0); ++ readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, options.bandwidth_in_bytes); + p = s + strspn(s, " "); + x = get_bar_length(i * 8); + mvaddch(*y + 1, x, ACS_BTEE);