gentoo resync : 20.03.2021

4 files changed, 3 insertions, 290 deletions

diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index be04304c7e92..aebb89fe00d0 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,8 +1,5 @@
 AUX packit-1.0-noopt.patch 214 BLAKE2B a0f981b13b21f9e6f37f87f69e36aa41c68c6c3fefc3337a7864d7e554315de555304c0f76227870a0b498d5301438038c175f66d908e5cd470407c79717fe40 SHA512 a4d0bcdb8947d219459d1a5687cdcadb7f8e9792bad2adabe8a402d42e19c5ca9e6e808bd6d832490af271d58d555d18c5f4949758233b47f27d7e115d36e6f3
-AUX packit-1.6.1-fno-common.patch 5729 BLAKE2B 6a7c516baf0bc455f493151268494ea6bc4f08ad577d1c2e4f904292345a8aee9182890c476d7749f75226be4c32d3030bdacddc467da5a4de9d81bb3a9ac81f SHA512 bbcb1dbb69a3b4cf31cc0533f2dacc0482e7ebd00cd157ee80430a3d085051fe2076e0208e7f64df1dfa216b9344c148624c687bcace6a4fe28faafdf76f000b
-DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2
 DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd
-EBUILD packit-1.6.1.ebuild 698 BLAKE2B 8faf26054fc9ed7274bb041c5670b8d032b11bdedbafc461e5bbb99b4a516bfd4df53b4c458422570ef0f2c9d135ea8870f45f798f335c0b60095a3ec72a04b5 SHA512 ac398634d37e1f9da624496574afe33d0fd0dc59a4a094106d91687355519aa929e694bade1d4681f57b52f98fb8f394b69db1a86d4011d62cf31cfdd769e754
-EBUILD packit-1.7.ebuild 656 BLAKE2B cfefd879b7e17b8d1b063c10681cece5f41a70504419db2cfddd6ddc87b4ee54388c98146862fa494bf6b4c6fdec1fd39f11165f6bd727bf08deee3ed3620665 SHA512 51d3649ad59e0f814c1d688966c8a09ca0647bafcc0a33c8dc015eb6277bb0071f506dcb7794fec45d6bee72e83b5ef2ecde94e75f16659ef57adf29e08742a6
+EBUILD packit-1.7.ebuild 654 BLAKE2B ec4aa17e5bc33fa3279f9b04145ef3f58161b05375bfd12ad42c23a3f1b17a3109d8ce3e92ad3113e5b0207c998d26d285c4c98ef6b0ea910b6370ac3562f4ab SHA512 7da31bfabc6ab3147ad4e6a9f2e70b382091d1aca47a7e04e3080597c438611f3f6d8b20e782cff63acc66edf549e5b35eb1a2ba5db4b0f843ae379eb3795913
 EBUILD packit-9999.ebuild 582 BLAKE2B a7015c50254810d82f6dcb12a2cdd05ca8893b39ef0de4d59acf8a54147b026821c23947228832d2303a128cea35c068f14b2da1cfa4e681fe2ee1647760baa4 SHA512 4d332811932801f9f330247ffc136b3c869d4c0788d7c1433be903cc3faf44916c0f219197e367cfe175829facd7bd988aab6307a5cbf9a27e034b607f44cb16
 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250
