diff --git a/.gitignore b/.gitignore index 7f0b4c6..aa2e596 100644 --- a/.gitignore +++ b/.gitignore @@ -214,3 +214,5 @@ noarch/ /tzdata2023d.tar.gz /tzcode2024a.tar.gz /tzdata2024a.tar.gz +/tzcode2024b.tar.gz +/tzdata2024b.tar.gz diff --git a/0004-Fix-Apr-vs-April-2024b.patch b/0004-Fix-Apr-vs-April-2024b.patch new file mode 100644 index 0000000..7c3d161 --- /dev/null +++ b/0004-Fix-Apr-vs-April-2024b.patch @@ -0,0 +1,23 @@ +commit 926b507fa5c3192b1b68fab5910cbd3ba9377c97 +Author: Paul Eggert +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 diff --git a/0005-Improve-style-checks-for-months-2024b.patch b/0005-Improve-style-checks-for-months-2024b.patch new file mode 100644 index 0000000..b02b882 --- /dev/null +++ b/0005-Improve-style-checks-for-months-2024b.patch @@ -0,0 +1,77 @@ +commit 7b6fb155cadd5e5ee70b55c2770e1bdd2f5d2a38 +Author: Paul Eggert +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 >"/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") { diff --git a/ZoneTest.java b/ZoneTest.java new file mode 100644 index 0000000..e690728 --- /dev/null +++ b/ZoneTest.java @@ -0,0 +1,42 @@ +/* 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 . */ + + +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 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); + } +} + diff --git a/javazic-harden-links.patch b/javazic-harden-links.patch new file mode 100644 index 0000000..0d8d76b --- /dev/null +++ b/javazic-harden-links.patch @@ -0,0 +1,86 @@ +Modified for downstream inclusion in tzdata-java. + +commit 1bc13a1c10a580f84f1b7686c95344ec2633f611 +Author: Florian Weimer +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 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 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)|(?max)|(?only)|(?[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 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); + } + + /** + diff --git a/sources b/sources index 2f9e98e..5da42b3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2024a.tar.gz) = 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c -SHA512 (tzdata2024a.tar.gz) = 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 +SHA512 (tzcode2024b.tar.gz) = 0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026 +SHA512 (tzdata2024b.tar.gz) = 0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193 diff --git a/tzdata.spec b/tzdata.spec index 04d2915..d5034a6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2024a -%define tzdata_version 2024a -%define tzcode_version 2024a -Release: 5%{?dist} +Version: 2024b +%define tzdata_version 2024b +%define tzcode_version 2024b +Release: 1%{?dist} License: LicenseRef-Fedora-Public-Domain AND (GPL-2.0-only WITH ClassPath-exception-2.0) URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -11,8 +11,11 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz 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: make +BuildRequires: gcc BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel BuildRequires: glibc-common >= 2.5.90-7 @@ -27,7 +30,9 @@ the world. %package java Summary: Timezone data for Java Source3: javazic-1.8-37392f2f5d59.tar.xz +Source4: ZoneTest.java Patch100: JDK-8051641.patch +Patch101: javazic-harden-links.patch %description java This package contains timezone information for use by Java runtimes. @@ -39,6 +44,8 @@ This package contains timezone information for use by Java runtimes. %if 0%{?rhel} %patch -p1 -P 3 %endif +%patch -p1 -P 4 +%patch -p1 -P 5 # tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. # Use rearguard for java @@ -56,6 +63,7 @@ tar zxf rearguard/tzdata%{version}-rearguard.tar.gz tar xf %{SOURCE3} %patch -P 100 +%patch -P 101 -p1 echo "%{name}%{tzdata_version}" >> VERSION @@ -102,6 +110,25 @@ install -p -m 644 zone.tab zone1970.tab iso3166.tab leap-seconds.list leapsecond mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 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 %{SOURCE4} . +javac ZoneTest.java +java_home/bin/java ZoneTest +echo ============END TESTING=========== + %files %{_datadir}/zoneinfo %license LICENSE @@ -114,6 +141,18 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Jan 07 2025 Patsy Griffin - 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. +- Harden against links to removed zones + * Tue Oct 29 2024 Troy Dawson - 2024a-5 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018