jengelh/iptraf-ng
SHA256
1
0
Fork 0
forked from pool/iptraf-ng
Code Pull Requests Activity

- Rename the SRPM from iptraf to iptraf-ng. Effectively no change for the produced BRPMs.

Browse Source 
- Add 0001-ifstats-make-sort-by-ifname-the-only-mode-of-operati.patch from upstream.

OBS-URL: https://build.opensuse.org/package/show/network:utilities/iptraf-ng?expand=0&rev=3
This commit is contained in:
Jan Engelhardt 2020-01-12 14:49:53 +00:00 committed by Git OBS Bridge
parent 5ce1a4f0d6
commit 10bb5c8406
5 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-ifstats-make-sort-by-ifname-the-only-mode-of-operati.patch Normal file
View File

@ -0,0 +1,27 @@
From 96b7a5e17dce341b083ae802501d5c1c1966a0a9 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 6 Jan 2020 16:40:58 +0100
Subject: [PATCH] ifstats: make sort-by-ifname the only mode of operation
https://github.com/iptraf-ng/iptraf-ng/pull/2
Signed-off-by: Jan Engelhardt <jengelh@inai.de>
---
src/ifstats.c | 13 +++----------
src/options.c | 50 ++++++++++++++++++++------------------------------
src/options.h | 2 +-
3 files changed, 24 insertions(+), 41 deletions(-)
diff --git a/src/ifstats.c b/src/ifstats.c
index 0ae9b08..f871fc7 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -194,7 +194,7 @@ static void initiflist(struct iflist **list)
/* make the linked list sorted by ifindex */
struct iflist *cur = *list, *last = NULL;
- while (cur != NULL && cur->ifindex < ifindex) {
+ while (cur != NULL && strcmp(cur->ifname, ifname) < 0) {
last = cur;
cur = cur->next_entry;
}

3
iptraf-ng-1.1.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7647e7db4bb5e300216a200a3e8985ab83149af3004c74042ce35775c9e13058
size 403028

9
iptraf-ng.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Sun Jan 12 14:45:33 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Employ new homepage URLs.
- Rename the SRPM from iptraf to iptraf-ng. Effectively no change
for the produced BRPMs.
- Add 0001-ifstats-make-sort-by-ifname-the-only-mode-of-operati.patch
from upstream.
-------------------------------------------------------------------
Wed Aug 12 11:56:36 UTC 2015 - jslaby@suse.com

59
iptraf-ng.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package iptraf
# spec file for package iptraf-ng
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,24 +12,26 @@
# 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/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: iptraf
Name: iptraf-ng
Version: 1.1.4
Release: 0
Summary: TCP/IP Network Monitor
License: GPL-2.0+
License: GPL-2.0-or-later
Group: Productivity/Networking/Diagnostic
Url: https://fedorahosted.org/iptraf-ng/
URL: https://github.com/iptraf-ng/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
Source: https://github.com/iptraf-ng/iptraf-ng/archive/v%version.tar.gz
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
Patch3: 0001-ifstats-make-sort-by-ifname-the-only-mode-of-operati.patch
Obsoletes: iptraf < 4
# Just pick a number that is >3
Provides: iptraf = 4
BuildRequires: automake
BuildRequires: ncurses-devel
BuildRequires: xz
@ -39,41 +41,22 @@ 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
%autosetup -n %name-%version -p1
%build
if [ ! -e configure ]; then autoreconf -fi; fi
%configure
make %{?_smp_mflags};
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";
%make_install
b="%buildroot"
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)
%files
%_sbindir/iptraf*
%_sbindir/rvnamed*
%_mandir/man8/iptraf*

3
v1.1.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:16b9b05bf5d3725d86409b901696639ad46944d02de6def87b1ceae5310dd35c
size 556843