diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile index 44cdb25e8b..51a78403b8 100644 --- a/net/ntpd/Makefile +++ b/net/ntpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ntp -PKG_VERSION:=4.2.8p15 -PKG_RELEASE:=4 +PKG_VERSION:=4.2.8p17 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ -PKG_HASH:=f65840deab68614d5d7ceb2d0bb9304ff70dcdedd09abb79754a87536b849c19 +PKG_HASH:=103dd272e6a66c5b8df07dce5e9a02555fcd6f1397bdfb782237328e89d3a866 PKG_LICENSE:=NTP PKG_LICENSE_FILES:=COPYRIGHT html/copyright.html diff --git a/net/ntpd/README.md b/net/ntpd/README.md index 70e11a6e3e..40ef733197 100644 --- a/net/ntpd/README.md +++ b/net/ntpd/README.md @@ -36,7 +36,7 @@ The parameter(s) `server` enumerate a list of servers to be used for reference NTP servers by the local daemon. At least one is required, and two or more are recommended (unless you have an extremely available local server). They should be picked to be geographically divergent, -and preferrably reachable via different network carriers to protect +and preferably reachable via different network carriers to protect against network partitions, etc. They should also be high-quality time providers (i.e. having stable, accurate clock sources). @@ -71,10 +71,10 @@ As a result, the NTP servers that your ISP may point you at are often of unknown/unverified quality, and you use them at your own risk. -Early millenial versions of Windows (2000, XP, etc) used NTP only +Early millennial versions of Windows (2000, XP, etc) used NTP only to _initially set_ the clock to approximately 100ms accuracy (and -not maintain sychronization), so the bar wasn't set very high. -Since then, requirements for higher-qualty timekeeping have +not maintain synchronization), so the bar wasn't set very high. +Since then, requirements for higher-quality timekeeping have arisen (e.g. multi-master SQL database replication), but most ISPs have not kept up with the needs of their users. diff --git a/net/ntpd/patches/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch b/net/ntpd/patches/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch deleted file mode 100644 index 7db6eefcfb..0000000000 --- a/net/ntpd/patches/0001-libntp-Do-not-use-PTHREAD_STACK_MIN-on-glibc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 31 Jul 2021 10:51:41 -0700 -Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc - -In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which -could mean different stack sizes at runtime on different architectures -and it also causes compile failure. Default glibc thread stack size -or 64Kb set by ntp should be good in glibc these days. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - libntp/work_thread.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/libntp/work_thread.c -+++ b/libntp/work_thread.c -@@ -41,7 +41,7 @@ - #ifndef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE (64U * 1024) - #endif --#ifndef __sun -+#if !defined(__sun) && !defined(__GLIBC__) - #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN - # undef THREAD_MINSTACKSIZE - # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN