Hello community, here is the log from the commit of package iptraf for openSUSE:Factory checked in at 2012-05-10 14:32:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/iptraf (Old) and /work/SRC/openSUSE:Factory/.iptraf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iptraf", Maintainer is "vdziewie...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/iptraf/iptraf.changes 2011-12-15 16:06:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.iptraf.new/iptraf.changes 2012-05-10 14:32:09.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 10 03:53:20 UTC 2012 - jeng...@inai.de + +- Update to new upstream release 1.1.2 +* New RFC1071-based IP checksum implementation +* Various fixes for IPv6 port statistics and byte counting, + interfaces with long names, PPP handling +* Make capturing on TUN interfaces work +* Support GRE tunnels + +------------------------------------------------------------------- Old: ---- fix-calling-rvnamed.patch iptraf-ng-1.0.2+git64.tar.xz New: ---- iptraf-ng-1.1.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ iptraf.spec ++++++ --- /var/tmp/diff_new_pack.0WvZ9T/_old 2012-05-10 14:32:11.000000000 +0200 +++ /var/tmp/diff_new_pack.0WvZ9T/_new 2012-05-10 14:32:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package iptraf # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -17,7 +17,7 @@ Name: iptraf -Version: 1.0.2+git64 +Version: 1.1.2 Release: 0 Summary: TCP/IP Network Monitor License: GPL-2.0+ @@ -25,11 +25,9 @@ Url: https://fedorahosted.org/iptraf-ng/ #Git-Clone: git://git.fedorahosted.org/git/iptraf-ng -#currently with +3 from git://dev.medozas.de/iptraf-ng Source: %name-ng-%version.tar.xz #PATCH-FIX-UPSTREAM off-by-one allocation error (bnc#711726) -Patch0: iptraf-1.0.2-segfault.patch -Patch1: fix-calling-rvnamed.patch +Patch1: iptraf-1.0.2-segfault.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake BuildRequires: ncurses-devel @@ -41,13 +39,13 @@ interface statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN station packet and byte counts. - %package ng # 2010-04: We really want to have a iptraf-ng binrpm so that Obsoletes can # easily work (and make the user somewhat aware of the change by seeing a # new install in zypper). puzel wanted to keep the iptraf name in OBS however, # so we now have this nifty construct with an empty main package. Summary: TCP/IP Network Monitor +Group: Productivity/Networking/Diagnostic # Just pick a number that is >3 Provides: iptraf = 4 Obsoletes: iptraf < 4 @@ -58,11 +56,9 @@ interface statistics and activity indicators, TCP/UDP traffic breakdowns, and LAN station packet and byte counts. - %prep -%setup -qn %name-ng -%patch0 -p1 -%patch1 -p1 +%setup -qn %name-ng-%version +%patch -P 1 -p1 %build if [ ! -e configure ]; then @@ -72,13 +68,18 @@ make %{?_smp_mflags}; %install -make install DESTDIR="%buildroot"; -install -d -m 0755 %{buildroot}/var/lib/iptraf-ng +b="%buildroot"; +make install DESTDIR="$b"; +install -dm 0755 "$b/%_localstatedir/lib/iptraf-ng"; +ln -s iptraf-ng "$b/%_sbindir/iptraf"; +ln -s iptraf-ng.8 "$b/%_mandir/man8/iptraf.8"; %files ng %defattr(-,root,root) -%_sbindir/* -%_mandir/man*/* -/var/lib/iptraf-ng +%_sbindir/iptraf* +%_sbindir/rvnamed* +%_mandir/man8/iptraf* +%_mandir/man8/rvnamed* +%_localstatedir/lib/iptraf-ng %changelog ++++++ iptraf-1.0.2-segfault.patch ++++++ --- /var/tmp/diff_new_pack.0WvZ9T/_old 2012-05-10 14:32:11.000000000 +0200 +++ /var/tmp/diff_new_pack.0WvZ9T/_new 2012-05-10 14:32:11.000000000 +0200 @@ -1,22 +1,20 @@ -Index: iptraf-ng/src/tui/winops.c +From: vci...@suse.com +References: http://bugzilla.novell.com/711726 + +--- + src/tui/winops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: iptraf-ng-1.1.2/src/tui/winops.c =================================================================== ---- iptraf-ng.orig/src/tui/winops.c -+++ iptraf-ng/src/tui/winops.c -@@ -28,7 +28,7 @@ void tx_colorwin(WINDOW * win) +--- iptraf-ng-1.1.2.orig/src/tui/winops.c ++++ iptraf-ng-1.1.2/src/tui/winops.c +@@ -31,7 +31,7 @@ void tx_colorwin(WINDOW * win) { - int ctr; - char *blankpad; -- blankpad = (char *) malloc(sizeof(char) * (COLS + 1)); -+ blankpad = (char *) malloc(sizeof(char) * (COLS + 2)); + int ctr; + char *blankpad; +- blankpad = (char *) malloc(sizeof(char) * (COLS + 1)); ++ blankpad = malloc(COLS + 2); - strcpy(blankpad, ""); + strcpy(blankpad, ""); -@@ -50,7 +50,7 @@ void tx_wcoloreol(WINDOW *win) - int y, x; - int cury, curx; - char sp_buf[10]; -- -+ - getyx(win, cury, curx); - getmaxyx(win, y, x); - sprintf(sp_buf, "%%%dc", x - curx - 1); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
