From nobody Wed Feb 19 04:34:03 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 4YyNnm1HyKz5njlJ; Wed, 19 Feb 2025 04:34:04 +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 4YyNnl6X9Mz3Nh5; Wed, 19 Feb 2025 04:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739939643; 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=NCoPvY9PiAOXEfUZb+Wcl0HZ6H/qF1QqubTFb+cF9BI=; b=ctqV0xUkIY4kxsFhlgFFDL5dI1x56tNUJnTX2zvls2QgWHfeuGR2uDs50MiUDkrbhyPAiw 1VlquqTcRlOVZxHwS8d4d78K7K1VnFsMFshAyiILssCvB3adlnLJknMuqZzZxQ3t+cYbu+ wNaMIE5xjHEtQv5mbH2gc2q7rXBXwd/iery7Ie+ckDrHvRj00CAxFwfGop0xvhI5l3ej5X 4ztWTZI5E9KVmSwIsRfiTs1fO/oX8zNTcS2kSDMv1tIbV9CffpfSRdj05GXKOLtJ+wo8fI KBOfBkULUoNG3X67oXKj+dJdLzF0XwfTYchQgs6Y7YzM/BiQ46QXhna4NGw4eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739939643; a=rsa-sha256; cv=none; b=p1qC76Vxw8XqfCkDY+t5fx66pJviTnji9z2iwqfLRKvSK4gDVO4rLKmBXYsSHx84X3Ry4f QyILbgRh6QhtZQaQvV/rqO9L52yAgiiM2XvybuuSOdnThs/F55DIRrXChLinCWgbn4t1Sy 6rq8x+pxYsEKhXF7ljSyCiMlqkJSZipWfGasBD+ORk41A2zGWIBNkY7dlNzdbMCkf45t5J 9J9olRe9Jr+p8Ak6Ps4EoWIMAWm1+Gf/pRXUxwpncofFd9/hosddB1kUDpZKC086yYuPDK lcMIwT3X5a0nIu3FmBlbn2OrqQNw0QgsP3Fibu5ms6Zd4eAGA2Cxohw+a4kdwQ== 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=1739939643; 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=NCoPvY9PiAOXEfUZb+Wcl0HZ6H/qF1QqubTFb+cF9BI=; b=K0TqjiOh52DyGq/RAyv02vrA5CDXQAoykSX38QJdQ51olSeMjWupxeZrLmyBkPJXMlDuMV aUBcUFz/SlO84UVZMa2my/xDFYc+EO1QR/rRtrvSDGJc2QvgGUE7dft2SYkr/MKXXCQst0 fILwFaY8hooyzHclZdMe+Gl63+e0++3CWd4qhsCNHzJ2Ue+v5DMyA4MyKTkVIiewXDNXCk ZwxIqtDTQM33377lLr81sUP5WCsxMtG0Bc9mzYqZE3RdE2IYgae6kKuoUxOfPNjsAwbQ3Q ZDAb8fqhABX/eGS1zdXzrFIRIvRUGP7n4wyDVuqZB9a7STEDhUNvCdtXr9Gzdw== 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 4YyNnl6500zrW9; Wed, 19 Feb 2025 04:34:03 +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 51J4Y3Ff037518; Wed, 19 Feb 2025 04:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51J4Y3K1037515; Wed, 19 Feb 2025 04:34:03 GMT (envelope-from git) Date: Wed, 19 Feb 2025 04:34:03 GMT Message-Id: <202502190434.51J4Y3K1037515@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: eb41ab89fcea - 2025Q1 - 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/2025Q1 X-Git-Reftype: branch X-Git-Commit: eb41ab89fceabd1af4b02dcdb4a840824e06f520 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb41ab89fceabd1af4b02dcdb4a840824e06f520 commit eb41ab89fceabd1af4b02dcdb4a840824e06f520 Author: Cy Schubert AuthorDate: 2025-02-19 03:43:15 +0000 Commit: Cy Schubert CommitDate: 2025-02-19 03:58:29 +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 (cherry picked from commit 37ce58edb91a6fb06efa1c847ed8710f988d39c4) --- 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