diff --git a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch b/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
deleted file mode 100644
index f4813d868ab1..000000000000
--- a/net-analyzer/packit/files/packit-1.6.1-fno-common.patch
+++ /dev/null
@@ -1,251 +0,0 @@
---- a/src/capture_defs.h
-+++ b/src/capture_defs.h
-@@ -30,12 +30,12 @@
- #define READ_TIMEOUT                    500
- #define SNAPLEN_DEFAULT                 68
- 
--u_int16_t g_display;
--u_int16_t g_link_layer;
--u_int16_t g_dump_pkt;
--u_int16_t g_time_gmt;
--u_int16_t g_t_rst;
--u_int16_t g_snap_len;
--u_int32_t g_pkt_rst;
-+extern u_int16_t g_display;
-+extern u_int16_t g_link_layer;
-+extern u_int16_t g_dump_pkt;
-+extern u_int16_t g_time_gmt;
-+extern u_int16_t g_t_rst;
-+extern u_int16_t g_snap_len;
-+extern u_int32_t g_pkt_rst;
- 
- #endif /* __CAPTURE_DEFS_H */
---- a/src/error.c
-+++ b/src/error.c
-@@ -26,6 +26,8 @@
- 
- #include "error.h"
- 
-+char error_buf[ERRBUF_MAXLEN];
-+
- void
- fatal_error(char *err,...)
- {
---- a/src/error.h
-+++ b/src/error.h
-@@ -33,7 +33,7 @@
- #define SUCCESS           		1
- #define FAILURE           		-1
- 
--char error_buf[ERRBUF_MAXLEN];
-+extern char error_buf[ERRBUF_MAXLEN];
- 
- void fatal_error(char *,...);
- 
---- a/src/globals.h
-+++ b/src/globals.h
-@@ -138,20 +138,20 @@
- #define P_INT64                         0x7FFFFFFFFFFFFFFF
- #define P_UINT64                        0xFFFFFFFFFFFFFFFF
- 
--char g_w_file[OPT_MAXLEN];
--char g_r_file[OPT_MAXLEN];
-+extern char g_w_file[OPT_MAXLEN];
-+extern char g_r_file[OPT_MAXLEN];
- 
--pcap_t *g_pkt;
--u_int8_t g_tr_fin;
--char *g_filter;
--char *g_device;
--u_int16_t g_hdr_len;
--u_int16_t g_pkt_len;
--u_int16_t g_verbose;
--u_int16_t g_resolve;
--u_int16_t g_p_mode;
--u_int64_t g_cnt;
--u_int64_t g_inj_cnt;
--u_int64_t g_cap_cnt;
-+extern pcap_t *g_pkt;
-+extern u_int8_t g_tr_fin;
-+extern char *g_filter;
-+extern char *g_device;
-+extern u_int16_t g_hdr_len;
-+extern u_int16_t g_pkt_len;
-+extern u_int16_t g_verbose;
-+extern u_int16_t g_resolve;
-+extern u_int16_t g_p_mode;
-+extern u_int64_t g_cnt;
-+extern u_int64_t g_inj_cnt;
-+extern u_int64_t g_cap_cnt;
- 
- #endif /* __GLOBALS_H */
---- a/src/inject_defs.h
-+++ b/src/inject_defs.h
-@@ -30,7 +30,7 @@
- #ifndef __INJECTION_STRUCTS_H
- #define __INJECTION_STRUCTS_H
- 
--struct ip4hdr_opts
-+extern struct ip4hdr_opts
- {
-     u_int16_t p;                   /* protocol type */
-     u_int16_t rand_p;
-@@ -59,7 +59,7 @@
-     u_int16_t rand_d_addr;
- } g_ip4hdr_o;
- 
--struct tcphdr_opts
-+extern struct tcphdr_opts
- {
-     u_int16_t s_port;              /* tcp source port */
-     u_int16_t d_port;              /* tcp destination port */
-@@ -82,7 +82,7 @@
- 
- } g_thdr_o;
- 
--struct udphdr_opts
-+extern struct udphdr_opts
- {
-     u_int16_t s_port;              /* udp source port */
-     u_int16_t d_port;              /* udp destination port */
-@@ -90,7 +90,7 @@
-     u_int16_t sum;                      /* udp checksum */
- } g_uhdr_o;
- 
--struct icmp4hdr_opts
-+extern struct icmp4hdr_opts
- {
-     u_int16_t type;                /* icmp4 type */
-     u_int16_t code;                /* icmp4 code */
-@@ -132,7 +132,7 @@
-     u_int32_t ttime;                    /* transmit timestamp */
- } g_i4hdr_o;
- 
--struct enethdr_opts
-+extern struct enethdr_opts
- {
-     u_int16_t rand_s_addr;
-     u_int16_t rand_d_addr;
-@@ -143,7 +143,7 @@
-     u_int8_t dhw_addr[18];
- } g_ehdr_o;
- 
--struct arphdr_opts
-+extern struct arphdr_opts
- {
-     u_int16_t op_type;                  /* arp operation */
- 
-@@ -163,28 +163,28 @@
-     u_int8_t rhw_addr[18];
- } g_ahdr_o;
- 
--libnet_t *g_pkt_d;
-+extern libnet_t *g_pkt_d;
- 
--u_int16_t g_init_type;
--u_int16_t g_rand_d_port;
--u_int16_t g_rand_s_port;
--u_int16_t g_s_port;
--u_int16_t g_d_port;
--u_int16_t g_port_range;
--u_int16_t g_interval_sec;
--u_int16_t g_interval_usec;
--u_int16_t g_injection_type;
--u_int16_t g_r_timeout;
--u_int16_t g_burst_rate;
--u_int16_t g_payload_len;
--u_int8_t *g_payload;
--u_int8_t g_hex_payload;
--u_int8_t *g_s_d_port;
--u_int8_t g_hwaddr_p[18];
--u_int8_t g_rawip;
-+extern u_int16_t g_init_type;
-+extern u_int16_t g_rand_d_port;
-+extern u_int16_t g_rand_s_port;
-+extern u_int16_t g_s_port;
-+extern u_int16_t g_d_port;
-+extern u_int16_t g_port_range;
-+extern u_int16_t g_interval_sec;
-+extern u_int16_t g_interval_usec;
-+extern u_int16_t g_injection_type;
-+extern u_int16_t g_r_timeout;
-+extern u_int16_t g_burst_rate;
-+extern u_int16_t g_payload_len;
-+extern u_int8_t *g_payload;
-+extern u_int8_t g_hex_payload;
-+extern u_int8_t *g_s_d_port;
-+extern u_int8_t g_hwaddr_p[18];
-+extern u_int8_t g_rawip;
- 
--struct timeval g_bf_pcap;
--struct timeval g_af_pcap;
-+extern struct timeval g_bf_pcap;
-+extern struct timeval g_af_pcap;
- 
- 
- #endif /* __INJECTION_STRUCTS_H */
---- a/src/main.c
-+++ b/src/main.c
-@@ -30,6 +30,62 @@
- 
- #include "main.h"
- 
-+char g_w_file[OPT_MAXLEN];
-+char g_r_file[OPT_MAXLEN];
-+
-+pcap_t *g_pkt;
-+u_int8_t g_tr_fin;
-+char *g_filter;
-+char *g_device;
-+u_int16_t g_hdr_len;
-+u_int16_t g_pkt_len;
-+u_int16_t g_verbose;
-+u_int16_t g_resolve;
-+u_int16_t g_p_mode;
-+u_int64_t g_cnt;
-+u_int64_t g_inj_cnt;
-+u_int64_t g_cap_cnt;
-+
-+/* capture_defs.h */
-+u_int16_t g_display;
-+u_int16_t g_link_layer;
-+u_int16_t g_dump_pkt;
-+u_int16_t g_time_gmt;
-+u_int16_t g_t_rst;
-+u_int16_t g_snap_len;
-+u_int32_t g_pkt_rst;
-+
-+/* inject_defs.h */
-+u_int16_t g_init_type;
-+u_int16_t g_rand_d_port;
-+u_int16_t g_rand_s_port;
-+u_int16_t g_s_port;
-+u_int16_t g_d_port;
-+u_int16_t g_port_range;
-+u_int16_t g_interval_sec;
-+u_int16_t g_interval_usec;
-+u_int16_t g_injection_type;
-+u_int16_t g_r_timeout;
-+u_int16_t g_burst_rate;
-+u_int16_t g_payload_len;
-+u_int8_t *g_payload;
-+u_int8_t g_hex_payload;
-+u_int8_t *g_s_d_port;
-+u_int8_t g_hwaddr_p[18];
-+u_int8_t g_rawip;
-+
-+struct timeval g_bf_pcap;
-+struct timeval g_af_pcap;
-+
-+struct arphdr_opts g_ahdr_o;
-+struct enethdr_opts g_ehdr_o;
-+struct icmp4hdr_opts g_i4hdr_o;
-+struct ip4hdr_opts g_ip4hdr_o;
-+struct tcphdr_opts g_thdr_o;
-+struct udphdr_opts g_uhdr_o;
-+
-+libnet_t *g_pkt_d;
-+
- void
- parse_capture_options(int argc, char *argv[])
- {
diff --git a/net-analyzer/packit/packit-1.6.1.ebuild b/net-analyzer/packit/packit-1.6.1.ebuild
deleted file mode 100644
index 48ba4aeab1c9..000000000000
--- a/net-analyzer/packit/packit-1.6.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-DESCRIPTION="network packet generator and capture tool"
-HOMEPAGE="https://github.com/resurrecting-open-source-projects/packit"
-SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-DEPEND="
-	net-libs/libnet:1.1
-	net-libs/libpcap
-"
-RDEPEND="${DEPEND}"
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0-noopt.patch
-	"${FILESDIR}"/${PN}-1.6.1-fno-common.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc docs/*
-}
diff --git a/net-analyzer/packit/packit-1.7.ebuild b/net-analyzer/packit/packit-1.7.ebuild
index 5059d8e159a0..6f454fbc9ba2 100644
--- a/net-analyzer/packit/packit-1.7.ebuild
+++ b/net-analyzer/packit/packit-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/resurrecting-open-source-projects/packit/archive/${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="
 	net-libs/libnet:1.1