From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 830E013835A for ; Mon, 15 Mar 2021 22:11:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6536E087C; Mon, 15 Mar 2021 22:11:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B11D6E087C for ; Mon, 15 Mar 2021 22:11:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64FDA33BDF8 for ; Mon, 15 Mar 2021 22:11:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C1D1F5A7 for ; Mon, 15 Mar 2021 22:11:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615846239.c1183f81933fb13484fe85c0dce24b274cdfa7a9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/packit/files/, net-analyzer/packit/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/packit/Manifest net-analyzer/packit/files/packit-1.6.1-fno-common.patch net-analyzer/packit/packit-1.6.1.ebuild X-VCS-Directories: net-analyzer/packit/files/ net-analyzer/packit/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: c1183f81933fb13484fe85c0dce24b274cdfa7a9 X-VCS-Branch: master Date: Mon, 15 Mar 2021 22:11:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f199a926-5856-480f-9b44-f58d6931f8c0 X-Archives-Hash: e60a5af4ca943fee9e955df2091a3175 commit: c1183f81933fb13484fe85c0dce24b274cdfa7a9 Author: Sam James gentoo org> AuthorDate: Mon Mar 15 22:10:39 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 15 22:10:39 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1183f81 net-analyzer/packit: drop 1.6.1 Bug: https://bugs.gentoo.org/776550 Signed-off-by: Sam James gentoo.org> net-analyzer/packit/Manifest | 1 - .../packit/files/packit-1.6.1-fno-common.patch | 251 --------------------- net-analyzer/packit/packit-1.6.1.ebuild | 33 --- 3 files changed, 285 deletions(-) diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest index 69e82515e9d..df96e38d0b6 100644 --- a/net-analyzer/packit/Manifest +++ b/net-analyzer/packit/Manifest @@ -1,2 +1 @@ -DIST packit-1.6.1.tar.gz 52643 BLAKE2B 4b67c179140a21ec3dc8b5ae2e116a771fdbd860c3a880588a29346f04c956a80a59fcaf84f42ae6c505554e5b942964ed3f2d3a06d408e5b36850276832994a SHA512 462470bfc755dc33418ae0a65237d0dcbbe04609de710883134bcb1e13cff9212cd9a28e888b2e839a06a566fa080ecd6c6668414f1cac2bde337c81d1ac58a2 DIST packit-1.7.tar.gz 53192 BLAKE2B f5a7fcd0790e05be593be47c2339c3ecb14b2fd45308a273ecc9d5398087698605c2174a8440e870ccf35fd9d560bea11ca720e44045115c15757f6f98d00ac4 SHA512 4e7d13ef5387dc446e718792562dbf84f9e0b611196a3590ea8e8b4411ae30694b48f28ab632a0b692935adffb44757e65a4eb5ab942b5d625acbdc08d34aefd 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 f4813d868ab..00000000000 --- 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 48ba4aeab1c..00000000000 --- 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/* -}