commit iftop for openSUSE:Factory

2020-07-27 Thread root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2020-07-27 17:42:17

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new.3592 (New)


Package is "iftop"

Mon Jul 27 17:42:17 2020 rev:31 rq:822848 version:0.99.4

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2019-04-22 
12:26:51.940950706 +0200
+++ /work/SRC/openSUSE:Factory/.iftop.new.3592/iftop.changes2020-07-27 
17:44:18.675220133 +0200
@@ -1,0 +2,7 @@
+Fri Jul 10 17:35:13 UTC 2020 - Brice DEKANY 
+
+- added 007-iftop-declare-extern-vars.patch: fix for compilations
+  error with GCC10 (Default to -fno-common)
+  See: https://www.gnu.org/software/gcc/gcc-10/porting_to.html
+
+---

New:

  007-iftop-declare-extern-vars.patch



Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.Sjc3Gb/_old  2020-07-27 17:44:21.779223047 +0200
+++ /var/tmp/diff_new_pack.Sjc3Gb/_new  2020-07-27 17:44:21.783223051 +0200
@@ -34,6 +34,7 @@
 Patch4: 004-iftop-unlimited_text_output.patch
 Patch5: 0001-Prefer-ncurses6w.patch
 Patch6: 006-iftop-choose_first_running_interface.patch
+Patch7: 007-iftop-declare-extern-vars.patch
 %if 0%{?suse_version} >= 1500
 BuildRequires:  pkgconfig(ncursesw)
 %else
@@ -58,6 +59,9 @@
 %patch5 -p1
 %endif
 %patch6 -p1
+%if 0%{?suse_version} >= 1500
+%patch7 -p1
+%endif
 
 %build
 autoreconf -fiv

++ 007-iftop-declare-extern-vars.patch ++
diff -u a/ui_common.c b/ui_common.c
--- a/ui_common.c   2020-07-10 16:35:47.874322400 +
+++ b/ui_common.c   2020-07-10 16:37:16.862322400 +
@@ -24,6 +24,12 @@
 char* unit_bits[UNIT_DIVISIONS] =  { "b", "Kb", "Mb", "Gb"};
 char* unit_bytes[UNIT_DIVISIONS] =  { "B", "KB", "MB", "GB"};
 
+sorted_list_type screen_list;
+host_pair_line totals;
+int peaksent, peakrecv, peaktotal;
+hash_type* screen_hash;
+hash_type* service_hash;
+
 extern hash_type* history;
 extern int history_pos;
 extern int history_len;
diff -u a/ui_common.h b/ui_common.h
--- a/ui_common.h   2020-07-10 16:35:47.874322400 +
+++ b/ui_common.h   2020-07-10 16:36:41.182322400 +
@@ -33,12 +33,12 @@
 
 extern options_t options;
 
-sorted_list_type screen_list;
-host_pair_line totals;
-int peaksent, peakrecv, peaktotal;
+extern sorted_list_type screen_list;
+extern host_pair_line totals;
+extern int peaksent, peakrecv, peaktotal;
 extern history_type history_totals;
-hash_type* screen_hash;
-hash_type* service_hash;
+extern hash_type* screen_hash;
+extern hash_type* service_hash;
 
 void analyse_data(void);
 void screen_list_init(void);

commit iftop for openSUSE:Factory

2019-04-22 Thread root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2019-04-22 12:26:50

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new.5536 (New)


Package is "iftop"

Mon Apr 22 12:26:50 2019 rev:30 rq:696487 version:0.99.4

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2019-02-27 
17:29:31.819312572 +0100
+++ /work/SRC/openSUSE:Factory/.iftop.new.5536/iftop.changes2019-04-22 
12:26:51.940950706 +0200
@@ -1,0 +2,7 @@
+Thu Apr 11 07:57:36 UTC 2019 - l...@linux-schulserver.de - 0.99.4
+
+- added 006-iftop-choose_first_running_interface.patch:
+  Choose first running interface, rather than first "up" interface
+- apply/use 0001-Prefer-ncurses6w.patch only on newer distributions
+
+---

