gentoo resync : 05.02.2020

4 files changed, 201 insertions, 2 deletions

diff --git a/net-analyzer/ipv6toolkit/Manifest b/net-analyzer/ipv6toolkit/Manifest
index f66a4be17ed3..0d8eeb224ef3 100644
--- a/net-analyzer/ipv6toolkit/Manifest
+++ b/net-analyzer/ipv6toolkit/Manifest
@@ -1,6 +1,7 @@
+AUX ipv6toolkit-2.1_p20190919-fno-common.patch 5414 BLAKE2B cf9f97ed1155044211e31f7c0d081d283681de63b5f9f00a910f29f91055675f8af8045db7ec77277a9f5bc518063677c9cd0d1cf7df44606a9b253f48089ed1 SHA512 939b9a113867d8a308c4a3802ca55d6c8e5bc050e5dc50ecf8558b2008bca6e734996ee091db33a16a6efbf14a12a00bc213616f0229fb143259d7b069dfe7dc
 DIST ipv6toolkit-2.0_p20160422.tar.gz 796716 BLAKE2B 468375afbf385ac9b571708be1baff0b0c56a0895bb73f3711522120b0e5fdfded3d73fea2a7d48b38f1e6387e0d63674c08eb503281f6eb635ea131ae67ec47 SHA512 532d6b76159fca03bdcebe341540a4071d2381dd3046469d0dfa5e8eecda5ffb4182d40658ef14c67bd11b781773bff1192e96d0ac4210c5ca095c6475d6c26d
 DIST ipv6toolkit-2.1_p20190919.tar.gz 979235 BLAKE2B 1b652b00874b9a71a5e5b86643d9c71fc02917af93d9730e7e4be7e5203d07dfef5bc7d1bb0453a6bf9dece69f7f4256912f0902132dd21530ae8ea9e94b8b4f SHA512 78e7565f4827d21573ced06002311a4f3736df71846085b3e8e47e0d6aebeaa4e60881c148c3c65ee010ffcfb2bf3ad56bb2625203aff5b0fdf40fbb7f37ecb9
 EBUILD ipv6toolkit-2.0_p20160422.ebuild 1245 BLAKE2B e108d57bf264bc9b0d1f42e83b638354520832267bfa6c700dd7630e163e5da3aeebe332be7786c21cb86dcbd216e579ed669d402373135440d98ea0fdabe014 SHA512 f3c18c571a6c341697135c3cb1b355bed43bc79a61bdf048c112819e312658b260b8afca432e046fa391a16af8e97d36644daf77dd11d236d3b70ae263d88ea7
-EBUILD ipv6toolkit-2.1_p20190919.ebuild 1158 BLAKE2B be8f899af0570e84204eb8f72cc4199f9d486b9ffe10d1a98496463577fe6d62b69add5e4e07fa93a5193f396cb7f772d2ce04f6759faebdae1fe6f9625127ae SHA512 29b9e9fbc19dd1f9400bf5fa4e350c5859ca1b650410f8f57a92898d3d933a67cec8af2e1d25fea1e44b09d091cc091e8705cf1ea91b26ba9d8c00ef88c58cfd
-EBUILD ipv6toolkit-99999999.ebuild 1029 BLAKE2B da79779c2bb84b817aa197e86931e8fdc8a14597916a867bd01cc211b770425e485bfb19f28345a85a62b60e8bea8f5c2065c26b5e89699d67e306f5746d2a3c SHA512 376b1b2b881e0285f084b8edad8f4aefc83683d3f4c947e3ca4ada0518bc9291ed8f09bc3bbd275e27f32532857ef33ae2006277c6341adf800a5471274d39c1
+EBUILD ipv6toolkit-2.1_p20190919.ebuild 1222 BLAKE2B 6f5666e4a94bdcfac16aa92f591c14199fd4b2d007adaded56bbe06b6d0648b2d9cb36e228efdf89283247f88267159735648181436c39dd76ee578e109c7613 SHA512 c31766b0b48b0fd62b459bef37a905722612c6f2ec86ab329f6f0cc56643a01b1cecc48aaf9efec6acba257cda496a87f300478991fbe511b67b86659d1bf8c9
+EBUILD ipv6toolkit-99999999.ebuild 1093 BLAKE2B 3dac02bc93aeb2d5428b074ea38655851d191ce32ac33fb31258909782f05cc1d93e7336dd47c5276ca7f50a7d2a33fa5e417514312d7541e3bbc555ee3f713c SHA512 fb3df9ea5c010e0a94d554fa87600b8a6d46b68127cf151008ac8daa9d9caca9dae930f2e603901a2a0b8ba71fb0f3906ba2d4aadc69fa7251649472b113cac4
 MISC metadata.xml 527 BLAKE2B e275ef7193981f8415d0aa0973743deb8b4b0302fb093a26254dd0e681e072e175466869335c909c2f39ecc241f2de1e1a8135b0f6f59f17a566fcd5d9065e51 SHA512 acec773e132e352f4f81af6840f3370da00f48e5e13f39a2fccc441e5d119c5fac4319b24745eef1b4fb0921e8ace7456f7230432fd86978bb27cc54b7de3ec4
