From nobody Mon Dec 23 22:47:29 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 4YHCp93w5sz5hYcX; Mon, 23 Dec 2024 22:47:29 +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 4YHCp93Fjxz4NNf; Mon, 23 Dec 2024 22:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734994049; 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=n6h6mLzOGtBo9f7a2ZPD5wjpUA8NnDKB6TV9hEP1WGE=; b=IYWiZFGSFASPb+rVchDBTVHg91nK3aoU3Iixpw34eYGWLPNA9eAa/cLEer1zcQsqSeWHc4 S/FXS3M9MgHVPENGRAzrG3NSgMr3CR2RYje7JDsWe7BEnpGxclZyUW3VV/ZrtPa2CtPiRw xbgNBfmKXKP127LZH7XczzqUTRr116y81iJLmbcTXgH+SUajQIddBspvhJQ1NpFw0NG/rS NqUl9bO7dJmnddFm7d++90aQ5031cd91CAwncO+PrH3BCoAaMKOVdFd/5858dysgVnYQsf CZg6Er+0D22IBv3P2vH42cf7sBK9TWwPix9viL6MvUHTifCTLg5Jg+Gef9fs2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734994049; 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=n6h6mLzOGtBo9f7a2ZPD5wjpUA8NnDKB6TV9hEP1WGE=; b=l9BRT5bPZ4okLAeJoytdBkZrCLQTR2nd8Jv8JlIo3dSVZozjVkFd+dKQS8kKr5l3p2yPsf vlD31QD1rSpe4NO2IHeNGp+f0aRtsxzvq66JkHR1QAdkKeprG+oE5Qo49LqzyZYD4ALUwj ZwTJ7RczDTTHDCXQ3QxJEPsYvMejN9Y+H4Lm5+DWwmn/sdcxqSoUeK6zN34e/sm8XaxRrn uysuMuNb2b4xAlSJq3NsJQUKreZKJypq4v2bgq7XoIJVAmCdX+qtyMIZbL5y+SVlnpTHFJ WvCyY0BKuBFx5yZKlY5dLJKVNlo0XWyzVvEIkncBy8P5MG9T9X9ARTAuvwwRrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734994049; a=rsa-sha256; cv=none; b=RXWXU7GwEY6HNm5SyUdzx6ukmRRNUt9zssIBtlEdW3wnjWAAz467RZH285nZlw6mnnTpfg hPN6XPbzVResGTX6j9uyOzZi5Vtk40JcrMbR/chvdN4c97keba2jlmNZQocCTy5SGM2bU0 9+Uc5JMIeKsKJ5hcuvsAm7K58gbUbQTFN1EadiCCLoMA7npHJhqRxJtP/8VKQq+VP6NPLw EgpefphVwHv3XEpOLzyLkEiTevU+mWQxqH6g38rbEUqXJg8PtMupDbi8mwusHEW4JQ9t5P pRwQBACXFr1KbmsRXHQyPPNv/xgQQZupudTCnOca4DKWsubiLplWTxy3AmC6OA== 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 4YHCp92m6kz1CBV; Mon, 23 Dec 2024 22:47:29 +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 4BNMlTjM097327; Mon, 23 Dec 2024 22:47:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BNMlTiQ097324; Mon, 23 Dec 2024 22:47:29 GMT (envelope-from git) Date: Mon, 23 Dec 2024 22:47:29 GMT Message-Id: <202412232247.4BNMlTiQ097324@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: 088aa7d5609b - 2024Q4 - 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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 088aa7d5609bcd9d11a32fd743dff59a402248da Auto-Submitted: auto-generated The branch 2024Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=088aa7d5609bcd9d11a32fd743dff59a402248da commit 088aa7d5609bcd9d11a32fd743dff59a402248da Author: Cy Schubert AuthorDate: 2024-12-23 22:42:54 +0000 Commit: Cy Schubert CommitDate: 2024-12-23 22:47:20 +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 (cherry picked from commit 43537eb9c3e5d588ec4add6973ae03c6053a863a) --- 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 dce7244f7f6d..19f8dcb7eb83 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