Compare commits

...

No commits in common. "imports/c8s/tzdata-2021b-1.el8" and "c8" have entirely different histories.

7 changed files with 109 additions and 61 deletions

4
.gitignore vendored
View File

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

View File

@ -1,4 +1,4 @@
77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
1fd5fbcca323380184589a54bc70111525edc519 SOURCES/tzcode2021b.tar.gz
23f8f6880fafa938dfb442ce5352be6ba75b9609 SOURCES/tzdata2021b.tar.gz
96c682391618d0f053d70ccb98cd65d969d014cd SOURCES/tzcode2024a.tar.gz
310a281e4551e4e9a11db4f9ceea85a6529af4af SOURCES/tzdata2024a.tar.gz

View File

@ -1,30 +0,0 @@
From 2a7c7c5873ff0eb725e8eafad04f6af6ada66dc6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 25 Sep 2021 08:32:39 -0700
Subject: [PROPOSED] Fix Jan Mayen typo
Fix typo in 2021-09-24 revert of most of the 2021-05-19
alike-since-1970 patch. Problem reported by Chris Walton in:
https://mm.icann.org/pipermail/tz/2021-September/030772.html
* backward (Atlantic/Jan_Mayen): Link from Europe/Oslo,
not Europe/Berlin.
---
backward | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backward b/backward
index 7c288e3..5412c46 100644
--- a/backward
+++ b/backward
@@ -116,7 +116,7 @@ Link Asia/Makassar Asia/Ujung_Pandang
Link Asia/Ulaanbaatar Asia/Ulan_Bator
Link Asia/Bangkok Asia/Vientiane
Link Atlantic/Faroe Atlantic/Faeroe
-Link Europe/Berlin Atlantic/Jan_Mayen
+Link Europe/Oslo Atlantic/Jan_Mayen
Link Africa/Abidjan Atlantic/St_Helena
Link Australia/Sydney Australia/ACT
Link Australia/Sydney Australia/Canberra
--
2.30.2

View File

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

View File

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

View File

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

View File

@ -1,8 +1,8 @@
Summary: Timezone data
Name: tzdata
Version: 2021b
%define tzdata_version 2021b
%define tzcode_version 2021b
Version: 2024a
%define tzdata_version 2024a
%define tzcode_version 2024a
Release: 1%{?dist}
License: Public Domain
Group: System Environment/Base
@ -10,8 +10,7 @@ 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
Patch001: 0001-Fix-Jan-Mayen-typo.patch
Patch002: 0002-Fix-have-snprintf-error.patch
Patch002: 0002-Fix-have-snprintf.patch
Patch003: 0003-continue-to-ship-posixrules.patch
BuildRequires: gawk, glibc, perl-interpreter
@ -42,7 +41,6 @@ This package contains timezone information for use by Java runtimes.
%prep
%setup -q -c -a 1
%patch001 -p1
%patch002 -p1
%patch003 -p1
@ -126,7 +124,7 @@ java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
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 leapseconds tzdata.zi $RPM_BUILD_ROOT%{_datadir}/zoneinfo
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/
@ -151,8 +149,88 @@ echo ============END TESTING===========
%{_datadir}/javazi-1.8
%changelog
* Sat Sep 25 2021 Patsy Griffin <patsy@redhat.com> - 2021b-1
- Rebase to tzdata-2021b
* Thu Feb 01 2024 Patsy Griffin <patsy@redhat.com> - 2024a-1
- Rebase to tzdata-2024a
- Kazakhstan will transition from UTC+6 to UTC+5 on 2024-03-01.
- Palestine will spring forward a week later than previously
predicted.
* Mon Jan 01 2024 Patsy Griffin <patsy@redhat.com> - 2023d-1
- Rebase to tzdata-2023d
- Include time zone changes for Ittoqqortoormiit, Greenland
and Vostok, Antarctica.
- Update the expiration date for the leap-seconds.list file.
No new leap seconds were added.
* Mon Aug 21 2023 Patsy Griffin <patsy@redhat.com> - 2023c-2
- Bump release to test recent process changes. (RHEL-1326)
* Tue Mar 28 2023 Patsy Griffin <patsy@redhat.com> - 2023c-1
- Rebase to tzdata-2023c
- Lebanon reversed the change added in tzdata-2023b.
* Fri Mar 24 2023 Patsy Griffin <patsy@redhat.com> - 2023b-1
- Rebase to tzdata-2023b
- Lebanon will transition to DST on April 20/21, not March 25/26.
* Wed Mar 22 2023 Patsy Griffin <patsy@redhat.com> - 2023a-1
- Rebase to tzdata-2023a
- Egypt reintroduced DST, from April through October.
- Morocco springs forward April 23, not April 30.
- Palestine delayed the start of DST this year.
* Fri Jan 6 2023 Patsy Griffin <patsy@redhat.com> - 2022g-2
- Include leap-seconds.list in tzdata install. (#2154109)
* Tue Nov 29 2022 Patsy Griffin <patsy@redhat.com> - 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
2022-11-30.
- Added a new Zone America/Ciudad_Juarez that splits from
America/Ojinaga.
* Mon Oct 31 2022 Patsy Griffin <patsy@redhat.com> - 2022f-1
- Rebase to tzdata-2022f
- Mexico will stop observing DST except near the US border.
- Chihuahua moved to -06 year round starting on 2022-10-30.
- Fiji no longer observes DST.
* Tue Aug 16 2022 Patsy Griffin <patsy@redhat.com> - 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 <patsy@redhat.com> - 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 <patsy@redhat.com> - 2022a-2
- Update the release for rebuild.
* Fri Apr 1 2022 Patsy Griffin <patsy@redhat.com> - 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
* Fri Oct 22 2021 Patsy Griffin <patsy@redhat.com> - 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 <patsy@redhat.com> - 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
- Jordan now starts DST on February's last Thursday.
- Samoa no longer observes DST.