From nobody Thu Dec 7 06:26:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Sm46M6s2Xz53hdS for ; Thu, 7 Dec 2023 06:26:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Sm46M5CM1z3cSC for ; Thu, 7 Dec 2023 06:26:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40b595bf5d2so7101825e9.2 for ; Wed, 06 Dec 2023 22:26:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1701930378; x=1702535178; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=31NqvO3xbsoZ4P95WNEJngzE3ewHXQUF0Ai4VaZ+L28=; b=nNZYzy/xgL1uaxLdewGwj0HRc7uEy21qImuDJmuEC+wrtSqd4SjKYNsbWReHnZ+eZz tudC8CjBKuFmbi6yQ1MsG+grAfVyiY6JyFm1m9EN8Apugce8u0eILsXWn9mAoGTcfyVj O6cUHWKQCF25junU9j4u/fZnQmsztPo9nseu0vUZu0tNIiLSyB6fKDZzGU8KH9ATjFP/ hB8tWwGgvO38MNLJdyXl7/VJI4D7QWI6gGKjUkhsoBxUrD+VJabXXTtUTzQ82iu1LjUc ombCrtu6/t6Wj0w/PaRNBB/vGzqd5PNiNULciBZSSgaksNuzRO3DZiqdySH5+pNo2njb USGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701930378; x=1702535178; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=31NqvO3xbsoZ4P95WNEJngzE3ewHXQUF0Ai4VaZ+L28=; b=HzMXQul6RhlaY9mPrICfIgVdHN0B2DZnHaKhTmnK0W7RNk+lsXKjCJ6jKkA1luiTmQ 4GPFgCejXTyihvi2dciQzSufVezBA9s+arCtTkJewihzqrmSJ8DdaePzy5UEiCIhaDEE CUgwNyrnSDf+ZHA3rv7mh+LKiATlYYF2pzlOrPHTO3QQBqO9hxoVK5UStTwf1Go+cwRK mqAGVwdFcC5vfAJP+uXkoE+sBznvH+ZAwoblAmOfFVdGUyMrheBx5Od5rHK+85UyV7O/ 2kYZUKlAbfWHopq6YlwoOBW60s+QXLvvTw+P3ES7W5K4HK+SHWKPM1fbXepVkDKxcQF0 Eo8Q== X-Gm-Message-State: AOJu0YxPdKKUpbrQMbdEMSgCs7xIhvEl7oJ5FKrgJ2yDb9yzD0uPX/kG Ho1W4VaMsuu3UN+8Ofl36Ri17mROHPi+rZK4/Lp28Q== X-Google-Smtp-Source: AGHT+IGLFyyCLFjx87h1qn18hQfaJb5gOvRNtKN4AiuBgBmKz99+tKk9B8RtLehyxEuRIb2LHhWnnRfHyrwzLNiPPu0= X-Received: by 2002:a05:600c:4fd4:b0:40b:5e21:c5d7 with SMTP id o20-20020a05600c4fd400b0040b5e21c5d7mr706710wmq.165.1701930377998; Wed, 06 Dec 2023 22:26:17 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> In-Reply-To: <202312070550.3B75o8WV066387@gitrepo.freebsd.org> From: Warner Losh Date: Wed, 6 Dec 2023 23:26:05 -0700 Message-ID: Subject: Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources To: Philip Paeps Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000009d08f0060be58b36" X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Sm46M5CM1z3cSC --0000000000009d08f0060be58b36 Content-Type: text/plain; charset="UTF-8" We should point to bipm https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list since they are the source of truth, no? Warner On Wed, Dec 6, 2023, 10:50 PM Philip Paeps wrote: > The branch main has been updated by philip: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=b1c95af45488bef649e9a84890e2414ff80b3a00 > > commit b1c95af45488bef649e9a84890e2414ff80b3a00 > Author: Philip Paeps > AuthorDate: 2023-12-07 05:48:13 +0000 > Commit: Philip Paeps > CommitDate: 2023-12-07 05:48:13 +0000 > > rc.conf: correct $ntp_leapfile_sources > > IETF is no longer serving leap-seconds.list. Point at IANA instead. > > This fixes "service ntpd fetch". > > MFC after: 1 day > --- > libexec/rc/rc.conf | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf > index 3269288728b6..145e0b70ca3b 100644 > --- a/libexec/rc/rc.conf > +++ b/libexec/rc/rc.conf > @@ -424,7 +424,7 @@ ntp_src_leapfile="/etc/ntp/leap-seconds" > # Initial source for ntpd leapfile > ntp_db_leapfile="/var/db/ntpd.leap-seconds.list" > # Working copy (updated weekly) leapfile > -ntp_leapfile_sources=" > https://www.ietf.org/timezones/data/leap-seconds.list" > +ntp_leapfile_sources=" > https://data.iana.org/time-zones/tzdb/leap-seconds.list" > # Source from which to fetch leapfile > ntp_leapfile_fetch_opts="-mq" # Options to use for ntp leapfile fetch, > # e.g. --no-verify-peer > --0000000000009d08f0060be58b36 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
We should point to bipm https://hpiers.obspm.fr/iers/bul/bul= c/ntp/leap-seconds.list since they are the source of truth, no?

Warner=C2=A0

On Wed, Dec 6, 2023= , 10:50 PM Philip Paeps <philip@fr= eebsd.org> wrote:
The bran= ch main has been updated by philip:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3Db1c95af45488bef649e9a84890e2414ff80= b3a00

commit b1c95af45488bef649e9a84890e2414ff80b3a00
Author:=C2=A0 =C2=A0 =C2=A0Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2023-12-07 05:48:13 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Philip Paeps <philip@FreeBSD.org>
CommitDate: 2023-12-07 05:48:13 +0000

=C2=A0 =C2=A0 rc.conf: correct $ntp_leapfile_sources

=C2=A0 =C2=A0 IETF is no longer serving leap-seconds.list.=C2=A0 Point at I= ANA instead.

=C2=A0 =C2=A0 This fixes "service ntpd fetch".

=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 1 day
---
=C2=A0libexec/rc/rc.conf | 2 +-
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
index 3269288728b6..145e0b70ca3b 100644
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -424,7 +424,7 @@ ntp_src_leapfile=3D"/etc/ntp/leap-seconds" =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Initial source for ntpd leapfile =C2=A0ntp_db_leapfile=3D"/var/db/ntpd.leap-seconds.list"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Working copy (updated weekly) leap= file
-ntp_leapfile_sources=3D"https:= //www.ietf.org/timezones/data/leap-seconds.list"
+ntp_leapfile_sources=3D"http= s://data.iana.org/time-zones/tzdb/leap-seconds.list"
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # Source from which to fetch leapfil= e
=C2=A0ntp_leapfile_fetch_opts=3D"-mq"=C2=A0 # Options to use for = ntp leapfile fetch,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 # e.g. --no-verify-peer
--0000000000009d08f0060be58b36--