.gitignore

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

.tzdata.metadata

@@ -1,4 +1,4 @@
 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
-95cfb1106f60e925f0255d340350ba4be51b9b29 SOURCES/tzcode2024b.tar.gz
-52adf39a4b3c29502866167e78b89b20fd08dc3e SOURCES/tzdata2024b.tar.gz
+ffcae61ec6a0b703deb7c5dba497577eae018cd5 SOURCES/tzcode2022g.tar.gz
+f28562b04f3a26c4a01b295efce86a5d378ea9af SOURCES/tzdata2022g.tar.gz

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

@@ -0,0 +1,12 @@
+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

@@ -1,12 +0,0 @@
-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	2023-03-22 17:41:49.069789592 -0400
-+++ b/Makefile	2023-03-22 17:44:07.528427093 -0400
-@@ -52,7 +52,7 @@ LOCALTIME=	Factory
+--- a/Makefile	2020-10-13 15:58:12.000000000 -0400
++++ b/Makefile	2020-10-13 16:03:09.461302282 -0400
+@@ -60,7 +60,7 @@ LOCALTIME=	GMT
  #	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 POSIXRULES is '-' or if the template file cannot be accessed.
-Binary files a/tzdata2023a-rearguard.tar.gz and b/tzdata2023a-rearguard.tar.gz differ
+ # if the time zone files cannot be accessed.
+Binary files a/tzdata2020b-rearguard.tar.gz and b/tzdata2020b-rearguard.tar.gz differ

SOURCES/0004-Fix-Apr-vs-April-2024b.patch

@@ -1,23 +0,0 @@
-commit 926b507fa5c3192b1b68fab5910cbd3ba9377c97
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Thu Sep 5 14:36:02 2024 -0700
-
-    "Apr", not "April", in IN column
-    
-    * northamerica (Rule): Use "Apr", not "April", in the IN column.
-    Both forms are valid, but "Apr" is more consistent.
-    Problem reported by Howard Hinnant.
-
-diff --git a/northamerica b/northamerica
-index 01f392e0..1af874b6 100644
---- a/northamerica
-+++ b/northamerica
-@@ -2631,7 +2631,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
- # http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
--Rule	Mexico	1931	only	-	April	30	0:00	1:00	D
-+Rule	Mexico	1931	only	-	Apr	30	0:00	1:00	D
- Rule	Mexico	1931	only	-	Oct	1	0:00	0	S
- Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
- Rule	Mexico	1939	only	-	Jun	25	0:00	0	S

SOURCES/0005-Improve-style-checks-for-months-2024b.patch

