diff --git a/.gitignore b/.gitignore index a55cde2..443756f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -SOURCES/javazic-1.8-37392f2f5d59.tar.xz -SOURCES/javazic.tar.gz -SOURCES/tzcode2025b.tar.gz -SOURCES/tzdata2025b.tar.gz +javazic-1.8-37392f2f5d59.tar.xz +tzcode2025b.tar.gz +tzdata2025b.tar.gz diff --git a/.tzdata.metadata b/.tzdata.metadata deleted file mode 100644 index 1913b75..0000000 --- a/.tzdata.metadata +++ /dev/null @@ -1,4 +0,0 @@ -77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz -ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz -30ede27ab7d353270714e6eec2eb36b712c53426 SOURCES/tzcode2025b.tar.gz -619f59455fc146b9882a03fb9db2b7a044b5fcd6 SOURCES/tzdata2025b.tar.gz diff --git a/SOURCES/0002-Fix-have-snprintf.patch b/0002-Fix-have-snprintf-error.patch similarity index 100% rename from SOURCES/0002-Fix-have-snprintf.patch rename to 0002-Fix-have-snprintf-error.patch diff --git a/SOURCES/0003-continue-to-ship-posixrules.patch b/0003-continue-to-ship-posixrules.patch similarity index 100% rename from SOURCES/0003-continue-to-ship-posixrules.patch rename to 0003-continue-to-ship-posixrules.patch diff --git a/SOURCES/8051641.patch b/JDK-8051641.patch similarity index 68% rename from SOURCES/8051641.patch rename to JDK-8051641.patch index 4f5be47..e55cb5f 100644 --- a/SOURCES/8051641.patch +++ b/JDK-8051641.patch @@ -1,3 +1,15 @@ +# HG changeset patch +# User aefimov +# Date 1419878542 -10800 +# Mon Dec 29 21:42:22 2014 +0300 +# Node ID 189490f29d1e335a2b7d162a0260d961a729652c +# Parent c8a71253d6e291112e62551b8dfc859e15dd9503 +# https://hg.openjdk.org/jdk8u/jdk8u-dev/jdk/rev/189490f29d1e + +# 8051641: Africa/Casablanca transitions is incorrectly calculated starting from 2027 + +# Reviewed-by: sherman + 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 diff --git a/SOURCES/7090844.patch b/SOURCES/7090844.patch deleted file mode 100644 index 669d171..0000000 --- a/SOURCES/7090844.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/7090844.patch b/7090844.patch -new file mode 100644 -index 0000000..fd5b531 ---- /dev/null -+++ b/7090844.patch -@@ -0,0 +1,38 @@ -+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:42:30.000000000 -0400 -++++ sun/tools/javazic/Mappings.java 2015-04-13 12:43:32.000000000 -0400 -+@@ -1,5 +1,5 @@ -+ /* -+- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. -++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+@@ -26,9 +26,6 @@ -+ package sun.tools.javazic; -+ -+ import java.util.ArrayList; -+-import java.util.HashMap; -+-import java.util.HashSet; -+-import java.util.Iterator; -+ import java.util.LinkedList; -+ import java.util.List; -+ import java.util.Map; -+@@ -79,8 +76,8 @@ -+ // If the GMT offset of this Zone will change in some -+ // future time, this Zone is added to the exclude list. -+ boolean isExcluded = false; -+- if (zone.size() > 1) { -+- ZoneRec zrec = zone.get(zone.size()-2); -++ for (int i = 0; i < zone.size(); i++) { -++ ZoneRec zrec = zone.get(i); -+ if ((zrec.getGmtOffset() != rawOffset) -+ && (zrec.getUntilTime(0) > Time.getCurrentTime())) { -+ if (excludeList == null) { -+@@ -88,6 +85,7 @@ -+ } -+ excludeList.add(zone.getName()); -+ isExcluded = true; -++ break; -+ } -+ } -+ diff --git a/SOURCES/7133138.patch b/SOURCES/7133138.patch deleted file mode 100644 index ef71275..0000000 --- a/SOURCES/7133138.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/7133138.patch b/7133138.patch -new file mode 100644 -index 0000000..882f15f ---- /dev/null -+++ b/7133138.patch -@@ -0,0 +1,38 @@ -+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:44:10.000000000 -0400 -++++ sun/tools/javazic/Mappings.java 2015-04-13 12:45:28.000000000 -0400 -+@@ -1,5 +1,5 @@ -+ /* -+- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. -++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+@@ -26,6 +26,7 @@ -+ package sun.tools.javazic; -+ -+ import java.util.ArrayList; -++import java.util.HashMap; -+ import java.util.LinkedList; -+ import java.util.List; -+ import java.util.Map; -+@@ -162,6 +163,20 @@ -+ for (String key : toBeRemoved) { -+ aliases.remove(key); -+ } -++ // Eliminate any alias-to-alias mappings. For example, if -++ // there are A->B and B->C, A->B is changed to A->C. -++ Map newMap = new HashMap(); -++ for (String key : aliases.keySet()) { -++ String realid = aliases.get(key); -++ String leaf = realid; -++ while (aliases.get(leaf) != null) { -++ leaf = aliases.get(leaf); -++ } -++ if (!realid.equals(leaf)) { -++ newMap.put(key, leaf); -++ } -++ } -++ aliases.putAll(newMap); -+ } -+ -+ Map getAliases() { diff --git a/SOURCES/javazic-fixup.patch b/SOURCES/javazic-fixup.patch deleted file mode 100644 index 8b19ef4..0000000 --- a/SOURCES/javazic-fixup.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- sun/util/calendar/LocalGregorianCalendar.java.keiths 2007-09-07 14:48:19.000000000 -0700 -+++ sun/util/calendar/LocalGregorianCalendar.java 2007-09-07 14:52:58.000000000 -0700 -@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte - static LocalGregorianCalendar getLocalGregorianCalendar(String name) { - Properties calendarProps = null; - try { -- String homeDir = (String) AccessController.doPrivileged( -- new sun.security.action.GetPropertyAction("java.home")); -+ String homeDir = (String) System.getProperty("java.home"); - final String fname = homeDir + File.separator + "lib" + File.separator - + "calendars.properties"; - calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() { ---- sun/util/calendar/ZoneInfoFile.java.keiths 2007-09-07 14:54:58.000000000 -0700 -+++ sun/util/calendar/ZoneInfoFile.java 2007-09-07 14:55:36.000000000 -0700 -@@ -1021,8 +1021,7 @@ public class ZoneInfoFile { - byte[] buffer = null; - - try { -- String zi_dir = (String) AccessController.doPrivileged( -- new sun.security.action.GetPropertyAction("user.zoneinfo.dir")); -+ String zi_dir = (String) System.getProperty("user.zoneinfo.dir"); - File dir = null; - if (zi_dir != null) - dir = new File(zi_dir); -@@ -1035,8 +1034,7 @@ public class ZoneInfoFile { - } - - if (dir == null) { -- String homeDir = (String) AccessController.doPrivileged( -- new sun.security.action.GetPropertyAction("java.home")); -+ String homeDir = (String) System.getProperty("java.home"); - zi_dir = homeDir + File.separator + "lib" + File.separator - + "zi"; - } diff --git a/SOURCES/rebase-01.patch b/SOURCES/rebase-01.patch deleted file mode 100644 index 3613014..0000000 --- a/SOURCES/rebase-01.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git a/rebase-01.patch b/rebase-01.patch -new file mode 100644 -index 0000000..bca6ed4 ---- /dev/null -+++ b/rebase-01.patch -@@ -0,0 +1,31 @@ -+--- sun/tools/javazic/Mappings.java.orig 2007-08-30 03:55:48.000000000 -0400 -++++ sun/tools/javazic/Mappings.java 2015-04-13 12:39:44.000000000 -0400 -+@@ -1,12 +1,12 @@ -+ /* -+- * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved. -++ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved. -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+ * -+ * This code is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License version 2 only, as -+- * published by the Free Software Foundation. Sun designates this -++ * published by the Free Software Foundation. Oracle designates this -+ * particular file as subject to the "Classpath" exception as provided -+- * by Sun in the LICENSE file that accompanied this code. -++ * by Oracle in the LICENSE file that accompanied this code. -+ * -+ * This code is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+@@ -18,9 +18,9 @@ -+ * 2 along with this work; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -+ * -+- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, -+- * CA 95054 USA or visit www.sun.com if you need additional information or -+- * have any questions. -++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -++ * or visit www.oracle.com if you need additional information or have any -++ * questions. -+ */ -+ -+ package sun.tools.javazic; diff --git a/SOURCES/rebase-02.patch b/SOURCES/rebase-02.patch deleted file mode 100644 index 1f17044..0000000 --- a/SOURCES/rebase-02.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/rebase-02.patch b/rebase-02.patch -new file mode 100644 -index 0000000..0f57125 ---- /dev/null -+++ b/rebase-02.patch -@@ -0,0 +1,36 @@ -+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:40:26.000000000 -0400 -++++ sun/tools/javazic/Mappings.java 2015-04-13 12:42:11.000000000 -0400 -+@@ -75,8 +75,10 @@ -+ Zone zone = zones.get(zoneName); -+ String zonename = zone.getName(); -+ int rawOffset = zone.get(zone.size()-1).getGmtOffset(); -++ -+ // If the GMT offset of this Zone will change in some -+ // future time, this Zone is added to the exclude list. -++ boolean isExcluded = false; -+ if (zone.size() > 1) { -+ ZoneRec zrec = zone.get(zone.size()-2); -+ if ((zrec.getGmtOffset() != rawOffset) -+@@ -85,7 +87,7 @@ -+ excludeList = new ArrayList(); -+ } -+ excludeList.add(zone.getName()); -+- continue; -++ isExcluded = true; -+ } -+ } -+ -+@@ -101,9 +103,11 @@ -+ rawOffsetsIndex.add(i, rawOffset); -+ -+ Set perRawOffset = new TreeSet(); -+- perRawOffset.add(zonename); -++ if (!isExcluded) { -++ perRawOffset.add(zonename); -++ } -+ rawOffsetsIndexTable.add(i, perRawOffset); -+- } else { -++ } else if (!isExcluded) { -+ int i = rawOffsetsIndex.indexOf(new Integer(rawOffset)); -+ Set perRawOffset = rawOffsetsIndexTable.get(i); -+ perRawOffset.add(zonename); diff --git a/SOURCES/ZoneTest.java b/ZoneTest.java similarity index 100% rename from SOURCES/ZoneTest.java rename to ZoneTest.java diff --git a/SOURCES/javazic-harden-links.patch b/javazic-harden-links.patch similarity index 99% rename from SOURCES/javazic-harden-links.patch rename to javazic-harden-links.patch index 9d5aad5..0d8d76b 100644 --- a/SOURCES/javazic-harden-links.patch +++ b/javazic-harden-links.patch @@ -5,7 +5,7 @@ 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 diff --git a/sources b/sources new file mode 100644 index 0000000..5da021f --- /dev/null +++ b/sources @@ -0,0 +1,3 @@ +SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 +SHA512 (tzcode2025b.tar.gz) = 19826b12968c10fc4db7e4b07ba782bfb8590eeebaec6f719d74b92a2e642ab817bd72bceff0015ce52a838edfdb00753b3cd87dd84b35abf2606e5bee445f76 +SHA512 (tzdata2025b.tar.gz) = 7d83741f3cae81fac8131994b43c55b6da7328df18b706e5ee40e9b3212bc506e6f8fc90988b18da424ed59eff69bce593f2783b7b5f18eb483a17aeb94258d6 diff --git a/SPECS/tzdata.spec b/tzdata.spec similarity index 85% rename from SPECS/tzdata.spec rename to tzdata.spec index 613cde2..6304eae 100644 --- a/SPECS/tzdata.spec +++ b/tzdata.spec @@ -4,22 +4,22 @@ Version: 2025b %define tzdata_version 2025b %define tzcode_version 2025b Release: 1%{?dist} -License: Public Domain -Group: System Environment/Base +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 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 -BuildRequires: gawk, glibc, perl-interpreter -BuildRequires: java-devel BuildRequires: make BuildRequires: gcc +BuildRequires: gawk, glibc, perl-interpreter +BuildRequires: java-devel BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch +ExcludeArch: i686 %description This package contains data files with rules for various timezones around @@ -27,17 +27,10 @@ the world. %package java 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 +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. @@ -45,59 +38,42 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch002 -p1 -%patch003 -p1 +%patch -p1 -P 2 +%if 0%{?rhel} +%patch -p1 -P 3 +%endif -# Currently tzdata is providing the "rearguard" data set for maximum -# compatibility with existing Red Hat Enterprise Linux installs. Future releases of -# Red Hat Enterprise Linux will be transitioning to the default or "vanguard" tzdata -# data set. -# -# The "rearguard" and "vanguard" data sets are defined by the upstream tzdata project -# and represent approximately the same data, with "vanguard" optimized for newer time -# zone data tooling, and "rearguard" optimized for compatibility with existing tooling. -# For example "vanguard" implements support for negative DST offsets, while "rearguard" -# supports the traditional format. - -# Create the reargard data files. +# tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. +# Use rearguard for java +mkdir rearguard make VERSION=%{version} tzdata%{version}-rearguard.tar.gz +mv tzdata%{version}-rearguard.tar.gz rearguard +pushd rearguard tar zxf tzdata%{version}-rearguard.tar.gz - -# Run make to re-create the tzdata.zi file for rearguard format -rm tzdata.zi -make VERSION=%{version} DATAFORM=rearguard tzdata.zi - -mkdir javazic -tar zxf %{SOURCE3} -C javazic -pushd javazic -%patch100 -%patch101 -%patch102 -%patch103 -%patch104 - -# Hack alert! sun.tools may be defined and installed in the -# VM. In order to guarantee that we are using IcedTea/OpenJDK -# for creating the zoneinfo files, rebase all the packages -# from "sun." to "rht.". Unfortunately, gcj does not support -# any of the -Xclasspath options, so we must go this route -# to ensure the greatest compatibility. -mv sun rht -find . -type f -name '*.java' -print0 \ - | xargs -0 -- sed -i -e 's:sun\.tools\.:rht.tools.:g' \ - -e 's:sun\.util\.:rht.util.:g' popd -tar xf %{SOURCE4} -%patch105 -%patch106 -p1 +%if 0%{?rhel} +# Use rearguard for rhel (overwrite default vangaurd data) +tar zxf rearguard/tzdata%{version}-rearguard.tar.gz +%endif + +tar xf %{SOURCE3} +%patch -P 100 +%patch -P 101 -p1 echo "%{name}%{tzdata_version}" >> VERSION %build +# Run make to create the tzdata.zi file +rm tzdata.zi +%if 0%{?rhel} +make VERSION=%{version} DATAFORM=rearguard tzdata.zi +%else +make tzdata.zi +%endif FILES="africa antarctica asia australasia europe northamerica southamerica - pacificnew etcetera backward" + etcetera backward factory" mkdir zoneinfo/{,posix,right} zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES @@ -106,31 +82,27 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES # grep -v tz-art.htm tz-link.htm > tz-link.html -# Java 6/7 tzdata -pushd javazic -javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java` -popd - -java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ - -d javazi \ - $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward +# tzdata-2018g introduced 25:00 which breaks java - use the rearguard files for java +JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ + rearguard/australasia rearguard/europe rearguard/northamerica \ + rearguard/southamerica rearguard/etcetera \ + rearguard/backward" # Java 8 tzdata pushd javazic-1.8 -javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java` +javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java` popd java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ -srcdir . -dstfile tzdb.dat \ -verbose \ - $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward + $JAVA_FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward %install rm -fr $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir} cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir} install -p -m 644 zone.tab zone1970.tab iso3166.tab leap-seconds.list leapseconds tzdata.zi $RPM_BUILD_ROOT%{_datadir}/zoneinfo -cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ @@ -148,13 +120,12 @@ for tzdb in $(find java_home -name tzdb.dat) ; do cp $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/tzdb.dat $tzdb done # Compile the smoke test and run it. -cp %{SOURCE5} . +cp %{SOURCE4} . javac ZoneTest.java java_home/bin/java ZoneTest echo ============END TESTING=========== %files -%defattr(-,root,root) %{_datadir}/zoneinfo %license LICENSE %doc README @@ -163,35 +134,23 @@ echo ============END TESTING=========== %doc tz-art.html %files java -%defattr(-,root,root) -%{_datadir}/javazi %{_datadir}/javazi-1.8 %changelog * Mon Mar 24 2025 Patsy Griffin - 2025b-1 -- Update to tzdata-2025b (RHEL-84748) +- Update to tzdata-2025b (RHEL-84740) - Chile's Aysén Region moves from -04/-03 to -03 year-round, diverging from America/Santiago and creating a new zone America/Coyhaique. * Tue Jan 21 2025 Patsy Griffin - 2025a-1 - Update to tzdata-2025a (RHEL-74309) + Update to tzdata-2025a (RHEL-74296) - Paraguay is now permanently at -03. This impacts timestamps starting on 2025-03-22. - Includes improvements to pre-1991 data for the Philippines. - Etc/Unknown is now reserved. -* Wed Oct 09 2024 Patsy Griffin - 2024b-4 -- Bump release and rebuild to fix a build issue. - -* Thu Oct 03 2024 Patsy Griffin - 2024b-3 -- Add copyright, patch attribution and build dependencies for - the previous commit. (RHEL-59542) - -* Fri Sep 20 2024 Florian Weimer - 2024b-2 -- Harden against links to removed zones (RHEL-59542) - -* Wed Sep 11 2024 Patsy Griffin - 2024b-1 +* 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. @@ -201,41 +160,73 @@ echo ============END TESTING=========== - 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 -* Thu Feb 01 2024 Patsy Griffin - 2024a-1 +* Tue Oct 29 2024 Troy Dawson - 2024a-5 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 2024a-4 +- Bump release for June 2024 mass rebuild + +* Thu Apr 18 2024 Patsy Griffin - 2024a-3 +- Add java patch to fix incorrect calculations for + Africa/Casablanca starting in 2027. (RHEL-32178) +- Remove hardcoded versioned path to javac. + +* Tue Feb 06 2024 Patsy Griffin - 2024a-2 +- Correct the bz# for the tzdata-2024 commit. + +* Mon Feb 05 2024 Patsy Griffin - 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 - 2023d-1 +* Sat Jan 27 2024 Fedora Release Engineering - 2023d-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 18 2024 Patsy Griffin - 2023d-2 +- Migrate License field to SPDX identifiers for + https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 + +* Wed Jan 03 2024 Patsy Griffin - 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 - 2023c-2 -- Bump release to test recent process changes. (RHEL-1326) +* Wed Dec 13 2023 Patsy Griffin - 2023c-5 +- Remove Java 6/7 support for Fedora 40 and RHEL 10 forward. -* Tue Mar 28 2023 Patsy Griffin - 2023c-1 +* Tue Oct 3 2023 David Cantrell - 2023c-4 +- Use the new syntax for the %%patch macro in the spec file + +* Mon Jul 24 2023 Yaakov Selkowitz - 2023c-3 +- Disable Java 6/7 data in RHEL 10 builds + +* Sat Jul 22 2023 Fedora Release Engineering - 2023c-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Mar 29 2023 Patsy Griffin - 2023c-1 - Rebase to tzdata-2023c - - Lebanon reversed the change added in tzdata-2023b. + - Reinstate Lebanon DST change effective March 25. * Fri Mar 24 2023 Patsy Griffin - 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 - 2023a-1 +* Thu Mar 23 2023 Patsy Griffin - 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. + - 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 - 2022g-2 -- Include leap-seconds.list in tzdata install. (#2154109) +* Sat Jan 21 2023 Fedora Release Engineering - 2022g-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Tue Nov 29 2022 Patsy Griffin - 2022g-1 +* Fri Dec 02 2022 Patsy Griffin - 2022g-1 - Rebase to tzdata-2022g - The northern edge of the Mexican state of Chihuahua will change time zone to agree with nearby US locations on @@ -249,42 +240,70 @@ echo ============END TESTING=========== - Chihuahua moved to -06 year round starting on 2022-10-30. - Fiji no longer observes DST. -* Tue Aug 16 2022 Patsy Griffin - 2022c-1 +* Fri Oct 14 2022 Patsy Griffin - 2022e-1 +- Rebase to tzdata-2022e + - Jordan and Syria cancelled the DST transition planned + for 2022-10-28, remaining at +03 permanently. + +* Sun Sep 25 2022 Patsy Griffin - 2022d-1 +- Rebase to tzdata-2022d + - Palestine DST transition will be on October 29, 2022, + not October 28, 2022. + - Europe/Uzhgorod and Europe/Zaporozhye are moved to 'backzone'. + +* Mon Aug 22 2022 Patsy Griffin - 2022c-1 - Rebase to tzdata-2022c - supersedes tzdata-2022b - Add a work-around for an awk bug in FreeBSD, macOS, etc. - Improve tzselect with respect to intercontinental Zones. -* Wed Aug 10 2022 Patsy Griffin - 2022b-1 +* Sun Aug 14 2022 Patsy Griffin - 2022b-1 - Rebase to tzdata-2022b - Chile transitions to DST on 2022-09-11, not 2022-09-04 - 'make install' now defaults LOCALTIME to Factory rather than GMT - More zones that are the same since 1970 have been moved to backzone. - Include patch for awk workaround. -* Tue Apr 5 2022 Patsy Griffin - 2022a-2 -- Update the release for rebuild. +* Sat Jul 23 2022 Fedora Release Engineering - 2022a-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Fri Apr 1 2022 Patsy Griffin - 2022a-1 +* Fri Jul 15 2022 Patsy Griffin - 2022a-3 +- Java OpenJDK packages are no longer available on i686. + Exclude i686 builds. (bz #2104108) + +* Tue Jun 07 2022 Patsy Griffin - 2022a-2 +- Include leap-second.list in tzdata install. (#2091390) + +* Wed Mar 23 2022 Patsy Griffin - 2022a-1 - Rebase to tzdata-2022a - - Palestine springs forward on 2022-03-27, not -03-26. - - zdump -v now outputs better failure information - - fixes for code that reads corrupted TZif data + - Palestine springs forward on 2022-03-27, not 2022-03-26. + - zdump -v now outputs better failure information. + - bug fixes for code that reads corrupted TZif data. -* Fri Oct 22 2021 Patsy Griffin - 2021e-1 +* Tue Feb 08 2022 Patsy Griffin - 2021e-4 +- Clean-up changelog. + +* Sat Feb 05 2022 Jiri Vanek - 2021e-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/Java17 + +* Sat Jan 22 2022 Fedora Release Engineering - 2021e-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Oct 26 2021 Patsy Griffin - 2021e-1 - Rebase to tzdata-2021e - supersedes tzdata-2021d - Pacific/Fiji suspended DST for the 2021/2022 season. - 'zic -r' now marks unspecified timestamps with "-00". - Palestine will fall back 2021-10-29 at 01:00, rather than the predicted 2021-10-30. -* Wed Oct 06 2021 Patsy Griffin - 2021c-1 -- Rebase to tzdata-2021c - supersedes tzdata-2021b - - Revert most of 2021b changes to 'backward'. - - Fix 'zic -b fat' bug in pre-1970 32-bit data. - - Fix two Link line typos. - - Distribute SECURITY file. -- Includes changes in tzdata-2021b - - Innclude patch for Mayen +* Thu Oct 07 2021 Patsy Griffin - 2021c-1 +- Rebase to tzdata-2021c + - Revert most 2021b changes to the 'backward' file. + - Fix 'zic -b fat' bug in pre-1970 32-bit data reported in tzdata-2021b. + - Fix two Link line typos from tzdata-2021b. + - Distribute the new SECURITY file. + +* Sat Sep 25 2021 Patsy Griffin - 2021b-1 +- Rebase to tzdata-2021b - Jordan now starts DST on February's last Thursday. - Samoa no longer observes DST. - Merge more location-based Zones whose timestamps agree since 1970. @@ -299,11 +318,14 @@ echo ============END TESTING=========== - zdump -v now outputs more-useful boundary cases. - tzfile.5 better matches a draft successor to RFC 8536. -* Sun Jan 24 2021 Patsy Griffin - 2021a-1 +* Fri Jul 23 2021 Fedora Release Engineering - 2021a-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jan 25 2021 Patsy Griffin - 2021a-1 - Rebase to tzdata-2021a - South Sudan will change from +03 to +02 on 2021-02-01. -* Tue Dec 29 2020 Patsy Griffin - 2020f-1 +* Wed Dec 30 2020 Patsy Griffin - 2020f-1 - Rebase to tzdata-2020f including changes for tzdata-2020e - tzdata-2020f fixes a bug in tzdata-2020e that caused an invalid zi file in rearguard format @@ -312,22 +334,22 @@ echo ============END TESTING=========== timestamps since 1970 and was therefore created by mistake, now moved to the "backward" file. -* Wed Oct 21 2020 Patsy Griffin - 2020d-1 -- Rebase to tzdata-2020d - - Palestine will end summer time on 2020-10-24 rather than the - predicted 2020-10-31. +* Wed Dec 16 2020 Patsy Griffin - 2020d-3 +- Add 0003-continue-to-ship-posixrules.patch to initialize + POSIXRULES variable. -* Mon Oct 19 2020 Patsy Griffin - 2020c-1 -- Rebase to tzdata-2020c +* Wed Dec 16 2020 Patsy Griffin - 2020d-2 +- Add conditional support for rhel and eln. + +* Fri Oct 23 2020 Patsy Griffin - 2020d-1 +- Rebase to tzdata-2020d including changes from tzdata-2020c + - Palestine will end summer time on 2020-10-24 rather than the + predicted 2020-10-31. - Fiji starts DST later than usual, on 2020-12-20. - Rearguard now provides an empty file pacificnew to support downstream software that expects it. -* Tue Oct 13 2020 Patsy Griffin - 2020b-2 -- Include the upstream patch to support pacificnew for java tzupdater. -- Set POSIXRULES macro to continue installing posixrules file. - -* Wed Oct 07 2020 Patsy Griffin - 2020b-1 +* Wed Oct 14 2020 Patsy Griffin - 2020b-1 - Rebase to tzdata-2020b - Yukon timezones represented by America/Whitehorse and America/Dawson will change time zone rules from -08/-07 to @@ -337,7 +359,17 @@ echo ============END TESTING=========== - Remove obsolete files pacificnew, systemv, and yearistype.sh from the distribution. -* Fri Apr 24 2020 Patsy Griffin - 2020a-1 +* Wed Jul 29 2020 Fedora Release Engineering - 2020a-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 2020a-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jun 12 2020 Jiri Vanek - 2020a-2 +- bumped source/target to 1.6 for tzdata for jdk6/7 +- bumped source/target to 1.8 for tzdata for jdk8 + +* Thu Apr 30 2020 Patsy Griffin - 2020a-1 - Rebase to tzdata-2020a - Morocco will spring forward on 2020-05-31 rather than previously predicted 2020-05-24. @@ -345,48 +377,51 @@ echo ============END TESTING=========== effective 2020-03-08. - America/Godthab was renamed to America/Nuuk. -* Wed Sep 11 2019 Patsy Griffin - 2019c-1 +* Fri Jan 31 2020 Fedora Release Engineering - 2019c-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 17 2020 Patsy Griffin - 2019c-2 +- Don't build the factory zone for tzdata-java. + Patch provided by Severin Gehwolf (#1789468) + +* Mon Sep 23 2019 Patsy Griffin - 2019c-1 - Rebase to tzdata-2019c - Fiji will observe DST from 2019-11-10 to 2020-01-12. - Norfolk Island will begin observing Australian-style DST on 2019-10-06. +- Add Factory back in to be more consistent with upstream. -* Mon Jul 01 2019 Patsy Griffin - 2019b-1 +* Sat Jul 27 2019 Fedora Release Engineering - 2019b-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 09 2019 Patsy Griffin - 2019b-1 - Rebase to tzdata-2019b - Brazil will no longer observe DST going forward. - The 2019 spring transition for Palestine occurred 03-29, not 03-30. -* Tue Mar 26 2019 Patsy Griffin Franklin - 2019a-1 +* Fri Mar 29 2019 Patsy Griffin Franklin - 2019a-1 - Rebase to tzdata-2019a - Palestine will start DST on 2019-03-30, rather than 2019-03-23 as previously predicted. - Metlakatla rejoined Alaska time on 2019-01-20, ending its observances of Pacific standard time. -* Wed Jan 02 2019 Patsy Griffin Franklin - 2018i-1 -- Rebase to tzdata-2018i (includes changes from tzdata-2018h) - - São Tomé and Príncipe changed from UTC+01 to UTC+00 on 2019-01-01. - - Qyzylorda, Kazakhstan changed from UTC+06 to UTC+05 on 2018-12-21. - - Created a new zone Asia/Qostanay since Qostanay, Kazakhstan didn't - transition with the Qyzylorda change. - - Metlakatla, Alaska will observe PST for this winter only. - - Predict that Morocco will continue to adjust clocks around Ramadan. - - Also include predictions for Iran from 2038 through 2090. +* Sun Feb 03 2019 Fedora Release Engineering - 2018i-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Mon Oct 29 2018 Patsy Griffin Franklin - 2018g-1 +* Mon Nov 12 2018 Patsy Griffin Franklin - 2018g-1 - Rebase to tzdata-2018g - - Morocco will remain at UTC+1 rather than switching back to UTC+0 as - planned. This change is effective Octobober 28, 2018. -- Include changes introduced in tzdata-2018f + Includes changes for tzdata-2018f. - Volgograd will change from UTC+03 to UTC+04 on 2018-10-28 at 02:00. - Fiji will end DST on 2019-01-13 instead of the 2019-01-20 as previously predicted. - Most of Chile will end DST on the first Saturday in April at 24:00 and restart DST on the first Saturday in September at 24:00. + - Morocco will change from UTC+00/+01 to permanent +01 effective 2018-10-27. -* Fri Sep 28 2018 Patsy Franklin - 2018e-2 -- Add make check for testing. +* Sat Jul 14 2018 Fedora Release Engineering - 2018e-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Mon May 14 2018 Patsy Franklin - 2018e-1 +* Wed May 16 2018 Patsy Franklin - 2018e-1 - Rebase to tzdata-2018e - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018. - In this update, the upstream project now defaults to using @@ -394,7 +429,7 @@ echo ============END TESTING=========== * Wed Mar 28 2018 Patsy Franklin - 2018d-1 - Rebase to tzdata-2018d: - - DST for Asia/Gaza and Asia/Hebron has changed + - DST for Asia/Gaza and Asia/Hebron has changed from March 31 to March 24. - Antarctica/Casey station changed to UTC+8 on March 11.