New:

  006-iftop-choose_first_running_interface.patch



Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.6DxCnQ/_old  2019-04-22 12:26:52.760950386 +0200
+++ /var/tmp/diff_new_pack.6DxCnQ/_new  2019-04-22 12:26:52.760950386 +0200
@@ -25,7 +25,6 @@
 %define pkg_version 1.0pre4
 Url:http://www.ex-parrot.com/~pdw/iftop/
 BuildRequires:  libpcap-devel
-BuildRequires:  pkgconfig(ncursesw)
 BuildRequires:  automake
 Source0:
http://www.ex-parrot.com/~pdw/iftop/download/iftop-%{pkg_version}.tar.gz
 Patch0: MAC-address-format.patch
@@ -34,6 +33,12 @@
 Patch3: 003-rateidx_init-fix.patch  
 Patch4: 004-iftop-unlimited_text_output.patch
 Patch5: 0001-Prefer-ncurses6w.patch
+Patch6: 006-iftop-choose_first_running_interface.patch
+%if 0%{?suse_version} >= 1500
+BuildRequires:  pkgconfig(ncursesw)
+%else
+BuildRequires:  ncurses-devel
+%endif
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -49,7 +54,10 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%if 0%{?suse_version} >= 1500
 %patch5 -p1
+%endif
+%patch6 -p1
 
 %build
 autoreconf -fiv

