git: 088aa7d5609b - 2024Q4 - net/ntp: Undo upstream (ntp.org) fix for upstream Bug 3851

The branch 2024Q4 has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=088aa7d5609bcd9d11a32fd743dff59a402248da

commit 088aa7d5609bcd9d11a32fd743dff59a402248da
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-12-23 22:42:54 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
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