commit 9f4dbf2544e07c9fb43dcdabe19381bb81d98cba1c4f20ac3ac306003d612286 Author: Marcus Meissner Date: Sun Jan 12 13:41:22 2020 +0000 Accepting request 758341 from network:utilities initiate SRPM rename to iptraf-ng OBS-URL: https://build.opensuse.org/request/show/758341 OBS-URL: https://build.opensuse.org/package/show/network:utilities/iptraf-ng?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/build-use-wide-version-of-lpanel-when-needed.patch b/build-use-wide-version-of-lpanel-when-needed.patch new file mode 100644 index 0000000..9974aaf --- /dev/null +++ b/build-use-wide-version-of-lpanel-when-needed.patch @@ -0,0 +1,75 @@ +From: Vitezslav Samel +Date: Thu, 17 Apr 2014 14:24:25 +0200 +Subject: build: use wide version of -lpanel when needed +Patch-mainline: yes +Git-commit: 1a009a230aacaa87d24fe75a257ffe8d57313116 +References: bnc#940207 + +When linking with -lncurses[56]w we need to link with -lpanelw. + +Signed-off-by: Vitezslav Samel +Signed-off-by: Nikola Pajkovsky +Signed-off-by: Jiri Slaby +--- + Makefile | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) + +diff --git a/Makefile b/Makefile +index 958b0fbeec0f..59b7c6f90298 100644 +--- a/Makefile ++++ b/Makefile +@@ -218,7 +218,7 @@ ifdef NEEDS_NCURSESW5 + NCURSES_CFLAGS := $(shell ncursesw5-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw5-config --libs 2>/dev/null) + ifndef NO_PANEL +- NCURSES_LDFLAGS += -lpanel ++ NCURSES_LDFLAGS += -lpanelw + endif + endif + endif +@@ -238,7 +238,7 @@ ifdef NEEDS_NCURSESW6 + NCURSES_CFLAGS := $(shell ncursesw6-config --cflags 2>/dev/null) + NCURSES_LDFLAGS := $(shell ncursesw6-config --libs 2>/dev/null) + ifndef NO_PANEL +- NCURSES_LDFLAGS += -lpanel ++ NCURSES_LDFLAGS += -lpanelw + endif + endif + endif +@@ -248,21 +248,27 @@ ifndef NCURSES_LDFLAGS + 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) ++ ifndef NO_PANEL ++ NCURSES_LDFLAGS += -lpanelw ++ endif + 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) ++ ifndef NO_PANEL ++ NCURSES_LDFLAGS += -lpanel ++ endif + 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) ++ ifndef NO_PANEL ++ NCURSES_LDFLAGS += -lpanelw ++ endif + 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),) +- ifndef NO_PANEL +- NCURSES_LDFLAGS += -lpanel +- endif ++ ifndef NO_PANEL ++ NCURSES_LDFLAGS += -lpanel ++ endif + endif + endif + +-- +2.5.0 + diff --git a/iptraf-ng-1.1.4-fix-Floating-point-exception-in-tcplog_flowra.patch b/iptraf-ng-1.1.4-fix-Floating-point-exception-in-tcplog_flowra.patch new file mode 100644 index 0000000..28b4a6c --- /dev/null +++ b/iptraf-ng-1.1.4-fix-Floating-point-exception-in-tcplog_flowra.patch @@ -0,0 +1,37 @@ +From 9b320138755542b927df650da0bd1e61ecaa41d7 Mon Sep 17 00:00:00 2001 +Message-Id: <9b320138755542b927df650da0bd1e61ecaa41d7.1378117677.git.npajkovs@redhat.com> +From: Vitezslav Samel +Date: Thu, 29 Aug 2013 10:11:42 +0200 +Subject: [PATCH] BUGFIX: fix "Floating point exception" in + tcplog_flowrate_msg() + +commit 0d55bee "tcplog_flowrate_msg(): cleanup and fix") removed +condition, which leads to zero division. + +Time diff between current time and ->conn_starttime is 0, because of +rate_print updates happen in less then 1 sec and later on, we try to +divide ->bcount by interval, which is 0, hencs zero division. + +Reported-by: Erik K. +Signed-off-by: Vitezslav Samel +Signed-off-by: Nikola Pajkovsky +--- + src/tcptable.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/tcptable.c b/src/tcptable.c +index a4133d9..e217b19 100644 +--- a/src/tcptable.c ++++ b/src/tcptable.c +@@ -437,6 +437,8 @@ static char *tcplog_flowrate_msg(struct tcptableent *entry, char *buf, + size_t bufsize) + { + time_t interval = time(NULL) - entry->conn_starttime; ++ if (interval < 1) ++ interval = 1; + + char rbuf[64]; + rate_print(entry->bcount / interval, rbuf, sizeof(rbuf)); +-- +1.8.1.2 + diff --git a/iptraf-ng-1.1.4.tar.xz b/iptraf-ng-1.1.4.tar.xz new file mode 100644 index 0000000..e26629b --- /dev/null +++ b/iptraf-ng-1.1.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7647e7db4bb5e300216a200a3e8985ab83149af3004c74042ce35775c9e13058 +size 403028 diff --git a/iptraf.changes b/iptraf.changes new file mode 100644 index 0000000..2133ec1 --- /dev/null +++ b/iptraf.changes @@ -0,0 +1,263 @@ +------------------------------------------------------------------- +Wed Aug 12 11:56:36 UTC 2015 - jslaby@suse.com + +- add build-use-wide-version-of-lpanel-when-needed.patch (bnc#940207) + +------------------------------------------------------------------- +Wed Sep 18 20:41:58 UTC 2013 - andreas.stieger@gmx.de + +- fix "Floating point exception" in tcplog_flowrate_msg(), adds + iptraf-ng-1.1.4-fix-Floating-point-exception-in-tcplog_flowra.patch + from Fedora [bnc#841156] + +------------------------------------------------------------------- +Wed Aug 7 15:25:54 UTC 2013 - jengelh@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) + +------------------------------------------------------------------- +Thu Mar 28 19:45:48 UTC 2013 - jengelh@inai.de + +- Update to new git snapshot 1.1.3.1+git49 +* remove TokenRing and ISDN support +* 802.1ad and QinQ VLAN handling +* restore functionality of iptraf -B (bnc#812080) +- Remove iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch + (merged upstream) +- Add 0001-build-prefer-ncurses6-and-wide.patch +- Depend on 3.1 headers (source uses ETH_P_QINQ1) + +------------------------------------------------------------------- +Sun Oct 7 13:53:53 UTC 2012 - andreas.stieger@gmx.de + +- iptraf-ng-1.1.3.1-kernel-v3.5-kill-off-token-ring-support.patch + to remove TokenRing support which was removed in Linux 3.5 +- move to pristine upstream tarball + +------------------------------------------------------------------- +Thu May 31 11:48:35 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 1.1.3.1 +* support SIT tunnels +* fix checksumming for odd-sized IPv4 packets +- iptraf-1.0.2-segfault.patch rendered obsolete by commit b3eec3f + +------------------------------------------------------------------- +Thu May 10 03:53:20 UTC 2012 - jengelh@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 + +------------------------------------------------------------------- +Thu Dec 15 11:15:30 UTC 2011 - puzel@suse.com + +- install /var/lib/iptraf-ng directory (bnc#736900) +- fix executing rvnamed daemon (bnc#737032) + - add fix-calling-rvnamed.patch + +------------------------------------------------------------------- +Fri Dec 2 16:22:57 UTC 2011 - coolo@suse.com + +- add automake as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Thu Sep 1 12:17:42 UTC 2011 - vcizek@suse.com + +- fixed segfault caused by off-by-one allocation error (bnc#711726) + +------------------------------------------------------------------- +Wed Apr 20 23:31:06 UTC 2011 - jengelh@medozas.de + +- Name the binary package iptraf-ng + +------------------------------------------------------------------- +Mon Apr 4 11:15:56 UTC 2011 - jengelh@medozas.de + +- Run spec-beautifier + +------------------------------------------------------------------- +Mon Apr 4 10:39:37 UTC 2011 - puzel@novell.com + +- switch to iptraf-ng (thanks jengelh@medozas.de) +- drop all patches (merged upstream) + +------------------------------------------------------------------- +Sun Feb 14 00:04:52 CET 2010 - rguenther@suse.de + +- fix harmless buffer-overflow to fix build with GCC 4.5 + +------------------------------------------------------------------- +Wed Nov 11 15:12:11 CET 2009 - puzel@suse.cz + +- iptraf-3.0.0-fix-promisc-crash.patch (bnc#548485) + +------------------------------------------------------------------- +Mon Oct 6 15:20:54 CEST 2008 - prusnak@suse.cz + +- fixed wrong comparison of file descriptor (fd.patch) [bnc#431904] + +------------------------------------------------------------------- +Thu Apr 10 11:30:48 CEST 2008 - prusnak@suse.cz + +- alter package after ncurses packaging change + +------------------------------------------------------------------- +Thu Mar 29 17:47:08 CEST 2007 - rguenther@suse.de + +- add ncurses-devel BuildRequires + +------------------------------------------------------------------- +Tue Nov 28 11:34:15 CET 2006 - prusnak@suse.cz + +- fixed line drawing in console (lines.patch) [#223678] + +------------------------------------------------------------------- +Wed Aug 30 10:45:23 CEST 2006 - lmichnovic@suse.cz + +- fixed uninitialized variable (uninitialized.patch) [#197715] + +------------------------------------------------------------------- +Wed Jan 25 21:36:40 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Nov 24 10:09:10 CET 2005 - pnemec@suse.cz + +- fix strict aliasing errors. +- added patch -strict-aliasing.patch + +------------------------------------------------------------------- +Wed Nov 23 16:43:54 CET 2005 - pnemec@suse.cz + +- updated to new version 3.0.0 +- fixed headers and support/Makefile to build + +------------------------------------------------------------------- +Thu Sep 8 17:30:25 CEST 2005 - pnemec@suse.cz + +- fixed file permisions bug [#114849] + +------------------------------------------------------------------- +Mon Aug 29 14:03:15 CEST 2005 - postadal@suse.cz + +- added support for ni, br, tap, dummy and vmnet devices + [#105545] (dev.diff) + +------------------------------------------------------------------- +Fri Jun 17 16:38:36 CEST 2005 - meissner@suse.de + +- use RPM_OPT_FLAGS in support/ too. + +------------------------------------------------------------------- +Mon Jun 13 15:20:48 CEST 2005 - kukuk@suse.de + +- Avoid using kernel headers if there are glibc variants + +------------------------------------------------------------------- +Wed Apr 13 09:55:07 CEST 2005 - arvin@suse.de + +- added support for modem device + +------------------------------------------------------------------- +Tue Jan 18 15:37:04 CET 2005 - postadal@suse.cz + +- added support for dsl device [#49721, #49882] + +------------------------------------------------------------------- +Thu Sep 30 17:25:50 CEST 2004 - postadal@suse.cz + +- allow normal user use iptraf if the s-bit is set [#46231] (euid-fix.diff) + +------------------------------------------------------------------- +Fri Sep 3 11:36:35 CEST 2004 - kukuk@suse.de + +- Fix compiling with new glibc headers + +------------------------------------------------------------------- +Tue Apr 20 14:55:19 CEST 2004 - postadal@suse.cz + +- set iptraf and rvnamed permission to 0755 + +------------------------------------------------------------------- +Sat Jan 10 21:46:29 CET 2004 - adrian@suse.de + +- build as user + +------------------------------------------------------------------- +Mon Jan 13 14:29:36 CET 2003 - postadal@suse.cz + +- updated to version 2.7.0 + * added support for Token Ring, sbni long-range modem, Free s/WAN IPSec + logical, DVB (sm2*, sm3*, penta*), wireless LAN (wlan*, wvlan*) interfaces + * a lot of fixes + +------------------------------------------------------------------- +Mon Dec 17 08:03:19 CET 2001 - cihlar@suse.cz + +- added /var/run/iptraf to package +- fixed man pages + +------------------------------------------------------------------- +Thu Nov 29 15:29:06 CET 2001 - cihlar@suse.cz + +- update to version 2.5.0: + * many fixes and improvements + +------------------------------------------------------------------- +Wed Jul 4 08:37:29 CEST 2001 - cihlar@suse.cz + +- update to version 2.4.0 +- added BuildRoot +- clean up spec file + +------------------------------------------------------------------- +Thu Jan 4 10:27:34 MET 2001 - ray@suse.de + +- update to version 2.3.1 + +------------------------------------------------------------------- +Tue Feb 15 12:17:48 CET 2000 - aj@suse.de + +- Fix CFLAGS. + +------------------------------------------------------------------- +Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de + +- ran old prepare_spec on spec file to switch to new prepare_spec. + +------------------------------------------------------------------- +Wed Aug 25 16:38:18 MEST 1999 - uli@suse.de + +- added CFLAGS for PPC + +------------------------------------------------------------------- +Thu Jan 21 01:19:02 MET 1999 - ro@suse.de + +- no m486 on alpha + +------------------------------------------------------------------- +Mon Sep 14 12:30:42 MEST 1998 - ro@suse.de + +- added directory /var/iptraf to filelist + +------------------------------------------------------------------- +Thu Aug 20 11:11:27 MEST 1998 - ro@suse.de + +- fixed src/dirs.h (adapted to initial changes in Makefile) +- and adapted the README.rvnamed + +------------------------------------------------------------------- +Sat Jun 20 14:13:36 MEST 1998 - ray@suse.de + +- new package + + diff --git a/iptraf.spec b/iptraf.spec new file mode 100644 index 0000000..da42e84 --- /dev/null +++ b/iptraf.spec @@ -0,0 +1,83 @@ +# +# spec file for package iptraf +# +# Copyright (c) 2013 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: iptraf +Version: 1.1.4 +Release: 0 +Summary: TCP/IP Network Monitor +License: GPL-2.0+ +Group: Productivity/Networking/Diagnostic +Url: https://fedorahosted.org/iptraf-ng/ + +#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: iptraf-ng-1.1.4-fix-Floating-point-exception-in-tcplog_flowra.patch +Patch2: build-use-wide-version-of-lpanel-when-needed.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: ncurses-devel +BuildRequires: xz + +%description +IPTraf-ng is a console-based network statistics utility. It gathers a +variety of information such as TCP connection packet and byte counts, +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 + +%description ng +IPTraf-ng is a console-based network statistics utility. It gathers a +variety of information such as TCP connection packet and byte counts, +interface statistics and activity indicators, TCP/UDP traffic +breakdowns, and LAN station packet and byte counts. + +%prep +%setup -qn %name-ng-%version +%patch1 -p1 +%patch2 -p1 + +%build +%configure +make %{?_smp_mflags}; + +%install +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/iptraf* +%_sbindir/rvnamed* +%_mandir/man8/iptraf* +%_mandir/man8/rvnamed* +%_localstatedir/lib/iptraf-ng + +%changelog