gentoo resync : 19.01.2018

5 files changed, 62 insertions, 114 deletions

diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index 8b452bcc1b12..51455f573c2b 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -1,11 +1,10 @@
 AUX ax_pthread.m4 12983 BLAKE2B b1cbb45242493f9bf998ec82cf754b894d77ee4e1d3ed33b2e44e52c63c3114809ad4e42253579f9b3177a2b3de60aa8dac26311191b0ce7e82cf1f25f1a2123 SHA512 93c7ba3bb00712308de95273563f41814d05a6650ae2eec25f2b198f757b7f0206ae2e5679ff436da939be9bd962f37317978759ac08c1d14df0beb03440f84a
 AUX iftop-1.0_pre4-Makefile.am.patch 378 BLAKE2B 52029c14bc6afcd4d8cb86099fa78f00720af3d26384cdf059d005d768b8c226b459b5c1ebe2c936f20bb1afa033aa4560c488f98400b6cef162ebdcff3b7e03 SHA512 c7a81669de83701054493ee0f9979da8bfa481bd0769a501364598889cfb5aa762473e5099904ee13dad9052bfdd27913306df8ad4a91132532ac874504321fa
 AUX iftop-1.0_pre4-configure.ac.patch 9916 BLAKE2B deab542e4b33905e0ad215aa70498671cf5c4f7118a1ab3b8639bd992f540068a0cd3c7f846120686662825db864be9e3307cc1691b1ef86c8bc73b0e847d0f0 SHA512 5b83cdb69805d3ed8b188b1390d1d536dc99732312fa49951fad38810c7eb9c931d04daaaea7152d5289352dd3d167907ac5a25a994e4b1584b7b5a578fc0698
-AUX iftop-1.0_pre4-pthread.patch 1462 BLAKE2B 4345e571afe5830b51da3798df6c8ad1e2417f4d0579cc86750f51b9dc4ed3a1dfd92e5a3e792db467564c363f63beb2d6bfbac9a616ac6a80d37aafbf995e5e SHA512 0befb38a673d826f25319517d64e4aecea641cdc8626ab51bd468dc0e2f23c779854fbfd9e7cfe51e30ecdf04e3c831fc793ab5e402df3c8153044c679add2b8
-AUX iftop-1.0_pre4-tinfo.patch 1560 BLAKE2B d9c3d6363c718fba0148753acfe0c99e04f2fe447fe0f7b03459bc37818b7654322c26eafd3f21ccd03ee323d855a2d20c17828ad4d17250df3cea49f8fdc40a SHA512 d47095fdc65f0dea60471d0c927ab7bf4d51129826bfbf1cc95233054a8d17d36de7e86042c7d2ac0faa0b27f3ced169b5063cc8d36dcf78c548a920ae59f4e2
+AUX iftop-1.0_pre4-ip6.arpa.patch 1857 BLAKE2B 920b5393366d0fe1ccf7619a862fb6a919abcaf578babc2d7de05b7828a7c847a2ad65ece44e91bab29aead849d0f65bffae0ed680e03fe07f218a15cefe13fd SHA512 8fed0043412a25a702d252f0bbf36b199c9222c18ac9bb47ef725885a9faaacb12bf6e5debd5885544ace68065bfda12c2b6ccf7e11f2834cf3f86f6657bfcba
 AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 BLAKE2B 42318fa63e40a2a0b3f50d33c6ca3fef69c837290272f132d63dde276a4302254378f8ab31ab49dbb0b50e821594a2979c713f9119eb4ec852971b585648b344 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf
 AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2fa0642455ed6e4c18024a19b656bb9d42eefd4e2db2ea066dae28528ad51f12b439307f0a SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b
 DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22
 EBUILD iftop-1.0_pre4-r2.ebuild 942 BLAKE2B 15e691dc44693bba16bf4a326419f69bb0fef3698262f017e4becb3828e3fec88f5818997da86dd39fd021d316087a4b32fe0c8c6120ab0902f665b43312a8de SHA512 99a36fad0f615711d836ee6e8aa8c4c370c609944cd8fd0d66e40cb3b0b4f8bd0605a5c193a33f1a557ec13a74d63288c4e93a76669f45398183f02bbdfe7898
-EBUILD iftop-1.0_pre4.ebuild 878 BLAKE2B 33e5de1fabe37241a52c18f47168187be9321197bf8513f6b92fea4002dc16567864c55603b39c6b37e1e8c7068b365a5a1edf6c9dfe5e5ef1c822bc86a6b1fa SHA512 343e55b2ce782d9c7e15d9c0e12620c16ae222a5666258215eac083f6a87721fa64ecadfaa83b39bf691b65925ed11f82c6044421f751da5fc2bf7a3bff8705c
+EBUILD iftop-1.0_pre4-r3.ebuild 977 BLAKE2B 942285e9896f3cd1b4431a41ce75ac55131dfe2ae7b0978596327a9df4d238d9088e2952f958a5eca725e99f4f0c8b7a06533020c7531b6e5ef3393cbd74084e SHA512 9d3e84519fcd745d055dc8c1fea5525f25d08ddf30bb8894cef7d2af3631d2d5fa5aa5368026c5092f5bce2a60f663db7245de2d82ede451eb57ff06d4f78ac1
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
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 000000000000..706db4546db9
--- /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/files/iftop-1.0_pre4-pthread.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
deleted file mode 100644
index ce04c46a65ef..000000000000
--- 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 bb14b3c6ca47..000000000000
--- 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-r3.ebuild
index 84f5ff4d23af..037c80722a7e 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI=6
 inherit autotools eutils
 
 DESCRIPTION="display bandwidth usage on an interface"
@@ -11,25 +10,28 @@ 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=""
+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="
+	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() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-
+	default
 	# bug 490168
 	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
-	epatch "${FILESDIR}"/${P}-pthread.patch
 
 	eautoreconf
 }