gentoo resync : 05.02.2020

3 files changed, 96 insertions, 0 deletions

diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
index 2aedd7c23223..0213f46c469d 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -1,9 +1,11 @@
 AUX netwatch-1.3.0.1-append_ldflags.patch 558 BLAKE2B cdfe908ef103ba484ab6e375dabd6b7bd60bd1c93d4b834d1da640a73ce3912541f75632ac8ee51c3dbf38a4168b7301c73c3986bbe043890071da761f4e73dd SHA512 afee222f8f0c18de7b1c5f62d0f3705e40dccb09827410c67f61da9a0dc951c2d01b0e02cc4b6154d17ef8aaa625dd4265c4514a97d7df9dd9dc14da8a851338
 AUX netwatch-1.3.0.1-do-not-call.patch 307 BLAKE2B 686d4d6d5ada26620ca8a2b02021be1fef17d3ba8da8149bb7dc037c386e1590f44a62357d779ce87732496cc8f9957a1df9e29947f6def7d18cf4e8b3dc29cb SHA512 988516e66e0f02edd484854488fe232c6ae8158d135a2e26837b9c2178650111cf2d33c29bee3f9c0b01b21d7ded0eebf93b39fa7a714a04e3d99f490f7690ea
 AUX netwatch-1.3.0.1-fix-fortify.patch 313 BLAKE2B 1f5d672118dfd3ef9b907e77b8a575f1e025d66b584dc4c74ac500ccf03a353dda5841a19a920a97224cd6fe784adfb40878ccd43ed82387d0ffa4ffd76f2ccb SHA512 ed33d1df73293c172982f016d033bf2bd35fca50e89e20433ae867b418446a44614da49b161f190c7579b21cfb1d01e514fc77fddb3ca5f469f0daec2acab0cf
+AUX netwatch-1.3.0.1-fno-common.patch 1075 BLAKE2B a2329a590a088ff0a5b4e985945d6f92cbe02dd2865ed0f4caaa356671aba03cabbf9850c3f0651416fc93d5e794b528b72814d478fe32d90b1cb5f8dfb5504f SHA512 a257ce4ca20abcdc268cdf86a2ceee683f016f67af78622f620f18d9aaa4a0f3c0cfbae0edf8fefa718996d86353f094a4c6b886edda6ccd906f408398377789
 AUX netwatch-1.3.0.1-includes.patch 489 BLAKE2B 9528ed80f11b33652824e9239022b85e1ec8331b2b1e31c5000d8f8ae863d572fd12d15d003b829c4487faee09b28fd29ec51579072b2a731f01990b597ddfbf SHA512 dd1005f58772aeef3909342df0b4a1f14bbd509b51361ab52f752b274fb51ab3a45a93b6af4feaaedb4fbace94ae55c7e153c9f1eb8257f66549c72a957885f1
 AUX netwatch-1.3.0.1-open.patch 446 BLAKE2B 37fcc069b4fa7867cb1ec2bffd2930fb7fcc6b89a215c979bc3086b3d4a5834af9a4c461dc24ffee4163c6d544f1e3f2eaf2fba7e638eb0ceecd11e1c00396e0 SHA512 1de8f6290efcce43eac22d65c5c266d9048ad7346c654bcbaa65f325d380e180ddbc9586836a8334c416c608e5abeee1e49281e3bb226b709e57763138fa7f54
 AUX netwatch-1.3.0.1-tinfo.patch 1444 BLAKE2B 9160adbe768a7306bd46a832e4761864c6d05347d310fe130427fde56958714edeef121e56879ffeb3263ead7b2b53fc45b41ccf5b79611bc9b8b4d89c80b9f4 SHA512 675545527013a67de3a8dc32fab9b197f90d7ff24847e6e2d6959dd97ff4bc2838446807c7948d68c34790aac1d45d322506f94b99c47534af5d33e1bf85903d
 DIST netwatch-1.3.0-1.tgz 187936 BLAKE2B 9b7b9f822f344eb707977b13cfb603e5bfe8387d04b826182e667740953ef1315b646c521995185190b1dffa5d725f0001f1f6bdeca11ce1332786ca571421b7 SHA512 c0feddf01d118c7d8ff1fd8344692db5ad6f1bbaf375a7ed296756314454a7b1fb430f73d698156aca7a4391578215b3e6cb0f899044be228827a0acb4caba2a
 EBUILD netwatch-1.3.0.1-r3.ebuild 1004 BLAKE2B d671a299e4e4ad06b26774c37b4b8fbe3d47bac238927e48c7f9c7efbf62501ebac117e5c7787d82abb57d722586b92bc92b65e8795302f1cd70cbcb49d88391 SHA512 75964e3687c8323ba835b249de104cf8b49e6de8bff300bd0229c5dbe3fb835ffddc4d4b01477b87992a5ae58c3c434398f609ea82648f99febca3a51e197c59
