commit: ff71922ee25d106ef20079a32b7456cefc4bee9c Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sat Dec 12 13:34:48 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Dec 12 13:34:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff71922e
net-analyzer/fping: remove unused patches Package-Manager: Portage-3.0.11, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: David Seifert <soap <AT> gentoo.org> .../fping/files/fping-2.4_beta2_p161-err.h.patch | 10 ----- .../files/fping-2.4_beta2_p161-min-time.patch | 47 ---------------------- net-analyzer/fping/files/fping-4.1-ipv6.patch | 15 ------- .../fping/files/fping-4.2-fno-common.patch | 11 ----- 4 files changed, 83 deletions(-) diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch deleted file mode 100644 index 38946ac3852..00000000000 --- a/net-analyzer/fping/files/fping-2.4_beta2_p161-err.h.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/fping.c -+++ b/fping.c -@@ -106,6 +106,7 @@ - - #include <arpa/inet.h> - #include <netdb.h> -+#include <err.h> /* err() warnx() */ - - /* RS6000 has sys/select.h */ - #ifdef HAVE_SYS_SELECT_H diff --git a/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch b/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch deleted file mode 100644 index a101fd4ae0e..00000000000 --- a/net-analyzer/fping/files/fping-2.4_beta2_p161-min-time.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/fping.c -+++ b/fping.c -@@ -25,6 +25,7 @@ - * Original author: Roland Schemers <[email protected]> - * IPv6 Support: Jeroen Massar <[email protected] / [email protected]> - * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de) -+ * Fixes: min_reply_i in splits and compiler warning. Alex Ghoth (alex AT ghoth.net) - * - * - * RCS header information no longer used. It has been moved to the -@@ -743,7 +744,7 @@ - - if( ( ping_data_size > MAX_PING_DATA ) || ( ping_data_size < MIN_PING_DATA ) ) - { -- fprintf( stderr, "%s: data size %u not valid, must be between %u and %u\n", -+ fprintf( stderr, "%s: data size %u not valid, must be between %lu and %u\n", - prog, ping_data_size, MIN_PING_DATA, MAX_PING_DATA ); - usage(); - -@@ -1112,7 +1113,7 @@ - ht = timeval_diff( ¤t_time, &cursor->last_send_time ); - - if( report_interval && ( loop_flag || count_flag ) && -- ( timeval_diff ( ¤t_time, &last_report_time ) > report_interval ) ) -+ ( timeval_diff ( ¤t_time, &last_report_time ) >= report_interval ) ) - { - print_per_system_splits(); - gettimeofday( ¤t_time, &tz ); -@@ -1487,8 +1488,8 @@ - }/* IF */ - - fprintf( stderr, "\n" ); -- h->num_sent_i = h->num_recv_i = h->max_reply_i = -- h->min_reply_i = h->total_time_i = 0; -+ h->num_sent_i = h->num_recv_i = h->max_reply_i = h->total_time_i = 0; -+ h->min_reply_i = 10000000; - - }/* FOR */ - -@@ -2377,6 +2378,7 @@ - p->timeout = timeout; - p->running = 1; - p->min_reply = 10000000; -+ p->min_reply_i = 10000000; - - if( strlen( p->host ) > max_hostname_len ) - max_hostname_len = strlen( p->host ); diff --git a/net-analyzer/fping/files/fping-4.1-ipv6.patch b/net-analyzer/fping/files/fping-4.1-ipv6.patch deleted file mode 100644 index 7889b568a19..00000000000 --- a/net-analyzer/fping/files/fping-4.1-ipv6.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/fping.c -+++ b/src/fping.c -@@ -687,7 +687,11 @@ int main(int argc, char** argv) - - /* validate various option settings */ - -- if (socket4 < 0 && socket6 < 0) { -+ if (socket4 < 0 -+#ifdef IPV6 -+ && socket6 < 0 -+#endif -+ ) { - crash_and_burn("can't create socket (must run as root?)"); - } - diff --git a/net-analyzer/fping/files/fping-4.2-fno-common.patch b/net-analyzer/fping/files/fping-4.2-fno-common.patch deleted file mode 100644 index d18af66b063..00000000000 --- a/net-analyzer/fping/files/fping-4.2-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/fping.h -+++ b/src/fping.h -@@ -11,7 +11,7 @@ - void crash_and_burn( char *message ); - void errno_crash_and_burn( char *message ); - int in_cksum( unsigned short *p, int n ); --int random_data_flag; -+extern int random_data_flag; - - /* socket.c */ - int open_ping_socket_ipv4();
