Bug#1057235: bullseye-pu: package tzdata/2021a-1+deb11u11
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: tzdata@packages.debian.org, debian-glibc@lists.debian.org
Control: affects -1 + src:tzdata
[ Reason ]
tzdata contains a leap second file which is updated twice a year, and
which has an expiration date on 28 December 2023. Usually this file is
updated along with timezones changes, but 2023 has seen surprising low
number of timezone changes. Therefore we need to do a specific upload to
update this file with only this change.
In addition a typo in the Egypt DST rules changes has slipped into
version 2021a-1+deb11u9 and is fixed by this new version.
[ Impact ]
There is no leap second added at the end of 2023, so the impact is
relatively low, but people using NTP servers started to complain about
about warning in their log.
[ Tests ]
There is no test for this change.
[ Risks ]
The risk is quite low, the changes are minimal and routinely done twice
a year.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
This is the full changelog entry with explanations:
* Cherry-pick patches from upstream:
- 25-no-leap-second-on-2023-12-31.patch: Update leap-seconds.list from
upstream. The new expiration date is 28 June 2024. Closes: #1057185,
#1057186.
The leap-seconds.list change is taken from upstream, who took it from
NIST following an IERS Bulletin.
- 26-egypt-dst-fix.patch: Fix a typo in the Egypt change introduced in
tzdata 2021a-1+deb11u9. Closes: #1036104.
The patch 20-egypt-dst.patch added from upstream in tzdata 2021a-1+deb11u9
contains a single letter typo ('M' instead of 'm'), causing issues with some
parsers. This has been fixed upstream in subsequent commit, which is backported
here.
* debian/clean: Remove leapseconds during clean target.
The cleanup of the leapseconds file, is needed as following the above
change, the one shipped in the upstream tarball do not match anymore the
one generated during build from leap-seconds.list. This is needed to
avoid a FTBFS after successful build.
[ Other info ]
Given the limited changes, I have already uploaded the package to the
archive. Thanks for considering. It might be a good idea to release a
SUA given the next bullseye point release is not yet scheduled.
diff -Nru tzdata-2021a/debian/changelog tzdata-2021a/debian/changelog
--- tzdata-2021a/debian/changelog 2023-04-18 20:03:16.000000000 +0000
+++ tzdata-2021a/debian/changelog 2023-12-01 21:51:38.000000000 +0000
@@ -1,3 +1,15 @@
+tzdata (2021a-1+deb11u11) bullseye; urgency=medium
+
+ * Cherry-pick patches from upstream:
+ - 25-no-leap-second-on-2023-12-31.patch: Update leap-seconds.list from
+ upstream. The new expiration date is 28 June 2024. Closes: #1057185,
+ #1057186.
+ - 26-egypt-dst-fix.patch: Fix a typo in the Egypt change introduced in
+ tzdata 2021a-1+deb11u9. Closes: #1036104.
+ * debian/clean: Remove leapseconds during clean target.
+
+ -- Aurelien Jarno <aurel32@debian.org> Fri, 01 Dec 2023 22:51:38 +0100
+
tzdata (2021a-1+deb11u10) bullseye; urgency=medium
* Cherry-pick patch from upstream:
diff -Nru tzdata-2021a/debian/clean tzdata-2021a/debian/clean
--- tzdata-2021a/debian/clean 1970-01-01 00:00:00.000000000 +0000
+++ tzdata-2021a/debian/clean 2023-12-01 21:32:18.000000000 +0000
@@ -0,0 +1 @@
+leapseconds
diff -Nru tzdata-2021a/debian/patches/25-no-leap-second-on-2023-12-31.patch tzdata-2021a/debian/patches/25-no-leap-second-on-2023-12-31.patch
--- tzdata-2021a/debian/patches/25-no-leap-second-on-2023-12-31.patch 1970-01-01 00:00:00.000000000 +0000
+++ tzdata-2021a/debian/patches/25-no-leap-second-on-2023-12-31.patch 2023-12-01 20:47:11.000000000 +0000
@@ -0,0 +1,41 @@
+From c3e966c59b02b1f47f0b7b0e4aa6a86563c07062 Mon Sep 17 00:00:00 2001
+From: Tim Parenti <tim@timtimeonline.com>
+Date: Mon, 14 Aug 2023 15:29:57 -0400
+Subject: [PATCH] No leap second on 2023-12-31
+
+Per IERS Bulletin C 66 (2023-07-04).
+https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.66
+
+* leap-seconds.list: Update file from NIST, retrieved from
+ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list
+---
+ leap-seconds.list | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/leap-seconds.list b/leap-seconds.list
+index 17e3a100..3fe9a121 100644
+--- a/leap-seconds.list
++++ b/leap-seconds.list
+@@ -204,10 +204,10 @@
+ # current -- the update time stamp, the data and the name of the file
+ # will not change.
+ #
+-# Updated through IERS Bulletin C65
+-# File expires on: 28 December 2023
++# Updated through IERS Bulletin C66
++# File expires on: 28 June 2024
+ #
+-#@ 3912710400
++#@ 3928521600
+ #
+ 2272060800 10 # 1 Jan 1972
+ 2287785600 11 # 1 Jul 1972
+@@ -252,4 +252,4 @@
+ # the hash line is also ignored in the
+ # computation.
+ #
+-#h e76a99dc 65f15cc7 e613e040 f5078b5e b23834fe
++#h 16edd0f0 3666784f 37db6bdd e74ced87 59af48f1
+--
+2.42.0
+
diff -Nru tzdata-2021a/debian/patches/26-egypt-dst-fix.patch tzdata-2021a/debian/patches/26-egypt-dst-fix.patch
--- tzdata-2021a/debian/patches/26-egypt-dst-fix.patch 1970-01-01 00:00:00.000000000 +0000
+++ tzdata-2021a/debian/patches/26-egypt-dst-fix.patch 2023-12-01 21:49:19.000000000 +0000
@@ -0,0 +1,22 @@
+commit af242d11b62584808a66851b8707148bf1ee8d0a
+Author: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu Mar 2 02:01:27 2023 -0800
+
+ Max → max
+
+ * africa (Egypt): Use lower-case ‘max’ for consistency.
+ (Thanks to Peter Krefting.)
+
+diff --git a/africa b/africa
+index 24871f3d..985705de 100644
+--- a/africa
++++ b/africa
+@@ -338,7 +338,7 @@ Rule Egypt 2014 only - Jun 26 24:00 0 -
+ Rule Egypt 2014 only - Jul 31 24:00 1:00 S
+ Rule Egypt 2014 only - Sep lastThu 24:00 0 -
+ Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S
+-Rule Egypt 2023 Max - Oct lastThu 24:00 0 -
++Rule Egypt 2023 max - Oct lastThu 24:00 0 -
+
+ # Zone NAME STDOFF RULES FORMAT [UNTIL]
+ Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
diff -Nru tzdata-2021a/debian/patches/series tzdata-2021a/debian/patches/series
--- tzdata-2021a/debian/patches/series 2023-04-18 19:35:19.000000000 +0000
+++ tzdata-2021a/debian/patches/series 2023-12-01 21:37:16.000000000 +0000
@@ -22,3 +22,5 @@
22-palestine-dst4.patch
23-lebanon-dst.patch
24-lebanon-dst2.patch
+25-no-leap-second-on-2023-12-31.patch
+26-egypt-dst-fix.patch
Reply to: