Hi, I have update Chrony to version 4.8. After contacting hannken directly I made changes recommended by him. This is the cleanup patch: Since I'm not subscribed to the list, it would be helpful to be on the CC if questions arise. /Thomas === begin patch === >From 9de8ee59cbf0c1e138023fd6ba7c1b8360717f6d Mon Sep 17 00:00:00 2001 From: Thomas Kupper <tom%kupper.org@localhost> Date: Mon, 12 Jan 2026 06:08:12 +0000 Subject: [PATCH] chrony: update to version 4.8 --- net/chrony/Makefile | 7 +++--- net/chrony/distinfo | 10 ++++---- net/chrony/patches/patch-client.c | 6 ++--- .../patch-examples_chrony.conf.example3 | 24 +++++++++---------- 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 897f645e6987e64c3f4074fc55158dd8db1fa2f5..3277ef6e5efce59e57281fadd48677b300e6a06f 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2026/01/07 08:48:14 wiz Exp $ +# $NetBSD: Makefile,v 1.61 2025/05/18 10:27:33 zafer Exp $ -DISTNAME= chrony-4.2 -PKGREVISION= 11 +DISTNAME= chrony-4.8 CATEGORIES= net -MASTER_SITES= https://www.aydogan.net/distfiles/net/ +MASTER_SITES= https://chrony-project.org/releases/ MAINTAINER= hannken%NetBSD.org@localhost HOMEPAGE= https://chrony.tuxfamily.org/ diff --git a/net/chrony/distinfo b/net/chrony/distinfo index e84bba4caea6c0986f3a8e5a63ad7a575be2dc67..368f9073ebd4d3b2ea10717d365fcc03c1df089c 100644 --- a/net/chrony/distinfo +++ b/net/chrony/distinfo @@ -1,10 +1,10 @@ $NetBSD: distinfo,v 1.19 2022/04/12 14:19:55 nia Exp $ -BLAKE2s (chrony-4.2.tar.gz) = 15ae796007e985ff0588afd847d1aaf9ce3681eb6818425d0e87d6fd3ff71bc5 -SHA512 (chrony-4.2.tar.gz) = 7f946b27de605b3ebea62cf23916dfad77c99e8b2338ba239ede6b8216ce436b3d4d87770f371c8d8e006507c51d5c831b51f067957abd2935adfdec3f5aa67d -Size (chrony-4.2.tar.gz) = 578411 bytes +BLAKE2s (chrony-4.8.tar.gz) = 34eafb5ca35d3b21b1e3fc496a3b1e5ec1721bbab1d1cf0db8da5a4e8e53859e +SHA512 (chrony-4.8.tar.gz) = 949b796bb34db32a5c1b9e6b53be6a22e51c59f24a316d585b8a52a52ab1f61bdf0378dc58b282bb0ba4fac1f05e1e99fbe37cb4259aa2b359e7bf679c176aab +Size (chrony-4.8.tar.gz) = 649368 bytes SHA1 (patch-Makefile.in) = 42ebfcdbce472a173890571625efc4fef583d5b6 -SHA1 (patch-client.c) = 4155d6de9899ed599ace4a516f62847dfa723f53 +SHA1 (patch-client.c) = 483c71fc734192002bb0eaaefcb0f73c9aaaa941 SHA1 (patch-configure) = bf8ab3d81dafafb329402dd0eb4ac276eed10a2f SHA1 (patch-doc_Makefile.in) = 8e9902690ff431fd47429d53346faf2ac8f1b923 -SHA1 (patch-examples_chrony.conf.example3) = e26c69b806b970a2e958c94725531e7cbbcfae1c +SHA1 (patch-examples_chrony.conf.example3) = 52ab12ded077447b79601c0f07257740dd2ec926 diff --git a/net/chrony/patches/patch-client.c b/net/chrony/patches/patch-client.c index ef592b52307d08bca5b73a51ff3ffcd75b385949..0433cb683c1705b5850fc032826ed606e5599f81 100644 --- a/net/chrony/patches/patch-client.c +++ b/net/chrony/patches/patch-client.c @@ -1,9 +1,9 @@ -$NetBSD: patch-client.c,v 1.1 2021/03/12 09:57:18 nia Exp $ +$NetBSD$ NetBSD provides libedit-as-readline, but chrony wants libedit. just include the fake readline header. ---- client.c.orig 2020-10-07 15:27:34.000000000 +0000 +--- client.c.orig 2025-08-27 12:05:31.000000000 +0000 +++ client.c @@ -44,7 +44,7 @@ #include "util.h" @@ -13,4 +13,4 @@ just include the fake readline header. +#include <readline.h> #endif - /* ================================================== */ + #define MAX_UNIX_SOCKET_LENGTH (sizeof ((struct sockaddr_un *)NULL)->sun_path) diff --git a/net/chrony/patches/patch-examples_chrony.conf.example3 b/net/chrony/patches/patch-examples_chrony.conf.example3 index 38ea96eb8d861107057f2f395f2ade0a25f39215..ba025d72f61791b87ea12ecfaa8897e3bc447145 100644 --- a/net/chrony/patches/patch-examples_chrony.conf.example3 +++ b/net/chrony/patches/patch-examples_chrony.conf.example3 @@ -2,7 +2,7 @@ $NetBSD: patch-examples_chrony.conf.example3,v 1.2 2021/03/12 09:57:18 nia Exp $ Prepare for SUBST, not processed by configure. ---- examples/chrony.conf.example3.orig 2020-10-07 15:27:34.000000000 +0000 +--- examples/chrony.conf.example3.orig 2025-08-27 12:05:31.000000000 +0000 +++ examples/chrony.conf.example3 @@ -1,7 +1,7 @@ ####################################################################### @@ -13,7 +13,7 @@ Prepare for SUBST, not processed by configure. # want to enable. The more obscure options are not included. Refer # to the documentation for these. # -@@ -79,12 +79,12 @@ +@@ -81,12 +81,12 @@ # immediately so that it doesn't gain or lose any more time. You # generally want this, so it is uncommented. @@ -28,7 +28,7 @@ Prepare for SUBST, not processed by configure. # If you specify an NTP server with the nts option to enable authentication # with the Network Time Security (NTS) mechanism, or enable server NTS with -@@ -92,15 +92,15 @@ driftfile /var/lib/chrony/drift +@@ -94,15 +94,15 @@ driftfile /var/lib/chrony/drift # allow the client/server to save the NTS keys and cookies in order to reduce # the number of key establishments (NTS-KE sessions). @@ -40,14 +40,14 @@ Prepare for SUBST, not processed by configure. # and edit the following lines to specify the locations of the certificate and # key. --! ntsservercert /etc/.../foo.example.net.crt --! ntsserverkey /etc/.../foo.example.net.key -+! ntsservercert @PKG_SYSCONFDIR@/.../foo.example.net.crt -+! ntsserverkey @PKG_SYSCONFDIR@/.../foo.example.net.key +-! ntsservercert /etc/.../nts-server.crt +-! ntsserverkey /etc/.../nts-server.key ++! ntsservercert @PKG_SYSCONFDIR@/.../nts-server.crt ++! ntsserverkey @PKG_SYSCONFDIR@/.../nts-server.key # chronyd can save the measurement history for the servers to files when # it exits. This is useful in 2 situations: -@@ -117,14 +117,14 @@ ntsdumpdir /var/lib/chrony +@@ -119,14 +119,14 @@ ntsdumpdir /var/lib/chrony # # Uncomment the following line to use this. @@ -62,9 +62,9 @@ Prepare for SUBST, not processed by configure. -! pidfile /var/run/chrony/chronyd.pid +! pidfile @VARBASE@/run/chrony/chronyd.pid - # If the system timezone database is kept up to date and includes the - # right/UTC timezone, chronyd can use it to determine the current -@@ -165,7 +165,7 @@ ntsdumpdir /var/lib/chrony + # The system timezone database usually comes with a list of leap seconds and + # corresponding TAI-UTC offsets. chronyd can use it to set the offset of the +@@ -167,7 +167,7 @@ ntsdumpdir /var/lib/chrony # produce some graphs of your system's timekeeping performance, or you # need help in debugging a problem. @@ -73,7 +73,7 @@ Prepare for SUBST, not processed by configure. ! log measurements statistics tracking # If you have real time clock support enabled (see below), you might want -@@ -289,7 +289,7 @@ ntsdumpdir /var/lib/chrony +@@ -291,7 +291,7 @@ ntsdumpdir /var/lib/chrony # You need to have 'enhanced RTC support' compiled into your Linux # kernel. (Note, these options apply only to Linux.) === end patch === |