import CS tzdata-2024a-2.el9

.gitignore

@@ -1,4 +1,4 @@
 SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 SOURCES/javazic.tar.gz
-SOURCES/tzcode2022g.tar.gz
+SOURCES/tzcode2024a.tar.gz
-SOURCES/tzdata2022g.tar.gz
+SOURCES/tzdata2024a.tar.gz

.tzdata.metadata

@@ -1,4 +1,4 @@
 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
-ffcae61ec6a0b703deb7c5dba497577eae018cd5 SOURCES/tzcode2022g.tar.gz
+96c682391618d0f053d70ccb98cd65d969d014cd SOURCES/tzcode2024a.tar.gz
-f28562b04f3a26c4a01b295efce86a5d378ea9af SOURCES/tzdata2022g.tar.gz
+310a281e4551e4e9a11db4f9ceea85a6529af4af SOURCES/tzdata2024a.tar.gz

SOURCES/0002-Fix-have-snprintf-error.patch

@@ -1,12 +0,0 @@
-diff -Nrup a/Makefile b/Makefile
---- a/Makefile	2017-10-23 18:03:40.237177646 -0400
-+++ b/Makefile	2017-10-23 18:06:20.060683518 -0400
-@@ -292,7 +292,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn
- # January's first Monday when a "%V" format is used and January 1
- # falls on a Friday, Saturday, or Sunday.
- 
--CFLAGS=
-+CFLAGS= -DHAVE_SNPRINTF=1
- 
- # Linker flags.  Default to $(LFLAGS) for backwards compatibility
- # to release 2012h and earlier.

SOURCES/0002-Fix-have-snprintf.patch

@@ -0,0 +1,12 @@
+diff -Nrup a/Makefile b/Makefile
+--- a/Makefile	2024-01-01 17:57:30.112884304 -0500
++++ b/Makefile	2024-01-01 17:59:33.641497622 -0500
+@@ -423,6 +423,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn
+ # Uncomment the following line and edit its contents as needed.
+ 
+ #CFLAGS= -O 1
++CFLAGS= -DHAVE_SNPRINTF=1
+ 
+ 
+ # The name of a POSIX-like library archiver, its flags, C compiler,
+Binary files a/tzdata2023d-rearguard.tar.gz and b/tzdata2023d-rearguard.tar.gz differ

SOURCES/0003-continue-to-ship-posixrules.patch

@@ -1,7 +1,7 @@
 diff -Nrup a/Makefile b/Makefile
---- a/Makefile	2020-10-13 15:58:12.000000000 -0400
+--- a/Makefile	2023-03-22 17:41:49.069789592 -0400
-+++ b/Makefile	2020-10-13 16:03:09.461302282 -0400
++++ b/Makefile	2023-03-22 17:44:07.528427093 -0400
-@@ -60,7 +60,7 @@ LOCALTIME=	GMT
+@@ -52,7 +52,7 @@ LOCALTIME=	Factory
  #	make zonenames
  # to get a list of the values you can use for POSIXRULES.
  
@@ -9,5 +9,5 @@ diff -Nrup a/Makefile b/Makefile
 +POSIXRULES=	America/New_York
  
  # Also see TZDEFRULESTRING below, which takes effect only
- # if the time zone files cannot be accessed.
+ # if POSIXRULES is '-' or if the template file cannot be accessed.
-Binary files a/tzdata2020b-rearguard.tar.gz and b/tzdata2020b-rearguard.tar.gz differ
+Binary files a/tzdata2023a-rearguard.tar.gz and b/tzdata2023a-rearguard.tar.gz differ

SOURCES/8051641.patch

@@ -0,0 +1,17 @@
+diff -r c8a71253d6e2 -r 189490f29d1e make/src/classes/build/tools/tzdb/ZoneRulesBuilder.java
+--- javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java	Thu Oct 23 11:42:20 2014 +0200
++++ javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java	Mon Dec 29 21:42:22 2014 +0300
+@@ -491,10 +491,10 @@
+                 TZRule rule = new TZRule(year, month, dayOfMonthIndicator, dayOfWeek, time, timeEndOfDay, timeDefinition, savingAmountSecs);
+                 if (lastRule) {
+                     lastRuleList.add(rule);
+-                    maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
+                 } else {
+                     ruleList.add(rule);
+                 }
++                maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
+                 year++;
+             }
+         }
+--
+cgit v0.9.2

SPECS/tzdata.spec

@@ -1,15 +1,15 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022g
+Version: 2024a
-%define tzdata_version 2022g
+%define tzdata_version 2024a
-%define tzcode_version 2022g
+%define tzcode_version 2024a
 Release: 2%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
 Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
 Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 
-Patch002: 0002-Fix-have-snprintf-error.patch
+Patch002: 0002-Fix-have-snprintf.patch
 %if 0%{?rhel} || 0%{?eln}
 Patch003: 0003-continue-to-ship-posixrules.patch
 %endif
@@ -34,6 +34,7 @@ Patch101: rebase-01.patch
 Patch102: rebase-02.patch
 Patch103: 7090844.patch
 Patch104: 7133138.patch
+Patch105: 8051641.patch
 
 %description java
 This package contains timezone information for use by Java runtimes.
@@ -82,6 +83,7 @@ find . -type f -name '*.java' -print0 \
 popd
 
 tar xf %{SOURCE4}
+%patch105
 
 echo "%{name}%{tzdata_version}" >> VERSION
 
@@ -151,6 +153,40 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Mar 14 2024 Patsy Griffin <patsy@redhat.com> - 2024a-2
+- Add java patch to fix incorrect calculations for
+  Africa/Casablanca starting in 2027. (RHEL-26860)
+
+* Thu Feb 01 2024 Patsy Griffin <patsy@redhat.com> - 2024a-1
+- Rebase to tzdata-2024a
+  - Kazakhstan will transition from UTC+6 to UTC+5 on 2024-03-01.
+  - Palestine will spring forward a week later than previously
+    predicted.
+
+* Mon Jan 01 2024 Patsy Griffin <patsy@redhat.com> - 2023d-1
+- Rebase to tzdata-2023d
+  - Include time zone changes for Ittoqqortoormiit, Greenland
+    and Vostok, Antarctica.
+  - Update the expiration date for the leap-seconds.list file.
+    No new leap seconds were added.
+
+* Thu Aug 17 2023 Patsy Griffin <patsy@redhat.com> - 2023c-2
+- Bump release to test recent process changes. (RHEL-1323)
+
+* Tue Mar 28 2023 Patsy Griffin <patsy@redhat.com> - 2023c-1
+- Rebase to tzdata-2023c
+  - Lebanon reversed the change added in tzdata-2023b.
+
+* Fri Mar 24 2023 Patsy Griffin <patsy@redhat.com> - 2023b-1
+- Rebase to tzdata-2023b
+  - Lebanon will transition to DST on April 20/21, not March 25/26.
+
+* Wed Mar 22 2023 Patsy Griffin <patsy@redhat.com> - 2023a-1
+- Rebase to tzdata-2023a
+  - Egypt reintroduced DST, from April through October.
+  - Morocco springs forward April 23, not April 30.
+  - Palestine delayed the start of DST this year.
+
 * Fri Jan 6 2023 Patsy Griffin <patsy@redhat.com> - 2022g-2
 - Include leap-seconds.list in tzdata install. (#2157982)