* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/iftop/, net-analyzer/iftop/files/
@ 2018-01-17 11:23 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-01-17 11:23 UTC (permalink / raw
To: gentoo-commits
commit: c3e15bc6bfa9b4d08ede38baa872135d04a74ae0
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 11:16:53 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 11:16:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e15bc6
net-analyzer/iftop: Old.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../iftop/files/iftop-1.0_pre4-pthread.patch | 46 ------------------
.../iftop/files/iftop-1.0_pre4-tinfo.patch | 55 ----------------------
net-analyzer/iftop/iftop-1.0_pre4.ebuild | 42 -----------------
3 files changed, 143 deletions(-)
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
deleted file mode 100644
index ce04c46a65e..00000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,39 +383,10 @@
- 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
-- LIBS="$oldLIBS $lib"
-- AC_LINK_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])], [
-- foundthrlib=$lib
-- foundthrflag=$flag
-- thrfail=0
-- break
-- ])
-- done
-- if test $thrfail = 0 ; then
-- break
-- fi
--done
--
--if test $thrfail = 1 ; then
-- AC_MSG_RESULT([no idea])
-- AC_MSG_ERROR([can't figure out how to compile with POSIX threads
-- If your system actually supports POSIX threads, this means we've messed up.])
--fi
--
--AC_MSG_RESULT([CFLAGS=$foundthrflag and LIBS=$foundthrlib])
--AC_MSG_CHECKING([POSIX threads usability])
--AC_RUN_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])],
-- [AC_MSG_RESULT([yes])],
-- [AC_MSG_ERROR(
-- [it fails. We probably guessed the wrong CFLAGS.])],
-- [AC_MSG_RESULT([can't test because we are cross-compiling])])
-+AX_PTHREAD(
-+ [LIBS="$PTHREAD_LIBS $LIBS"
-+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"],
-+ AC_MSG_ERROR([Could not find out how to enable POSIX threads]))
-
- dnl
- dnl Are we on a system (like Solaris) that requires promiscuous mode in order to
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
deleted file mode 100644
index bb14b3c6ca4..00000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,7 +25,7 @@ iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \
- # addrs_ioctl.c addrs_dlpi.c dlcommon.c \
- # stringmap.c cfgfile.c
-
--
-+iftop_LDADD = $(ncurses_LIBS)
-
- noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \
- integers.h ip.h llc.h ns_hash.h options.h resolver.h \
---- a/configure.ac
-+++ b/configure.ac
-@@ -348,29 +348,27 @@
- 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([
-+PKG_CHECK_MODULES([ncurses], [ncursesw], [foundcurseslib="$ncurses_LIBS"], [
-+ PKG_CHECK_MODULES([ncurses], [ncurses], [foundcurseslib="$ncurses_LIBS"], [
-+ 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
-+ foundcurseslib=-l$curseslib
- break
- ])
--done
--
--if test x$foundcurseslib = x ; then
-- AC_MSG_RESULT([none found])
-+ done
-+ ],
- AC_MSG_ERROR([Curses! Foiled again!
- (Can't find a curses library supporting mvchgat.)
- Consider installing ncurses.])
--else
-- AC_MSG_RESULT([-l$foundcurseslib])
--fi
--
-+ )
-+])
-
- dnl
- dnl POSIX threads. Different systems like different combinations of flags,
diff --git a/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4.ebuild
deleted file mode 100644
index 84f5ff4d23a..00000000000
--- a/net-analyzer/iftop/iftop-1.0_pre4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="display bandwidth usage on an interface"
-SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
-HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="
- net-libs/libpcap
- sys-libs/ncurses:0="
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-
-S="${WORKDIR}"/${P/_/}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-tinfo.patch
-
- # bug 490168
- cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
- epatch "${FILESDIR}"/${P}-pthread.patch
-
- eautoreconf
-}
-
-src_install() {
- dosbin iftop
- doman iftop.8
-
- dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/iftop/, net-analyzer/iftop/files/
@ 2018-01-17 11:23 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-01-17 11:23 UTC (permalink / raw
To: gentoo-commits
commit: dc01387f569899d7355515cd0c00a3954781cbbf
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 17 11:22:56 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Jan 17 11:22:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc01387f
net-analyzer/iftop: Add upstream patch to fix IPv6 DNS resolution suggested by Michael Bazzinotti.
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../iftop/files/iftop-1.0_pre4-ip6.arpa.patch | 48 ++++++++++++++++++++++
net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild | 44 ++++++++++++++++++++
2 files changed, 92 insertions(+)
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-ip6.arpa.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-ip6.arpa.patch
new file mode 100644
index 00000000000..706db4546db
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-ip6.arpa.patch
@@ -0,0 +1,48 @@
+From 35af3cf65f17961d173b31fd3b00166ec095c226 Mon Sep 17 00:00:00 2001
+From: Paul Warren <pdw@mythic-beasts.com>
+Date: Mon, 6 Feb 2017 21:35:37 +0000
+Subject: [PATCH] Fix bug with DNS resolution. https://bugzilla.redhat.com/show_bug.cgi?id=1120254
+
+---
+ resolver.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/resolver.c b/resolver.c
+index adddbc1..a3123bd 100644
+--- a/resolver.c
++++ b/resolver.c
+@@ -438,11 +438,11 @@ void resolver_worker(void* ptr) {
+ char **ch_pp;
+ void **void_pp;
+ } u_old = { &old };
+- if(hash_find(ns_hash, &addr, u_old.void_pp) == HASH_STATUS_OK) {
++ if(hash_find(ns_hash, &addr.as_addr6, u_old.void_pp) == HASH_STATUS_OK) {
+ hash_delete(ns_hash, &addr);
+ xfree(old);
+ }
+- hash_insert(ns_hash, &addr, (void*)hostname);
++ hash_insert(ns_hash, &addr.as_addr6, (void*)hostname);
+ }
+
+ }
+@@ -488,7 +488,7 @@ void resolve(int af, void* addr, char* result, int buflen) {
+
+ pthread_mutex_lock(&resolver_queue_mutex);
+
+- if(hash_find(ns_hash, raddr, u_hostname.void_pp) == HASH_STATUS_OK) {
++ if(hash_find(ns_hash, &raddr->as_addr6, u_hostname.void_pp) == HASH_STATUS_OK) {
+ /* Found => already resolved, or on the queue, no need to keep
+ * it around */
+ free(raddr);
+@@ -497,7 +497,7 @@ void resolve(int af, void* addr, char* result, int buflen) {
+ hostname = xmalloc(INET6_ADDRSTRLEN);
+ inet_ntop(af, &raddr->addr, hostname, INET6_ADDRSTRLEN);
+
+- hash_insert(ns_hash, raddr, hostname);
++ hash_insert(ns_hash, &raddr->as_addr6, hostname);
+
+ if(((head + 1) % RESOLVE_QUEUE_LENGTH) == tail) {
+ /* queue full */
+--
+libgit2 0.26.0
+
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
new file mode 100644
index 00000000000..037c80722a7
--- /dev/null
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="display bandwidth usage on an interface"
+SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
+HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+RDEPEND="
+ net-libs/libpcap
+ sys-libs/ncurses:0=
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+S="${WORKDIR}"/${P/_/}
+PATCHES=(
+ "${FILESDIR}"/${P}-configure.ac.patch
+ "${FILESDIR}"/${P}-Makefile.am.patch
+ "${FILESDIR}"/${P}-tsent-set-but-not-used.patch
+ "${FILESDIR}"/${P}-ip6.arpa.patch
+)
+
+src_prepare() {
+ default
+ # bug 490168
+ cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
+
+ eautoreconf
+}
+
+src_install() {
+ dosbin iftop
+ doman iftop.8
+
+ dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/iftop/, net-analyzer/iftop/files/
@ 2019-02-07 17:50 Ben Kohler
0 siblings, 0 replies; 4+ messages in thread
From: Ben Kohler @ 2019-02-07 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 4b42f9409144423996b0240fbc49654a15788112
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 7 17:49:59 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Feb 7 17:50:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b42f940
net-analyzer/iftop: revbump for MAC formatting patch
Closes: https://bugs.gentoo.org/661890
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../files/iftop-1.0_pre4-fix-MAC-formatting.patch | 22 +++++++++++
net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild | 45 ++++++++++++++++++++++
2 files changed, 67 insertions(+)
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-fix-MAC-formatting.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-fix-MAC-formatting.patch
new file mode 100644
index 00000000000..d68a8095dce
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-fix-MAC-formatting.patch
@@ -0,0 +1,22 @@
+From: Xiaoguang Sun <sun.xiaoguang@yoyosys.com>
+Date: Tue, 11 Mar 2014 13:18:46 +0100
+Subject: MAC address format
+
+Forwarded: http://lists.beasts.org/pipermail/iftop-users/2014-March/000413.html
+---
+ iftop.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/iftop.c b/iftop.c
+index a090dcf..883782e 100644
+--- a/iftop.c
++++ b/iftop.c
+@@ -713,7 +713,7 @@ void packet_init() {
+ if(have_hw_addr) {
+ fprintf(stderr, "MAC address is:");
+ for (i = 0; i < 6; ++i)
+- fprintf(stderr, "%c%02x", i ? ':' : ' ', (unsigned int)if_hw_addr[i]);
++ fprintf(stderr, "%c%02x", i ? ':' : ' ', (unsigned char)if_hw_addr[i]);
+ fprintf(stderr, "\n");
+ }
+
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
new file mode 100644
index 00000000000..890ba6ff2ae
--- /dev/null
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="display bandwidth usage on an interface"
+SRC_URI="http://www.ex-parrot.com/pdw/iftop/download/${P/_/}.tar.gz"
+HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+RDEPEND="
+ net-libs/libpcap
+ sys-libs/ncurses:0=
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+S="${WORKDIR}"/${P/_/}
+PATCHES=(
+ "${FILESDIR}"/${P}-configure.ac.patch
+ "${FILESDIR}"/${P}-Makefile.am.patch
+ "${FILESDIR}"/${P}-tsent-set-but-not-used.patch
+ "${FILESDIR}"/${P}-ip6.arpa.patch
+ "${FILESDIR}"/${P}-fix-MAC-formatting.patch
+)
+
+src_prepare() {
+ default
+ # bug 490168
+ cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
+
+ eautoreconf
+}
+
+src_install() {
+ dosbin iftop
+ doman iftop.8
+
+ dodoc AUTHORS ChangeLog README "${FILESDIR}"/iftoprc
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/iftop/, net-analyzer/iftop/files/
@ 2020-01-31 22:45 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2020-01-31 22:45 UTC (permalink / raw
To: gentoo-commits
commit: ad78c19ac37adfc6e36779dfe1d762f87c671a66
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 31 22:45:30 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Jan 31 22:45:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad78c19a
net-analyzer/iftop: Fix CFLAGS=-fno-common
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Closes: https://bugs.gentoo.org/show_bug.cgi?id=707420
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
.../iftop/files/iftop-1.0_pre4-fno-common.patch | 56 ++++++++++++++++++++++
net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild | 3 +-
net-analyzer/iftop/iftop-9999999.ebuild | 3 +-
3 files changed, 60 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch
new file mode 100644
index 00000000000..13e0f1058f4
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-fno-common.patch
@@ -0,0 +1,56 @@
+--- a/ui_common.c
++++ b/ui_common.c
+@@ -28,6 +28,13 @@
+ extern int history_pos;
+ extern int history_len;
+
++sorted_list_type screen_list;
++host_pair_line totals;
++int peaksent, peakrecv, peaktotal;
++history_type history_totals;
++hash_type* screen_hash;
++hash_type* service_hash;
++
+ /*
+ * Compare two screen lines based on bandwidth. Start comparing from the
+ * specified column
+--- a/ui_common.h
++++ b/ui_common.h
+@@ -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);
+--- a/ui.c
++++ b/ui.c
+@@ -253,7 +253,6 @@
+ }
+ }
+
+-extern history_type history_totals;
+
+
+ void ui_print() {
+--- a/iftop.c
++++ b/iftop.c
+@@ -66,7 +66,6 @@
+ extern options_t options;
+
+ hash_type* history;
+-history_type history_totals;
+ time_t last_timestamp;
+ time_t first_timestamp;
+ int history_pos = 0;
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
index 8221ce61ddb..3f9d11ed9b4 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -26,6 +26,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0_pre4-tsent-set-but-not-used.patch
"${FILESDIR}"/${PN}-1.0_pre4-ip6.arpa.patch
"${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch
+ "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch
)
S="${WORKDIR}"/${P/_/}
diff --git a/net-analyzer/iftop/iftop-9999999.ebuild b/net-analyzer/iftop/iftop-9999999.ebuild
index 5e2de84db47..f67befd3bc2 100644
--- a/net-analyzer/iftop/iftop-9999999.ebuild
+++ b/net-analyzer/iftop/iftop-9999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0_pre4-configure.ac.patch
"${FILESDIR}"/${PN}-1.0_pre4-Makefile.am.patch
"${FILESDIR}"/${PN}-1.0_pre4-fix-MAC-formatting.patch
+ "${FILESDIR}"/${PN}-1.0_pre4-fno-common.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-31 22:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-17 11:23 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/iftop/, net-analyzer/iftop/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2018-01-17 11:23 Jeroen Roovers
2019-02-07 17:50 Ben Kohler
2020-01-31 22:45 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox