From nobody Mon Dec 23 22:45:20 2024 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 4YHClj1n9Jz5hXyb; Mon, 23 Dec 2024 22:45:21 +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 4YHClj1G67z4NSy; Mon, 23 Dec 2024 22:45:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734993921; 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=0B/b/OvCQo7X8eWX0yDQAfuMi1+OR1q+tFeiN7d1ExU=; b=VIP7lxjHXsSVN8xIVs2dp47z447i5OQZ6AMiG1XmI8untn+5oLoi1dUFIhGcvIjom21X2r LBLLSFrSjrX9vEJ8TVpfWxbrY7l3Pzp/J+Om50NxyBhqrBFvW5CYwi74zdbplwhxVdTp+a z0O329pQvjOOWiNjHdV4tRPle4u21xvH9UCT9BiXBsT9OMrX5JKGGvmBiQdtDZ8IghD23U bSfAO/Z0BnX5i5y3bOQsciFemovhYBcMfw5BRMeNfAITsZIIZPowRsvnNekm3ESJct6z7D DCFGa+CPXEQSQgNIiH0xg5x4SqhVdXGELQN3ZQTflhpLEaUyowkJMgFJW4AArQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734993921; 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=0B/b/OvCQo7X8eWX0yDQAfuMi1+OR1q+tFeiN7d1ExU=; b=PAei5O38t+YAj+HLfnNq1OV9zJVnuNz7iwWfmOaDBYIl3ia9DfwXuCJn1hKdK7RSsFKUUi /LE0YM1n4J7S9o350gL1Y7283HL2CZcHywZrFwmnkNtjz621zw5qbnL3vVuREQ6TZcdjPM f6LeHsvJoIKCfCEovr1WAIxOW4UJJf8qGKzw1SKDc55x00DylHwyMkMgWCVDVDsU6BXfvY dIDKo1uTL8DkuVBQ7mTGklRJW8s4p+Fhg9IG5bSDoDZcDC9SPyQ45bddsHFpGW9sqZ8rtB BUDUr1GAkNVHXRY1x8SsyQP9Glw1sL3dUvELTPHzqnui1cb1UQHveQLYXo43+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734993921; a=rsa-sha256; cv=none; b=DGwSVdwzOSZv/JyMPK42/8Nzl8H4lJ1YHhTkFE9SxCvYnbbm6QLgZ3cGJjk+KxES8/vBoN N3Nud2ENbIs0EfRYUmFcalwg+1ewD1C6PXQVSqCWOVNdTGH2TPRabwsKm7CZXm+zn/JRXL QMTnYI52z8UlQtWEvYXpiE7/dPXQiCjS7izli38VCc4d37EzNaCJaL/V4HWWBT8a9h1gvA OEDuKHrS6ovBcw+aGF2VF3TUUxzt2xmCWrvvkZL83++bCWtoOEQyU4pKL5YZk7CaiassFF mY7Q46Wppr9jeC6hzcwzhpVYRcypnBwL8JoynoJLc4qd9I85Afy5TjH5YkJckQ== 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 4YHClj0lM3z1C0V; Mon, 23 Dec 2024 22:45:21 +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 4BNMjK9A096481; Mon, 23 Dec 2024 22:45:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNMjK1t096478; Mon, 23 Dec 2024 22:45:20 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:45:20 GMT Message-Id: <202412232245.4BNMjK1t096478@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: 43537eb9c3e5 - main - net/ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 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: 43537eb9c3e5d588ec4add6973ae03c6053a863a Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=43537eb9c3e5d588ec4add6973ae03c6053a863a commit 43537eb9c3e5d588ec4add6973ae03c6053a863a Author: Cy Schubert AuthorDate: 2024-12-23 22:42:54 +0000 Commit: Cy Schubert CommitDate: 2024-12-23 22:45:04 +0000 net/ntp: Undo upstream (ntp.org) fix for upstream Bug 3851 The patch for upstream (ntp.org) fix for upstream Bug 3851 may have fixed a Linux bug but it caused a regression when ntpd is run on FreeBSD. PR: 283116 MFH: 2024Q4 --- net/ntp/Makefile | 1 + net/ntp/files/patch-ntpd_ntp_proto.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/net/ntp/Makefile b/net/ntp/Makefile index b9101f5874c8..eedd057fd5d4 100644 --- a/net/ntp/Makefile +++ b/net/ntp/Makefile @@ -1,5 +1,6 @@ PORTNAME= ntp PORTVERSION= 4.2.8p18 +PORTREVISION= 1 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_proto.c b/net/ntp/files/patch-ntpd_ntp_proto.c new file mode 100644 index 000000000000..d691fd1caade --- /dev/null +++ b/net/ntp/files/patch-ntpd_ntp_proto.c @@ -0,0 +1,18 @@ +--- 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