debian/changelog

+tzdata (2021a-0+deb10u12) buster-security; urgency=medium
+
+  * Cherry-pick patches from upstream (thanks Aurelien Jarno)
+    - 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-0+deb10u10.  Closes: #1036104.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Thu, 07 Dec 2023 09:25:52 +0100
+
 tzdata (2021a-0+deb10u11) buster-security; urgency=medium
 
   * Sync patchset with bullseye.

debian/patches/25-no-leap-second-on-2023-12-31.patch

+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
+

debian/patches/26-egypt-dst-fix.patch

+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

debian/patches/series

@@ -24,3 +24,5 @@ systemv.diff -p1
 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