@@ -1,77 +0,0 @@
-commit 7b6fb155cadd5e5ee70b55c2770e1bdd2f5d2a38
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Thu Sep 5 14:38:35 2024 -0700
-
-    Improve style checks for months
-    
-    * checktab.awk: Check style of STDOFF and month names.
-
-diff --git a/checktab.awk b/checktab.awk
-index 9a26e465..15a3a697 100644
---- a/checktab.awk
-+++ b/checktab.awk
-@@ -9,6 +9,19 @@ BEGIN {
- 	if (!zone_table) zone_table = "zone1970.tab"
- 	if (!want_warnings) want_warnings = -1
- 
-+	monthabbr["Jan"] = 1
-+	monthabbr["Feb"] = 1
-+	monthabbr["Mar"] = 1
-+	monthabbr["Apr"] = 1
-+	monthabbr["May"] = 1
-+	monthabbr["Jun"] = 1
-+	monthabbr["Jul"] = 1
-+	monthabbr["Aug"] = 1
-+	monthabbr["Sep"] = 1
-+	monthabbr["Oct"] = 1
-+	monthabbr["Nov"] = 1
-+	monthabbr["Dec"] = 1
-+
- 	while (getline <iso_table) {
- 		iso_NR++
- 		if ($0 ~ /^#/) continue
-@@ -128,12 +141,14 @@ BEGIN {
- $1 ~ /^#/ { next }
- 
- {
--	tz = rules = ""
-+	tz = rules = stdoff = ""
- 	if ($1 == "Zone") {
- 		tz = $2
-+		stdoff = $3
- 		ruleUsed[$4] = 1
- 		if ($5 ~ /%/) rulePercentUsed[$4] = 1
--	} else if ($1 == "Link" && zone_table == "zone.tab") {
-+	} else if ($1 == "Link") {
-+	    if (zone_table == "zone.tab") {
- 		# Ignore Link commands if source and destination basenames
- 		# are identical, e.g. Europe/Istanbul versus Asia/Istanbul.
- 		src = $2
-@@ -141,13 +156,27 @@ $1 ~ /^#/ { next }
- 		while ((i = index(src, "/"))) src = substr(src, i+1)
- 		while ((i = index(dst, "/"))) dst = substr(dst, i+1)
- 		if (src != dst) tz = $3
-+	    }
- 	} else if ($1 == "Rule") {
- 		ruleDefined[$2] = 1
- 		if ($10 != "-") ruleLetters[$2] = 1
-+		if (!monthabbr[$6]) {
-+		  printf "%s:%d: tricky month: %s\n", FILENAME, FNR, $6 \
-+			  >>"/dev/stderr"
-+		  status = 1
-+		}
- 	} else {
-+		stdoff = $1
- 		ruleUsed[$2] = 1
- 		if ($3 ~ /%/) rulePercentUsed[$2] = 1
- 	}
-+
-+	if (stdoff && stdoff !~ /^\-?1?[0-9](:[0-5][0-9](:[0-5][0-9])?)?$/) {
-+		printf "%s:%d: unlikely STDOFF: %s\n", FILENAME, FNR, stdoff \
-+			>>"/dev/stderr"
-+		status = 1
-+	}
-+
- 	if (tz && tz ~ /\// && tz !~ /^Etc\//) {
- 		if (!tztab[tz] && FILENAME != "backward" \
- 		    && zone_table != "zonenow.tab") {

SOURCES/ZoneTest.java

@@ -1,42 +0,0 @@
-/* Smoke test to ensure that tzdb.data can be loaded.
-   Copyright (c) 2024 Red Hat, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Affero General Public License as
-   published by the Free Software Foundation, either version 3 of the
-   License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-import java.time.zone.ZoneRulesProvider;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.util.Set;
-import java.util.TimeZone;
-
-public class ZoneTest {
-    public static void main(String[] args) {
-        // This is what failed in OpenJDK's build.tools.cldrconverter.
-        new GregorianCalendar(TimeZone.getTimeZone("America/Los_Angeles"),
-            Locale.US).get(Calendar.YEAR);
-
-        // In some OpenJDK versions, this exercises a different parser.
-        Set<String> available = ZoneRulesProvider.getAvailableZoneIds();
-        boolean errors = false;
-        if (available.contains("ROC"))
-            System.out.println("error: ROC zone is present");
-        if (!available.contains("America/New_York"))
-            System.out.println("error: America/New_York is missing");
-        if (errors)
-            System.exit(1);
-    }
-}
-

SOURCES/javazic-harden-links.patch

@@ -1,86 +0,0 @@
-Modified for downstream inclusion in tzdata-java.
-
-commit 1bc13a1c10a580f84f1b7686c95344ec2633f611
-Author: Florian Weimer <fweimer@openjdk.org>
-Date:   Thu Sep 26 22:37:45 2024 +0000
-
-    8340552: Harden TzdbZoneRulesCompiler against missing zone names
-
-    Reviewed-by: andrew, jlu, naoto
-
-diff -ur tzdata-2024b.orig/javazic-1.8/build/tools/tzdb/TzdbZoneRulesCompiler.java tzdata-2024b/javazic-1.8/build/tools/tzdb/TzdbZoneRulesCompiler.java
---- tzdata-2024b.orig/javazic-1.8/build/tools/tzdb/TzdbZoneRulesCompiler.java	2014-04-22 19:46:49.000000000 +0200
-+++ tzdata-2024b/javazic-1.8/build/tools/tzdb/TzdbZoneRulesCompiler.java	2024-09-20 21:10:12.748483767 +0200
-@@ -248,7 +248,7 @@
-             // link version-region-rules
-             out.writeShort(builtZones.size());
-             for (Map.Entry<String, ZoneRules> entry : builtZones.entrySet()) {
--                 int regionIndex = Arrays.binarySearch(regionArray, entry.getKey());
-+                 int regionIndex = findRegionIndex(regionArray, entry.getKey());
-                  int rulesIndex = rulesList.indexOf(entry.getValue());
-                  out.writeShort(regionIndex);
-                  out.writeShort(rulesIndex);
-@@ -256,8 +256,8 @@
-             // alias-region
-             out.writeShort(links.size());
-             for (Map.Entry<String, String> entry : links.entrySet()) {
--                 int aliasIndex = Arrays.binarySearch(regionArray, entry.getKey());
--                 int regionIndex = Arrays.binarySearch(regionArray, entry.getValue());
-+                 int aliasIndex = findRegionIndex(regionArray, entry.getKey());
-+                 int regionIndex = findRegionIndex(regionArray, entry.getValue());
-                  out.writeShort(aliasIndex);
-                  out.writeShort(regionIndex);
-             }
-@@ -269,6 +269,14 @@
-         }
-     }
- 
-+    private static int findRegionIndex(String[] regionArray, String region) {
-+        int index = Arrays.binarySearch(regionArray, region);
-+        if (index < 0) {
-+            throw new IllegalArgumentException("Unknown region: " + region);
-+        }
-+        return index;
-+    }
-+
-     private static final Pattern YEAR = Pattern.compile("(?i)(?<min>min)|(?<max>max)|(?<only>only)|(?<year>[0-9]+)");
-     private static final Pattern MONTH = Pattern.compile("(?i)(jan)|(feb)|(mar)|(apr)|(may)|(jun)|(jul)|(aug)|(sep)|(oct)|(nov)|(dec)");
-     private static final Matcher DOW = Pattern.compile("(?i)(mon)|(tue)|(wed)|(thu)|(fri)|(sat)|(sun)").matcher("");
-@@ -607,22 +615,20 @@
-             }
-             builtZones.put(aliasId, realRules);
-         }
--        // remove UTC and GMT
--        // builtZones.remove("UTC");
--        // builtZones.remove("GMT");
--        // builtZones.remove("GMT0");
--        builtZones.remove("GMT+0");
--        builtZones.remove("GMT-0");
--        links.remove("GMT+0");
--        links.remove("GMT-0");
--        // remove ROC, which is not supported in j.u.tz
--        builtZones.remove("ROC");
--        links.remove("ROC");
--        // remove EST, HST and MST. They are supported via
--        // the short-id mapping
--        builtZones.remove("EST");
--        builtZones.remove("HST");
--        builtZones.remove("MST");
-+
-+        List<String> zonesToRemove = Arrays.asList(
-+            // remove UTC and GMT
-+            "GMT+0",
-+            "GMT-0",
-+            // remove ROC, which is not supported in j.u.tz
-+            "ROC",
-+            // remove EST, HST and MST. They are supported via
-+            // the short-id mapping
-+            "EST",
-+            "HST",
-+            "MST");
-+        builtZones.keySet().removeAll(zonesToRemove);
-+        links.keySet().removeAll(zonesToRemove);
-     }
- 
-     /**
-

SPECS/tzdata.spec

@@ -1,24 +1,20 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2024b
-%define tzdata_version 2024b
-%define tzcode_version 2024b
-Release: 4%{?dist}
+Version: 2022g
+%define tzdata_version 2022g
+%define tzcode_version 2022g
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 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.patch
+Patch002: 0002-Fix-have-snprintf-error.patch
 Patch003: 0003-continue-to-ship-posixrules.patch
-Patch004: 0004-Fix-Apr-vs-April-2024b.patch
-Patch005: 0005-Improve-style-checks-for-months-2024b.patch
 
 BuildRequires: gawk, glibc, perl-interpreter
 BuildRequires: java-devel
-BuildRequires: make
-BuildRequires: gcc
 BuildRequires: glibc-common >= 2.5.90-7
 Conflicts: glibc-common <= 2.3.2-63
 BuildArchitectures: noarch
@@ -32,14 +28,12 @@ Summary: Timezone data for Java
 Group: System Environment/Base
 Source3: javazic.tar.gz
 Source4: javazic-1.8-37392f2f5d59.tar.xz
-Source5: ZoneTest.java
 Patch100: javazic-fixup.patch
 Patch101: rebase-01.patch
 Patch102: rebase-02.patch
 Patch103: 7090844.patch
 Patch104: 7133138.patch
 Patch105: 8051641.patch
-Patch106: javazic-harden-links.patch
 
 %description java
 This package contains timezone information for use by Java runtimes.
@@ -49,8 +43,6 @@ This package contains timezone information for use by Java runtimes.
 
 %patch002 -p1
 %patch003 -p1
-%patch004 -p1
-%patch005 -p1
 
 # Currently tzdata is providing the "rearguard" data set for maximum
 # compatibility with existing Red Hat Enterprise Linux installs. Future releases of
@@ -94,7 +86,6 @@ popd
 
 tar xf %{SOURCE4}
 %patch105
-%patch106 -p1
 
 echo "%{name}%{tzdata_version}" >> VERSION
 
@@ -141,20 +132,6 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %check
 echo ============TESTING===============
 /usr/bin/env LANG=C make -k VALIDATE=':' check && true
-
-# Create a custom JAVA_HOME, where we can replace tzdb.dat with the
-# one just built, for testing.
-system_java_home=$(dirname $(readlink -f $(which java)))/..
-mkdir -p java_home
-cp -Lr $system_java_home/* java_home/.
-for tzdb in $(find java_home -name tzdb.dat) ; do
-    rm $tzdb
-    cp $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/tzdb.dat $tzdb
-done
-# Compile the smoke test and run it.
-cp %{SOURCE5} .
-javac ZoneTest.java
-java_home/bin/java ZoneTest
 echo ============END TESTING===========
 
 %files
@@ -172,57 +149,6 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
-* Wed Oct 09 2024 Patsy Griffin <patsy@redhat.com> - 2024b-4
-- Bump release and rebuild to fix a build issue.
-
-* Thu Oct 03 2024 Patsy Griffin <patsy@redhat.com> - 2024b-3
-- Add copyright, patch attribution and build dependencies for
-  the previous commit. (RHEL-59542)
-
-* Fri Sep 20 2024 Florian Weimer <fweimer@redhat.com> - 2024b-2
-- Harden against links to removed zones (RHEL-59542)
-
-* Wed Sep 11 2024 Patsy Griffin <patsy@redhat.com> - 2024b-1
-- Update to tzdata-2024b
-  - Improve historical data for Mexico, Mongolia, and Portugal.
-  - System V names are now obsolescent.
-  - The main data form now uses %z.
-  - The code now conforms to RFC 8536 for early timestamps.
-  - Support POSIX.1-2024, which removes asctime_r and ctime_r.
-  - Assume POSIX.2-1992 or later for shell scripts.
-  - SUPPORT_C89 now defaults to 1.
-  - Include two upstream patches for month names as in April vs Apr.
-
-* 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.
-
-* Mon Aug 21 2023 Patsy Griffin <patsy@redhat.com> - 2023c-2
-- Bump release to test recent process changes. (RHEL-1326)
-
-* 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. (#2154109)