diff -urN netselect.old/Manifest netselect/Manifest --- netselect.old/Manifest 2006-07-15 01:29:41 +0200 +++ netselect/Manifest 2006-07-15 01:34:21 +0200 @@ -1,12 +1,20 @@ +AUX netselect.patch 1670 RMD160 0d93b937bbef10af53def6cd124e123fe12de3aa SHA1 eafea877b92d3ccc21563597f92711e47faca8df SHA256 b351edf5a8acfc6bece5ce0079129aa5896389478aac793e596f70b29db9583a +MD5 90b8f27e416506f3655181b7a39fcbe1 files/netselect.patch 1670 +RMD160 0d93b937bbef10af53def6cd124e123fe12de3aa files/netselect.patch 1670 +SHA256 b351edf5a8acfc6bece5ce0079129aa5896389478aac793e596f70b29db9583a files/netselect.patch 1670 +DIST netselect-0.3.tar.gz 22047 RMD160 f57b7348549a033c008d3b67b85ef12a3f91c9aa SHA1 708512a6eddb2e9aee0ad80c72ddc63f08372cab SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 +EBUILD netselect-0.3-r1.ebuild 1087 RMD160 2cf6407d0db47ebcd7bd4782451372a12362ec3d SHA1 109aafa7241fa975722b4cd328c18c2a5a977aff SHA256 fe1e4a7b68432ede81002c2beb02e32982dd17905d9bae00665cb8c51f079dab +MD5 46bf446fde1e0ebc057a26dd65de4340 netselect-0.3-r1.ebuild 1087 +RMD160 2cf6407d0db47ebcd7bd4782451372a12362ec3d netselect-0.3-r1.ebuild 1087 +SHA256 fe1e4a7b68432ede81002c2beb02e32982dd17905d9bae00665cb8c51f079dab netselect-0.3-r1.ebuild 1087 +MISC ChangeLog 2988 RMD160 e62b8a068919b00dd0c19028570252f8d4815176 SHA1 71a326a7a43ca436a26f36c75271720a04bf7f62 SHA256 a6b4693137a970db451e585e53f16913077d221a299213950dcbfefaf419e897 MD5 b831bb381e0c6e0951afd4c077a7dfd4 ChangeLog 2988 RMD160 e62b8a068919b00dd0c19028570252f8d4815176 ChangeLog 2988 SHA256 a6b4693137a970db451e585e53f16913077d221a299213950dcbfefaf419e897 ChangeLog 2988 -MD5 7396c62cc3e5735019287ae62229dd48 files/digest-netselect-0.3-r1 64 -RMD160 11ad3c9ac18b5b1f43aa599f132145445edd9995 files/digest-netselect-0.3-r1 64 -SHA256 ce5c46fd4ee2a789a19fcfb215ea6d1bc00df78993f2e4152aaa56d7c1099a51 files/digest-netselect-0.3-r1 64 +MISC metadata.xml 227 RMD160 917eb39a2068e2e2a26f5d8b8999abbe9f48bb4b SHA1 ff9d1f5383d9cede6afe1a4138b1dcc0ebdd179c SHA256 645ebb9d76e7763a81c4dee499147688e00258373d297ceb0b83b32eeb5fe44b MD5 b4a519c8440c3016ab875b1e47ad33e2 metadata.xml 227 RMD160 917eb39a2068e2e2a26f5d8b8999abbe9f48bb4b metadata.xml 227 SHA256 645ebb9d76e7763a81c4dee499147688e00258373d297ceb0b83b32eeb5fe44b metadata.xml 227 -MD5 9cead0c2b2ece8f5b554c4616c7ab5ab netselect-0.3-r1.ebuild 1155 -RMD160 1d9e3507346447f6ac321f3b7f9293a1bdc996c2 netselect-0.3-r1.ebuild 1155 -SHA256 1c34ef464ed4bda6be34a689d37c59eb9745cbd0bc70cfc1a302947b57cead47 netselect-0.3-r1.ebuild 1155 +MD5 8cd540443bd4f1638791a59b5df7814b files/digest-netselect-0.3-r1 238 +RMD160 7e99aef8cf70d0f88aad7f2cdce82bcf500856ac files/digest-netselect-0.3-r1 238 +SHA256 acad45ebe902130ed66741e72a6429041d1535642cd3194cc8dc6e71a72c694f files/digest-netselect-0.3-r1 238 diff -urN netselect.old/files/digest-netselect-0.3-r1 netselect/files/digest-netselect-0.3-r1 --- netselect.old/files/digest-netselect-0.3-r1 2006-07-15 01:29:41 +0200 +++ netselect/files/digest-netselect-0.3-r1 2006-07-15 01:34:21 +0200 @@ -1 +1,3 @@ MD5 3a3714946db2458e5db3d55373057ef2 netselect-0.3.tar.gz 22047 +RMD160 f57b7348549a033c008d3b67b85ef12a3f91c9aa netselect-0.3.tar.gz 22047 +SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 netselect-0.3.tar.gz 22047 diff -urN netselect.old/files/netselect.patch netselect/files/netselect.patch --- netselect.old/files/netselect.patch 1970-01-01 01:00:00 +0100 +++ netselect/files/netselect.patch 2006-07-15 01:34:11 +0200 @@ -0,0 +1,55 @@ +--- netselect.c.orig 2006-07-14 22:59:18.000000000 +0200 ++++ netselect.c 2006-07-14 22:57:22.000000000 +0200 +@@ -39,14 +39,13 @@ + * hey, great! Let me know. -- apenwarr + */ + +-#ifdef __EMX__ +-# include +-# include +-# include +-# include +-# include +-#else +-# include ++#ifdef __linux__ ++#include ++#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) ++#if defined(__OpenBSD__) ++#include ++#endif ++#include + #endif + + #include +@@ -152,6 +151,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; ++ int on = 1; + struct timeval now; + struct timezone tz; + OPacket outpacket; /* last output (udp) packet */ +@@ -234,7 +234,12 @@ + if (verbose >= 1) + fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n", + num_score, numhosts, numhosts==1 ? "" : "es"); +- ++ ++ if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) { ++ perror("IP_HDRINCL"); ++ _exit(EXIT_FAILURE); ++ } ++ + /* keep going until most of the hosts have been finished */ + must_continue = numhosts; + while (must_continue && must_continue >= numhosts/2) +@@ -712,7 +717,7 @@ + ip->ip_off = 0; + ip->ip_hl = sizeof(*ip) >> 2; + ip->ip_p = IPPROTO_UDP; +- ip->ip_len = 0; /* kernel fills this in */ ++ ip->ip_len = sizeof(OPacket); + ip->ip_ttl = ttl; + ip->ip_v = IPVERSION; + ip->ip_id = htons(ident + seq); diff -urN netselect.old/netselect-0.3-r1.ebuild netselect/netselect-0.3-r1.ebuild --- netselect.old/netselect-0.3-r1.ebuild 2006-07-15 01:29:41 +0200 +++ netselect/netselect-0.3-r1.ebuild 2006-07-15 01:32:33 +0200 @@ -10,7 +10,7 @@ LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86" +KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86 x86-fbsd" IUSE="" S="${WORKDIR}/${PN}" @@ -26,10 +26,8 @@ -e '34d' \ Makefile \ || die "sed Makefile failed" - if use ppc-macos; then - sed -i -e "s:::" netselect.c || die "sed Makefile failed" - fi - + + epatch "${FILESDIR}/netselect.patch" emake || die "emake failed" }