From nobody Wed Feb 19 03:55:58 2025 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 4YyMxq4H9lz5ngqD; Wed, 19 Feb 2025 03:55:59 +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 4YyMxp6LH4z40K4; Wed, 19 Feb 2025 03:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739937358; 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=Ez5PNDj+oMk7ibGPXr8usRUOVrG4PEsX5tdlPDSfi9A=; b=behk3zNeKJCthBFkAD/rlSTm4hKkryS++/UMJ2Ef62IgB0GgXZJ57il6rom6c+WADRNHkX yMDXA7JmayVK4sF1oFuABbSU/CAniQ34YmEVLlnISR3vkMvFUicWycFIGm6uW+2tS4I2W9 CXsnwOBPo7ObVSatiJ9rMq+jX0nw0og2z6uEPDnh8V9LeIfNsSrT0G7k40GOrRUkNf6O71 U3HYz+VYSIjG11nLG5xxyU9/1CiqlHb70TDsINq2NRxcoe0hd+DthCqUIKBOJprYHm+92E cnjWLc3TXnR617TClwWAOGxNVsRQ5Rbyka3QfGkwGdgVe+dScIhAg1Gedl86Hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739937358; a=rsa-sha256; cv=none; b=COAto1/J5iZX/da21owiAmvGP3MvSZ6nM9M4o6bY43pvdUCI+nO+xk0hJKMKso5DnugQAV ytS46SOVY56FV5UVE4pYejtLmp/NgwFpH0kbl+X108pmyC2fsun6HUaXDLfTx6CLqYhkyb Fh0p+L5UIdF/rL8qqTpHJSkQf5/+NkNHEJHJf08s5hb5zguKyG2B1JXa++7b56zX++8os+ /paYXZMlbtNjRrIaaR0+c5dDzck2wlaHO/5J4DeJyLqWP7qjBo1T4n0HnavFM68IFITxzl V82MrmCLEXqBrYDUS98JKDbijvXZGVwk0DEFbc1s2uh/2mlr2hP4th+myssf/Q== 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=1739937358; 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=Ez5PNDj+oMk7ibGPXr8usRUOVrG4PEsX5tdlPDSfi9A=; b=X89AxUkfw0o2uaVi3g4EAu1rrtGOtb7ErEtKnYrPQ9TwuAtOma2YdASstAUcwt+zt9hLkp PtQ+E7x83nJGSGaOTML5/Og0H5UoZdExvvjpZurGyWB4yoOuTtN2hh7zR2b0HmqoPl2u+J hN0n0cGCm1dechq9HI4DS+tMvhj3a0ah5xq/v7FEYcWimdAEBmNH1XVVXbjkGzpP8eINYZ UnKKD0KSnyfFfv8WvorEqSuSNUkAJx6l04GO5vRj/OabDjnpgWOAT8gTik393QHroVbg+K KbvLZ0awlIVH2iMxJsxmlfHWD6EFpzQ7NQC2F/nb5Xgcsolbg6pbfaoRUBiI5g== 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 4YyMxp5xBjzq6y; Wed, 19 Feb 2025 03:55:58 +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 51J3tws7063038; Wed, 19 Feb 2025 03:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51J3tw4D063035; Wed, 19 Feb 2025 03:55:58 GMT (envelope-from git) Date: Wed, 19 Feb 2025 03:55:58 GMT Message-Id: <202502190355.51J3tw4D063035@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 37ce58edb91a - main - net/ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37ce58edb91a6fb06efa1c847ed8710f988d39c4 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=37ce58edb91a6fb06efa1c847ed8710f988d39c4 commit 37ce58edb91a6fb06efa1c847ed8710f988d39c4 Author: Cy Schubert AuthorDate: 2025-02-19 03:43:15 +0000 Commit: Cy Schubert CommitDate: 2025-02-19 03:55:42 +0000 net/ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream 43537eb9c3e5 circumvented an upstream patch which caused an IPv6 pool regresson. This patch removes the circumvention and replaces it with an upstream patch planned for the new release of ntp. Obtained from: src bc02e6558720 MFH: 2025Q1 --- net/ntp/Makefile | 2 +- net/ntp/files/patch-ntpd_ntp__io.c | 15 +++++++++++++-- net/ntp/files/patch-ntpd_ntp_proto.c | 18 ------------------ 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/net/ntp/Makefile b/net/ntp/Makefile index c48eccfe6046..7b8937e5d1ad 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -1,6 +1,6 @@ PORTNAME= ntp PORTVERSION= 4.2.8p18 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \ http://archive.ntp.org/ntp4/ntp-4.2/ diff --git a/net/ntp/files/patch-ntpd_ntp__io.c b/net/ntp/files/patch-ntpd_ntp__io.c index b2bbf0fee058..10bac6d961f7 100644 --- a/net/ntp/files/patch-ntpd_ntp__io.c +++ b/net/ntp/files/patch-ntpd_ntp__io.c @@ -1,6 +1,17 @@ --- ntpd/ntp_io.c.orig 2024-05-07 04:21:17.000000000 -0700 -+++ ntpd/ntp_io.c 2025-02-18 19:31:18.434141000 -0800 -@@ -3205,7 +3205,7 @@ ++++ ntpd/ntp_io.c 2025-02-18 19:38:16.412031000 -0800 +@@ -1486,9 +1486,7 @@ + + if (IS_IPV6(psau)) { + p6addr = &psau->sa6.sin6_addr; +- if ( IN6_IS_ADDR_LINKLOCAL(p6addr) +- || IN6_IS_ADDR_SITELOCAL(p6addr)) { +- ++ if (IN6_IS_ADDR_LINKLOCAL(p6addr)) { + return TRUE; + } + } else if (IS_IPV4(psau)) { +@@ -3205,7 +3203,7 @@ } do { diff --git a/net/ntp/files/patch-ntpd_ntp_proto.c b/net/ntp/files/patch-ntpd_ntp_proto.c deleted file mode 100644 index d691fd1caade..000000000000 --- a/net/ntp/files/patch-ntpd_ntp_proto.c +++ /dev/null @@ -1,18 +0,0 @@ ---- ntpd/ntp_proto.c.orig 2024-05-07 04:21:28.000000000 -0700 -+++ ntpd/ntp_proto.c 2024-12-23 14:40:06.218503000 -0800 -@@ -471,6 +471,7 @@ - return; - } - -+#if 0 - /* [Bug 3851] drop pool servers which can no longer be reached. */ - if (MDF_PCLNT & peer->cast_flags) { - if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) -@@ -479,6 +480,7 @@ - return; - } - } -+#endif - - /* - * In unicast modes the dance is much more intricate. It is