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.changes 2019-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 <rob...@fedoraproject.org> 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, &ifr) == -1) || (ifr.ifr_flags & IFF_UP)) { + if ((s == -1) || (ioctl(s, SIOCGIFFLAGS, &ifr) == -1) || (ifr.ifr_flags & IFF_RUNNING)) { i = xstrdup(nameindex[j].if_name); break; }
