Hello community, here is the log from the commit of package iptraf for openSUSE:Factory checked in at 2013-08-10 18:28:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iptraf (Old) and /work/SRC/openSUSE:Factory/.iptraf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iptraf" Changes: -------- --- /work/SRC/openSUSE:Factory/iptraf/iptraf.changes 2013-04-02 11:54:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.iptraf.new/iptraf.changes 2013-08-10 18:28:33.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Aug 7 15:25:54 UTC 2013 - jeng...@inai.de + +- Update to new upstream release 1.1.4 +* update all rates not only the visible ones +* add 802.1ad / 802.1ah / QinQ ethertypes +- Removed 0001-build-prefer-ncurses6-and-wide.patch + (merged upstream) + +------------------------------------------------------------------- Old: ---- 0001-build-prefer-ncurses6-and-wide.patch iptraf-ng-1.1.3.1+git89.tar.xz New: ---- iptraf-ng-1.1.4.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptraf.spec ++++++ --- /var/tmp/diff_new_pack.k02krn/_old 2013-08-10 18:28:33.000000000 +0200 +++ /var/tmp/diff_new_pack.k02krn/_new 2013-08-10 18:28:34.000000000 +0200 @@ -17,7 +17,7 @@ Name: iptraf -Version: 1.1.3.1+git89 +Version: 1.1.4 Release: 0 Summary: TCP/IP Network Monitor License: GPL-2.0+ @@ -27,9 +27,7 @@ #Git-Clone: git://git.fedorahosted.org/git/iptraf-ng #DL-URL: http://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-%version.tar.gz Source: %name-ng-%version.tar.xz -Patch1: 0001-build-prefer-ncurses6-and-wide.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: linux-glibc-devel >= 3.1 BuildRequires: ncurses-devel BuildRequires: xz @@ -57,8 +55,7 @@ breakdowns, and LAN station packet and byte counts. %prep -%setup -qn %name-ng -%patch -P 1 -p1 +%setup -qn %name-ng-%version %build %configure ++++++ iptraf-ng-1.1.3.1+git89.tar.xz -> iptraf-ng-1.1.4.tar.xz ++++++ ++++ 3962 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iptraf-ng/CHANGES new/iptraf-ng-1.1.4/CHANGES --- old/iptraf-ng/CHANGES 2013-03-28 20:32:36.000000000 +0100 +++ new/iptraf-ng-1.1.4/CHANGES 2013-07-23 15:06:10.000000000 +0200 @@ -1,5 +1,18 @@ CHANGES file for iptraf-ng +* Tue Jul 23 2013 Nikola Pajkovsky <npajk...@redhat.com> - 1.1.4 +- locking code rewrite: only one instance is allowed now +- promiscuous mode rewrite +- build system: install iptraf-ng to sbin +- remove token-ring support +- remove ISDN interfaces support +- preparation for packet capturing into the file +- source code cleanups +- bugfix: don't segfault when there are no ports to remove +- rvnamed: fix the IPv6 resolving +- add 802.1ad and QinQ VLAN handling +- optimize code (to not use that much CPU) + * Wed May 23 2012 Nikola Pajkovsky <npajk...@redhat.com> - 1.1.3 - new building system (based only on make, no automake/autoconf) - code cleanups diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iptraf-ng/GEN-VERSION-FILE new/iptraf-ng-1.1.4/GEN-VERSION-FILE --- old/iptraf-ng/GEN-VERSION-FILE 2013-03-28 20:32:36.000000000 +0100 +++ new/iptraf-ng-1.1.4/GEN-VERSION-FILE 2013-07-23 15:06:11.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/bash GVF=VERSION-FILE -DEF_VER=1.1.3.1 +DEF_VER=1.1.4 LF=' ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iptraf-ng/Makefile new/iptraf-ng-1.1.4/Makefile --- old/iptraf-ng/Makefile 2013-03-28 20:41:54.000000000 +0100 +++ new/iptraf-ng-1.1.4/Makefile 2013-07-23 15:06:11.000000000 +0200 @@ -245,18 +245,18 @@ # try find ncuses by autodetect ifndef NCURSES_LDFLAGS - ifneq ($(shell ncurses5-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) - else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + ifneq ($(shell ncursesw6-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) else ifneq ($(shell ncurses6-config --libs 2>/dev/null),) NCURSES_CFLAGS := $(shell ncurses6-config --cflags 2>/dev/null) NCURSES_LDFLAGS := $(shell ncurses6-config --libs 2>/dev/null) - else ifneq ($(shell ncursesw6-config --libs 2>/dev/null),) - NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) - NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) + else ifneq ($(shell ncursesw5-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + else ifneq ($(shell ncurses5-config --libs 2>/dev/null),) + NCURSES_CFLAGS := $(shell ncurses5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncurses5-config --libs 2>/dev/null) endif ifneq ($(NCURSES_LDFLAGS),) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iptraf-ng/iptraf-ng.spec new/iptraf-ng-1.1.4/iptraf-ng.spec --- old/iptraf-ng/iptraf-ng.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/iptraf-ng-1.1.4/iptraf-ng.spec 2013-07-23 15:06:10.000000000 +0200 @@ -0,0 +1,70 @@ +Summary: A console-based network monitoring utility +Name: iptraf-ng +Version: 1.1.4 +Release: 1%{?dist} +Source0: https://fedorahosted.org/releases/i/p/iptraf-ng/%{name}-%{version}.tar.gz +Source1: iptraf-ng-logrotate.conf +URL: https://fedorahosted.org/iptraf-ng/ +License: GPLv2+ +Group: Applications/System +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: ncurses-devel +Obsoletes: iptraf < 3.1 +Provides: iptraf = 3.1 + +%description +IPTraf-ng is a console-based network monitoring utility. IPTraf gathers +data like TCP connection packet and byte counts, interface statistics +and activity indicators, TCP/UDP traffic breakdowns, and LAN station +packet and byte counts. IPTraf-ng features include an IP traffic monitor +which shows TCP flag information, packet and byte counts, ICMP +details, OSPF packet types, and oversized IP packet warnings; +interface statistics showing IP, TCP, UDP, ICMP, non-IP and other IP +packet counts, IP checksum errors, interface activity and packet size +counts; a TCP and UDP service monitor showing counts of incoming and +outgoing packets for common TCP and UDP application ports, a LAN +statistics module that discovers active hosts and displays statistics +about their activity; TCP, UDP and other protocol display filters so +you can view just the traffic you want; logging; support for Ethernet, +FDDI, ISDN, SLIP, PPP, and loopback interfaces; and utilization of the +built-in raw socket interface of the Linux kernel, so it can be used +on a wide variety of supported network cards. + +%prep +%setup -q + +%build +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# remove everything besides the html and pictures in Documentation +find Documentation -type f | grep -v '\.html$\|\.png$\|/stylesheet' | \ + xargs rm -f + +install -D -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/iptraf-ng + +install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/{lock,log,lib}/iptraf-ng + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc CHANGES FAQ LICENSE README* RELEASE-NOTES +%doc Documentation +%{_sbindir}/iptraf-ng +%{_sbindir}/rvnamed-ng +%{_mandir}/man8/iptraf-ng.8* +%{_mandir}/man8/rvnamed-ng.8* +%{_localstatedir}/lock/iptraf-ng +%{_localstatedir}/log/iptraf-ng +%{_localstatedir}/lib/iptraf-ng +%config(noreplace) %{_sysconfdir}/logrotate.d/iptraf-ng + +%changelog +* Wed Jan 11 2011 Nikola Pajkovsky <npajk...@redhat.com> - 1.1.0-1 +- Initialization build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iptraf-ng/src/ifstats.c new/iptraf-ng-1.1.4/src/ifstats.c --- old/iptraf-ng/src/ifstats.c 2013-03-28 20:41:54.000000000 +0100 +++ new/iptraf-ng-1.1.4/src/ifstats.c 2013-07-23 15:06:11.000000000 +0200 @@ -255,6 +255,23 @@ static void updaterates(struct iftab *table, unsigned long msecs) { + struct iflist *ptmp = table->head; + unsigned long rate; + + while (ptmp != NULL) { + rate_add_rate(&ptmp->rate, ptmp->spanbr, msecs); + rate = rate_get_average(&ptmp->rate); + + if (rate > ptmp->peakrate) + ptmp->peakrate = rate; + + ptmp->spanbr = 0; + ptmp = ptmp->next_entry; + } +} + +static void showrates(struct iftab *table) +{ struct iflist *ptmp = table->firstvisible; unsigned int idx = table->firstvisible->index; unsigned long rate; @@ -262,16 +279,11 @@ wattrset(table->statwin, HIGHATTR); do { - rate_add_rate(&ptmp->rate, ptmp->spanbr, msecs); rate = rate_get_average(&ptmp->rate); rate_print(rate, buf, sizeof(buf)); wmove(table->statwin, ptmp->index - idx, 63 * COLS / 80); wprintw(table->statwin, "%s", buf); - if (rate > ptmp->peakrate) - ptmp->peakrate = rate; - - ptmp->spanbr = 0; ptmp = ptmp->next_entry; } while (ptmp != table->lastvisible->next_entry); } @@ -511,6 +523,7 @@ msecs = timeval_diff_msec(&tv, &start_tv); updaterates(&table, msecs); + showrates(&table); printelapsedtime(statbegin, now, LINES - 3, 1, table.borderwin); starttime = now; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iptraf-ng/src/iptraf-ng-compat.h new/iptraf-ng-1.1.4/src/iptraf-ng-compat.h --- old/iptraf-ng/src/iptraf-ng-compat.h 2013-03-28 20:41:54.000000000 +0100 +++ new/iptraf-ng-1.1.4/src/iptraf-ng-compat.h 2013-07-23 15:06:11.000000000 +0200 @@ -44,6 +44,22 @@ #include <linux/if.h> #include <linux/if_arp.h> +#ifndef ETH_P_8021AD +#define ETH_P_8021AD 0x88A8 /* 802.1ad Service VLAN */ +#endif + +#ifndef ETH_P_QINQ1 +#define ETH_P_QINQ1 0x9100 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ +#endif + +#ifndef ETH_P_QINQ2 +#define ETH_P_QINQ2 0x9200 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ +#endif + +#ifndef ETH_P_QINQ3 +#define ETH_P_QINQ3 0x9300 /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */ +#endif + #define debug(...) \ do { \ fprintf(stderr, "%s:%s():%d:", \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iptraf-ng/src/tcptable.h new/iptraf-ng-1.1.4/src/tcptable.h --- old/iptraf-ng/src/tcptable.h 2013-03-28 20:41:54.000000000 +0100 +++ new/iptraf-ng-1.1.4/src/tcptable.h 2013-07-23 15:06:11.000000000 +0200 @@ -9,7 +9,16 @@ #include "rate.h" -#define max(a, b) (( a > b) ? a : b) +/* + * max() macros that also do + * strict type-checking.. See the + * "unnecessary" pointer comparison. + */ +#define max(x, y) ({ \ + typeof(x) _max1 = (x); \ + typeof(y) _max2 = (y); \ + (void) (&_max1 == &_max2); \ + _max1 > _max2 ? _max1 : _max2; }) #define FLAG_SYN 1 #define FLAG_RST 2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/iptraf-ng/version new/iptraf-ng-1.1.4/version --- old/iptraf-ng/version 1970-01-01 01:00:00.000000000 +0100 +++ new/iptraf-ng-1.1.4/version 2013-07-23 15:06:11.000000000 +0200 @@ -0,0 +1 @@ +1.1.4 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