+EBUILD netwatch-1.3.0.1-r4.ebuild 1000 BLAKE2B 86158179f80a298a250376ed784d0275e8f9e9c54b5c8d390d445fcab3edfe3dc17bd55a13d332a3ef5e4703d5bbd6b887bb9d0d8b9830206bbf729f0abb37f9 SHA512 78b635977bfae6c3997a213ceed364c33b64d76767475f4e37a0d9ce5f42fb13aa9799a1b9a2c5c612df3b753f375f006098f950cf6ddf69ede5b4dc4a6d5cdc
 MISC metadata.xml 274 BLAKE2B 75e74aa7e81d0d0097bcd02f91b106e38607e8c17cd10ecf224e3423d3b117d6110bfd0345a723b1e84a4b5d63ab07e8be1661e71f83eaaffcf6164d780e8858 SHA512 1d248e6ffe1a07fd1e2d6ca9f83f8108d8d5941b5067860e8c8daf5cf383446d21008f9fc1555fa6d3b045138173661e0426fb68b923969ffec027bc858bd53d
diff --git a/net-analyzer/netwatch/files/netwatch-1.3.0.1-fno-common.patch b/net-analyzer/netwatch/files/netwatch-1.3.0.1-fno-common.patch
new file mode 100644
index 000000000000..02331e7deead
--- /dev/null
+++ b/net-analyzer/netwatch/files/netwatch-1.3.0.1-fno-common.patch
@@ -0,0 +1,44 @@
+--- a/dispdata.c
++++ b/dispdata.c
+@@ -173,7 +173,6 @@
+ extern int simchange;
+ extern int simfwdir;
+ extern int simarr[8];
+-char *simfmt;
+ extern int iseth;
+ extern int nw_logall;
+ extern char nw_allname[256];
+--- a/netwatch.c
++++ b/netwatch.c
+@@ -161,6 +161,9 @@
+ char mylog[MAXFILENAME] = "/root/.log";
+ char specconfigfile[MAXFILENAME] = "/root/.netwatch.conf";
+ 
++struct port_info *tcp_port_types[TCPHASH];
++struct port_info *udp_port_types[UDPHASH];
++
+ int fdlog;
+ 
+ #if defined(_LINUX_IF_ETHER_H) || defined(_NETINET_IF_ETHER_H)
+--- a/netwatch.h
++++ b/netwatch.h
+@@ -209,16 +209,17 @@
+ };
+ 
+ #define TCPHASH 1786
+-struct port_info *tcp_port_types[TCPHASH];
++extern struct port_info *tcp_port_types[TCPHASH];
+ 
+ #define UDPHASH 1786
+-struct port_info *udp_port_types[UDPHASH];
++extern struct port_info *udp_port_types[UDPHASH];
+ 
+ int hashport( int port, int hash);
+ void initlist(struct port_info *first[], int hash);
+ char *searchlist(struct port_info *first[], int port, int hash);
+ char *servicenm( char *s, int port);
+ 
++extern char *simfmt;
+ 
+ 	
+ struct hostinfo {
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
new file mode 100644
index 000000000000..df6024cd6534
--- /dev/null
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PV=$(ver_cut 1-3)-$(ver_cut 4)
+
+DESCRIPTION="Ethernet/PPP IP Packet Monitor"
+HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
+SRC_URI="http://www.slctech.org/~mackay/NETWATCH/${PN}-${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	sys-kernel/linux-headers
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-append_ldflags.patch
+	"${FILESDIR}"/${P}-open.patch
+	"${FILESDIR}"/${P}-fix-fortify.patch
+	"${FILESDIR}"/${P}-do-not-call.patch
+	"${FILESDIR}"/${P}-includes.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+S=${WORKDIR}/${PN}-$(ver_cut 1-3)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_install() {
+	dosbin netresolv netwatch
+
+	doman netwatch.1
+	dodoc BUGS CHANGES README* TODO
+
+	if use doc; then
+		docinto html
+		dodoc NetwatchKeyCommands.html
+	fi
+}