From nobody Sun Feb 02 18:48:07 2025 X-Original-To: dev-commits-ports-main@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 4YmJY41JsZz5mhTs; Sun, 02 Feb 2025 18:48:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YmJY35Zhyz3Clp; Sun, 02 Feb 2025 18:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738522087; 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=7gjTgmOu/ER5r2Ewf5QXjQPLEuW941vLzJv7J3VLBWA=; b=iQYmCATKC76yg3vWIUHBqMISMERf+4OaGk1YEJSPs9XeFFBPw1a4Cywq3IOSp57flFazNo D+E+xfGWkwWfI6GZJxjlhavOd3EHeTTQlqhUY2ChfuJwmamusUBPbwgOW1+ip1LaIPnNIZ Tp/Wwa30yD7keg29XV8L8eX804DhwbK2Uh2GMKlKmnG1RpttLKwFLI6oyAlAa128xhPhLf CuP6lRf54tE/nnf/xv62NQgoaLGxXC2EORpZeuB4QXx3Odjan16rZaoDGDI62kyI+E8rFn 9iWooFZRVUyeFcVefK6tHbXWEX95eOTFHatYbtZRZofzkdhe/o1Lme+W4mlDGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738522087; 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=7gjTgmOu/ER5r2Ewf5QXjQPLEuW941vLzJv7J3VLBWA=; b=tZeT/md2fH6gmRq5okh9N1e8J0Q0YHvj/RCPkFhZbj9ImqHLQ0t3HKHj0kDlkUdQqdwKG9 oMKRjYAOOCd5viOLoYyfTlKSUuU4vb9O4aHOBay+dW8ZQoPTTHseGnK07Fi7HnFNteUvsK CiVRFmUl6WuuTclDfI4F2KiRcemYnK+8kvEZ10ZLqmmLxfoId2AUd2zB1M8mlzlgB6nfz3 hS+MTU5RXZIxXD9BSOwxClLSXhGJWx9HEMtv+HZV0KTIvkWBQxhAyP9sbibQkRXwOMCBLF ddLR2G4RY3zFciiKvOpo75IDjf3n80yCRZpt2COvr429Es3HBCUX6iLmhSC8dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738522087; a=rsa-sha256; cv=none; b=otlY7n09FHOyWn8wh/0qgQMlpstU8ytQ6xqglDS2d+wAszap6OKOVMdXivjrlyXGxfCO/Z vZNHVHTiSRA8eLw2oCmS/6bqNfixdMqjTD4Nh6w23ytOH4n61PzA8r4MJSsG/iclgt7g9B Z/wGRs7hNNxghskwseOUUfCQ1zwt9ZhDiB6+6RzqEd5utcDQwZRWBztZRQ6E95WnjAd/zE 4zkBuQLiu7WYpSVr/TRm0p4ZK/rO3SKe1Uzwz8eycZbVpzn4ZEdb6mJESnFIjfaGpMwFnX +o4GT6/ChNl6B/pvhnvvLC1DM+PzmlILj5CV8nR+/zeMs7w56vIs93V2p/d+Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YmJY352cBz12bv; Sun, 02 Feb 2025 18:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 512Im7N6019273; Sun, 2 Feb 2025 18:48:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 512Im7dN019270; Sun, 2 Feb 2025 18:48:07 GMT (envelope-from git) Date: Sun, 2 Feb 2025 18:48:07 GMT Message-Id: <202502021848.512Im7dN019270@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: eba24a3574a4 - main - net/fping: Update to 5.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eba24a3574a4c6edbcc178e9c1591f156936f7f2 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=eba24a3574a4c6edbcc178e9c1591f156936f7f2 commit eba24a3574a4c6edbcc178e9c1591f156936f7f2 Author: Andre Albsmeier AuthorDate: 2025-02-02 18:19:39 +0000 Commit: Daniel Engberg CommitDate: 2025-02-02 18:47:26 +0000 net/fping: Update to 5.3 * Replace PORTVERSION with DISTVERSION * Remove USES= autoreconf * Remove GNU_CONFIGURE_MANPREFIX * Remove patch (fixed upstream) * Adjustments to port makefile to more closely follow Porters Handbook Changelog: https://github.com/schweikert/fping/releases/tag/v5.3 Initial patch submitted by Andre Albsmeier with additions done by committer PR: 283648 Approved by: portmgr (maintainer timeout, 1+ month) --- net/fping/Makefile | 14 ++++++-------- net/fping/distinfo | 6 +++--- net/fping/files/patch-fping.c | 39 --------------------------------------- 3 files changed, 9 insertions(+), 50 deletions(-) diff --git a/net/fping/Makefile b/net/fping/Makefile index 56f4bcc6eed1..439c4716e791 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -1,9 +1,8 @@ PORTNAME= fping -PORTVERSION= 5.0 -PORTREVISION= 3 +DISTVERSION= 5.3 CATEGORIES= net MASTER_SITES= http://fping.org/dist/ \ - https://github.com/schweikert/${PORTNAME}/releases/download/v${PORTVERSION}/ + https://github.com/schweikert/${PORTNAME}/releases/download/v${DISTVERSION}/ MAINTAINER= jharris@widomaker.com COMMENT= Quickly ping multiple hosts without flooding the network @@ -15,18 +14,17 @@ LICENSE_NAME= Previous BSD License LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -USES= autoreconf - GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share + INSTALL_TARGET= install-strip OPTIONS_DEFINE= IPV6 OPTIONS_SUB= yes -IPV6_CONFIGURE_OFF=--disable-ipv6 + +IPV6_CONFIGURE_OFF= --disable-ipv6 post-install-IPV6-on: - ${RLN} ${STAGEDIR}${PREFIX}/sbin/fping ${STAGEDIR}${PREFIX}/sbin/fping6 + ${RLN} ${STAGEDIR}${PREFIX}/sbin/fping ${STAGEDIR}${PREFIX}/sbin/fping6 ${RLN} ${STAGEDIR}${PREFIX}/share/man/man8/fping.8 ${STAGEDIR}${PREFIX}/share/man/man8/fping6.8 .include diff --git a/net/fping/distinfo b/net/fping/distinfo index 99e8714e6a41..ae3754987f63 100644 --- a/net/fping/distinfo +++ b/net/fping/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1597788763 -SHA256 (fping-5.0.tar.gz) = ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8 -SIZE (fping-5.0.tar.gz) = 185281 +TIMESTAMP = 1735991851 +SHA256 (fping-5.3.tar.gz) = d57bd0141aea082e3adfc198bfc3db5dfd12a7014c7c2655e97f61cd54901d0e +SIZE (fping-5.3.tar.gz) = 197370 diff --git a/net/fping/files/patch-fping.c b/net/fping/files/patch-fping.c deleted file mode 100644 index e8b5343c04ba..000000000000 --- a/net/fping/files/patch-fping.c +++ /dev/null @@ -1,39 +0,0 @@ ---- src/fping.c.orig 2020-08-05 11:10:13 UTC -+++ src/fping.c -@@ -1060,11 +1060,11 @@ int main(int argc, char** argv) - exit(num_noaddress ? 2 : 1); - } - -- if (socket4 >= 0) { -+ if (src_addr_set && socket4 >= 0) { - socket_set_src_addr_ipv4(socket4, &src_addr, (socktype4 == SOCK_DGRAM) ? &ident4 : NULL); - } - #ifdef IPV6 -- if (socket6 >= 0) { -+ if (src_addr6_set && socket6 >= 0) { - socket_set_src_addr_ipv6(socket6, &src_addr6, (socktype6 == SOCK_DGRAM) ? &ident6 : NULL); - } - #endif -@@ -2299,6 +2299,22 @@ int wait_for_reply(int64_t wait_time) - #endif - else { - return 1; -+ } -+ -+ /* Check that src address is one of the hosts we pinged before */ -+ int found = 0; -+ for (int i = 0; i < num_hosts; i++) { -+ HOST_ENTRY *h = table[i]; -+ if (!addr_cmp((struct sockaddr*)&response_addr, (struct sockaddr*)&h->saddr)) { -+ found = 1; -+ break; -+ } -+ } -+ if (!found) { -+ // char buf[INET6_ADDRSTRLEN]; -+ // getnameinfo((struct sockaddr*)&response_addr, sizeof(response_addr), buf, INET6_ADDRSTRLEN, NULL, 0, NI_NUMERICHOST); -+ // fprintf(stderr, "ignoring response from %s\n", buf); -+ return 1; /* packet received, but not from a host we pinged */ - } - - seqmap_value = seqmap_fetch(seq, current_time_ns);