Hello community, here is the log from the commit of package iftop for openSUSE:Factory checked in at Tue Apr 26 09:01:50 CEST 2011.
-------- --- iftop/iftop.changes 2009-11-29 13:56:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/iftop/iftop.changes 2011-04-11 21:43:26.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Apr 11 19:25:30 UTC 2011 - l...@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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- iftop-0.17.tar.bz2 iftop-bar-bytes.patch iftop-bar-display.patch New: ---- counter_hash.h iftop-1.0-includes_fix.patch iftop-1.0pre1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iftop.spec ++++++ --- /var/tmp/diff_new_pack.VAdsP9/_old 2011-04-26 09:00:04.000000000 +0200 +++ /var/tmp/diff_new_pack.VAdsP9/_new 2011-04-26 09:00:04.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package iftop (Version 0.17) +# spec file for package iftop # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -20,16 +20,18 @@ Name: iftop Summary: Real-Time Interface Bandwidth Usage -Version: 0.17 -Release: 128 +Version: 0.99.1 +Release: 1 +%define real_version 1.0pre1 License: GPLv2+ Group: Productivity/Networking/Diagnostic Url: http://www.ex-parrot.com/~pdw/iftop/ -BuildRequires: libpcap-devel ncurses-devel -Source0: %name-%version.tar.bz2 -Patch0: %name-manpage.patch -Patch1: %name-bar-bytes.patch -Patch2: %name-bar-display.patch +BuildRequires: libpcap-devel +BuildRequires: ncurses-devel +Source0: %name-%real_version.tar.bz2 +Source1: counter_hash.h +Patch0: iftop-1.0-includes_fix.patch +Patch1: %name-manpage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,15 +48,16 @@ Chris Lightfoot <ch...@ex-parrot.com> %prep -%setup -q -%patch0 -%patch1 -p1 -%patch2 -p1 +%setup -q -n %name-%real_version +%patch0 -p0 +%patch1 -p0 +install -m644 %{SOURCE1} . %build -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ +export CFLAGS="%{optflags} -fno-strict-aliasing" \ +export CPPFLAGS="-I%{_includedir}/pcap" \ %configure -make %{?jobs:-j%jobs} +make %{?jobs:-j%jobs} iftop %install %makeinstall @@ -65,7 +68,8 @@ %files %defattr(-,root,root) %doc README ChangeLog COPYING TODO INSTALL -%attr(755,root,root) %{_sbindir}/iftop +%{_sbindir}/iftop +%{_sbindir}/iftop-dump %{_mandir}/man8/* %changelog ++++++ counter_hash.h ++++++ /* * addr_hash.h: * */ #ifndef __ADDR_HASH_H_ /* include guard */ #define __ADDR_HASH_H_ #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include "hash.h" typedef struct { unsigned long long sent; unsigned long long recv; } counter_type; typedef counter_type key_type; /* index into hash table */ hash_type* counter_hash_create(void); #endif /* __ADDR_HASH_H_ */ ++++++ iftop-1.0-includes_fix.patch ++++++ Index: iftop.c =================================================================== --- iftop.c.orig +++ iftop.c @@ -19,7 +19,7 @@ #include <sys/ioctl.h> #include <sys/socket.h> #include <net/if.h> -#include <net/bpf.h> +#include <pcap/bpf.h> #include <pthread.h> #include <curses.h> ++++++ iftop-manpage.patch ++++++ --- /var/tmp/diff_new_pack.VAdsP9/_old 2011-04-26 09:00:04.000000000 +0200 +++ /var/tmp/diff_new_pack.VAdsP9/_new 2011-04-26 09:00:04.000000000 +0200 @@ -1,38 +1,8 @@ -# Fixes a few typos. Thanks to A.Costa for the most of them. - Index: iftop.8 =================================================================== --- iftop.8.orig +++ iftop.8 -@@ -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 -@@ -85,6 +85,9 @@ is determined relative to the network bo - You may specify \fImask\fP as a dotted quad, such as /255.255.255.0, or as a - single number specifying the number of bits set in the netmask, such as /24. - .TP -+\fB-m\fP \fIlimit\fP -+Sets the upper limit for the bandwidth scale in bits/sec. -+.TP - \fB-c\fP \fIconfig file\fP - Specifies an alternate config file. If not specified, iftop will use - \fB~/.iftoprc\fP if it exists. See below for a description of config files -@@ -104,7 +107,6 @@ instance, +@@ -113,7 +113,6 @@ instance, foo.example.com => bar.example.com 1Kb 500b 100b <= 2Mb 2Mb 2Mb @@ -40,21 +10,3 @@ .fi shows, on the first line, traffic from \fBfoo.example.com\fP to \fBbar.example.com\fP; in the preceding 2 seconds, this averaged 1Kbit/s, -@@ -229,13 +231,15 @@ 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, regardsless 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. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
