Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Dec 2023 23:26:05 -0700
From:      Warner Losh <imp@bsdimp.com>
To:        Philip Paeps <philip@freebsd.org>
Cc:        src-committers <src-committers@freebsd.org>,  "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>,  "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org>
Subject:   Re: git: b1c95af45488 - main - rc.conf: correct $ntp_leapfile_sources
Message-ID:  <CANCZdfrSitY2W%2B7EVaa_yX=KhsJNq_FZqyOLnBeTZX_-6YGxpg@mail.gmail.com>
In-Reply-To: <202312070550.3B75o8WV066387@gitrepo.freebsd.org>
References:  <202312070550.3B75o8WV066387@gitrepo.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
--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 <philip@freebsd.org> wrote:

> The branch main has been updated by philip:
>
> URL:
> https://cgit.FreeBSD.org/src/commit/?id=b1c95af45488bef649e9a84890e2414ff80b3a00
>
> commit b1c95af45488bef649e9a84890e2414ff80b3a00
> Author:     Philip Paeps <philip@FreeBSD.org>
> AuthorDate: 2023-12-07 05:48:13 +0000
> Commit:     Philip Paeps <philip@FreeBSD.org>
> 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

<div dir=3D"auto">We should point to bipm <a href=3D"https://hpiers.obspm.f=
r/iers/bul/bulc/ntp/leap-seconds.list">https://hpiers.obspm.fr/iers/bul/bul=
c/ntp/leap-seconds.list</a> since they are the source of truth, no?<div dir=
=3D"auto"><br></div><div dir=3D"auto">Warner=C2=A0</div></div><br><div clas=
s=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On Wed, Dec 6, 2023=
, 10:50 PM Philip Paeps &lt;<a href=3D"mailto:philip@freebsd.org">philip@fr=
eebsd.org</a>&gt; wrote:<br></div><blockquote class=3D"gmail_quote" style=
=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">The bran=
ch main has been updated by philip:<br>
<br>
URL: <a href=3D"https://cgit.FreeBSD.org/src/commit/?id=3Db1c95af45488bef64=
9e9a84890e2414ff80b3a00" rel=3D"noreferrer noreferrer" target=3D"_blank">ht=
tps://cgit.FreeBSD.org/src/commit/?id=3Db1c95af45488bef649e9a84890e2414ff80=
b3a00</a><br>
<br>
commit b1c95af45488bef649e9a84890e2414ff80b3a00<br>
Author:=C2=A0 =C2=A0 =C2=A0Philip Paeps &lt;philip@FreeBSD.org&gt;<br>
AuthorDate: 2023-12-07 05:48:13 +0000<br>
Commit:=C2=A0 =C2=A0 =C2=A0Philip Paeps &lt;philip@FreeBSD.org&gt;<br>
CommitDate: 2023-12-07 05:48:13 +0000<br>
<br>
=C2=A0 =C2=A0 rc.conf: correct $ntp_leapfile_sources<br>
<br>
=C2=A0 =C2=A0 IETF is no longer serving leap-seconds.list.=C2=A0 Point at I=
ANA instead.<br>
<br>
=C2=A0 =C2=A0 This fixes &quot;service ntpd fetch&quot;.<br>
<br>
=C2=A0 =C2=A0 MFC after:=C2=A0 =C2=A0 =C2=A0 1 day<br>
---<br>
=C2=A0libexec/rc/rc.conf | 2 +-<br>
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf<br>
index 3269288728b6..145e0b70ca3b 100644<br>
--- a/libexec/rc/rc.conf<br>
+++ b/libexec/rc/rc.conf<br>
@@ -424,7 +424,7 @@ ntp_src_leapfile=3D&quot;/etc/ntp/leap-seconds&quot;<br=
>
=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<b=
r>
=C2=A0ntp_db_leapfile=3D&quot;/var/db/ntpd.leap-seconds.list&quot;<br>
=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<br>
-ntp_leapfile_sources=3D&quot;<a href=3D"https://www.ietf.org/timezones/dat=
a/leap-seconds.list" rel=3D"noreferrer noreferrer" target=3D"_blank">https:=
//www.ietf.org/timezones/data/leap-seconds.list</a>&quot;<br>
+ntp_leapfile_sources=3D&quot;<a href=3D"https://data.iana.org/time-zones/t=
zdb/leap-seconds.list" rel=3D"noreferrer noreferrer" target=3D"_blank">http=
s://data.iana.org/time-zones/tzdb/leap-seconds.list</a>&quot;<br>
=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<br>
=C2=A0ntp_leapfile_fetch_opts=3D&quot;-mq&quot;=C2=A0 # Options to use for =
ntp leapfile fetch,<br>
=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<br>
</blockquote></div>

--0000000000009d08f0060be58b36--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfrSitY2W%2B7EVaa_yX=KhsJNq_FZqyOLnBeTZX_-6YGxpg>