diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2024-12-23 14:42:54 -0800 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2024-12-23 14:47:20 -0800 |
| commit | 088aa7d5609bcd9d11a32fd743dff59a402248da (patch) | |
| tree | 713fcafb8790612e894848cd0473502200f57a2c | |
| parent | e328e7c218833412be5537690ffd61924b128593 (diff) | |
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)
| -rw-r--r-- | net/ntp/Makefile | 1 | ||||
| -rw-r--r-- | net/ntp/files/patch-ntpd_ntp_proto.c | 18 |
2 files changed, 19 insertions, 0 deletions
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 |