From nobody Sun Dec 31 22:59:37 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T3F1Q2Jdtz55W5W; Sun, 31 Dec 2023 22:59:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T3F1P4GC7z4HgG; Sun, 31 Dec 2023 22:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704063577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fPW+uMCsJwpW1vYgNKb+q1RGOgz82+Ojz7ajxxdDt5A=; b=B1Ejmx3J/dMYFlhfQj5ZU3ns4v6hClGzgGr8J3O65fa7yKjADqbuDjoW0a9JnVlUzs344t wxjQSJ8zH2YpheUdaHLzJi6336llewFRtoMJv4oe6ltxeL+zq69RVxvyQCk74pJD5IAbzx Ew8AHOplxX8VnuT+8ZNSmYwE7lRVyC/Ojq7b2w9y1yx0F3FbiCPFKROyDjdbKUl9ZECKyR iwMLtqg1W0Dup9+mQldUJ24vhe6FW1coI3De5D5x6MIXQyiYyKK2RKRQbl48dwzXOwuhZT uFuYK9ZKZrr/dsrZiR34B/V00IeVG1+nrfOV4wKQxTDCkVyswBIivMs2wn6etA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704063577; a=rsa-sha256; cv=none; b=kU+d3XfJl5ZoNuoISFWH8l94pFfHgxRMCxg1HGbhBn9sMts94TwVkk93bZDEZGlKCQ4WEy EkuFfSD78nbqhauMAMI+YfrbSoROukaN9u1jBhGaHqKMEi3pn1B8ddtebXBpJOlAh8u/+k jzEA4djbcHsKGNY6zxEZQTosNc4nix4J8EhCxRCTyxMW8+lAE/IrNb7zIeKL+nN9aBjldq TaX92eVf6Kwt1zzw4wlMNVf2aPV9YGod4Av2mtbMg6aqJvj/KRJeh9bmHCYgHUCnWgknrk uxSS7SOH6E/FdRRH2zQp+eB9CO6fpjtQzN5tsn+HTFwNpco3bI/b9tU1ZjZNJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704063577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fPW+uMCsJwpW1vYgNKb+q1RGOgz82+Ojz7ajxxdDt5A=; b=Flnt6PEsuhLwwmZWuo9ntQnRz51PcuiYKDtlXvGykIupGfDHJu/crbK9r+/ztnP7GjapDq OODU9wVgQAG/j7bvYWMS4URLVZgYw8DJqvz7WNfoYSCqkQRemfVB+H2Mybvlk+SX1Y4Lmj BGkr0iJl52YU3H/2hyi9dN4NpZjnS8miqPKOhz/NVlrpBiUSO7SOChaG8KrysskYLUUH59 xEf7MkefKREKhngocNic+ImyEPL8RvOjqFte7lKrsGGSytN/9KBTDmakjJqbsoK8xovna7 76yPPCnvGL06xAfNc94KiWd8wjxQOVdIQ/yi/scf97GA0PHh+Le0hKj0+yA/GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T3F1P2sK7zsqR; Sun, 31 Dec 2023 22:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BVMxbPp096185; Sun, 31 Dec 2023 22:59:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BVMxbKs096182; Sun, 31 Dec 2023 22:59:37 GMT (envelope-from git) Date: Sun, 31 Dec 2023 22:59:37 GMT Message-Id: <202312312259.3BVMxbKs096182@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 7b6d75861b96 - main - net/netselect: Jettison endian hacks List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b6d75861b96e8f49f4d9b28e20475def1aa3254 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b6d75861b96e8f49f4d9b28e20475def1aa3254 commit 7b6d75861b96e8f49f4d9b28e20475def1aa3254 Author: Muhammad Moinur Rahman AuthorDate: 2023-12-31 05:15:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-31 20:23:48 +0000 net/netselect: Jettison endian hacks - Pet portclippy --- net/netselect/Makefile | 2 +- net/netselect/files/patch-netselect.c | 31 ++++--------------------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/net/netselect/Makefile b/net/netselect/Makefile index 651ad955b84e..820ede8b9957 100644 --- a/net/netselect/Makefile +++ b/net/netselect/Makefile @@ -11,11 +11,11 @@ LICENSE= BSD3CLAUSE USES= gmake USE_GITHUB= yes - GH_ACCOUNT= apenwarr OPTIONS_DEFINE= SUID DOCS OPTIONS_SUB= yes + SUID_DESC= Install with the setuid bit to allow use by non-root users do-build: diff --git a/net/netselect/files/patch-netselect.c b/net/netselect/files/patch-netselect.c index 413ba24de07e..0d18806d5818 100644 --- a/net/netselect/files/patch-netselect.c +++ b/net/netselect/files/patch-netselect.c @@ -1,29 +1,6 @@ --- netselect.c.orig 2010-10-26 23:08:55 UTC +++ netselect.c -@@ -39,15 +39,14 @@ - * 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 - #include -@@ -167,6 +166,7 @@ int main(int argc, char **argv) +@@ -167,6 +167,7 @@ int main(int argc, char **argv) extern int optind; int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100; int ch, seq, ttl, max_ttl = 30, num_score = 1; @@ -31,7 +8,7 @@ int use_icmp = 0; unsigned int min_tries = 10; struct timeval now; -@@ -280,7 +280,12 @@ int main(int argc, char **argv) +@@ -280,7 +281,12 @@ int main(int argc, char **argv) if (verbose >= 1) fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n", num_score, numhosts, numhosts==1 ? "" : "es"); @@ -45,7 +22,7 @@ /* keep going until most of the hosts have been finished */ must_continue = numhosts; while (must_continue && must_continue >= numhosts/2) -@@ -774,7 +779,7 @@ static void send_probe(int seq, int ttl, OPacket *op, +@@ -774,7 +780,7 @@ static void send_probe(int seq, int ttl, OPacket *op, ip->ip_off = 0; ip->ip_hl = sizeof(*ip) >> 2; ip->ip_p = IPPROTO_UDP; @@ -54,7 +31,7 @@ ip->ip_ttl = ttl; ip->ip_v = IPVERSION; ip->ip_id = htons(ident + seq); -@@ -905,11 +910,7 @@ static HostData *wait_for_reply(HostData *hosts, int n +@@ -905,11 +911,7 @@ static HostData *wait_for_reply(HostData *hosts, int n time_t msec_used; HostData *host;