gentoo resync : 02.09.2020

3 files changed, 76 insertions, 0 deletions

diff --git a/net-analyzer/trafshow/Manifest b/net-analyzer/trafshow/Manifest
index 1f0a75e2a7fc..1541c358de3e 100644
--- a/net-analyzer/trafshow/Manifest
+++ b/net-analyzer/trafshow/Manifest
@@ -1,6 +1,8 @@
 AUX trafshow-5.2.3-gcc44.patch 215 BLAKE2B 37fb9bc3a8a27506bb367b9c4d2e7c8c01f5371e2b3bf28acba6dbb2f846d6be0064728a020e660d7549aa10e373fdb9fa15736284a8845919f245bac3626678 SHA512 64157530b0605758f083bdccc6729d9f785d08f343fa2d6de22b0f60533c75c8e522ea891a31a3f8137af95075c5004b7b520c8e2dd252ab772b7b9ac6de8212
 AUX trafshow-5.2.3-gentoo.patch 638 BLAKE2B 378c458585d055957976965f2ec6b770a8fb6a9fe1dad6be5450489f4de8ddbe4d4305626f245ec892fc6590342490aaa0f6567ee2799b9259c65a22519d8636 SHA512 fccba5018a5fd7c1665bc8004507d7689a101dee10560c007e68a77a4c07824ae10954fb3e9555abe3991c495e2bd235bdbb41e3ca027355a1d0a08ea3aff686
+AUX trafshow-5.2.3-pcap_init.patch 841 BLAKE2B f338a21de4f75acda08b1fc1f795edca3928ee3ec8bc7bc64ddcf7af5883947be6fda6b8bd5c8b847966e1cfd8c7b826641375dd676d5a72b215785675007715 SHA512 510d7d972cc9a90fc3d39b96d04e588b82409479cf470445cc22e90126cf72cf4799929cbcc8381f6ad450f8ab04af2fef229d9dd9667afae41c3f8b7656e746
 AUX trafshow-5.2.3-tinfo.patch 1864 BLAKE2B c2f908bd07cc31ad5c555e7e4055fb1f3378986cf032e26fbfe33e6213f528120cd9813fa73b0723f1a4f772149e793926cc3daef93a215ae910cd2dae1816d8 SHA512 55414a2f014f046b76c678aa6801ed6d5cb1cd9215854b1e0491192b06e42b71aad88a37507a446d13571cf95796807af06a3094f9167a507b3c4e8f1d3bd056
 DIST trafshow-5.2.3.tgz 142615 BLAKE2B c13ee7c39d598dc78e58b65b49a439ecc9e5630a24f78d2bc5a8ec39fc6aa15c084a291f8e932027108176e7aeeebbf5fb7e2380a64718273e67073869b7d5e9 SHA512 9ea57c319cb177de2d29eaf2a09c06f0bd7efcfc3e50d5fa5cc18f193c6dfc0109d4388ccbaee7bf2db37b5418fc0f4b6ce47a5558b652ecf9e891a813ef8540
+EBUILD trafshow-5.2.3-r1.ebuild 914 BLAKE2B 270b9a7a20ddb8d0c6aa99eb88dc4182d01d38f779f76a081ed257d80216b76853c6b5ed25820b166ee57d0e52e6c5f810e8461cb823acd86820c939c89bb403 SHA512 9b228160ab86170ed22d60ba78aeea7bbd8845b941ff0795551838dc99383d5bb64389bdd080d5b1651ec5928a39c02589a593acf3916e74ea7ff33337fa6e5f
 EBUILD trafshow-5.2.3.ebuild 846 BLAKE2B 25e04654fe1e4df05bc428e5ef57c8df0a2c87f6b268740cc506f534149c0a09f347b74a31a812f0ad56c2618aee28c64ce7abea460d68a2b93acf9651bb2c43 SHA512 548e0a060fd84841d71720c80f09ef2b13eea314d07522b534f2de7eb30669bd21b6d47a0c9331fad1e398e922d6e1e0719435367c27b0fd68a1ff50fe3a7943
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/trafshow/files/trafshow-5.2.3-pcap_init.patch b/net-analyzer/trafshow/files/trafshow-5.2.3-pcap_init.patch
new file mode 100644
index 000000000000..046795a58328
--- /dev/null
+++ b/net-analyzer/trafshow/files/trafshow-5.2.3-pcap_init.patch
@@ -0,0 +1,29 @@
+--- a/trafshow.c
++++ b/trafshow.c
+@@ -58,7 +58,7 @@
+ static void vers();
+ static void usage();
+ static pcap_if_t *pcap_matchdev(pcap_if_t *dp, const char *name);
+-static int pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp);
++static int ts_pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp);
+ static void *pcap_feed(void *arg); /* PCAP_HANDLER *ph */
+ #ifdef	HAVE_PCAP_GET_SELECTABLE_FD
+ static void *pcap_feed2(void *arg); /* PCAP_HANDLER *ph */
+@@ -172,7 +172,7 @@
+ 	}
+ 
+ 	/* initialize list of pcap handlers */
+-	if ((op = pcap_init(&ph_list, dev_list)) < 1) {
++	if ((op = ts_pcap_init(&ph_list, dev_list)) < 1) {
+ 		fprintf(stderr, "No packet capture device available (no permission?)\n");
+ 		exit(1);
+ 	}
+@@ -298,7 +298,7 @@
+ }
+ 
+ static int
+-pcap_init(ph_list, dp)
++ts_pcap_init(ph_list, dp)
+ 	PCAP_HANDLER **ph_list;
+ 	pcap_if_t *dp;
+ {
diff --git a/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild b/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild
new file mode 100644
index 000000000000..ce61398d05f8
--- /dev/null
+++ b/net-analyzer/trafshow/trafshow-5.2.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Full screen visualization of the network traffic"
+HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
+SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="slang"
+
+DEPEND="
+	net-libs/libpcap
+	!slang? ( sys-libs/ncurses )
+	slang? ( >=sys-libs/slang-1.4 )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc44.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-pcap_init.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
+
+src_prepare() {
+	default
+	cat /usr/share/aclocal/pkg.m4 >> aclocal.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	if ! use slang; then
+		# No command-line option so pre-cache instead
+		export ac_cv_have_curses=ncurses
+		export LIBS=-lncurses
+	fi
+
+	default
+}