From af5c6d18873cc91135b407ccb1589503de0e113e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 24 Jul 2023 15:15:19 -0400 Subject: [PATCH 01/24] Disable Java 6/7 data in Fedora 40 and RHEL 10 At this point perhaps this could be disabled in stable branches too, but at a minimum we neither need this for the next Fedora and RHEL versions, nor want to require Java 8 to build it. --- tzdata.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 3f30ef6..efb73ef 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,12 @@ +# TZ data for Java 6/7, requires Java 8 or older to compile +%bcond java7 %[!(0%{?fedora} >= 40 || 0%{?rhel} >= 10)] + Summary: Timezone data Name: tzdata Version: 2023c %define tzdata_version 2023c %define tzcode_version 2023c -Release: 2%{?dist} +Release: 3%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -15,7 +18,9 @@ Patch003: 0003-continue-to-ship-posixrules.patch BuildRequires: make BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel +%if %{with java7} BuildRequires: java-1.8.0-devel +%endif BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -60,6 +65,7 @@ popd tar zxf rearguard/tzdata%{version}-rearguard.tar.gz %endif +%if %{with java7} mkdir javazic tar zxf %{SOURCE3} -C javazic pushd javazic @@ -80,6 +86,7 @@ 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 +%endif tar xf %{SOURCE4} @@ -110,6 +117,7 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ rearguard/southamerica rearguard/etcetera \ rearguard/backward" +%if %{with java7} # Java 6/7 tzdata pushd javazic /usr/lib/jvm/java-1.8.0-openjdk/bin/javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java` @@ -118,6 +126,7 @@ popd java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ -d javazi \ $JAVA_FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward +%endif # Java 8 tzdata pushd javazic-1.8 @@ -134,7 +143,9 @@ 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 +%if %{with java7} cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi +%endif mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ @@ -147,10 +158,15 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %doc tz-art.html %files java +%if %{with java7} %{_datadir}/javazi +%endif %{_datadir}/javazi-1.8 %changelog +* 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 From 107a0ff239cd30ce1b3fe9252459e32f8d5d7314 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Tue, 3 Oct 2023 17:24:59 -0400 Subject: [PATCH 02/24] The previous %patchN syntax has been deprecated in favor of the '%patch -P N' syntax. Signed-off-by: David Cantrell --- tzdata.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index efb73ef..9f1969f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -6,7 +6,7 @@ Name: tzdata Version: 2023c %define tzdata_version 2023c %define tzcode_version 2023c -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -46,9 +46,9 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch002 -p1 +%patch -p1 -P 2 %if 0%{?rhel} -%patch003 -p1 +%patch -p1 -P 3 %endif # tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. @@ -69,11 +69,11 @@ tar zxf rearguard/tzdata%{version}-rearguard.tar.gz mkdir javazic tar zxf %{SOURCE3} -C javazic pushd javazic -%patch100 -%patch101 -%patch102 -%patch103 -%patch104 +%patch -P 100 +%patch -P 101 +%patch -P 102 +%patch -P 103 +%patch -P 104 # Hack alert! sun.tools may be defined and installed in the # VM. In order to guarantee that we are using IcedTea/OpenJDK @@ -164,6 +164,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* 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 From 17c81ff9b024d2d247982646ab9744eb2f0b64ae Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 14 Dec 2023 16:54:12 -0500 Subject: [PATCH 03/24] Remove Java 6/7 support for Fedora 40 and RHEL 10 forward. --- sources | 1 - tzdata.spec | 61 ++++++----------------------------------------------- 2 files changed, 6 insertions(+), 56 deletions(-) diff --git a/sources b/sources index 35c485b..e4a0e62 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ -SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 SHA512 (tzcode2023c.tar.gz) = fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 SHA512 (tzdata2023c.tar.gz) = 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 diff --git a/tzdata.spec b/tzdata.spec index 9f1969f..5892b93 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,12 +1,9 @@ -# TZ data for Java 6/7, requires Java 8 or older to compile -%bcond java7 %[!(0%{?fedora} >= 40 || 0%{?rhel} >= 10)] - Summary: Timezone data Name: tzdata Version: 2023c %define tzdata_version 2023c %define tzcode_version 2023c -Release: 4%{?dist} +Release: 5%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -18,9 +15,6 @@ Patch003: 0003-continue-to-ship-posixrules.patch BuildRequires: make BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel -%if %{with java7} -BuildRequires: java-1.8.0-devel -%endif BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -32,13 +26,7 @@ the world. %package java Summary: Timezone data for Java -Source3: javazic.tar.gz -Source4: javazic-1.8-37392f2f5d59.tar.xz -Patch100: javazic-fixup.patch -Patch101: rebase-01.patch -Patch102: rebase-02.patch -Patch103: 7090844.patch -Patch104: 7133138.patch +Source3: javazic-1.8-37392f2f5d59.tar.xz %description java This package contains timezone information for use by Java runtimes. @@ -65,30 +53,7 @@ popd tar zxf rearguard/tzdata%{version}-rearguard.tar.gz %endif -%if %{with java7} -mkdir javazic -tar zxf %{SOURCE3} -C javazic -pushd javazic -%patch -P 100 -%patch -P 101 -%patch -P 102 -%patch -P 103 -%patch -P 104 - -# 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 -%endif - -tar xf %{SOURCE4} +tar xf %{SOURCE3} echo "%{name}%{tzdata_version}" >> VERSION @@ -117,17 +82,6 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ rearguard/southamerica rearguard/etcetera \ rearguard/backward" -%if %{with java7} -# Java 6/7 tzdata -pushd javazic -/usr/lib/jvm/java-1.8.0-openjdk/bin/javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java` -popd - -java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ - -d javazi \ - $JAVA_FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward -%endif - # Java 8 tzdata pushd javazic-1.8 /usr/lib/jvm/java-17-openjdk/bin/javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java` @@ -143,9 +97,6 @@ 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 -%if %{with java7} -cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi -%endif mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ @@ -158,12 +109,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %doc tz-art.html %files java -%if %{with java7} -%{_datadir}/javazi -%endif %{_datadir}/javazi-1.8 %changelog +* Wed Dec 13 2023 Patsy Griffin - 2023c-5 +- Remove Java 6/7 support for Fedora 40 and RHEL 10 forward. + * Tue Oct 3 2023 David Cantrell - 2023c-4 - Use the new syntax for the %%patch macro in the spec file From 017132fe4285bb3d80e045bd3e25017373a49877 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 3 Jan 2024 16:51:38 -0500 Subject: [PATCH 04/24] Resolves: #2255598 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. --- .gitignore | 2 ++ 0002-Fix-have-snprintf-error.patch | 16 ++++++++-------- sources | 4 ++-- tzdata.spec | 15 +++++++++++---- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index a323947..6c56e99 100644 --- a/.gitignore +++ b/.gitignore @@ -210,3 +210,5 @@ noarch/ /tzdata2023b.tar.gz /tzcode2023c.tar.gz /tzdata2023c.tar.gz +/tzcode2023d.tar.gz +/tzdata2023d.tar.gz diff --git a/0002-Fix-have-snprintf-error.patch b/0002-Fix-have-snprintf-error.patch index cafdf4d..b3dab7f 100644 --- a/0002-Fix-have-snprintf-error.patch +++ b/0002-Fix-have-snprintf-error.patch @@ -1,12 +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. +--- 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= + #CFLAGS= -O 1 +CFLAGS= -DHAVE_SNPRINTF=1 - # Linker flags. Default to $(LFLAGS) for backwards compatibility - # to release 2012h and earlier. + + # 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 diff --git a/sources b/sources index e4a0e62..f5d4e62 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2023c.tar.gz) = fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 -SHA512 (tzdata2023c.tar.gz) = 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 +SHA512 (tzcode2023d.tar.gz) = 3994a5a060a7a5fffc6585f5191cf7679f9f9be44dbcee4d67d0e42c5b6020c308cb55caf8bf8d51554697665105a174cb470c8c4fc069438350f3bac725709b +SHA512 (tzdata2023d.tar.gz) = 81832b2d738c28cecbcb3906cc07568c5ae574adc9de35b25d4bf613581c92d471d67213b4261a56f0ec02efcf211b4e298b7e1dc367c972e726b0a2e9498df4 diff --git a/tzdata.spec b/tzdata.spec index 5892b93..af66b6c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2023c -%define tzdata_version 2023c -%define tzcode_version 2023c -Release: 5%{?dist} +Version: 2023d +%define tzdata_version 2023d +%define tzcode_version 2023d +Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -112,6 +112,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* 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. + * Wed Dec 13 2023 Patsy Griffin - 2023c-5 - Remove Java 6/7 support for Fedora 40 and RHEL 10 forward. From ed9247301fc2b84cc30890d927d40913d68c69e8 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 18 Jan 2024 14:17:17 -0500 Subject: [PATCH 05/24] Migrate License field to SPDX identifiers. Resolves: #2222093 Reviewed-by: Carlos O'Donell --- tzdata.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index af66b6c..06da47f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,8 +3,8 @@ Name: tzdata Version: 2023d %define tzdata_version 2023d %define tzcode_version 2023d -Release: 1%{?dist} -License: Public Domain +Release: 2%{?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 Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz @@ -112,6 +112,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* 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 From cf1e56dd76da452767c57dfa343c50ca953ae542 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 06:55:04 +0000 Subject: [PATCH 06/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 06da47f..84f884d 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2023d %define tzdata_version 2023d %define tzcode_version 2023d -Release: 2%{?dist} +Release: 3%{?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 @@ -112,6 +112,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* 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 From aa6d121af3ed128f0f7eaab4fe9eb966f096365a Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Tue, 6 Feb 2024 12:47:07 -0500 Subject: [PATCH 07/24] Resolves: #226312 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 ++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 6c56e99..7f0b4c6 100644 --- a/.gitignore +++ b/.gitignore @@ -212,3 +212,5 @@ noarch/ /tzdata2023c.tar.gz /tzcode2023d.tar.gz /tzdata2023d.tar.gz +/tzcode2024a.tar.gz +/tzdata2024a.tar.gz diff --git a/sources b/sources index f5d4e62..2f9e98e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2023d.tar.gz) = 3994a5a060a7a5fffc6585f5191cf7679f9f9be44dbcee4d67d0e42c5b6020c308cb55caf8bf8d51554697665105a174cb470c8c4fc069438350f3bac725709b -SHA512 (tzdata2023d.tar.gz) = 81832b2d738c28cecbcb3906cc07568c5ae574adc9de35b25d4bf613581c92d471d67213b4261a56f0ec02efcf211b4e298b7e1dc367c972e726b0a2e9498df4 +SHA512 (tzcode2024a.tar.gz) = 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c +SHA512 (tzdata2024a.tar.gz) = 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 diff --git a/tzdata.spec b/tzdata.spec index 84f884d..e8550da 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2023d -%define tzdata_version 2023d -%define tzcode_version 2023d -Release: 3%{?dist} +Version: 2024a +%define tzdata_version 2024a +%define tzcode_version 2024a +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 @@ -112,6 +112,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* 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. + * Sat Jan 27 2024 Fedora Release Engineering - 2023d-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3fae85033bee01c34229d982c66759ddfeb00a16 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Tue, 6 Feb 2024 13:12:14 -0500 Subject: [PATCH 08/24] Resolves: #2262312 - Correct the bz# for the tzdata-2024 commit. --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index e8550da..c59ae67 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 1%{?dist} +Release: 2%{?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 @@ -112,6 +112,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* 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. From aeb8df30adeffd99c6eca8696d74a8267ff34ddf Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 18:25:28 +0100 Subject: [PATCH 09/24] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index c59ae67..b806519 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 2%{?dist} +Release: 3%{?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 @@ -112,6 +112,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Feb 27 2024 Jiri Vanek - 2024a-3 +- Rebuilt for java-21-openjdk as system jdk + * Tue Feb 06 2024 Patsy Griffin - 2024a-2 - Correct the bz# for the tzdata-2024 commit. From 4568a67fa2b6b510db65cc6a021722cff1e3d5af Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sat, 2 Mar 2024 20:52:51 +0000 Subject: [PATCH 10/24] Remove hardcoded versioned path to javac --- tzdata.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index b806519..4f7c4f7 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 3%{?dist} +Release: 4%{?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 @@ -84,7 +84,7 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ # Java 8 tzdata pushd javazic-1.8 -/usr/lib/jvm/java-17-openjdk/bin/javac -source 1.8 -target 1.8 -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 \ @@ -112,6 +112,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Mar 02 2024 Andrew Hughes - 2024a-4 +- Remove hardcoded versioned path to javac + * Tue Feb 27 2024 Jiri Vanek - 2024a-3 - Rebuilt for java-21-openjdk as system jdk From 7553f7a9ce43f7666a875c12360857114880e974 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Mon, 8 Apr 2024 22:32:07 -0400 Subject: [PATCH 11/24] Resolves: #2266311 - Add java patch to fix incorrect calculations for Africa/Casablanca starting in 2027. --- 8051641.patch | 17 +++++++++++++++++ tzdata.spec | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 8051641.patch diff --git a/8051641.patch b/8051641.patch new file mode 100644 index 0000000..4f5be47 --- /dev/null +++ b/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 diff --git a/tzdata.spec b/tzdata.spec index 4f7c4f7..c2d37a8 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 4%{?dist} +Release: 5%{?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 @@ -27,6 +27,7 @@ the world. %package java Summary: Timezone data for Java Source3: javazic-1.8-37392f2f5d59.tar.xz +Patch100: 8051641.patch %description java This package contains timezone information for use by Java runtimes. @@ -54,6 +55,7 @@ tar zxf rearguard/tzdata%{version}-rearguard.tar.gz %endif tar xf %{SOURCE3} +%patch -P 100 echo "%{name}%{tzdata_version}" >> VERSION @@ -112,6 +114,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Apr 04 2024 Patsy Griffin - 2024a-5 +- Add java patch to fix incorrect calculations for + Africa/Casablanca starting in 2027. (#2266311) + * Sat Mar 02 2024 Andrew Hughes - 2024a-4 - Remove hardcoded versioned path to javac From 7c34d534e3ca270e440539abdcb2390b3468d1ed Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Fri, 26 Apr 2024 18:07:21 +0100 Subject: [PATCH 12/24] Add support for --with vanguard --- tzdata.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index c2d37a8..83a1402 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 5%{?dist} +Release: 6%{?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 @@ -20,6 +20,9 @@ Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch ExcludeArch: i686 +# Using '--with vanguard' will change the data format to the new vanguard form. +%bcond_with vanguard + %description This package contains data files with rules for various timezones around the world. @@ -50,7 +53,7 @@ tar zxf tzdata%{version}-rearguard.tar.gz popd %if 0%{?rhel} -# Use rearguard for rhel (overwrite default vangaurd data) +# Use rearguard for rhel (overwrite default dataform) tar zxf rearguard/tzdata%{version}-rearguard.tar.gz %endif @@ -62,7 +65,9 @@ echo "%{name}%{tzdata_version}" >> VERSION %build # Run make to create the tzdata.zi file rm tzdata.zi -%if 0%{?rhel} +%if %{with vanguard} +make VERSION=%{version} DATAFORM=vanguard tzdata.zi +%elif 0%{?rhel} make VERSION=%{version} DATAFORM=rearguard tzdata.zi %else make tzdata.zi @@ -114,6 +119,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Apr 26 2024 Jonathan Wakely - 2024a-6 +- Add support for --with vanguard + * Thu Apr 04 2024 Patsy Griffin - 2024a-5 - Add java patch to fix incorrect calculations for Africa/Casablanca starting in 2027. (#2266311) From c224b52b4ef3c746f343ccf0847e2e1987a7cee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 15 May 2024 00:09:28 +0200 Subject: [PATCH 13/24] Rebuilt with glibc-2.39.9000-10 to avoid regressions described in rhbz#2280403 --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 83a1402..d723a69 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 6%{?dist} +Release: 7%{?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 @@ -119,6 +119,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue May 14 2024 Miro Hrončok - 2024a-7 +- Rebuilt with glibc-2.39.9000-10 to avoid regressions described in rhbz#2280403 + * Fri Apr 26 2024 Jonathan Wakely - 2024a-6 - Add support for --with vanguard From 09431b011f5f1c8cc3ef030f2385bc1775923693 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 29 May 2024 11:27:05 -0400 Subject: [PATCH 14/24] Resolves: #2280403 - zic now defaults to "-b slim" to control data bloat. For now, build with ZFLAGS="-b fat" for backward compatibitliy. --- tzdata.spec | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index d723a69..c7c92d6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 7%{?dist} +Release: 8%{?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 @@ -43,10 +43,14 @@ This package contains timezone information for use by Java runtimes. %patch -p1 -P 3 %endif +# zic now defaults to "-b slim" to control data bloat. +# This can cause build issues for some packages. +# For now, build with ZFLAGS="-b fat" for backward compatibitliy. + # tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. # Use rearguard for java mkdir rearguard -make VERSION=%{version} tzdata%{version}-rearguard.tar.gz +make VERSION=%{version} ZFLAGS="-b fat" tzdata%{version}-rearguard.tar.gz mv tzdata%{version}-rearguard.tar.gz rearguard pushd rearguard tar zxf tzdata%{version}-rearguard.tar.gz @@ -66,9 +70,9 @@ echo "%{name}%{tzdata_version}" >> VERSION # Run make to create the tzdata.zi file rm tzdata.zi %if %{with vanguard} -make VERSION=%{version} DATAFORM=vanguard tzdata.zi +make VERSION=%{version} ZFLAGS="-b fat" DATAFORM=vanguard tzdata.zi %elif 0%{?rhel} -make VERSION=%{version} DATAFORM=rearguard tzdata.zi +make VERSION=%{version} ZFLAGS="-b fat" DATAFORM=rearguard tzdata.zi %else make tzdata.zi %endif @@ -77,9 +81,9 @@ FILES="africa antarctica asia australasia europe northamerica southamerica etcetera backward factory" mkdir zoneinfo/{,posix,right} -zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES -zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES -zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES +zic -b fat -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES +zic -b fat -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES +zic -b fat -y ./yearistype -d zoneinfo/right -L leapseconds $FILES # grep -v tz-art.htm tz-link.htm > tz-link.html @@ -119,6 +123,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue May 28 2024 Patsy Griffin - 2024a-8 +- zic now defaults to "-b slim" to control data bloat. + For now, build with ZFLAGS="-b fat" for backward compatibitliy. + * Tue May 14 2024 Miro Hrončok - 2024a-7 - Rebuilt with glibc-2.39.9000-10 to avoid regressions described in rhbz#2280403 From c8d58116e05b48abdcb27e3d92e99b3d81e79647 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:04:22 +0000 Subject: [PATCH 15/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index c7c92d6..91fb5b4 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 8%{?dist} +Release: 9%{?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 @@ -123,6 +123,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2024a-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue May 28 2024 Patsy Griffin - 2024a-8 - zic now defaults to "-b slim" to control data bloat. For now, build with ZFLAGS="-b fat" for backward compatibitliy. From 6e3748f32f5831a133eb40b8fb91478f9bef8755 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Wed, 11 Dec 2024 11:47:59 +0000 Subject: [PATCH 16/24] Add tests/Sanity/trivial_case Add testcase --- tests/Sanity/trivial_case/date.golden | 320 ++++++++++++++++++++++++++ tests/Sanity/trivial_case/datetimes | 10 + tests/Sanity/trivial_case/main.fmf | 10 + tests/Sanity/trivial_case/test.sh | 41 ++++ tests/Sanity/trivial_case/zones | 32 +++ 5 files changed, 413 insertions(+) create mode 100644 tests/Sanity/trivial_case/date.golden create mode 100644 tests/Sanity/trivial_case/datetimes create mode 100644 tests/Sanity/trivial_case/main.fmf create mode 100755 tests/Sanity/trivial_case/test.sh create mode 100644 tests/Sanity/trivial_case/zones diff --git a/tests/Sanity/trivial_case/date.golden b/tests/Sanity/trivial_case/date.golden new file mode 100644 index 0000000..645a868 --- /dev/null +++ b/tests/Sanity/trivial_case/date.golden @@ -0,0 +1,320 @@ +Europe/Berlin 2003-08-03 22:43:22 UTC -> Mon Aug 4 00:43:22 CEST 2003 +Europe/Berlin 2003-02-03 22:43:22 UTC -> Mon Feb 3 23:43:22 CET 2003 +Europe/Berlin 2004-08-03 22:43:22 UTC -> Wed Aug 4 00:43:22 CEST 2004 +Europe/Berlin 2004-02-03 22:43:22 UTC -> Tue Feb 3 23:43:22 CET 2004 +Europe/Berlin 2005-08-03 22:43:22 UTC -> Thu Aug 4 00:43:22 CEST 2005 +Europe/Berlin 2005-02-03 22:43:22 UTC -> Thu Feb 3 23:43:22 CET 2005 +Europe/Berlin 2006-08-03 22:43:22 UTC -> Fri Aug 4 00:43:22 CEST 2006 +Europe/Berlin 2006-02-03 22:43:22 UTC -> Fri Feb 3 23:43:22 CET 2006 +Europe/Berlin 2007-08-03 22:43:22 UTC -> Sat Aug 4 00:43:22 CEST 2007 +Europe/Berlin 2007-02-03 22:43:22 UTC -> Sat Feb 3 23:43:22 CET 2007 +Europe/Paris 2003-08-03 22:43:22 UTC -> Mon Aug 4 00:43:22 CEST 2003 +Europe/Paris 2003-02-03 22:43:22 UTC -> Mon Feb 3 23:43:22 CET 2003 +Europe/Paris 2004-08-03 22:43:22 UTC -> Wed Aug 4 00:43:22 CEST 2004 +Europe/Paris 2004-02-03 22:43:22 UTC -> Tue Feb 3 23:43:22 CET 2004 +Europe/Paris 2005-08-03 22:43:22 UTC -> Thu Aug 4 00:43:22 CEST 2005 +Europe/Paris 2005-02-03 22:43:22 UTC -> Thu Feb 3 23:43:22 CET 2005 +Europe/Paris 2006-08-03 22:43:22 UTC -> Fri Aug 4 00:43:22 CEST 2006 +Europe/Paris 2006-02-03 22:43:22 UTC -> Fri Feb 3 23:43:22 CET 2006 +Europe/Paris 2007-08-03 22:43:22 UTC -> Sat Aug 4 00:43:22 CEST 2007 +Europe/Paris 2007-02-03 22:43:22 UTC -> Sat Feb 3 23:43:22 CET 2007 +Europe/London 2003-08-03 22:43:22 UTC -> Sun Aug 3 23:43:22 BST 2003 +Europe/London 2003-02-03 22:43:22 UTC -> Mon Feb 3 22:43:22 GMT 2003 +Europe/London 2004-08-03 22:43:22 UTC -> Tue Aug 3 23:43:22 BST 2004 +Europe/London 2004-02-03 22:43:22 UTC -> Tue Feb 3 22:43:22 GMT 2004 +Europe/London 2005-08-03 22:43:22 UTC -> Wed Aug 3 23:43:22 BST 2005 +Europe/London 2005-02-03 22:43:22 UTC -> Thu Feb 3 22:43:22 GMT 2005 +Europe/London 2006-08-03 22:43:22 UTC -> Thu Aug 3 23:43:22 BST 2006 +Europe/London 2006-02-03 22:43:22 UTC -> Fri Feb 3 22:43:22 GMT 2006 +Europe/London 2007-08-03 22:43:22 UTC -> Fri Aug 3 23:43:22 BST 2007 +Europe/London 2007-02-03 22:43:22 UTC -> Sat Feb 3 22:43:22 GMT 2007 +Europe/Prague 2003-08-03 22:43:22 UTC -> Mon Aug 4 00:43:22 CEST 2003 +Europe/Prague 2003-02-03 22:43:22 UTC -> Mon Feb 3 23:43:22 CET 2003 +Europe/Prague 2004-08-03 22:43:22 UTC -> Wed Aug 4 00:43:22 CEST 2004 +Europe/Prague 2004-02-03 22:43:22 UTC -> Tue Feb 3 23:43:22 CET 2004 +Europe/Prague 2005-08-03 22:43:22 UTC -> Thu Aug 4 00:43:22 CEST 2005 +Europe/Prague 2005-02-03 22:43:22 UTC -> Thu Feb 3 23:43:22 CET 2005 +Europe/Prague 2006-08-03 22:43:22 UTC -> Fri Aug 4 00:43:22 CEST 2006 +Europe/Prague 2006-02-03 22:43:22 UTC -> Fri Feb 3 23:43:22 CET 2006 +Europe/Prague 2007-08-03 22:43:22 UTC -> Sat Aug 4 00:43:22 CEST 2007 +Europe/Prague 2007-02-03 22:43:22 UTC -> Sat Feb 3 23:43:22 CET 2007 +US/Alaska 2003-08-03 22:43:22 UTC -> Sun Aug 3 14:43:22 AKDT 2003 +US/Alaska 2003-02-03 22:43:22 UTC -> Mon Feb 3 13:43:22 AKST 2003 +US/Alaska 2004-08-03 22:43:22 UTC -> Tue Aug 3 14:43:22 AKDT 2004 +US/Alaska 2004-02-03 22:43:22 UTC -> Tue Feb 3 13:43:22 AKST 2004 +US/Alaska 2005-08-03 22:43:22 UTC -> Wed Aug 3 14:43:22 AKDT 2005 +US/Alaska 2005-02-03 22:43:22 UTC -> Thu Feb 3 13:43:22 AKST 2005 +US/Alaska 2006-08-03 22:43:22 UTC -> Thu Aug 3 14:43:22 AKDT 2006 +US/Alaska 2006-02-03 22:43:22 UTC -> Fri Feb 3 13:43:22 AKST 2006 +US/Alaska 2007-08-03 22:43:22 UTC -> Fri Aug 3 14:43:22 AKDT 2007 +US/Alaska 2007-02-03 22:43:22 UTC -> Sat Feb 3 13:43:22 AKST 2007 +US/Aleutian 2003-08-03 22:43:22 UTC -> Sun Aug 3 13:43:22 HDT 2003 +US/Aleutian 2003-02-03 22:43:22 UTC -> Mon Feb 3 12:43:22 HST 2003 +US/Aleutian 2004-08-03 22:43:22 UTC -> Tue Aug 3 13:43:22 HDT 2004 +US/Aleutian 2004-02-03 22:43:22 UTC -> Tue Feb 3 12:43:22 HST 2004 +US/Aleutian 2005-08-03 22:43:22 UTC -> Wed Aug 3 13:43:22 HDT 2005 +US/Aleutian 2005-02-03 22:43:22 UTC -> Thu Feb 3 12:43:22 HST 2005 +US/Aleutian 2006-08-03 22:43:22 UTC -> Thu Aug 3 13:43:22 HDT 2006 +US/Aleutian 2006-02-03 22:43:22 UTC -> Fri Feb 3 12:43:22 HST 2006 +US/Aleutian 2007-08-03 22:43:22 UTC -> Fri Aug 3 13:43:22 HDT 2007 +US/Aleutian 2007-02-03 22:43:22 UTC -> Sat Feb 3 12:43:22 HST 2007 +US/Arizona 2003-08-03 22:43:22 UTC -> Sun Aug 3 15:43:22 MST 2003 +US/Arizona 2003-02-03 22:43:22 UTC -> Mon Feb 3 15:43:22 MST 2003 +US/Arizona 2004-08-03 22:43:22 UTC -> Tue Aug 3 15:43:22 MST 2004 +US/Arizona 2004-02-03 22:43:22 UTC -> Tue Feb 3 15:43:22 MST 2004 +US/Arizona 2005-08-03 22:43:22 UTC -> Wed Aug 3 15:43:22 MST 2005 +US/Arizona 2005-02-03 22:43:22 UTC -> Thu Feb 3 15:43:22 MST 2005 +US/Arizona 2006-08-03 22:43:22 UTC -> Thu Aug 3 15:43:22 MST 2006 +US/Arizona 2006-02-03 22:43:22 UTC -> Fri Feb 3 15:43:22 MST 2006 +US/Arizona 2007-08-03 22:43:22 UTC -> Fri Aug 3 15:43:22 MST 2007 +US/Arizona 2007-02-03 22:43:22 UTC -> Sat Feb 3 15:43:22 MST 2007 +US/Central 2003-08-03 22:43:22 UTC -> Sun Aug 3 17:43:22 CDT 2003 +US/Central 2003-02-03 22:43:22 UTC -> Mon Feb 3 16:43:22 CST 2003 +US/Central 2004-08-03 22:43:22 UTC -> Tue Aug 3 17:43:22 CDT 2004 +US/Central 2004-02-03 22:43:22 UTC -> Tue Feb 3 16:43:22 CST 2004 +US/Central 2005-08-03 22:43:22 UTC -> Wed Aug 3 17:43:22 CDT 2005 +US/Central 2005-02-03 22:43:22 UTC -> Thu Feb 3 16:43:22 CST 2005 +US/Central 2006-08-03 22:43:22 UTC -> Thu Aug 3 17:43:22 CDT 2006 +US/Central 2006-02-03 22:43:22 UTC -> Fri Feb 3 16:43:22 CST 2006 +US/Central 2007-08-03 22:43:22 UTC -> Fri Aug 3 17:43:22 CDT 2007 +US/Central 2007-02-03 22:43:22 UTC -> Sat Feb 3 16:43:22 CST 2007 +US/Eastern 2003-08-03 22:43:22 UTC -> Sun Aug 3 18:43:22 EDT 2003 +US/Eastern 2003-02-03 22:43:22 UTC -> Mon Feb 3 17:43:22 EST 2003 +US/Eastern 2004-08-03 22:43:22 UTC -> Tue Aug 3 18:43:22 EDT 2004 +US/Eastern 2004-02-03 22:43:22 UTC -> Tue Feb 3 17:43:22 EST 2004 +US/Eastern 2005-08-03 22:43:22 UTC -> Wed Aug 3 18:43:22 EDT 2005 +US/Eastern 2005-02-03 22:43:22 UTC -> Thu Feb 3 17:43:22 EST 2005 +US/Eastern 2006-08-03 22:43:22 UTC -> Thu Aug 3 18:43:22 EDT 2006 +US/Eastern 2006-02-03 22:43:22 UTC -> Fri Feb 3 17:43:22 EST 2006 +US/Eastern 2007-08-03 22:43:22 UTC -> Fri Aug 3 18:43:22 EDT 2007 +US/Eastern 2007-02-03 22:43:22 UTC -> Sat Feb 3 17:43:22 EST 2007 +US/East-Indiana 2003-08-03 22:43:22 UTC -> Sun Aug 3 17:43:22 EST 2003 +US/East-Indiana 2003-02-03 22:43:22 UTC -> Mon Feb 3 17:43:22 EST 2003 +US/East-Indiana 2004-08-03 22:43:22 UTC -> Tue Aug 3 17:43:22 EST 2004 +US/East-Indiana 2004-02-03 22:43:22 UTC -> Tue Feb 3 17:43:22 EST 2004 +US/East-Indiana 2005-08-03 22:43:22 UTC -> Wed Aug 3 17:43:22 EST 2005 +US/East-Indiana 2005-02-03 22:43:22 UTC -> Thu Feb 3 17:43:22 EST 2005 +US/East-Indiana 2006-08-03 22:43:22 UTC -> Thu Aug 3 18:43:22 EDT 2006 +US/East-Indiana 2006-02-03 22:43:22 UTC -> Fri Feb 3 17:43:22 EST 2006 +US/East-Indiana 2007-08-03 22:43:22 UTC -> Fri Aug 3 18:43:22 EDT 2007 +US/East-Indiana 2007-02-03 22:43:22 UTC -> Sat Feb 3 17:43:22 EST 2007 +US/Hawaii 2003-08-03 22:43:22 UTC -> Sun Aug 3 12:43:22 HST 2003 +US/Hawaii 2003-02-03 22:43:22 UTC -> Mon Feb 3 12:43:22 HST 2003 +US/Hawaii 2004-08-03 22:43:22 UTC -> Tue Aug 3 12:43:22 HST 2004 +US/Hawaii 2004-02-03 22:43:22 UTC -> Tue Feb 3 12:43:22 HST 2004 +US/Hawaii 2005-08-03 22:43:22 UTC -> Wed Aug 3 12:43:22 HST 2005 +US/Hawaii 2005-02-03 22:43:22 UTC -> Thu Feb 3 12:43:22 HST 2005 +US/Hawaii 2006-08-03 22:43:22 UTC -> Thu Aug 3 12:43:22 HST 2006 +US/Hawaii 2006-02-03 22:43:22 UTC -> Fri Feb 3 12:43:22 HST 2006 +US/Hawaii 2007-08-03 22:43:22 UTC -> Fri Aug 3 12:43:22 HST 2007 +US/Hawaii 2007-02-03 22:43:22 UTC -> Sat Feb 3 12:43:22 HST 2007 +US/Indiana-Starke 2003-08-03 22:43:22 UTC -> Sun Aug 3 17:43:22 EST 2003 +US/Indiana-Starke 2003-02-03 22:43:22 UTC -> Mon Feb 3 17:43:22 EST 2003 +US/Indiana-Starke 2004-08-03 22:43:22 UTC -> Tue Aug 3 17:43:22 EST 2004 +US/Indiana-Starke 2004-02-03 22:43:22 UTC -> Tue Feb 3 17:43:22 EST 2004 +US/Indiana-Starke 2005-08-03 22:43:22 UTC -> Wed Aug 3 17:43:22 EST 2005 +US/Indiana-Starke 2005-02-03 22:43:22 UTC -> Thu Feb 3 17:43:22 EST 2005 +US/Indiana-Starke 2006-08-03 22:43:22 UTC -> Thu Aug 3 17:43:22 CDT 2006 +US/Indiana-Starke 2006-02-03 22:43:22 UTC -> Fri Feb 3 17:43:22 EST 2006 +US/Indiana-Starke 2007-08-03 22:43:22 UTC -> Fri Aug 3 17:43:22 CDT 2007 +US/Indiana-Starke 2007-02-03 22:43:22 UTC -> Sat Feb 3 16:43:22 CST 2007 +US/Michigan 2003-08-03 22:43:22 UTC -> Sun Aug 3 18:43:22 EDT 2003 +US/Michigan 2003-02-03 22:43:22 UTC -> Mon Feb 3 17:43:22 EST 2003 +US/Michigan 2004-08-03 22:43:22 UTC -> Tue Aug 3 18:43:22 EDT 2004 +US/Michigan 2004-02-03 22:43:22 UTC -> Tue Feb 3 17:43:22 EST 2004 +US/Michigan 2005-08-03 22:43:22 UTC -> Wed Aug 3 18:43:22 EDT 2005 +US/Michigan 2005-02-03 22:43:22 UTC -> Thu Feb 3 17:43:22 EST 2005 +US/Michigan 2006-08-03 22:43:22 UTC -> Thu Aug 3 18:43:22 EDT 2006 +US/Michigan 2006-02-03 22:43:22 UTC -> Fri Feb 3 17:43:22 EST 2006 +US/Michigan 2007-08-03 22:43:22 UTC -> Fri Aug 3 18:43:22 EDT 2007 +US/Michigan 2007-02-03 22:43:22 UTC -> Sat Feb 3 17:43:22 EST 2007 +US/Mountain 2003-08-03 22:43:22 UTC -> Sun Aug 3 16:43:22 MDT 2003 +US/Mountain 2003-02-03 22:43:22 UTC -> Mon Feb 3 15:43:22 MST 2003 +US/Mountain 2004-08-03 22:43:22 UTC -> Tue Aug 3 16:43:22 MDT 2004 +US/Mountain 2004-02-03 22:43:22 UTC -> Tue Feb 3 15:43:22 MST 2004 +US/Mountain 2005-08-03 22:43:22 UTC -> Wed Aug 3 16:43:22 MDT 2005 +US/Mountain 2005-02-03 22:43:22 UTC -> Thu Feb 3 15:43:22 MST 2005 +US/Mountain 2006-08-03 22:43:22 UTC -> Thu Aug 3 16:43:22 MDT 2006 +US/Mountain 2006-02-03 22:43:22 UTC -> Fri Feb 3 15:43:22 MST 2006 +US/Mountain 2007-08-03 22:43:22 UTC -> Fri Aug 3 16:43:22 MDT 2007 +US/Mountain 2007-02-03 22:43:22 UTC -> Sat Feb 3 15:43:22 MST 2007 +US/Pacific 2003-08-03 22:43:22 UTC -> Sun Aug 3 15:43:22 PDT 2003 +US/Pacific 2003-02-03 22:43:22 UTC -> Mon Feb 3 14:43:22 PST 2003 +US/Pacific 2004-08-03 22:43:22 UTC -> Tue Aug 3 15:43:22 PDT 2004 +US/Pacific 2004-02-03 22:43:22 UTC -> Tue Feb 3 14:43:22 PST 2004 +US/Pacific 2005-08-03 22:43:22 UTC -> Wed Aug 3 15:43:22 PDT 2005 +US/Pacific 2005-02-03 22:43:22 UTC -> Thu Feb 3 14:43:22 PST 2005 +US/Pacific 2006-08-03 22:43:22 UTC -> Thu Aug 3 15:43:22 PDT 2006 +US/Pacific 2006-02-03 22:43:22 UTC -> Fri Feb 3 14:43:22 PST 2006 +US/Pacific 2007-08-03 22:43:22 UTC -> Fri Aug 3 15:43:22 PDT 2007 +US/Pacific 2007-02-03 22:43:22 UTC -> Sat Feb 3 14:43:22 PST 2007 +US/Samoa 2003-08-03 22:43:22 UTC -> Sun Aug 3 11:43:22 SST 2003 +US/Samoa 2003-02-03 22:43:22 UTC -> Mon Feb 3 11:43:22 SST 2003 +US/Samoa 2004-08-03 22:43:22 UTC -> Tue Aug 3 11:43:22 SST 2004 +US/Samoa 2004-02-03 22:43:22 UTC -> Tue Feb 3 11:43:22 SST 2004 +US/Samoa 2005-08-03 22:43:22 UTC -> Wed Aug 3 11:43:22 SST 2005 +US/Samoa 2005-02-03 22:43:22 UTC -> Thu Feb 3 11:43:22 SST 2005 +US/Samoa 2006-08-03 22:43:22 UTC -> Thu Aug 3 11:43:22 SST 2006 +US/Samoa 2006-02-03 22:43:22 UTC -> Fri Feb 3 11:43:22 SST 2006 +US/Samoa 2007-08-03 22:43:22 UTC -> Fri Aug 3 11:43:22 SST 2007 +US/Samoa 2007-02-03 22:43:22 UTC -> Sat Feb 3 11:43:22 SST 2007 +America/Bahia 2003-08-03 22:43:22 UTC -> Sun Aug 3 19:43:22 -03 2003 +America/Bahia 2003-02-03 22:43:22 UTC -> Mon Feb 3 20:43:22 -02 2003 +America/Bahia 2004-08-03 22:43:22 UTC -> Tue Aug 3 19:43:22 -03 2004 +America/Bahia 2004-02-03 22:43:22 UTC -> Tue Feb 3 19:43:22 -03 2004 +America/Bahia 2005-08-03 22:43:22 UTC -> Wed Aug 3 19:43:22 -03 2005 +America/Bahia 2005-02-03 22:43:22 UTC -> Thu Feb 3 19:43:22 -03 2005 +America/Bahia 2006-08-03 22:43:22 UTC -> Thu Aug 3 19:43:22 -03 2006 +America/Bahia 2006-02-03 22:43:22 UTC -> Fri Feb 3 19:43:22 -03 2006 +America/Bahia 2007-08-03 22:43:22 UTC -> Fri Aug 3 19:43:22 -03 2007 +America/Bahia 2007-02-03 22:43:22 UTC -> Sat Feb 3 19:43:22 -03 2007 +America/Bogota 2003-08-03 22:43:22 UTC -> Sun Aug 3 17:43:22 -05 2003 +America/Bogota 2003-02-03 22:43:22 UTC -> Mon Feb 3 17:43:22 -05 2003 +America/Bogota 2004-08-03 22:43:22 UTC -> Tue Aug 3 17:43:22 -05 2004 +America/Bogota 2004-02-03 22:43:22 UTC -> Tue Feb 3 17:43:22 -05 2004 +America/Bogota 2005-08-03 22:43:22 UTC -> Wed Aug 3 17:43:22 -05 2005 +America/Bogota 2005-02-03 22:43:22 UTC -> Thu Feb 3 17:43:22 -05 2005 +America/Bogota 2006-08-03 22:43:22 UTC -> Thu Aug 3 17:43:22 -05 2006 +America/Bogota 2006-02-03 22:43:22 UTC -> Fri Feb 3 17:43:22 -05 2006 +America/Bogota 2007-08-03 22:43:22 UTC -> Fri Aug 3 17:43:22 -05 2007 +America/Bogota 2007-02-03 22:43:22 UTC -> Sat Feb 3 17:43:22 -05 2007 +America/Costa_Rica 2003-08-03 22:43:22 UTC -> Sun Aug 3 16:43:22 CST 2003 +America/Costa_Rica 2003-02-03 22:43:22 UTC -> Mon Feb 3 16:43:22 CST 2003 +America/Costa_Rica 2004-08-03 22:43:22 UTC -> Tue Aug 3 16:43:22 CST 2004 +America/Costa_Rica 2004-02-03 22:43:22 UTC -> Tue Feb 3 16:43:22 CST 2004 +America/Costa_Rica 2005-08-03 22:43:22 UTC -> Wed Aug 3 16:43:22 CST 2005 +America/Costa_Rica 2005-02-03 22:43:22 UTC -> Thu Feb 3 16:43:22 CST 2005 +America/Costa_Rica 2006-08-03 22:43:22 UTC -> Thu Aug 3 16:43:22 CST 2006 +America/Costa_Rica 2006-02-03 22:43:22 UTC -> Fri Feb 3 16:43:22 CST 2006 +America/Costa_Rica 2007-08-03 22:43:22 UTC -> Fri Aug 3 16:43:22 CST 2007 +America/Costa_Rica 2007-02-03 22:43:22 UTC -> Sat Feb 3 16:43:22 CST 2007 +America/Jamaica 2003-08-03 22:43:22 UTC -> Sun Aug 3 17:43:22 EST 2003 +America/Jamaica 2003-02-03 22:43:22 UTC -> Mon Feb 3 17:43:22 EST 2003 +America/Jamaica 2004-08-03 22:43:22 UTC -> Tue Aug 3 17:43:22 EST 2004 +America/Jamaica 2004-02-03 22:43:22 UTC -> Tue Feb 3 17:43:22 EST 2004 +America/Jamaica 2005-08-03 22:43:22 UTC -> Wed Aug 3 17:43:22 EST 2005 +America/Jamaica 2005-02-03 22:43:22 UTC -> Thu Feb 3 17:43:22 EST 2005 +America/Jamaica 2006-08-03 22:43:22 UTC -> Thu Aug 3 17:43:22 EST 2006 +America/Jamaica 2006-02-03 22:43:22 UTC -> Fri Feb 3 17:43:22 EST 2006 +America/Jamaica 2007-08-03 22:43:22 UTC -> Fri Aug 3 17:43:22 EST 2007 +America/Jamaica 2007-02-03 22:43:22 UTC -> Sat Feb 3 17:43:22 EST 2007 +America/Mexico_City 2003-08-03 22:43:22 UTC -> Sun Aug 3 17:43:22 CDT 2003 +America/Mexico_City 2003-02-03 22:43:22 UTC -> Mon Feb 3 16:43:22 CST 2003 +America/Mexico_City 2004-08-03 22:43:22 UTC -> Tue Aug 3 17:43:22 CDT 2004 +America/Mexico_City 2004-02-03 22:43:22 UTC -> Tue Feb 3 16:43:22 CST 2004 +America/Mexico_City 2005-08-03 22:43:22 UTC -> Wed Aug 3 17:43:22 CDT 2005 +America/Mexico_City 2005-02-03 22:43:22 UTC -> Thu Feb 3 16:43:22 CST 2005 +America/Mexico_City 2006-08-03 22:43:22 UTC -> Thu Aug 3 17:43:22 CDT 2006 +America/Mexico_City 2006-02-03 22:43:22 UTC -> Fri Feb 3 16:43:22 CST 2006 +America/Mexico_City 2007-08-03 22:43:22 UTC -> Fri Aug 3 17:43:22 CDT 2007 +America/Mexico_City 2007-02-03 22:43:22 UTC -> Sat Feb 3 16:43:22 CST 2007 +America/Santiago 2003-08-03 22:43:22 UTC -> Sun Aug 3 18:43:22 -04 2003 +America/Santiago 2003-02-03 22:43:22 UTC -> Mon Feb 3 19:43:22 -03 2003 +America/Santiago 2004-08-03 22:43:22 UTC -> Tue Aug 3 18:43:22 -04 2004 +America/Santiago 2004-02-03 22:43:22 UTC -> Tue Feb 3 19:43:22 -03 2004 +America/Santiago 2005-08-03 22:43:22 UTC -> Wed Aug 3 18:43:22 -04 2005 +America/Santiago 2005-02-03 22:43:22 UTC -> Thu Feb 3 19:43:22 -03 2005 +America/Santiago 2006-08-03 22:43:22 UTC -> Thu Aug 3 18:43:22 -04 2006 +America/Santiago 2006-02-03 22:43:22 UTC -> Fri Feb 3 19:43:22 -03 2006 +America/Santiago 2007-08-03 22:43:22 UTC -> Fri Aug 3 18:43:22 -04 2007 +America/Santiago 2007-02-03 22:43:22 UTC -> Sat Feb 3 19:43:22 -03 2007 +Australia/Brisbane 2003-08-03 22:43:22 UTC -> Mon Aug 4 08:43:22 AEST 2003 +Australia/Brisbane 2003-02-03 22:43:22 UTC -> Tue Feb 4 08:43:22 AEST 2003 +Australia/Brisbane 2004-08-03 22:43:22 UTC -> Wed Aug 4 08:43:22 AEST 2004 +Australia/Brisbane 2004-02-03 22:43:22 UTC -> Wed Feb 4 08:43:22 AEST 2004 +Australia/Brisbane 2005-08-03 22:43:22 UTC -> Thu Aug 4 08:43:22 AEST 2005 +Australia/Brisbane 2005-02-03 22:43:22 UTC -> Fri Feb 4 08:43:22 AEST 2005 +Australia/Brisbane 2006-08-03 22:43:22 UTC -> Fri Aug 4 08:43:22 AEST 2006 +Australia/Brisbane 2006-02-03 22:43:22 UTC -> Sat Feb 4 08:43:22 AEST 2006 +Australia/Brisbane 2007-08-03 22:43:22 UTC -> Sat Aug 4 08:43:22 AEST 2007 +Australia/Brisbane 2007-02-03 22:43:22 UTC -> Sun Feb 4 08:43:22 AEST 2007 +Australia/West 2003-08-03 22:43:22 UTC -> Mon Aug 4 06:43:22 AWST 2003 +Australia/West 2003-02-03 22:43:22 UTC -> Tue Feb 4 06:43:22 AWST 2003 +Australia/West 2004-08-03 22:43:22 UTC -> Wed Aug 4 06:43:22 AWST 2004 +Australia/West 2004-02-03 22:43:22 UTC -> Wed Feb 4 06:43:22 AWST 2004 +Australia/West 2005-08-03 22:43:22 UTC -> Thu Aug 4 06:43:22 AWST 2005 +Australia/West 2005-02-03 22:43:22 UTC -> Fri Feb 4 06:43:22 AWST 2005 +Australia/West 2006-08-03 22:43:22 UTC -> Fri Aug 4 06:43:22 AWST 2006 +Australia/West 2006-02-03 22:43:22 UTC -> Sat Feb 4 06:43:22 AWST 2006 +Australia/West 2007-08-03 22:43:22 UTC -> Sat Aug 4 06:43:22 AWST 2007 +Australia/West 2007-02-03 22:43:22 UTC -> Sun Feb 4 07:43:22 AWDT 2007 +Australia/South 2003-08-03 22:43:22 UTC -> Mon Aug 4 08:13:22 ACST 2003 +Australia/South 2003-02-03 22:43:22 UTC -> Tue Feb 4 09:13:22 ACDT 2003 +Australia/South 2004-08-03 22:43:22 UTC -> Wed Aug 4 08:13:22 ACST 2004 +Australia/South 2004-02-03 22:43:22 UTC -> Wed Feb 4 09:13:22 ACDT 2004 +Australia/South 2005-08-03 22:43:22 UTC -> Thu Aug 4 08:13:22 ACST 2005 +Australia/South 2005-02-03 22:43:22 UTC -> Fri Feb 4 09:13:22 ACDT 2005 +Australia/South 2006-08-03 22:43:22 UTC -> Fri Aug 4 08:13:22 ACST 2006 +Australia/South 2006-02-03 22:43:22 UTC -> Sat Feb 4 09:13:22 ACDT 2006 +Australia/South 2007-08-03 22:43:22 UTC -> Sat Aug 4 08:13:22 ACST 2007 +Australia/South 2007-02-03 22:43:22 UTC -> Sun Feb 4 09:13:22 ACDT 2007 +Australia/Melbourne 2003-08-03 22:43:22 UTC -> Mon Aug 4 08:43:22 AEST 2003 +Australia/Melbourne 2003-02-03 22:43:22 UTC -> Tue Feb 4 09:43:22 AEDT 2003 +Australia/Melbourne 2004-08-03 22:43:22 UTC -> Wed Aug 4 08:43:22 AEST 2004 +Australia/Melbourne 2004-02-03 22:43:22 UTC -> Wed Feb 4 09:43:22 AEDT 2004 +Australia/Melbourne 2005-08-03 22:43:22 UTC -> Thu Aug 4 08:43:22 AEST 2005 +Australia/Melbourne 2005-02-03 22:43:22 UTC -> Fri Feb 4 09:43:22 AEDT 2005 +Australia/Melbourne 2006-08-03 22:43:22 UTC -> Fri Aug 4 08:43:22 AEST 2006 +Australia/Melbourne 2006-02-03 22:43:22 UTC -> Sat Feb 4 09:43:22 AEDT 2006 +Australia/Melbourne 2007-08-03 22:43:22 UTC -> Sat Aug 4 08:43:22 AEST 2007 +Australia/Melbourne 2007-02-03 22:43:22 UTC -> Sun Feb 4 09:43:22 AEDT 2007 +Australia/Sydney 2003-08-03 22:43:22 UTC -> Mon Aug 4 08:43:22 AEST 2003 +Australia/Sydney 2003-02-03 22:43:22 UTC -> Tue Feb 4 09:43:22 AEDT 2003 +Australia/Sydney 2004-08-03 22:43:22 UTC -> Wed Aug 4 08:43:22 AEST 2004 +Australia/Sydney 2004-02-03 22:43:22 UTC -> Wed Feb 4 09:43:22 AEDT 2004 +Australia/Sydney 2005-08-03 22:43:22 UTC -> Thu Aug 4 08:43:22 AEST 2005 +Australia/Sydney 2005-02-03 22:43:22 UTC -> Fri Feb 4 09:43:22 AEDT 2005 +Australia/Sydney 2006-08-03 22:43:22 UTC -> Fri Aug 4 08:43:22 AEST 2006 +Australia/Sydney 2006-02-03 22:43:22 UTC -> Sat Feb 4 09:43:22 AEDT 2006 +Australia/Sydney 2007-08-03 22:43:22 UTC -> Sat Aug 4 08:43:22 AEST 2007 +Australia/Sydney 2007-02-03 22:43:22 UTC -> Sun Feb 4 09:43:22 AEDT 2007 +Australia/North 2003-08-03 22:43:22 UTC -> Mon Aug 4 08:13:22 ACST 2003 +Australia/North 2003-02-03 22:43:22 UTC -> Tue Feb 4 08:13:22 ACST 2003 +Australia/North 2004-08-03 22:43:22 UTC -> Wed Aug 4 08:13:22 ACST 2004 +Australia/North 2004-02-03 22:43:22 UTC -> Wed Feb 4 08:13:22 ACST 2004 +Australia/North 2005-08-03 22:43:22 UTC -> Thu Aug 4 08:13:22 ACST 2005 +Australia/North 2005-02-03 22:43:22 UTC -> Fri Feb 4 08:13:22 ACST 2005 +Australia/North 2006-08-03 22:43:22 UTC -> Fri Aug 4 08:13:22 ACST 2006 +Australia/North 2006-02-03 22:43:22 UTC -> Sat Feb 4 08:13:22 ACST 2006 +Australia/North 2007-08-03 22:43:22 UTC -> Sat Aug 4 08:13:22 ACST 2007 +Australia/North 2007-02-03 22:43:22 UTC -> Sun Feb 4 08:13:22 ACST 2007 +Asia/Tokyo 2003-08-03 22:43:22 UTC -> Mon Aug 4 07:43:22 JST 2003 +Asia/Tokyo 2003-02-03 22:43:22 UTC -> Tue Feb 4 07:43:22 JST 2003 +Asia/Tokyo 2004-08-03 22:43:22 UTC -> Wed Aug 4 07:43:22 JST 2004 +Asia/Tokyo 2004-02-03 22:43:22 UTC -> Wed Feb 4 07:43:22 JST 2004 +Asia/Tokyo 2005-08-03 22:43:22 UTC -> Thu Aug 4 07:43:22 JST 2005 +Asia/Tokyo 2005-02-03 22:43:22 UTC -> Fri Feb 4 07:43:22 JST 2005 +Asia/Tokyo 2006-08-03 22:43:22 UTC -> Fri Aug 4 07:43:22 JST 2006 +Asia/Tokyo 2006-02-03 22:43:22 UTC -> Sat Feb 4 07:43:22 JST 2006 +Asia/Tokyo 2007-08-03 22:43:22 UTC -> Sat Aug 4 07:43:22 JST 2007 +Asia/Tokyo 2007-02-03 22:43:22 UTC -> Sun Feb 4 07:43:22 JST 2007 +Asia/Istanbul 2003-08-03 22:43:22 UTC -> Mon Aug 4 01:43:22 EEST 2003 +Asia/Istanbul 2003-02-03 22:43:22 UTC -> Tue Feb 4 00:43:22 EET 2003 +Asia/Istanbul 2004-08-03 22:43:22 UTC -> Wed Aug 4 01:43:22 EEST 2004 +Asia/Istanbul 2004-02-03 22:43:22 UTC -> Wed Feb 4 00:43:22 EET 2004 +Asia/Istanbul 2005-08-03 22:43:22 UTC -> Thu Aug 4 01:43:22 EEST 2005 +Asia/Istanbul 2005-02-03 22:43:22 UTC -> Fri Feb 4 00:43:22 EET 2005 +Asia/Istanbul 2006-08-03 22:43:22 UTC -> Fri Aug 4 01:43:22 EEST 2006 +Asia/Istanbul 2006-02-03 22:43:22 UTC -> Sat Feb 4 00:43:22 EET 2006 +Asia/Istanbul 2007-08-03 22:43:22 UTC -> Sat Aug 4 01:43:22 EEST 2007 +Asia/Istanbul 2007-02-03 22:43:22 UTC -> Sun Feb 4 00:43:22 EET 2007 +Asia/Vladivostok 2003-08-03 22:43:22 UTC -> Mon Aug 4 09:43:22 +11 2003 +Asia/Vladivostok 2003-02-03 22:43:22 UTC -> Tue Feb 4 08:43:22 +10 2003 +Asia/Vladivostok 2004-08-03 22:43:22 UTC -> Wed Aug 4 09:43:22 +11 2004 +Asia/Vladivostok 2004-02-03 22:43:22 UTC -> Wed Feb 4 08:43:22 +10 2004 +Asia/Vladivostok 2005-08-03 22:43:22 UTC -> Thu Aug 4 09:43:22 +11 2005 +Asia/Vladivostok 2005-02-03 22:43:22 UTC -> Fri Feb 4 08:43:22 +10 2005 +Asia/Vladivostok 2006-08-03 22:43:22 UTC -> Fri Aug 4 09:43:22 +11 2006 +Asia/Vladivostok 2006-02-03 22:43:22 UTC -> Sat Feb 4 08:43:22 +10 2006 +Asia/Vladivostok 2007-08-03 22:43:22 UTC -> Sat Aug 4 09:43:22 +11 2007 +Asia/Vladivostok 2007-02-03 22:43:22 UTC -> Sun Feb 4 08:43:22 +10 2007 +Asia/Bangkok 2003-08-03 22:43:22 UTC -> Mon Aug 4 05:43:22 +07 2003 +Asia/Bangkok 2003-02-03 22:43:22 UTC -> Tue Feb 4 05:43:22 +07 2003 +Asia/Bangkok 2004-08-03 22:43:22 UTC -> Wed Aug 4 05:43:22 +07 2004 +Asia/Bangkok 2004-02-03 22:43:22 UTC -> Wed Feb 4 05:43:22 +07 2004 +Asia/Bangkok 2005-08-03 22:43:22 UTC -> Thu Aug 4 05:43:22 +07 2005 +Asia/Bangkok 2005-02-03 22:43:22 UTC -> Fri Feb 4 05:43:22 +07 2005 +Asia/Bangkok 2006-08-03 22:43:22 UTC -> Fri Aug 4 05:43:22 +07 2006 +Asia/Bangkok 2006-02-03 22:43:22 UTC -> Sat Feb 4 05:43:22 +07 2006 +Asia/Bangkok 2007-08-03 22:43:22 UTC -> Sat Aug 4 05:43:22 +07 2007 +Asia/Bangkok 2007-02-03 22:43:22 UTC -> Sun Feb 4 05:43:22 +07 2007 diff --git a/tests/Sanity/trivial_case/datetimes b/tests/Sanity/trivial_case/datetimes new file mode 100644 index 0000000..88d4735 --- /dev/null +++ b/tests/Sanity/trivial_case/datetimes @@ -0,0 +1,10 @@ +2003-08-03 22:43:22 UTC +2003-02-03 22:43:22 UTC +2004-08-03 22:43:22 UTC +2004-02-03 22:43:22 UTC +2005-08-03 22:43:22 UTC +2005-02-03 22:43:22 UTC +2006-08-03 22:43:22 UTC +2006-02-03 22:43:22 UTC +2007-08-03 22:43:22 UTC +2007-02-03 22:43:22 UTC diff --git a/tests/Sanity/trivial_case/main.fmf b/tests/Sanity/trivial_case/main.fmf new file mode 100644 index 0000000..09494ed --- /dev/null +++ b/tests/Sanity/trivial_case/main.fmf @@ -0,0 +1,10 @@ +summary: tzdata testing by trivial case +component: +- tzdata +test: ./test.sh +tier: 1 +framework: beakerlib +require+: +- tzdata +- coreutils +duration: 5m diff --git a/tests/Sanity/trivial_case/test.sh b/tests/Sanity/trivial_case/test.sh new file mode 100755 index 0000000..c23dfc9 --- /dev/null +++ b/tests/Sanity/trivial_case/test.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGE="tzdata" +REQUIRES="$PACKAGE coreutils glibc" +export LC_TIME=C + +rlJournalStart + rlPhaseStartSetup + rlShowRunningKernel + rlAssertRpm --all + rlRun "TmpDir=\$(mktemp -d)" + rlRun "cp zones datetimes date.golden $TmpDir" + rlRun "pushd $TmpDir" + rlPhaseEnd + + rlPhaseStartTest "run test" + while read timezone; do + rlLogInfo "timezone: $timezone" + while read datetime; do + echo -n "$timezone $datetime -> " >>date.log + rlRun "TZ=$timezone date -d \"$datetime\" >>date.log" + done date.diff"; then + rlFail "Differences observed"; + rlRun "rlFileSubmit ./date.diff date.diff" + fi + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $TmpDir" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/Sanity/trivial_case/zones b/tests/Sanity/trivial_case/zones new file mode 100644 index 0000000..df2b323 --- /dev/null +++ b/tests/Sanity/trivial_case/zones @@ -0,0 +1,32 @@ +Europe/Berlin +Europe/Paris +Europe/London +Europe/Prague +US/Alaska +US/Aleutian +US/Arizona +US/Central +US/Eastern +US/East-Indiana +US/Hawaii +US/Indiana-Starke +US/Michigan +US/Mountain +US/Pacific +US/Samoa +America/Bahia +America/Bogota +America/Costa_Rica +America/Jamaica +America/Mexico_City +America/Santiago +Australia/Brisbane +Australia/West +Australia/South +Australia/Melbourne +Australia/Sydney +Australia/North +Asia/Tokyo +Asia/Istanbul +Asia/Vladivostok +Asia/Bangkok From 73a99c88fb6552460f40ba32e079c4c846545092 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Wed, 11 Dec 2024 14:43:49 +0000 Subject: [PATCH 17/24] Make the main plan identical to CentOS --- plans/{ci.fmf => main.fmf} | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) rename plans/{ci.fmf => main.fmf} (50%) diff --git a/plans/ci.fmf b/plans/main.fmf similarity index 50% rename from plans/ci.fmf rename to plans/main.fmf index 85710d6..ec17042 100644 --- a/plans/ci.fmf +++ b/plans/main.fmf @@ -1,6 +1,5 @@ -summary: CI Gating Plan +summary: Main Plan discover: how: fmf - directory: tests execute: how: tmt From bedf4971fde20a097f1c75dc199c3cf8eff311ef Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 12 Dec 2024 14:25:05 -0500 Subject: [PATCH 18/24] Update to tzdata-2024b - System V names are now obsolescent. - The main data format 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. Resolves: #2310315 Reviewed-by: Carlos O'Donell --- .gitignore | 2 + 0004-Fix-Apr-vs-April-2024b.patch | 23 +++++ ...mprove-style-checks-for-months-2024b.patch | 77 +++++++++++++++++ ZoneTest.java | 42 ++++++++++ javazic-harden-links.patch | 84 +++++++++++++++++++ sources | 4 +- tzdata.spec | 47 ++++++++++- 7 files changed, 273 insertions(+), 6 deletions(-) create mode 100644 0004-Fix-Apr-vs-April-2024b.patch create mode 100644 0005-Improve-style-checks-for-months-2024b.patch create mode 100644 ZoneTest.java create mode 100644 javazic-harden-links.patch 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..3d51306 --- /dev/null +++ b/javazic-harden-links.patch @@ -0,0 +1,84 @@ +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 91fb5b4..44c295b 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: 9%{?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 @@ -30,7 +33,9 @@ the world. %package java Summary: Timezone data for Java Source3: javazic-1.8-37392f2f5d59.tar.xz +Source4: ZoneTest.java Patch100: 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. %setup -q -c -a 1 %patch -p1 -P 2 +%patch -p1 -P 4 +%patch -p1 -P 5 %if 0%{?rhel} %patch -p1 -P 3 %endif @@ -63,6 +70,7 @@ tar zxf rearguard/tzdata%{version}-rearguard.tar.gz tar xf %{SOURCE3} %patch -P 100 +%patch -p1 -P 101 echo "%{name}%{tzdata_version}" >> VERSION @@ -111,6 +119,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 @@ -123,6 +150,18 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Dec 12 2024 Patsy Griffin - 2024b-1 +- Update to tzdata-2024b (#2310315) + - 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 + * Sat Jul 20 2024 Fedora Release Engineering - 2024a-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 7a175106d26cbe49d395344860e8f1c47e126ac9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:32:22 +0000 Subject: [PATCH 19/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 44c295b..3a84a77 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024b %define tzdata_version 2024b %define tzcode_version 2024b -Release: 1%{?dist} +Release: 2%{?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 @@ -150,6 +150,9 @@ echo ============END TESTING=========== %{_datadir}/javazi-1.8 %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2024b-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Dec 12 2024 Patsy Griffin - 2024b-1 - Update to tzdata-2024b (#2310315) - Improve historical data for Mexico, Mongolia, and Portugal. From e7c973c9df06e6cf032c64bde986a6452902a43b Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 6 Feb 2025 09:24:25 -0500 Subject: [PATCH 20/24] Update to tzdata-2025a - 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. Resolves: #2338511 Reviewed-by: Carlos O'Donell --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index aa2e596..b8aabb3 100644 --- a/.gitignore +++ b/.gitignore @@ -216,3 +216,5 @@ noarch/ /tzdata2024a.tar.gz /tzcode2024b.tar.gz /tzdata2024b.tar.gz +/tzcode2025a.tar.gz +/tzdata2025a.tar.gz diff --git a/sources b/sources index 5da42b3..b1d9bf5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2024b.tar.gz) = 0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026 -SHA512 (tzdata2024b.tar.gz) = 0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193 +SHA512 (tzcode2025a.tar.gz) = 308f6a3d6ebfa18446f8296e5c799e18dccecd79ace3ba004d3f233892c7428faae152b217b22d229c59dd4e0faafee797d8b3583b58fa982b81f7cc7347f502 +SHA512 (tzdata2025a.tar.gz) = 93b8f939d39bdfe451e262666f9099c529c96c49d14c08e3611560ca660e12e16d08a22b145d615e00570fb194881618d6f9a0a617c119ab447be03279d747c3 diff --git a/tzdata.spec b/tzdata.spec index 3a84a77..523499e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2024b -%define tzdata_version 2024b -%define tzcode_version 2024b -Release: 2%{?dist} +Version: 2025a +%define tzdata_version 2025a +%define tzcode_version 2025a +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,6 @@ 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 @@ -44,8 +42,6 @@ This package contains timezone information for use by Java runtimes. %setup -q -c -a 1 %patch -p1 -P 2 -%patch -p1 -P 4 -%patch -p1 -P 5 %if 0%{?rhel} %patch -p1 -P 3 %endif @@ -150,6 +146,13 @@ echo ============END TESTING=========== %{_datadir}/javazi-1.8 %changelog +* Tue Feb 04 2025 Patsy Griffin - 2025a-1 + Update to tzdata-2025a (#2338511) + - 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. + * Sun Jan 19 2025 Fedora Release Engineering - 2024b-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 659438ded669b99e2d6e021f8033568e94045e23 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Fri, 28 Mar 2025 14:14:21 -0400 Subject: [PATCH 21/24] Update to tzdata-2025b (#2354293) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Chile's Aysén Region moves from -04/-03 to -03 year-round, diverging from America/Santiago and creating a new zone America/Coyhaique. Resolves: #2354293 Reviewed-by: Florian Weimer --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b8aabb3..f4ca566 100644 --- a/.gitignore +++ b/.gitignore @@ -218,3 +218,5 @@ noarch/ /tzdata2024b.tar.gz /tzcode2025a.tar.gz /tzdata2025a.tar.gz +/tzcode2025b.tar.gz +/tzdata2025b.tar.gz diff --git a/sources b/sources index b1d9bf5..5da021f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2025a.tar.gz) = 308f6a3d6ebfa18446f8296e5c799e18dccecd79ace3ba004d3f233892c7428faae152b217b22d229c59dd4e0faafee797d8b3583b58fa982b81f7cc7347f502 -SHA512 (tzdata2025a.tar.gz) = 93b8f939d39bdfe451e262666f9099c529c96c49d14c08e3611560ca660e12e16d08a22b145d615e00570fb194881618d6f9a0a617c119ab447be03279d747c3 +SHA512 (tzcode2025b.tar.gz) = 19826b12968c10fc4db7e4b07ba782bfb8590eeebaec6f719d74b92a2e642ab817bd72bceff0015ce52a838edfdb00753b3cd87dd84b35abf2606e5bee445f76 +SHA512 (tzdata2025b.tar.gz) = 7d83741f3cae81fac8131994b43c55b6da7328df18b706e5ee40e9b3212bc506e6f8fc90988b18da424ed59eff69bce593f2783b7b5f18eb483a17aeb94258d6 diff --git a/tzdata.spec b/tzdata.spec index 523499e..7b00e5c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2025a -%define tzdata_version 2025a -%define tzcode_version 2025a +Version: 2025b +%define tzdata_version 2025b +%define tzcode_version 2025b 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 @@ -146,6 +146,12 @@ echo ============END TESTING=========== %{_datadir}/javazi-1.8 %changelog +* Thu Mar 27 2025 Patsy Griffin - 2025b-1 + Update to tzdata-2025b (#2354293) + - 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 Feb 04 2025 Patsy Griffin - 2025a-1 Update to tzdata-2025a (#2338511) - Paraguay is now permanently at -03. This impacts timestamps From e0db3ddf503c2d528b9e005e8f4d2bed7d00514d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:40:43 +0000 Subject: [PATCH 22/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 7b00e5c..6e84bca 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2025b %define tzdata_version 2025b %define tzcode_version 2025b -Release: 1%{?dist} +Release: 2%{?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 @@ -146,6 +146,9 @@ echo ============END TESTING=========== %{_datadir}/javazi-1.8 %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2025b-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Mar 27 2025 Patsy Griffin - 2025b-1 Update to tzdata-2025b (#2354293) - Chile's Aysén Region moves from -04/-03 to -03 year-round, From 533e41b83dbb41296edd944b18262b21036dc311 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 01:25:47 +0200 Subject: [PATCH 23/24] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- tzdata.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 6e84bca..e321605 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2025b %define tzdata_version 2025b %define tzcode_version 2025b -Release: 2%{?dist} +Release: 3%{?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 @@ -15,7 +15,7 @@ Patch003: 0003-continue-to-ship-posixrules.patch BuildRequires: make BuildRequires: gcc BuildRequires: gawk, glibc, perl-interpreter -BuildRequires: java-devel +BuildRequires: java-25-devel BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -146,6 +146,9 @@ echo ============END TESTING=========== %{_datadir}/javazi-1.8 %changelog +* Tue Jul 29 2025 jiri vanek - 2025b-3 +- Rebuilt for java-25-openjdk as preffered jdk + * Fri Jul 25 2025 Fedora Release Engineering - 2025b-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3969d052d1216f94e94b26a56c1a8a0fe2404556 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Sun, 14 Dec 2025 21:15:09 -0500 Subject: [PATCH 24/24] Update to tzdata-2025c (#2421294) - Update the expiration date for the leap seconds files. Resolves: #2421294 Reviewed by: DJ Delorie --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 +++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f4ca566..714f3b0 100644 --- a/.gitignore +++ b/.gitignore @@ -220,3 +220,5 @@ noarch/ /tzdata2025a.tar.gz /tzcode2025b.tar.gz /tzdata2025b.tar.gz +/tzcode2025c.tar.gz +/tzdata2025c.tar.gz diff --git a/sources b/sources index 5da021f..0b8efef 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2025b.tar.gz) = 19826b12968c10fc4db7e4b07ba782bfb8590eeebaec6f719d74b92a2e642ab817bd72bceff0015ce52a838edfdb00753b3cd87dd84b35abf2606e5bee445f76 -SHA512 (tzdata2025b.tar.gz) = 7d83741f3cae81fac8131994b43c55b6da7328df18b706e5ee40e9b3212bc506e6f8fc90988b18da424ed59eff69bce593f2783b7b5f18eb483a17aeb94258d6 +SHA512 (tzcode2025c.tar.gz) = d14bc0680b9cb33d6526a2c0e483f2abafc2593cfe5fbfe7dcab940aafdc1baaec065dbaa1bb58b03586a8631ffdf43ebb22ff5a70503298b6ea2cf061d82c16 +SHA512 (tzdata2025c.tar.gz) = 1e33f7212fd0ae2ad3c16e68f0c1fc7a6ad26a126b8406c379a5768d79604c6a816054bd0fe3a63228d70cd6a1fc2b1bae2a9f8014e102d3727eb9d21affa1f1 diff --git a/tzdata.spec b/tzdata.spec index e321605..db52d01 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2025b -%define tzdata_version 2025b -%define tzcode_version 2025b -Release: 3%{?dist} +Version: 2025c +%define tzdata_version 2025c +%define tzcode_version 2025c +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 @@ -53,7 +53,7 @@ This package contains timezone information for use by Java runtimes. # tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. # Use rearguard for java mkdir rearguard -make VERSION=%{version} ZFLAGS="-b fat" tzdata%{version}-rearguard.tar.gz +make VERSION=%{version} ZFLAGS="-b fat" tzdata%{version}-rearguard.tar.gz.t mv tzdata%{version}-rearguard.tar.gz rearguard pushd rearguard tar zxf tzdata%{version}-rearguard.tar.gz @@ -146,6 +146,10 @@ echo ============END TESTING=========== %{_datadir}/javazi-1.8 %changelog +* Sun Dec 14 2025 Patsy Griffin - 2025c-1 + Update to tzdata-2025c (#2421294) + - Update the expiration date for the leap seconds files. + * Tue Jul 29 2025 jiri vanek - 2025b-3 - Rebuilt for java-25-openjdk as preffered jdk