Add patch to make netselect work on non-Linux systems (BSDish), thanks to Timothy Redaelli in bug #140414. Add ~x86-fbsd keyword.

Package-Manager: portage-2.1.1_pre2-r8

5 files changed, 100 insertions, 16 deletions

diff --git a/net-analyzer/netselect/ChangeLog b/net-analyzer/netselect/ChangeLog
index 0b4626973517..77852e1a6e84 100644
--- a/net-analyzer/netselect/ChangeLog
+++ b/net-analyzer/netselect/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/netselect
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/ChangeLog,v 1.27 2006/04/09 11:27:05 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/ChangeLog,v 1.28 2006/07/15 16:20:42 flameeyes Exp $
+
+  15 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/netselect-0.3-bsd.patch, netselect-0.3-r1.ebuild:
+  Add patch to make netselect work on non-Linux systems (BSDish), thanks to
+  Timothy Redaelli in bug #140414. Add ~x86-fbsd keyword.
 
   09 Apr 2006; Markus Ullmann <jokey@gentoo.org> netselect-0.3-r1.ebuild:
   Changing fperms wrt bug #129265 and clean up
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 9567e261cb5c..f03e7bb15009 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -1,12 +1,30 @@
-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
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX netselect-0.3-bsd.patch 1670 RMD160 0d93b937bbef10af53def6cd124e123fe12de3aa SHA1 eafea877b92d3ccc21563597f92711e47faca8df SHA256 b351edf5a8acfc6bece5ce0079129aa5896389478aac793e596f70b29db9583a
+MD5 90b8f27e416506f3655181b7a39fcbe1 files/netselect-0.3-bsd.patch 1670
+RMD160 0d93b937bbef10af53def6cd124e123fe12de3aa files/netselect-0.3-bsd.patch 1670
+SHA256 b351edf5a8acfc6bece5ce0079129aa5896389478aac793e596f70b29db9583a files/netselect-0.3-bsd.patch 1670
+DIST netselect-0.3.tar.gz 22047 RMD160 f57b7348549a033c008d3b67b85ef12a3f91c9aa SHA1 708512a6eddb2e9aee0ad80c72ddc63f08372cab SHA256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978
+EBUILD netselect-0.3-r1.ebuild 1140 RMD160 7dffda0a7e10c960a72fb76c3d2130a02b53926f SHA1 3afe4b1fd7a59d490dab597334235626d3166e65 SHA256 102cb30487450c8c51a025bbf2fe1d3e1b93f3f6bec92c27308695ee44114183
+MD5 0998eb994a5f2e8ffe4cbc55e3995dbf netselect-0.3-r1.ebuild 1140
+RMD160 7dffda0a7e10c960a72fb76c3d2130a02b53926f netselect-0.3-r1.ebuild 1140
+SHA256 102cb30487450c8c51a025bbf2fe1d3e1b93f3f6bec92c27308695ee44114183 netselect-0.3-r1.ebuild 1140
+MISC ChangeLog 3239 RMD160 b12599b0fb450d7eb38b604e6fc63a6595086b36 SHA1 a972ba6a1a5e29a126d7ed57a93ff789f121e2e1 SHA256 a0ebbe456dc99abd994bad4929c896fcff576bddd8eed9980366bf927a5e79f0
+MD5 286406e35f8df1380bd4a15eac2c8787 ChangeLog 3239
+RMD160 b12599b0fb450d7eb38b604e6fc63a6595086b36 ChangeLog 3239
+SHA256 a0ebbe456dc99abd994bad4929c896fcff576bddd8eed9980366bf927a5e79f0 ChangeLog 3239
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEuRXhAiZjviIA2XgRAiiLAJ0S5mG22HX5jkecPWX3rVE1igpBJQCgos7q
+joK2JiCr9owQjgKOnl1e7WU=
+=U30Z
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netselect/files/digest-netselect-0.3-r1 b/net-analyzer/netselect/files/digest-netselect-0.3-r1
index c6c319950d7b..b8cf6541048d 100644
--- a/net-analyzer/netselect/files/digest-netselect-0.3-r1
+++ b/net-analyzer/netselect/files/digest-netselect-0.3-r1
@@ -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 --git a/net-analyzer/netselect/files/netselect-0.3-bsd.patch b/net-analyzer/netselect/files/netselect-0.3-bsd.patch
new file mode 100644
index 000000000000..6e7f1cacca48
--- /dev/null
+++ b/net-analyzer/netselect/files/netselect-0.3-bsd.patch
@@ -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 <io.h>
+-# include <fcntl.h>
+-# include <sys/types.h>
+-# include <sys/select.h>
+-# include <machine/endian.h>
+-#else
+-# include <endian.h>
++#ifdef __linux__
++#include <endian.h>
++#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
++#if defined(__OpenBSD__)
++#include <machine/types.h>
++#endif
++#include <machine/endian.h>
+ #endif
+ 
+ #include <sys/param.h>
+@@ -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 --git a/net-analyzer/netselect/netselect-0.3-r1.ebuild b/net-analyzer/netselect/netselect-0.3-r1.ebuild
index 6a0631486afd..03529cf66676 100644
--- a/net-analyzer/netselect/netselect-0.3-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/netselect-0.3-r1.ebuild,v 1.16 2006/04/09 11:27:05 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/netselect-0.3-r1.ebuild,v 1.17 2006/07/15 16:20:42 flameeyes Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic
 
 DESCRIPTION="Ultrafast implementation of ping."
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/netselect/"
@@ -10,11 +10,18 @@ SRC_URI="http://www.worldvisions.ca/~apenwarr/netselect/${P}.tar.gz"
 
 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}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-bsd.patch"
+}
+
 src_compile() {
 	append-ldflags $(bindnow-flags)
 
@@ -26,9 +33,6 @@ src_compile() {
 		-e '34d' \
 		Makefile \
 		|| die "sed Makefile failed"
-	if use ppc-macos; then
-		sed -i -e "s:<endian.h>:<machine/endian.h>:" netselect.c || die "sed Makefile failed"
-	fi
 
 	emake || die "emake failed"
 }