jer 15/02/14 07:46:06 Modified: netselect-0.3-bsd.patch Log: Readd removed include by James Taylor (bug #540032). (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.4 net-analyzer/netselect/files/netselect-0.3-bsd.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netselect/files/netselect-0.3-bsd.patch?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netselect/files/netselect-0.3-bsd.patch?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/netselect/files/netselect-0.3-bsd.patch?r1=1.3&r2=1.4 Index: netselect-0.3-bsd.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/netselect/files/netselect-0.3-bsd.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- netselect-0.3-bsd.patch 14 Jul 2014 16:36:56 -0000 1.3 +++ netselect-0.3-bsd.patch 14 Feb 2015 07:46:06 -0000 1.4 @@ -1,6 +1,6 @@ --- a/netselect.c +++ b/netselect.c -@@ -39,14 +39,13 @@ +@@ -39,14 +39,14 @@ * hey, great! Let me know. -- apenwarr */ @@ -14,6 +14,7 @@ -# include <endian.h> +#ifdef __linux__ +#include <endian.h> ++#include <sys/types.h> +#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) +#if defined(__OpenBSD__) +#include <machine/types.h> @@ -22,7 +23,7 @@ #endif #include <sys/param.h> -@@ -152,6 +151,7 @@ +@@ -152,6 +152,7 @@ extern int optind; int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100; int ch, seq, ttl, max_ttl = 30, min_tries = 10, num_score = 1; @@ -30,7 +31,7 @@ struct timeval now; struct timezone tz; OPacket outpacket; /* last output (udp) packet */ -@@ -234,7 +234,12 @@ +@@ -234,7 +235,12 @@ if (verbose >= 1) fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n", num_score, numhosts, numhosts==1 ? "" : "es"); @@ -44,7 +45,7 @@ /* keep going until most of the hosts have been finished */ must_continue = numhosts; while (must_continue && must_continue >= numhosts/2) -@@ -712,7 +717,7 @@ +@@ -712,7 +718,7 @@ ip->ip_off = 0; ip->ip_hl = sizeof(*ip) >> 2; ip->ip_p = IPPROTO_UDP;
