commit iftop.2897 for openSUSE:12.3:Update

Hello community, here is the log from the commit of package iftop.2897 for openSUSE:12.3:Update checked in at 2014-07-14 09:18:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/iftop.2897 (Old) and /work/SRC/openSUSE:12.3:Update/.iftop.2897.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "iftop.2897" Changes: -------- New Changes file: --- /dev/null 2014-06-12 08:28:52.960034756 +0200 +++ /work/SRC/openSUSE:12.3:Update/.iftop.2897.new/iftop.changes 2014-07-14 09:18:52.000000000 +0200 @@ -0,0 +1,167 @@ +------------------------------------------------------------------- +Wed Apr 30 07:21:18 UTC 2014 - lars@linux-schulserver.de + +- fix bnc#875625: iftop 0.99.2 memory leakeage +- added MAC-address-format.patch : defining the MAC address of the + interface as char instead of integer, which results in correct + commandline output + http://lists.beasts.org/pipermail/iftop-users/2014-March/000413.html +- added 001-Avoid-32-bit-overflow-for-rates-when-calculating-bar.patch + http://lists.beasts.org/pipermail/iftop-users/2014-March/000414.html +- added 002-scale-up-to-tbit.patch : Extend the scale[] array up to + terabit. 10gbit is not uncommon, 100gbit 40 and 100 gbit are coming, + 400 gbit and terabit are future possibilities. +- 003-rateidx_init-fix.patch : When calculating the first rateidx, + we were overshooting to the next scale. Fix that. +- 004-iftop-unlimited_text_output.patch : Allow unlimited number of + lines in text output, using "iftop -t -L 0" + +------------------------------------------------------------------- +Fri Feb 14 08:31:54 UTC 2014 - andreas.stieger@gmx.de + +- update to 1.0pre4: + * Man page documentation of -t mode. + * Compile time warning fixes. +- removed patches: + * iftop-implicit-pointer-decl.patch +- remove autoconf calls previously required + +------------------------------------------------------------------- +Fri Jan 3 10:50:42 UTC 2014 - pascal.bleser@opensuse.org + +- update to 1.0pre3: + * bugs and compilation issues were fixed + * a "text output" mode was added. + +- drop the following patches, merged upstream: + * iftop-manpage.patch + * iftop-multicast.patch + +------------------------------------------------------------------- +Tue Mar 5 17:55:17 UTC 2013 - crrodriguez@opensuse.org + +- Use ncursesw6 +- fix a number of implicit declarations and + implicit-pointer-decl warnings (iftop-implicit-pointer-decl.patch) + +------------------------------------------------------------------- +Sun Nov 25 19:30:40 UTC 2012 - schwab@linux-m68k.org + +- Properly handle multicast packages +- Define USE_GETIFADDRS to use getifaddrs for better IPv6 support + +------------------------------------------------------------------- +Mon Apr 2 17:55:26 UTC 2012 - andreas.stieger@gmx.de + +- update to 1.0pre2: + * reverse IPv6 using all methods except ares + * faster switching of graph scale + * fixed support for DLT_NULL + * fix for segfault on interfaces with no MAC address + * improved interface autodetect + * a stab at implementing support for radiotap interfaces (DLT 127). +- updated iftop-manpage.patch to fix manpage formatting warning +- remove INSTALL from installed files +- removed revious source +- removed iftop-1.0-includes_fix.patch +- removed counter_hash.h + +------------------------------------------------------------------- +Mon Apr 11 19:25:30 UTC 2011 - lars@linux-schulserver.de + +- update to 1.0pre1: + + Support for IPv6 + + Various typos fixed + + documentation fixed + + Fixed behaviour of "-b" option + + Support for PFLOG Interfaces + + Fix for performance issue with address hashing + + Fix for failing link address detection for GNU/kfreebsd + + Improved behaviour of sort in sent/recv only mode + + Fixed segfault / hang when supplying multiple -i options +- removed upstreamed patches + +------------------------------------------------------------------- +Sun Nov 29 12:36:30 UTC 2009 - lrupp@suse.de + +- added iftop-bar-bytes.patch and iftop-bar-display.patch from + Debian +- enhanced the iftop-manpage.patch +- small specfile cleanup + +------------------------------------------------------------------- +Tue Nov 3 19:09:20 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de + +- make patch0 usage consistent + +------------------------------------------------------------------- +Thu Jul 26 16:54:07 CEST 2007 - prusnak@suse.cz + +- changed libpcap to libpcap-devel in BuildRequires + +------------------------------------------------------------------- +Thu Mar 29 17:45:24 CEST 2007 - rguenther@suse.de + +- add ncurses-devel BuildRequires + +------------------------------------------------------------------- +Mon Jul 10 13:09:10 CEST 2006 - mskibbe@suse.de + +- update to version 0.17 which + o Added support for ppp interfaces + o Fixed segfault bug in config file handling + o Fixes to man page + o Fix for hash table memory handling bug + o Added 802.1q VLAN support + +------------------------------------------------------------------- +Wed Jan 25 21:36:35 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Wed Oct 12 13:02:44 CEST 2005 - hvogel@suse.de + +- Add -fno-strict-aliasing + +------------------------------------------------------------------- +Wed Mar 9 12:17:08 CET 2005 - hvogel@suse.de + +- add '-m' parameter to manpage + +------------------------------------------------------------------- +Mon Mar 1 15:23:20 CET 2004 - hvogel@suse.de + +- update to version 0.16 which includes all fixes from mmj + +------------------------------------------------------------------- +Wed Feb 4 20:10:02 CET 2004 - mmj@suse.de + +- Fix dereferencing of type-punned pointers + +------------------------------------------------------------------- +Thu Jan 29 14:03:50 CET 2004 - hvogel@suse.de + +- mark man pages as documentation + +------------------------------------------------------------------- +Mon Jan 26 14:37:16 CET 2004 - hvogel@suse.de + +- do not use %configure macro +- use CFLAGS + +------------------------------------------------------------------- +Wed Jan 21 16:04:54 CET 2004 - mmj@suse.de + +- Fix compound statement to work with new gcc-3.4 + +------------------------------------------------------------------- +Tue Jan 20 18:29:35 CET 2004 - hvogel@suse.de + +- first build and release. Version 0.15 + New: ---- 001-Avoid-32-bit-overflow-for-rates-when-calculating-bar.patch 002-scale-up-to-tbit.patch 003-rateidx_init-fix.patch 004-iftop-unlimited_text_output.patch MAC-address-format.patch iftop-1.0pre4.tar.gz iftop.changes iftop.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iftop.spec ++++++ # # spec file for package iftop # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: iftop Summary: Real-Time Interface Bandwidth Usage License: GPL-2.0+ Group: Productivity/Networking/Diagnostic Version: 0.99.4 Release: 0 %define pkg_version 1.0pre4 Url: http://www.ex-parrot.com/~pdw/iftop/ BuildRequires: libpcap-devel BuildRequires: ncurses-devel Source0: http://www.ex-parrot.com/~pdw/iftop/download/iftop-%{pkg_version}.tar.gz Patch0: MAC-address-format.patch Patch1: 001-Avoid-32-bit-overflow-for-rates-when-calculating-bar.patch Patch2: 002-scale-up-to-tbit.patch Patch3: 003-rateidx_init-fix.patch Patch4: 004-iftop-unlimited_text_output.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description 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. It is handy for explaining why the network links slow. %prep %setup -q -n %name-%pkg_version %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %build export CFLAGS="%optflags $(ncursesw6-config --cflags)" export LDFLAGS="$(ncursesw6-config --libs)" %configure %__make %{?smp_mflags} CPPFLAGS=-DUSE_GETIFADDRS %install %makeinstall %files %defattr(-,root,root) %doc README ChangeLog COPYING TODO %{_sbindir}/iftop %doc %{_mandir}/man8/iftop.8* %changelog ++++++ 001-Avoid-32-bit-overflow-for-rates-when-calculating-bar.patch ++++++ http://lists.beasts.org/pipermail/iftop-users/2014-March/000414.html From: Hans Fugal Date: Fri, 7 Mar 2014 13:22:04 -0800 Subject: [PATCH 1/3] Avoid 32-bit overflow for rates when calculating bar length Avoid 32-bit overflow by using double instead of int. uint64_t would be another option but these are only ever used in conjunction with floats. (float was also an option) --- ui.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui.c b/ui.c index 57ca6c0..8a3b9d0 100644 --- a/ui.c +++ b/ui.c @@ -71,7 +71,8 @@ int dontshowdisplay = 0; /* Barchart scales. */ static struct { - int max, interval; + double max; + int interval; } scale[] = { { 64000, 10 }, /* 64 kbit/s */ { 128000, 10 }, @@ -105,7 +106,7 @@ static float get_max_bandwidth() { } /* rate in bits */ -static int get_bar_length(const int rate) { +static int get_bar_length(const double rate) { float l; if (rate <= 0) return 0; ++++++ 002-scale-up-to-tbit.patch ++++++ http://lists.beasts.org/pipermail/iftop-users/2014-March/000414.html From: Hans Fugal Date: Fri, 7 Mar 2014 13:22:18 -0800 Subject: [PATCH 2/3] scale[] up to tbit Extend the scale[] array up to terabit. 10gbit is not uncommon, 100gbit 40 and 100 gbit are coming, 400 gbit and terabit are future possibilities. --- ui.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ui.c b/ui.c index 8a3b9d0..d1500ad 100644 --- a/ui.c +++ b/ui.c @@ -74,13 +74,16 @@ static struct { double max; int interval; } scale[] = { - { 64000, 10 }, /* 64 kbit/s */ - { 128000, 10 }, - { 256000, 10 }, - { 1000000, 10 }, /* 1 Mbit/s */ - { 10000000, 10 }, - { 100000000, 100 }, - { 1000000000, 100 } /* 1 Gbit/s */ + { 64000, 10 }, /* 64 kbit/s */ + { 128000, 10 }, + { 256000, 10 }, + { 1000000, 10 }, /* 1 Mbit/s */ + { 10000000, 10 }, + { 100000000, 100 }, + { 1000000000, 100 }, /* 1 Gbit/s */ + { 10000000000, 100 }, + { 100000000000, 100 }, + { 1000000000000, 100 }, /* 1 Tbit/s */ }; static int rateidx = 0, wantbiggerrate; ++++++ 003-rateidx_init-fix.patch ++++++ http://lists.beasts.org/pipermail/iftop-users/2014-March/000414.html From: Hans Fugal Date: Fri, 7 Mar 2014 13:23:14 -0800 Subject: [PATCH 3/3] rateidx_init fix When calculating the first rateidx, we were overshooting to the next scale. Fix that. --- ui.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui.c b/ui.c index d1500ad..15624bf 100644 --- a/ui.c +++ b/ui.c @@ -116,7 +116,8 @@ static int get_bar_length(const double rate) { if (rate > scale[rateidx].max) { wantbiggerrate = 1; if(! rateidx_init) { - while(rate > scale[rateidx_init++].max) { + while(rate > scale[rateidx_init].max) { + rateidx_init++; } rateidx = rateidx_init; } ++++++ 004-iftop-unlimited_text_output.patch ++++++ http://lists.beasts.org/pipermail/iftop-users/2014-March/000415.html Author: Roman Hoog Antink Date: Mon Mar 17 11:34:37 2014 +0100 support unlimited text output Index: iftop-1.0pre4/tui.c =================================================================== --- iftop-1.0pre4.orig/tui.c +++ iftop-1.0pre4/tui.c @@ -73,7 +73,7 @@ void tui_print() { printf("\n"); /* Traverse the list of all connections */ - while((nn = sorted_list_next_item(&screen_list, nn)) != NULL && l < options.num_lines) { + while((nn = sorted_list_next_item(&screen_list, nn)) != NULL && (!options.num_lines || l < options.num_lines)) { /* Increment the line counter */ l++; Index: iftop-1.0pre4/ui.c =================================================================== --- iftop-1.0pre4.orig/ui.c +++ iftop-1.0pre4/ui.c @@ -50,6 +50,7 @@ " < - sort by source name\n"\ " > - sort by dest name\n"\ " o - freeze current order\n"\ +" L # - print # lines in text output\n"\ "\n"\ "iftop, version " PACKAGE_VERSION ++++++ MAC-address-format.patch ++++++ From: Xiaoguang Sun Date: Tue, 11 Mar 2014 13:18:46 +0100 Subject: MAC address format Forwarded: http://lists.beasts.org/pipermail/iftop-users/2014-March/000413.html --- iftop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iftop.c b/iftop.c index a090dcf..883782e 100644 --- a/iftop.c +++ b/iftop.c @@ -713,7 +713,7 @@ void packet_init() { if(have_hw_addr) { fprintf(stderr, "MAC address is:"); for (i = 0; i < 6; ++i) - fprintf(stderr, "%c%02x", i ? ':' : ' ', (unsigned int)if_hw_addr[i]); + fprintf(stderr, "%c%02x", i ? ':' : ' ', (unsigned char)if_hw_addr[i]); fprintf(stderr, "\n"); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org