<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/af04b4aba085cb62d55c81e7f7c645a29e3f85c9">https://github.com/macports/macports-ports/commit/af04b4aba085cb62d55c81e7f7c645a29e3f85c9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit af04b4aba085cb62d55c81e7f7c645a29e3f85c9
</span>Author: Keto <therealketo@gmail.com>
AuthorDate: Sun Nov 24 01:08:00 2024 -0500
<span style='display:block; white-space:pre;color:#404040;'> netselect: Update to 0.4
</span>---
net/netselect/Portfile | 41 ++++++++++++++++++------------------
net/netselect/files/Makefile.diff | 36 -------------------------------
net/netselect/files/netselect.c.diff | 23 ++++++++++----------
3 files changed, 32 insertions(+), 68 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netselect/Portfile b/net/netselect/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d773df5676..01ba0316e53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netselect/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/netselect/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup makefile 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name netselect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup apenwarr netselect 0.4 netselect-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 3a3714946db2458e5db3d55373057ef2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f57b7348549a033c008d3b67b85ef12a3f91c9aa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fe81942589d5219d030e5cecfb12787fb6d3613416cb326dea4952bf53f9c978 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22047
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> categories net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span> license BSD
<span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description an ultrafast intelligent parallelizing binary-search implementation of "ping."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://web.archive.org/web/20170330204132/http://apenwarr.ca/netselect/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://web.archive.org/web/20120801072054if_/http://apenwarr.ca/netselect/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description An ultrafast intelligent parallelizing binary-search implementation of "ping"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles netselect.c.diff Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4a124acea19f4bcfb98f1b66ae5f89c2e56da97b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ae343991c94b1fdeb5e7896bb11d357c1dd9297f5d842c507953f57935e15e19 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22095
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append netselect.c.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.destdir DESTDIR="${destroot}" PREFIX="${prefix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.has_destdir no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+makefile.override-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url [lindex ${master_sites} 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 555 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 444 ${worksrcpath}/${name}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netselect/files/Makefile.diff b/net/netselect/files/Makefile.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb38b806ad3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netselect/files/Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.orig Wed Jan 14 16:29:58 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile Wed Jan 14 16:30:40 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PREFIX = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--BINDEST = ${PREFIX}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--MANDEST = ${PREFIX}/man/man8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+BINDEST = ${DESTDIR}${PREFIX}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MANDEST = ${DESTDIR}${PREFIX}/man/man8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC = gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = -O2 -Wall -I. -g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,18 +19,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- netselect: netselect.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CC} ${LDFLAGS} -o $@ $^ ${LIBS}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifdef OS2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- emxbind -bwq netselect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -sudo chown root netselect && sudo chmod u+s netselect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef OS2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# emxbind -bwq netselect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# -sudo chown root netselect && sudo chmod u+s netselect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: $(PROG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -install -d ${BINDEST}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #-install -d ${MANDEST}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install $(STRIP) -o root -g root -m 4755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install $(STRIP) -o root -g wheel -m 4755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- netselect${BINSUFFIX} ${BINDEST}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install -o root -g root -m 0755 netselect-apt ${BINDEST}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #install -o root -g root -m 0644 netselect.8 ${MANDEST}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uninstall:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netselect/files/netselect.c.diff b/net/netselect/files/netselect.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e5021acf8b3..61f44057d21 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netselect/files/netselect.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/netselect/files/netselect.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- netselect.c.orig Wed Jan 14 16:13:00 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ netselect.c Wed Jan 14 16:24:00 2004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- netselect.c 2010-10-26 23:08:55.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ netselect.c 2024-11-24 00:06:55.339564162 +0000
</span> @@ -39,8 +39,10 @@
* hey, great! Let me know. -- apenwarr
*/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,26 +13,27 @@
</span> # include <fcntl.h>
# include <sys/types.h>
# include <sys/select.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,6 +154,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -167,6 +169,7 @@
</span> extern int optind;
int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int ch, seq, ttl, max_ttl = 30, min_tries = 10, num_score = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int ch, seq, ttl, max_ttl = 30, num_score = 1;
</span> + int on = 1;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ int use_icmp = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int min_tries = 10;
</span> struct timeval now;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- struct timezone tz;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPacket outpacket; /* last output (udp) packet */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -235,6 +238,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -280,7 +283,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (verbose >= 1)
</span> fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n",
num_score, numhosts, numhosts==1 ? "" : "es");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> + if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ perror("IP_HDRINCL");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ perror("IP_HDRINCL");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ exit(1);
</span> + }
/* keep going until most of the hosts have been finished */
must_continue = numhosts;
while (must_continue && must_continue >= numhosts/2)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -712,7 +719,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -774,7 +780,7 @@
</span> ip->ip_off = 0;
ip->ip_hl = sizeof(*ip) >> 2;
ip->ip_p = IPPROTO_UDP;
</pre><pre style='margin:0'>
</pre>