git: bc5cb5369819 - stable/15 - tzcode: Update to 2026e

From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Thu, 05 Nov 2026 15:12:05 UTC
The branch stable/15 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=bc5cb53698198f5dcc7ead1acdc42d9e07e2dd89

commit bc5cb53698198f5dcc7ead1acdc42d9e07e2dd89
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-09-30 08:40:30 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-11-05 15:11:49 +0000

    tzcode: Update to 2026e
    
    MFC after:      1 week
    
    (cherry picked from commit 2447e7773e36bbc89e80294c1e8cb53f9f607762)
---
 contrib/tzcode/NEWS        | 38 ++++++++++++++++++++++++++++++++++++++
 contrib/tzcode/asctime.c   |  4 ++--
 contrib/tzcode/localtime.c |  6 +++---
 contrib/tzcode/theory.html |  2 +-
 contrib/tzcode/version     |  2 +-
 5 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/contrib/tzcode/NEWS b/contrib/tzcode/NEWS
index ae240d31b84e..fe2d7c62b624 100644
--- a/contrib/tzcode/NEWS
+++ b/contrib/tzcode/NEWS
@@ -1,5 +1,43 @@
 News for the tz database
 
+Release 2026e - 2026-09-29 17:14:38 -0700
+
+  Briefly:
+    Manitoba moves to permanent -05 on 2026-10-31.
+
+  Changes to future timestamps
+
+    Manitoba’s 2026-03-08 spring forward was its last foreseeable clock
+    change, as it moved to permanent -05 thereafter.  Model this with
+    its traditional abbreviation EST.  Although the change to
+    permanent -05 legally takes place on 2026-10-31, temporarily model
+    the change to occur on 2026-11-01 at 02:00 for the same reason as
+    other recent temporary hacks.  (Caution: see “NOTE FOR 2026b
+    TEMPORARY HACK FOR CLDR AND CANADA” below.)
+
+      As the change affects both America/Winnipeg and its backward
+      compatibility link, the obsolescent setting TZ="Canada/Central"
+      will now use the abbreviation EST for affected timestamps,
+      akin to TZ="Canada/Pacific" behavior introduced in 2026b.
+
+      Another TZDB release may be needed soon if any of the portions of
+      northwestern Ontario historically aligned with America/Winnipeg do
+      not follow.  For now, given the short leadtime with Manitoba’s
+      announcement, assume that they will, to avoid creating new zones
+      that may not be needed if no divergence occurs.
+
+  Changes to past timestamps
+
+    In 1925 Ireland fell back on 09-20 not 10-04 (thanks to Stan Ulbrych).
+
+  Changes to commentary
+
+    Discussion on timekeeping practices in northwestern Ontario has been
+    expanded in light of Manitoba’s recent announcement.  It is not yet
+    known whether or to what extent these areas may adapt their own
+    timekeeping practices in response.
+
+
 Release 2026d - 2026-09-11 15:21:07 -0700
 
   Briefly:
diff --git a/contrib/tzcode/asctime.c b/contrib/tzcode/asctime.c
index 491d23bf73ac..696bb97a57f7 100644
--- a/contrib/tzcode/asctime.c
+++ b/contrib/tzcode/asctime.c
@@ -76,8 +76,8 @@ asctime_r(struct tm const *restrict timeptr, char *restrict buf)
 	register const char *	mn;
 	int year, mday, hour, min, sec;
 	long long_TM_YEAR_BASE = TM_YEAR_BASE;
-	size_t bufsize = (buf == buf_asctime
-			  ? sizeof buf_asctime : STD_ASCTIME_BUF_SIZE);
+	int bufsize = (buf == buf_asctime
+		       ? sizeof buf_asctime : STD_ASCTIME_BUF_SIZE);
 
 	if (timeptr == NULL) {
 		strcpy(buf, "??? ??? ?? ??:??:?? ????\n");
diff --git a/contrib/tzcode/localtime.c b/contrib/tzcode/localtime.c
index 67eba0fb7459..e050d8ab629b 100644
--- a/contrib/tzcode/localtime.c
+++ b/contrib/tzcode/localtime.c
@@ -938,9 +938,9 @@ tzloadbody(char const *name, struct state *sp, char tzloadflags,
 		name = TZDEFAULT;
 		if (! name)
 		  return EINVAL;
-#ifdef __FreeBSD__
-		tzloadflags &= ~TZLOAD_FROMENV;
-#endif /* __FreeBSD__ */
+		/* Omit "tzloadflags &= ~TZLOAD_FROMENV;" here, as that
+		   would hurt performance by rereading and reanalyzing the
+		   TZDEFAULT file even when it is unchanged.  */
 	}
 
 	if (name[0] == ':')
diff --git a/contrib/tzcode/theory.html b/contrib/tzcode/theory.html
index d56e1a79df46..84c6b8df8a71 100644
--- a/contrib/tzcode/theory.html
+++ b/contrib/tzcode/theory.html
@@ -66,7 +66,7 @@ time (<abbr>DST</abbr>),
 and <code>America/Phoenix</code> which does not observe <abbr>DST</abbr>.
 Applications that also deal with past timestamps in the mountain time
 zone can choose from over a dozen timezones, such as
-<code>America/Boise</code>, <code>America/Edmonton</code>, and
+<code>America/Boise</code> and
 <code>America/Hermosillo</code>, each of which currently uses mountain
 time but differs from other timezones for some timestamps after 1970.
 </p>
diff --git a/contrib/tzcode/version b/contrib/tzcode/version
index b62e2687afbb..2c2d640a0f1c 100644
--- a/contrib/tzcode/version
+++ b/contrib/tzcode/version
@@ -1 +1 @@
-2026d
+2026e