diff --git a/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch
new file mode 100644
index 000000000000..9d4a3dcffe9e
--- /dev/null
+++ b/net-analyzer/ipv6toolkit/files/ipv6toolkit-2.1_p20190919-fno-common.patch
@@ -0,0 +1,192 @@
+--- a/tools/flow6.c
++++ b/tools/flow6.c
+@@ -85,8 +85,7 @@
+ 
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+ char				*pref;
+--- a/tools/frag6.c
++++ b/tools/frag6.c
+@@ -94,8 +94,7 @@
+ 
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+ char				*pref;
+--- a/tools/icmp6.c
++++ b/tools/icmp6.c
+@@ -114,8 +114,7 @@
+ 
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+ char				*pref;
+--- a/tools/ipv6toolkit.h
++++ b/tools/ipv6toolkit.h
+@@ -2,3 +2,10 @@
+ #define	MAX_CMDLINE_OPT_LEN	40
+ #define DATE_STR_LEN		40
+ 
++#include <pcap.h>
++#include <setjmp.h>
++
++extern char errbuf[PCAP_ERRBUF_SIZE];
++extern struct bpf_program pcap_filter;
++extern sigjmp_buf env;
++extern unsigned int canjump;
+--- a/tools/jumbo6.c
++++ b/tools/jumbo6.c
+@@ -80,8 +80,7 @@
+ 
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+ char				*pref;
+--- a/tools/na6.c
++++ b/tools/na6.c
+@@ -61,8 +61,7 @@
+ struct in6_addr		*pkt_ipv6addr;    
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ char 				all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
+ unsigned char		buffer[65556];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+--- a/tools/ni6.c
++++ b/tools/ni6.c
+@@ -90,8 +90,7 @@
+ 
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ char				domain[MAX_DOMAIN_LEN];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+--- a/tools/ns6.c
++++ b/tools/ns6.c
+@@ -59,8 +59,7 @@
+ const u_char		*pktdata;
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ 
+ unsigned char		buffer[65556];
+ unsigned char 		*v6buffer, *ptr, *startofprefixes;
+--- a/tools/path6.c
++++ b/tools/path6.c
+@@ -88,8 +88,7 @@
+ 
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+ char				*pref;
+--- a/tools/ra6.c
++++ b/tools/ra6.c
+@@ -64,8 +64,7 @@
+ struct in6_addr		*pkt_ipv6addr;    
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char				dev[64];
+ char				all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
+ 
+ unsigned char		buffer[ETHER_HDR_LEN+MIN_IPV6_HLEN+MAX_IPV6_PAYLOAD];
+--- a/tools/rd6.c
++++ b/tools/rd6.c
+@@ -106,8 +106,7 @@
+ 
+ bpf_u_int32				my_netmask;
+ bpf_u_int32				my_ip;
+-struct bpf_program		pcap_filter;
+-char 					dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 					dev[64];
+ unsigned char			buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ unsigned char			*v6buffer, *ptr, *startofprefixes;
+ char					*pref;
+--- a/tools/rs6.c
++++ b/tools/rs6.c
+@@ -60,8 +60,7 @@
+ struct in6_addr			*pkt_ipv6addr;    
+ bpf_u_int32				my_netmask;
+ bpf_u_int32				my_ip;
+-struct bpf_program		pcap_filter;
+-char					dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char					dev[64];
+ char					all_nodes_addr[]= ALL_NODES_MULTICAST_ADDR;
+ 
+ unsigned char			buffer[65556];
+--- a/tools/scan6.c
++++ b/tools/scan6.c
+@@ -153,8 +153,7 @@
+ 
+ bpf_u_int32				my_netmask;
+ bpf_u_int32				my_ip;
+-struct bpf_program		pcap_filter;
+-char 					dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 					dev[64];
+ unsigned char			buffer[BUFFER_SIZE], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ char					line[LINE_BUFFER_SIZE];
+ unsigned char			*v6buffer, *ptr, *startofprefixes;
+@@ -269,10 +268,6 @@
+ 						                 443, 547, 993, 995, 1194, 3306, 5060, 5061, 5432, 6446, 8080};
+ 
+ 
+-/* IPv6 Address Resolution */
+-sigjmp_buf				env;
+-unsigned int			canjump;
+-
+ int main(int argc, char **argv){
+ 	extern char				*optarg;
+ 	int						r;
+--- a/tools/tcp6.c
++++ b/tools/tcp6.c
+@@ -116,8 +116,7 @@
+ 
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_TCP_HLEN];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+ char				*pref;
+--- a/tools/udp6.c
++++ b/tools/udp6.c
+@@ -99,8 +99,7 @@
+ 
+ bpf_u_int32			my_netmask;
+ bpf_u_int32			my_ip;
+-struct bpf_program	pcap_filter;
+-char 				dev[64], errbuf[PCAP_ERRBUF_SIZE];
++char 				dev[64];
+ unsigned char		buffer[65556], buffrh[MIN_IPV6_HLEN + MIN_UDP_HLEN];
+ unsigned char		*v6buffer, *ptr, *startofprefixes;
+ char				*pref;
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
index 6a4df21782ca..bff5e134fff8 100644
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.1_p20190919.ebuild
@@ -21,6 +21,9 @@ RDEPEND="
 	${DEPEND}
 	sys-apps/hwids
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch
+)
 
 HWIDS_OUI_PATH=/usr/share/misc/oui.txt
 
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
index 8a862e677183..2248b0b2e758 100644
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-99999999.ebuild
@@ -19,6 +19,9 @@ RDEPEND="
 	${DEPEND}
 	sys-apps/hwids
 "
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.1_p20190919-fno-common.patch
+)
 
 HWIDS_OUI_PATH=/usr/share/misc/oui.txt