diff options
Diffstat (limited to 'net-analyzer/tcpstat')
| -rw-r--r-- | net-analyzer/tcpstat/Manifest | 5 | ||||
| -rw-r--r-- | net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch | 11 | ||||
| -rw-r--r-- | net-analyzer/tcpstat/files/tcpstat-1.5-db.patch | 165 | ||||
| -rw-r--r-- | net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild | 45 | ||||
| -rw-r--r-- | net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild | 4 |
5 files changed, 3 insertions, 227 deletions
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest index b4dfdd439519..c55bfa620cf1 100644 --- a/net-analyzer/tcpstat/Manifest +++ b/net-analyzer/tcpstat/Manifest @@ -1,5 +1,3 @@ -AUX tcpstat-1.5-_DEFAULT_SOURCE.patch 428 BLAKE2B ee4ac925f6baa2728cdc5ec2d31fe9ddfa555465f3386ff0413a851541c06d160270f56896c715c136849776b7233482a0de359c616e73ed4be0755ed05da199 SHA512 471309ad08b0a10f18b34a3d69a81ff19223787f375ea652fb12a96b3166432a55efb091d255aee4388262e44af0d4b3ea2a644ddc6cfaf8201b57194511a1d9 -AUX tcpstat-1.5-db.patch 4691 BLAKE2B 1c135688c7197144f6add6ccca007a70141033a16a6b3c24cf4d9769f43b651fc5cfc2bad875c010d7b888e5533af49aca7eab2c691bb716e2c389435136ab0d SHA512 03de51e86bd0aa1bf2d29097871fe8409498050100c4adefde7d8aae7bdd752455af6ce13b490f4e596ea90557b37c95b974705cbaece35d9b465571fdb31d6d AUX tcpstat-1.5_p8-_DEFAULT_SOURCE.patch 510 BLAKE2B 37197b4cbd2c957ad06f8f9813675678b1105e5e63664885dc8346ab96a07e3ca55485a472ea7b6c027518be031669ead178c438bb315ae813e47e7d982f4c46 SHA512 36f92f585e044695eaec96c557bcdd42be170d8d2827c31ff1d310931a7f7aaabe8cf0495ce70b110534872d155af9b9934106ac001bac16662cea8c74e257f4 AUX tcpstat-1.5_p8-ipv6.patch 1031 BLAKE2B 140174a7dc761c1a9c3183919fd3594e61f866282ccbef95840adeba9dab062d73652335761c13183f9df291b854cae2801001ed32be7571c9f744176bbe90a4 SHA512 65bd5be8498317c7a778d56582d716433ae1eeabbccb0ae6b5deab7de067927db23e4cce0115bf7ece5e410851cd9d74c9523a1ec802bcea4cd7933bc9121095 AUX tcpstat-1.5_p8-libpcap.patch 191 BLAKE2B 2bc5d3cb2abf84459e4eb0869ff41b295415c9075b69faa97c27eb604658dd9ff8a7a8f8b0f8515cb26f3554672bd3222a8cce0a4538dbd3e1931df6506d07a8 SHA512 e94799b018178c92541e33afaf297fe60039344392fe2629bc82af691df5c14f3e629e2728d87f323ccb191a1dd7d0d501967d73f0d2142e20b4d13bc93467df @@ -7,6 +5,5 @@ AUX tcpstat-1.5_p8-off-by-one.patch 1299 BLAKE2B 651fddce0312ecf6c7c6d55f1bf7d65 AUX tcpstat-1.5_p8-unused.patch 2731 BLAKE2B d1d120953a68cd5fa1dddaf3b6521c953fcf3772fd5d52cafca2fbbceffa0c1245a4e882b6cad17464ecc003642efd54fe00413eade52cf16adc1985c0c0431a SHA512 5c9a058dc299b04e8cd7b875643200efbcdfa99cfbd33b5527bf4b0960cdeb44767bd3da3df91c4ba8b4ec9dcbd1d5a313c880c7d32ed5ded9201432ff871c09 DIST tcpstat-1.5.tar.gz 93102 BLAKE2B 39a570fe6176fda0e8a6539417ece268183a1ebed6fa956b8ec5556b8bbd2508829e7d0861ef39b551bd6070df70cfdaf3dbf694a42ad00be4ea0f3e5c757ce5 SHA512 f1399365e754e4d9e19657c455a580294a7b4002a0d02ff05791a45574dcb1d0e75dc492157ef595066502b1553702481c67b20ad24267a50d7293766c39a5ab DIST tcpstat_1.5-8.debian.tar.xz 7844 BLAKE2B d74e3fd6a274d5e4e0963741bcfe870cfa300281706f965ac1c61ab7e6eb9aa2ea06566649fb3ae8d6071464cfa4bc037e58f64bf32f71ad8b3006976a515417 SHA512 f54546a9191feddc5410c7abb6764533ce89de4bd93fdc480e1a8f7473b405ca914482e6b950ead39d78d235caf093aaa663c683df346417070b97fc3e4f5c41 -EBUILD tcpstat-1.5-r3.ebuild 901 BLAKE2B ba69175b94aff336df71902cf519a6b6bdb9f5a7da838755f954f43de30c51cf9d27e1ea3089994b61eadde7ef9fe9ce65c91309a06ce217646c5a47a30586f6 SHA512 6a124f03a3f57e31a9459b53c5df803270d459e665284bd20726db326e91dea000adbd5c1f95678ea44d6a4ec0042dd1e5ff4670a7240c0c6359d59159c02ee0 -EBUILD tcpstat-1.5_p8.ebuild 1287 BLAKE2B 521a7edc1f13c27f712a39d8dc744c2884812fcd8fb1d70875ab846cc07141544bc9ff6c27202b6998866c37456f6aab5376798c39733dcde02d48d54c52eaca SHA512 24fc76424d3a625a85c8048a37ed0b88aa4be31fb2c5eea900c6204b2bd45f8bbcc34983aa7b0c9bd1d666c87aecce747ec62e6e89a4e152703a0519c6ab382d +EBUILD tcpstat-1.5_p8.ebuild 1283 BLAKE2B 7b5798d2771f6b0f34c60c7d9191dbe055e7c130e3e11617cd8a06540bde1840a343daca1d1d9572d6845ca58b1e8ff773928e14dbcff9709b4a72f09b385466 SHA512 b9e52660890f99819507afbc82df71265e8dead3737c69f964bab96297169f91cb9398be1553e88cd8ae26715e0ffd6d86a73e83440dee803c1db364acdea2c0 MISC metadata.xml 276 BLAKE2B e21811549278e73aa9a14acfe242fd022106a39ac1300caa00615772d7f54d08a433052659a271f9ac0d453c7776fc2b9e8d86e6d3f637817c214174dde52cb2 SHA512 f0e6c6bc89659e01e157d9bf30d0a2f3fd2d71bc26c8d12489c4a44fc5237159946e25b46e7295ab4676aea63559194977a0b1e76aced31d81cf6387dd0f4250 diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch deleted file mode 100644 index e3e0df933d5c..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -68,7 +68,7 @@ - case $my_build_os in - aix*) AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;; - osf1*) AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;; -- linux*) AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;; -+ linux*) AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;; - bsd/os*) ;; - freebsd*) ;; - sunos*) ;; diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch deleted file mode 100644 index 88e668e1a4a5..000000000000 --- a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch +++ /dev/null @@ -1,165 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -84,15 +84,26 @@ - dnl ####################### - dnl Checks for header files - dnl ####################### - AC_HEADER_STDC - AC_HEADER_SYS_WAIT --AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h netinet/ip6.h) -+AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h) - - dnl BSD/OS Seems to not have a good ethernet header, so we gotta wing it - AC_CHECK_HEADERS(net/if.h net/ethernet.h netinet/if_ether.h net/ppp_defs.h) - -+AC_ARG_ENABLE( ipv6, [ AC_HELP_STRING([--enable-ipv6], [s use IPv6?]) ], ip6=$enableval ) -+if test "$ip6" = "yes" -+then -+ AC_CHECK_HEADER(netinet/ip6.h, , [AC_MSG_ERROR([I couldn't find netinet/ip6.h though you asked for ipv6 support.])] ) -+elif test "$ip6" != "no" -+then -+ AC_CHECK_HEADER(netinet/ip6.h) -+ -+fi -+ -+ - dnl ############################################################# - dnl Checks for typedefs, structures, and compiler characteristics - dnl ############################################################# - AC_C_CONST - AC_TYPE_SIZE_T -@@ -147,34 +158,11 @@ - If you already have... then please rerun configure with the option - --with-pcap-lib=DIR - with "DIR" being where libpcap is found.]) - ]) - --dnl look for dbopen for tcpprof --TCPPROF="" --LD_TCPPROF="" --AC_CHECK_LIB(c, dbopen, [ TCPPROF=tcpprof ], [ -- AC_CHECK_LIB(db1, dbopen, [ -- TCPPROF=tcpprof -- LD_TCPPROF="-ldb1" -- AC_DEFINE(USE_DB1_LIBRARY, 1, [ Use the sleepycat DB library. ]) -- ], [ -- AC_MSG_WARN([ -- -- *** WARNING *** -- I couldn't locate the Berkeley DB library. The extra utility -- "tcpprof" will not be built. THIS IS OK!!! "tcpstat" will -- continue to be built as if this never happened. -- -- If you wish to use the extra "tcpprof" program, please install -- the Berkeley DB library from: -- ftp://ftp.cs.berkeley.edu/ucb/4bsd/db.tar.gz -- ]) -- ]) --]) - AC_SUBST(TCPPROF) --AC_SUBST(LD_TCPPROF) - AC_SUBST(MATHLIB) - - AC_CONFIG_FILES([ - Makefile - doc/Makefile ---- a/lib/process.c -+++ b/lib/process.c -@@ -230,12 +230,12 @@ - * calls a user function pointing to the data - * - * XXX: filter is not used. capture_seconds also isn't, but snoop is - * always read from a file. - */ --int get_snoop_data(char *fname, char *filter, int flags, -- Double capture_seconds, void (*hook)(packet_data *, void **), -+int get_snoop_data(char *fname, char *filter __attribute__((unused)), int flags, -+ Double capture_seconds __attribute__((unused)), void (*hook)(packet_data *, void **), - void **args) { - - u_char *packet; - int fd, len, blen, ret = 0; - struct snoop_file_header fh; ---- a/lib/tcpseq.c -+++ b/lib/tcpseq.c -@@ -54,11 +54,10 @@ - u_char flags; - struct tcpseq_ha test_ha; - struct tcphdr *tp = NULL; - struct ip *ip; - #ifdef INET6 -- int is_ip6 = 0; - struct ip6_hdr *ip6; - - ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr; - if (is_ip6_packet(pd)) - tp= &(pd->data.ip6.body.tcphdr); ---- a/src/catpcap.c -+++ b/src/catpcap.c -@@ -50,11 +50,11 @@ - if (c == ' ') return c; - if ((u_char)c > 0xa1 && SHOW_HIGH_BIT) return c; - return '.'; - } - --void proc_pcap(u_char *user, const struct pcap_pkthdr *h, const u_char *p) { -+void proc_pcap(u_char *user __attribute__((unused)), const struct pcap_pkthdr *h, const u_char *p) { - u_int length = h->caplen, i, j, k, step; - u_char *r, *s; - char c; - - r = (u_char *)p; -@@ -90,11 +90,11 @@ - } - /* - * process_file() takes the output of tcpdump, saves packets, and displays - * statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - int run = 1, i; - pcap_t *pd; - char ebuf[PCAP_ERRBUF_SIZE]; - struct bpf_program bpf_prog; - ---- a/src/dump.c -+++ b/src/dump.c -@@ -37,21 +37,21 @@ - char filterexpr[BUF_SIZ] = ""; - int get_tcp_flags = 0; - int what_to_show = 0; - int packet_number = 0; - --void my_hook(packet_data *pd, void **args) { -+void my_hook(packet_data *pd) { - printf("PACKET NUMBER: %d\n", ++packet_number); - print_packet(pd, what_to_show); - printf("-------------------\n"); - } - - /* - * process_file() takes the output of tcpdump, saves packets, and displays - * statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - get_dump_data(fname, filterexpr, get_tcp_flags, - -1.0, my_hook, NULL); - } - - int parse_show_types(char *in) { ---- a/src/tcpstat.c -+++ b/src/tcpstat.c -@@ -421,11 +421,11 @@ - } - - /* - * process_file() gets the data, and then displays the statistics - */ --void process_file(char *fname, u_int unused) { -+void process_file(char *fname, u_int unused __attribute__((unused))) { - void *argv[2]; - statistics stats; - Double x; - - signal(SIGUSR1, catch_signal); diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild deleted file mode 100644 index ce12a85db51b..000000000000 --- a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools flag-o-matic toolchain-funcs - -DESCRIPTION="Reports network interface statistics" -HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/" -SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 sparc x86" -IUSE="ipv6" - -DEPEND=" - net-libs/libpcap -" -RDEPEND=" - ${DEPEND} -" -DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt ) -PATCHES=( - "${FILESDIR}"/${P}-db.patch - "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - append-cflags -Wall -Wextra - econf \ - $(use_enable ipv6) \ - --with-pcap-include='' \ - --with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)" -} - -src_install() { - default - dobin src/{catpcap,packetdump} - newdoc src/README README.src -} diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild index a7ffbe9723e3..859524d5c260 100644 --- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild +++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.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 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="BSD-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="amd64 ~ppc ppc64 sparc x86" IUSE="ipv6" DEPEND=" |