++ 006-iftop-choose_first_running_interface.patch ++
Choose first running interface, rather than first "up" interface (Redhat 
#1403025).
Submitted by:  Robert Scheck 

Index: iftop-1.0pre4/options.c
===
--- iftop-1.0pre4.orig/options.c
+++ iftop-1.0pre4/options.c
@@ -103,7 +103,7 @@ static char *get_first_interface(void) {
 while(nameindex[j].if_index != 0) {
 if (strcmp(nameindex[j].if_name, "lo") != 0 && 
!is_bad_interface_name(nameindex[j].if_name)) {
 strncpy(ifr.ifr_name, nameindex[j].if_name, sizeof(ifr.ifr_name));
-if ((s == -1) || (ioctl(s, SIOCGIFFLAGS, ) == -1) || 
(ifr.ifr_flags & IFF_UP)) {
+if ((s == -1) || (ioctl(s, SIOCGIFFLAGS, ) == -1) || 
(ifr.ifr_flags & IFF_RUNNING)) {
 i = xstrdup(nameindex[j].if_name);
 break;
 }

commit iftop for openSUSE:Factory

2019-02-27 Thread root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2019-02-27 17:29:30

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new.28833 (New)


Package is "iftop"

Wed Feb 27 17:29:30 2019 rev:29 rq:679570 version:0.99.4

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2014-07-12 
17:15:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.iftop.new.28833/iftop.changes   2019-02-27 
17:29:31.819312572 +0100
@@ -1,0 +2,6 @@
+Thu Jan  3 13:22:08 UTC 2019 - Cristian Rodríguez 
+
+- 0001-Prefer-ncurses6w.patch: prefer ncursesw6, previously force-fed
+  via CFLAGS/LDFLAGS but did not really work.
+
+---

New:

  0001-Prefer-ncurses6w.patch



Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.XxMUli/_old  2019-02-27 17:29:32.271312410 +0100
+++ /var/tmp/diff_new_pack.XxMUli/_new  2019-02-27 17:29:32.271312410 +0100
@@ -25,13 +25,15 @@
 %define pkg_version 1.0pre4
 Url:http://www.ex-parrot.com/~pdw/iftop/
 BuildRequires:  libpcap-devel
-BuildRequires:  ncurses-devel
+BuildRequires:  pkgconfig(ncursesw)
+BuildRequires:  automake
 Source0:
http://www.ex-parrot.com/~pdw/iftop/download/iftop-%{pkg_version}.tar.gz
 Patch0: MAC-address-format.patch
 Patch1: 001-Avoid-32-bit-overflow-for-rates-when-calculating-bar.patch
 Patch2: 002-scale-up-to-tbit.patch
 Patch3: 003-rateidx_init-fix.patch  
 Patch4: 004-iftop-unlimited_text_output.patch
+Patch5: 0001-Prefer-ncurses6w.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -47,10 +49,10 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
-export CFLAGS="%optflags $(ncursesw6-config --cflags)"
-export LDFLAGS="$(ncursesw6-config --libs)"
+autoreconf -fiv
 %configure
 %__make %{?smp_mflags} CPPFLAGS=-DUSE_GETIFADDRS
 
@@ -61,6 +63,6 @@
 %defattr(-,root,root)
 %doc README ChangeLog COPYING TODO
 %{_sbindir}/iftop
-%doc %{_mandir}/man8/iftop.8*
+%{_mandir}/man8/iftop.8*
 
 %changelog

++ 0001-Prefer-ncurses6w.patch ++
>From 5c213cce4f4a8b6a68dec4bca00e5754ff3d9e63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= 
Date: Thu, 3 Jan 2019 10:13:41 -0300
Subject: [PATCH] Prefer ncurses6w.

---
 Makefile.am  |  4 +++-
 configure.ac | 60 ++--
 2 files changed, 5 insertions(+), 59 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4a5ec95..d11953b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,11 +13,13 @@
 sbin_PROGRAMS = iftop 
 #iftop-dump
 
+iftop_CFLAGS = $(NCURSES_CFLAGS) -pthread -Wall -fvisibility=hidden
 iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \
  options.c resolver.c screenfilter.c serv_hash.c \
  sorted_list.c threadprof.c ui_common.c ui.c tui.c util.c \
 addrs_ioctl.c addrs_dlpi.c dlcommon.c \
-stringmap.c cfgfile.c vector.c
+stringmap.c cfgfile.c
+iftop_LDADD = $(NCURSES_LIBS)
 
 #iftop_dump_SOURCES = counter_hash.c hash.c iftop-dump.c  \
 # options.c \
diff --git a/configure.ac b/configure.ac
index b93a206..0d3dc55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,7 @@ AM_INIT_AUTOMAKE
 dnl Make sure we have a C compiler
 AC_PROG_CC
 AC_HEADER_STDC
+AC_USE_SYSTEM_EXTENSIONS
 
 dnl
 dnl Options to configure.
@@ -347,70 +348,13 @@ dnl we use the (apparently obscure) mvchgat function. 
Unfortunately, there's
 dnl a solid chance that mvchgat is a macro, so we can't just use
 dnl AC_SEARCH_LIBS
 dnl
-
-AC_MSG_CHECKING([for a curses library containing mvchgat])
-oldLIBS=$LIBS
-for curseslib in ncursesw curses ncurses ; do
-LIBS="$oldLIBS -l$curseslib"
-AC_TRY_LINK([
-#include <$curseslib.h>
-], [
-mvchgat(0, 0, 1, A_REVERSE, 0, NULL)
-], [
-foundcurseslib=$curseslib
-break
-])
-done
-
-if test x$foundcurseslib = x ; then
-AC_MSG_RESULT([none found])
-AC_MSG_ERROR([Curses! Foiled again!
-  (Can't find a curses library supporting mvchgat.)
-  Consider installing ncurses.])
-else
-AC_MSG_RESULT([-l$foundcurseslib])
-fi
-
+PKG_CHECK_MODULES([NCURSES], [ncursesw])
 
 dnl
 dnl POSIX threads. Different systems like different combinations of flags,
 dnl libraries, etc. We use a test program to figure this stuff out.
 dnl
 
-AC_MSG_CHECKING([POSIX threads compilation])
-thrfail=1
-oldCFLAGS=$CFLAGS
-oldLIBS=$LIBS
-for flag in "" -mt -pthread -thread ; do
-CFLAGS="$oldCFLAGS $flag"
-for lib in "" -lpthread "-lpthread -lposix4" ; do
-

commit iftop for openSUSE:Factory

2014-07-12 Thread h_root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2014-07-12 17:15:14

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new (New)


Package is iftop

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2014-05-08 
12:38:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2014-07-12 
17:15:20.0 +0200
@@ -3,0 +4 @@
+- fix bnc#875625: iftop 0.99.2 memory leakeage



Other differences:
--
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit iftop for openSUSE:Factory

2014-02-14 Thread h_root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2014-02-15 08:05:11

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new (New)


Package is iftop

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2014-01-05 
10:24:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2014-02-15 
08:05:13.0 +0100
@@ -1,0 +2,10 @@
+Fri Feb 14 08:31:54 UTC 2014 - andreas.stie...@gmx.de
+
+- update to 1.0pre4:
+  * Man page documentation of -t mode.
+  * Compile time warning fixes.
+- removed patches:
+  * iftop-implicit-pointer-decl.patch
+- remove autoconf calls previously required
+
+---

Old:

  iftop-1.0pre3.tar.gz
  iftop-implicit-pointer-decl.patch

New:

  iftop-1.0pre4.tar.gz



Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.8ApP3f/_old  2014-02-15 08:05:13.0 +0100
+++ /var/tmp/diff_new_pack.8ApP3f/_new  2014-02-15 08:05:13.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package iftop
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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,13 @@
 Summary:Real-Time Interface Bandwidth Usage
 License:GPL-2.0+
 Group:  Productivity/Networking/Diagnostic
-Version:0.99.3
+Version:0.99.4
 Release:0
-%define pkg_version 1.0pre3
+%define pkg_version 1.0pre4
 Url:http://www.ex-parrot.com/~pdw/iftop/
 BuildRequires:  libpcap-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  automake
 Source0:
http://www.ex-parrot.com/~pdw/iftop/download/iftop-%{pkg_version}.tar.gz
-# Patch1: %name-manpage.patch
-Patch3: iftop-implicit-pointer-decl.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,11 +37,8 @@
 
 %prep
 %setup -q -n %name-%pkg_version
-#patch1 -p0
-%patch3 -p1
 
 %build
-autoreconf -fiv
 export CFLAGS=%optflags $(ncursesw6-config --cflags)
 export LDFLAGS=$(ncursesw6-config --libs)
 %configure
@@ -53,9 +47,6 @@
 %install
 %makeinstall
 
-%clean
-%{?buildroot:%__rm -rf '%{buildroot}'}
-
 %files
 %defattr(-,root,root)
 %doc README ChangeLog COPYING TODO

++ iftop-1.0pre3.tar.gz - iftop-1.0pre4.tar.gz ++
 7518 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit iftop for openSUSE:Factory

2014-01-05 Thread h_root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2014-01-05 10:24:46

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new (New)


Package is iftop

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2013-03-07 
07:21:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2014-01-05 
10:24:47.0 +0100
@@ -1,0 +2,11 @@
+Fri Jan  3 10:50:42 UTC 2014 - pascal.ble...@opensuse.org
+
+- update to 1.0pre3:
+  * bugs and compilation issues were fixed
+  * a text output mode was added.
+
+- drop the following patches, merged upstream:
+  * iftop-manpage.patch
+  * iftop-multicast.patch
+
+---

Old:

  iftop-1.0pre2.tar.gz
  iftop-manpage.patch
  iftop-multicast.patch

New:

  iftop-1.0pre3.tar.gz



Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.KOPmt6/_old  2014-01-05 10:24:47.0 +0100
+++ /var/tmp/diff_new_pack.KOPmt6/_new  2014-01-05 10:24:47.0 +0100
@@ -20,16 +20,15 @@
 Summary:Real-Time Interface Bandwidth Usage
 License:GPL-2.0+
 Group:  Productivity/Networking/Diagnostic
-Version:0.99.2
+Version:0.99.3
 Release:0
-%define real_version 1.0pre2
+%define pkg_version 1.0pre3
 Url:http://www.ex-parrot.com/~pdw/iftop/
 BuildRequires:  libpcap-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  automake
-Source0:%name-%real_version.tar.gz
-Patch1: %name-manpage.patch
-Patch2: %name-multicast.patch
+Source0:
http://www.ex-parrot.com/~pdw/iftop/download/iftop-%{pkg_version}.tar.gz
+# Patch1: %name-manpage.patch
 Patch3: iftop-implicit-pointer-decl.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -39,36 +38,28 @@
 bandwidth usage by pairs of hosts. It is handy for explaining why the
 network links slow.
 
-
-
-Authors:
-
-Paul Warren p...@ex-parrot.com
-Chris Lightfoot ch...@ex-parrot.com
-
 %prep
-%setup -q -n %name-%real_version
-%patch1 -p0
-%patch2 -p1
-%patch3
+%setup -q -n %name-%pkg_version
+#patch1 -p0
+%patch3 -p1
 
 %build
 autoreconf -fiv
 export CFLAGS=%optflags $(ncursesw6-config --cflags)
 export LDFLAGS=$(ncursesw6-config --libs)
 %configure
-%__make %{?jobs:-j%jobs} CPPFLAGS=-DUSE_GETIFADDRS
+%__make %{?smp_mflags} CPPFLAGS=-DUSE_GETIFADDRS
 
 %install
 %makeinstall
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{?buildroot:%__rm -rf '%{buildroot}'}
 
 %files
 %defattr(-,root,root)
 %doc README ChangeLog COPYING TODO
 %{_sbindir}/iftop
-%{_mandir}/man8/*
+%doc %{_mandir}/man8/iftop.8*
 
 %changelog

++ iftop-1.0pre2.tar.gz - iftop-1.0pre3.tar.gz ++
 17803 lines of diff (skipped)

++ iftop-implicit-pointer-decl.patch ++
--- /var/tmp/diff_new_pack.KOPmt6/_old  2014-01-05 10:24:47.0 +0100
+++ /var/tmp/diff_new_pack.KOPmt6/_new  2014-01-05 10:24:47.0 +0100
@@ -1,45 +1,19 @@
 cfgfile.h.orig
-+++ cfgfile.h
-@@ -13,14 +13,14 @@ typedef struct {
- int value;
- } config_enumeration_type;
- 
--int read_config();
-+int read_config(char *file, int whinge_on_error);
- 
- char *config_get_string(const char *directive);
- int config_get_bool(const char *directive);
- int config_get_int(const char *directive, int *value);
- int config_get_float(const char *directive, float *value);
- int config_init();
--
--
-+void config_set_string(const char *directive, const char* s);
-+int config_get_enum(const char *directive, config_enumeration_type 
*enumeration, int *value);
- 
- #endif /* __CFGFILE_H_ */
 iftop.c.orig
-+++ iftop.c
-@@ -3,6 +3,8 @@
-  *
-  */
- 
-+#define NCURSES_NOMACROS 1
-+#define NCURSES_OPAQUE 1
- #include integers.h
- 
- #include stdio.h
-@@ -62,6 +64,8 @@ struct in6_addr if_ip6_addr;
+diff --git a/Makefile.am b/Makefile.am
+index 5009efd..2206245 100644
+--- a/Makefile.am
 b/Makefile.am
+@@ -10,6 +10,7 @@
+ # $Id: Makefile.am,v 1.12 2014/01/01 14:37:31 pdw Exp $
+ #
  
- extern options_t options;
++AM_CPPFLAGS = -include $(top_builddir)/config.h
+ sbin_PROGRAMS = iftop 
+ #iftop-dump
  
-+extern int get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr 
*if_ip_addr, struct in6_addr *if_ip6_addr);
-+
- hash_type* history;
- history_type history_totals;
- time_t last_timestamp;
 cfgfile.c.orig
-+++ cfgfile.c
+diff --git a/cfgfile.c b/cfgfile.c
+index ad1edc8..89f7c6f 100644
+--- a/cfgfile.c
 b/cfgfile.c
 @@ -8,6 +8,7 @@
  #include stdio.h
  #include string.h
@@ -48,19 +22,11 @@
  
  #include stringmap.h
  #include iftop.h
 options.h.orig
-+++ options.h
-@@ -93,5 +93,6 @@ typedef struct {
- 
- void

commit iftop for openSUSE:Factory

2013-03-06 Thread h_root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2013-03-07 07:21:14

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new (New)


Package is iftop, Maintainer is lr...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2012-12-14 
09:18:38.0 +0100
+++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2013-03-07 
07:21:15.0 +0100
@@ -1,0 +2,7 @@
+Tue Mar  5 17:55:17 UTC 2013 - crrodrig...@opensuse.org
+
+- Use ncursesw6
+- fix a number of implicit declarations and 
+  implicit-pointer-decl warnings (iftop-implicit-pointer-decl.patch)
+
+---

New:

  iftop-implicit-pointer-decl.patch



Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.r0KrfX/_old  2013-03-07 07:21:15.0 +0100
+++ /var/tmp/diff_new_pack.r0KrfX/_new  2013-03-07 07:21:15.0 +0100
@@ -26,9 +26,11 @@
 Url:http://www.ex-parrot.com/~pdw/iftop/
 BuildRequires:  libpcap-devel
 BuildRequires:  ncurses-devel
+BuildRequires:  automake
 Source0:%name-%real_version.tar.gz
 Patch1: %name-manpage.patch
 Patch2: %name-multicast.patch
+Patch3: iftop-implicit-pointer-decl.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -48,8 +50,12 @@
 %setup -q -n %name-%real_version
 %patch1 -p0
 %patch2 -p1
+%patch3
 
 %build
+autoreconf -fiv
+export CFLAGS=%optflags $(ncursesw6-config --cflags)
+export LDFLAGS=$(ncursesw6-config --libs)
 %configure
 %__make %{?jobs:-j%jobs} CPPFLAGS=-DUSE_GETIFADDRS
 

++ iftop-implicit-pointer-decl.patch ++
--- cfgfile.h.orig
+++ cfgfile.h
@@ -13,14 +13,14 @@ typedef struct {
 int value;
 } config_enumeration_type;
 
-int read_config();
+int read_config(char *file, int whinge_on_error);
 
 char *config_get_string(const char *directive);
 int config_get_bool(const char *directive);
 int config_get_int(const char *directive, int *value);
 int config_get_float(const char *directive, float *value);
 int config_init();
-
-
+void config_set_string(const char *directive, const char* s);
+int config_get_enum(const char *directive, config_enumeration_type 
*enumeration, int *value);
 
 #endif /* __CFGFILE_H_ */
--- iftop.c.orig
+++ iftop.c
@@ -3,6 +3,8 @@
  *
  */
 
+#define NCURSES_NOMACROS 1
+#define NCURSES_OPAQUE 1
 #include integers.h
 
 #include stdio.h
@@ -62,6 +64,8 @@ struct in6_addr if_ip6_addr;
 
 extern options_t options;
 
+extern int get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr 
*if_ip_addr, struct in6_addr *if_ip6_addr);
+
 hash_type* history;
 history_type history_totals;
 time_t last_timestamp;
--- cfgfile.c.orig
+++ cfgfile.c
@@ -8,6 +8,7 @@
 #include stdio.h
 #include string.h
 #include errno.h
+#include stdlib.h
 
 #include stringmap.h
 #include iftop.h
--- options.h.orig
+++ options.h
@@ -93,5 +93,6 @@ typedef struct {
 
 void options_set_defaults();
 void options_read(int argc, char **argv);
-
+void options_read_args(int argc, char **argv);
+void options_make(void);
 #endif /* __OPTIONS_H_ */
--- configure.in.orig
+++ configure.in
@@ -34,7 +34,9 @@ AM_INIT_AUTOMAKE(iftop, 1.0pre2)
 AC_DEFINE_UNQUOTED(IFTOP_VERSION, $VERSION, [The iftop version number])
 
 dnl Make sure we have a C compiler
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
 AC_HEADER_STDC
 
 dnl
--- Makefile.am.orig
+++ Makefile.am
@@ -10,6 +10,7 @@
 # $Id: Makefile.am,v 1.11 2010/11/27 17:19:25 pdw Exp $
 #
 
+AM_CPPFLAGS = -include $(top_builddir)/config.h
 sbin_PROGRAMS = iftop 
 #iftop-dump
 
--- edline.c.orig
+++ edline.c
@@ -6,6 +6,9 @@
 
 static const char rcsid[] = $Id: edline.c,v 1.2 2002/11/04 12:27:35 chris Exp 
$;
 
+#define NCURSES_NOMACROS 1
+#define NCURSES_OPAQUE 1
+
 #include ctype.h
 #include curses.h
 #include string.h
--- ui.c.orig
+++ ui.c
@@ -3,6 +3,9 @@
  *
  */
 
+#define NCURSES_NOMACROS 1
+#define NCURSES_OPAQUE 1
+
 #include sys/types.h
 
 #include ctype.h
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit iftop for openSUSE:Factory

2012-12-14 Thread h_root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2012-12-14 09:18:06

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new (New)


Package is iftop, Maintainer is lr...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2012-04-12 
09:26:54.0 +0200
+++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2012-12-14 
09:18:38.0 +0100
@@ -1,0 +2,6 @@
+Sun Nov 25 19:30:40 UTC 2012 - sch...@linux-m68k.org
+
+- Properly handle multicast packages
+- Define USE_GETIFADDRS to use getifaddrs for better IPv6 support
+
+---

New:

  iftop-multicast.patch



Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.w9Uziv/_old  2012-12-14 09:18:40.0 +0100
+++ /var/tmp/diff_new_pack.w9Uziv/_new  2012-12-14 09:18:40.0 +0100
@@ -28,6 +28,7 @@
 BuildRequires:  ncurses-devel
 Source0:%name-%real_version.tar.gz
 Patch1: %name-manpage.patch
+Patch2: %name-multicast.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -46,10 +47,11 @@
 %prep
 %setup -q -n %name-%real_version
 %patch1 -p0
+%patch2 -p1
 
 %build
 %configure
-%__make %{?jobs:-j%jobs}
+%__make %{?jobs:-j%jobs} CPPFLAGS=-DUSE_GETIFADDRS
 
 %install
 %makeinstall

++ iftop-multicast.patch ++
From 0c4d60de0626e97fcd965c67378379b5d7980264 Mon Sep 17 00:00:00 2001
From: Andreas Schwab sch...@linux-m68k.org
Date: Sun, 25 Nov 2012 19:26:22 +0100
Subject: [PATCH] Handle incoming multicast packages
Upstream: 
http://lists.beasts.org/pipermail/iftop-users/2012-November/000381.html

---
 iftop.c | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/iftop.c b/iftop.c
index 06778d6..2805cd6 100644
--- a/iftop.c
+++ b/iftop.c
@@ -286,6 +286,14 @@ static void handle_ip_packet(struct ip* iptr, int hw_dir)
 assign_addr_pair(ap, iptr, 1);
 direction = 0;
 }
+else if (IP_V(iptr) == 4  IN_MULTICAST(iptr-ip_dst.s_addr)) {
+assign_addr_pair(ap, iptr, 1);
+direction = 0;
+}
+else if (IP_V(iptr) == 6  IN6_IS_ADDR_MULTICAST(ip6tr-ip6_dst)) {
+assign_addr_pair(ap, iptr, 1);
+direction = 0;
+}
 /*
  * Cannot determine direction from hardware or IP levels.  Therefore 
  * assume that it was a packet between two other machines, assign
@@ -304,6 +312,8 @@ static void handle_ip_packet(struct ip* iptr, int hw_dir)
 direction = 0;
 }
 /* Drop other uncertain packages. */
+else
+return;
 }
 
 if(IP_V(iptr) == 4  options.netfilter != 0) {
-- 
1.8.0

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit iftop for openSUSE:Factory

2012-04-12 Thread h_root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2012-04-12 09:26:53

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new (New)


Package is iftop, Maintainer is lr...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/iftop/iftop.changes  2011-09-23 
02:03:25.0 +0200
+++ /work/SRC/openSUSE:Factory/.iftop.new/iftop.changes 2012-04-12 
09:26:54.0 +0200
@@ -1,0 +2,16 @@
+Mon Apr  2 17:55:26 UTC 2012 - andreas.stie...@gmx.de
+
+- update to 1.0pre2:
+  * reverse IPv6 using all methods except ares
+  * faster switching of graph scale
+  * fixed support for DLT_NULL
+  * fix for segfault on interfaces with no MAC address
+  * improved interface autodetect
+  * a stab at implementing support for radiotap interfaces (DLT 127).
+- updated iftop-manpage.patch to fix manpage formatting warning
+- remove INSTALL from installed files
+- removed revious source
+- removed iftop-1.0-includes_fix.patch
+- removed counter_hash.h
+
+---

Old:

  counter_hash.h
  iftop-1.0-includes_fix.patch
  iftop-1.0pre1.tar.bz2

New:

  iftop-1.0pre2.tar.gz



Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.gdfvAD/_old  2012-04-12 09:26:56.0 +0200
+++ /var/tmp/diff_new_pack.gdfvAD/_new  2012-04-12 09:26:56.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package iftop
 #
-# 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
@@ -15,22 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:   iftop
 Summary:Real-Time Interface Bandwidth Usage
-Version:0.99.1
-Release:1
-%define real_version 1.0pre1
 License:GPL-2.0+
 Group:  Productivity/Networking/Diagnostic
+Version:0.99.2
+Release:0
+%define real_version 1.0pre2
 Url:http://www.ex-parrot.com/~pdw/iftop/
 BuildRequires:  libpcap-devel
 BuildRequires:  ncurses-devel
-Source0:%name-%real_version.tar.bz2
-Source1:counter_hash.h
-Patch0: iftop-1.0-includes_fix.patch
+Source0:%name-%real_version.tar.gz
 Patch1: %name-manpage.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 
@@ -49,15 +45,11 @@
 
 %prep
 %setup -q -n %name-%real_version
-%patch0 -p0
 %patch1 -p0
-install -m644 %{SOURCE1} .
 
 %build
-export CFLAGS=%{optflags} -fno-strict-aliasing \
-export CPPFLAGS=-I%{_includedir}/pcap \
 %configure
-make %{?jobs:-j%jobs} iftop
+%__make %{?jobs:-j%jobs}
 
 %install
 %makeinstall
@@ -67,9 +59,8 @@
 
 %files
 %defattr(-,root,root)
-%doc README ChangeLog COPYING TODO INSTALL
+%doc README ChangeLog COPYING TODO
 %{_sbindir}/iftop
-%{_sbindir}/iftop-dump
 %{_mandir}/man8/*
 
 %changelog

++ iftop-manpage.patch ++
--- /var/tmp/diff_new_pack.gdfvAD/_old  2012-04-12 09:26:56.0 +0200
+++ /var/tmp/diff_new_pack.gdfvAD/_new  2012-04-12 09:26:56.0 +0200
@@ -1,7 +1,7 @@
 Index: iftop.8
 ===
 iftop.8.orig
-+++ iftop.8
+--- iftop.8.orig   2011-10-02 22:05:40.0 +0100
 iftop.82012-04-02 18:36:00.0 +0100
 @@ -113,7 +113,6 @@ instance,
  foo.example.com  =  bar.example.com  1Kb  500b   100b
   =   2Mb2Mb2Mb
@@ -10,3 +10,11 @@
  .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,
+@@ -196,7 +195,6 @@ directive is a name value pair, for exam
+ 
+ interface: eth0
+ 
+-.Sp
+ .fi
+ sets the network interface.  The following config directives are supported:
+ 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit iftop for openSUSE:Factory

2011-12-06 Thread h_root 
Hello community,

here is the log from the commit of package iftop for openSUSE:Factory checked 
in at 2011-12-06 18:19:14

Comparing /work/SRC/openSUSE:Factory/iftop (Old)
 and  /work/SRC/openSUSE:Factory/.iftop.new (New)


Package is iftop, Maintainer is lr...@suse.com

Changes:




Other differences:
--
++ iftop.spec ++
--- /var/tmp/diff_new_pack.deGgfH/_old  2011-12-06 18:33:32.0 +0100
+++ /var/tmp/diff_new_pack.deGgfH/_new  2011-12-06 18:33:32.0 +0100
@@ -23,7 +23,7 @@
 Version:0.99.1
 Release:1
 %define real_version 1.0pre1
-License:GPLv2+
+License:GPL-2.0+
 Group:  Productivity/Networking/Diagnostic
 Url:http://www.ex-parrot.com/~pdw/iftop/
 BuildRequires:  libpcap-devel

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit iftop for openSUSE:Factory

2011-04-26 Thread h_root 

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.0 +0100
+++ /mounts/work_src_done/STABLE/iftop/iftop.changes2011-04-11 
21:43:26.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.VAdsP9/_new  2011-04-26 09:00:04.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.VAdsP9/_new  2011-04-26 09:00:04.0 +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