summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/ntp/Makefile2
-rw-r--r--net/ntp/files/patch-ntpd_ntp__io.c15
-rw-r--r--net/ntp/files/patch-ntpd_ntp_proto.c18
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