Compare commits

...

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

32 changed files with 416 additions and 1857 deletions

View File

@ -1 +0,0 @@
1

220
.gitignore vendored
View File

@ -1,216 +1,4 @@
tzdata-base-0.tar.bz2
javazic.tar.gz
tzcode2007j.tar.gz
tzdata2007j.tar.gz
tzdata2007k.tar.gz
tzcode2007k.tar.gz
tzcode2008a.tar.gz
tzdata2008b.tar.gz
tzdata2008c.tar.gz
tzdata2008d.tar.gz
tzdata2008e.tar.gz
tzcode2008e.tar.gz
tzdata2008f.tar.gz
tzdata2008g.tar.gz
tzcode2008g.tar.gz
tzdata2008h.tar.gz
tzcode2008h.tar.gz
tzdata2008i.tar.gz
tzdata2009a.tar.gz
tzcode2009a.tar.gz
tzdata2009d.tar.gz
tzcode2009d.tar.gz
tzdata2009e.tar.gz
tzcode2009e.tar.gz
tzdata2009f.tar.gz
tzdata2009h.tar.gz
tzcode2009h.tar.gz
tzdata2009i.tar.gz
tzcode2009i.tar.gz
tzdata2009j.tar.gz
tzdata2009k.tar.gz
tzcode2009k.tar.gz
tzdata2009m.tar.gz
tzdata2009u.tar.gz
tzcode2009t.tar.gz
tzdata2010c.tar.gz
tzcode2010c.tar.gz
tzdata2010e.tar.gz
tzcode2010f.tar.gz
tzdata2010f.tar.gz
tzdata2010h.tar.gz
tzdata2010i.tar.gz
tzdata2010j.tar.gz
tzcode2010j.tar.gz
tzdata2010k.tar.gz
tzcode2010k.tar.gz
tzcode2010l.tar.gz
tzdata2010l.tar.gz
/tzdata2010n.tar.gz
/tzcode2010n.tar.gz
/tzdata2010o.tar.gz
/tzdata2011a.tar.gz
/tzcode2011a.tar.gz
/tzdata2011b.tar.gz
/tzcode2011b.tar.gz
tzdata/
/tzdata-*/
*.rpm
/tzdata2011d.tar.gz
/tzcode2011d.tar.gz
/tzdata2011f.tar.gz
/tzcode2011e.tar.gz
/tzdata2011g.tar.gz
/tzcode2011g.tar.gz
noarch/
.build-*
/tzdata2011h.tar.gz
/tzdata2011i.tar.gz
/tzcode2011i.tar.gz
/tzdata2011j.tar.gz
/tzdata2011l.tar.gz
/tzdata2011n.tar.gz
/tzdata2012b.tar.gz
/tzcode2012b.tar.gz
/tzdata2012c.tar.gz
/tzcode2012c.tar.gz
/tzdata2012d.tar.gz
/tzdata2012e.tar.gz
/tzcode2012e.tar.gz
/tzdata2012f.tar.gz
/tzcode2012f.tar.gz
/tzdata2012g.tar.gz
/tzcode2012g.tar.gz
/tzdata2012h.tar.gz
/tzcode2012h.tar.gz
/tzdata2012i.tar.gz
/tzcode2012i.tar.gz
/tzdata2012j.tar.gz
/tzcode2012j.tar.gz
/tzdata2013b.tar.gz
/tzcode2013b.tar.gz
/tzdata2013c.tar.gz
/tzcode2013c.tar.gz
/tzdata2013d.tar.gz
/tzcode2013d.tar.gz
/tzdata2013g.tar.gz
/tzcode2013g.tar.gz
/tzcode2013h.tar.gz
/tzdata2013h.tar.gz
/tzcode2013i.tar.gz
/tzdata2013i.tar.gz
/tzdata2014a.tar.gz
/tzcode2014a.tar.gz
/tzcode2014b.tar.gz
/tzdata2014b.tar.gz
/tzcode2014c.tar.gz
/tzdata2014c.tar.gz
/javazic-1.8-37392f2f5d59.tar.xz
/tzcode2014e.tar.gz
/tzdata2014e.tar.gz
/tzcode2014f.tar.gz
/tzdata2014f.tar.gz
/tzcode2014g.tar.gz
/tzdata2014g.tar.gz
/tzcode2014h.tar.gz
/tzdata2014h.tar.gz
/tzcode2014i.tar.gz
/tzdata2014i.tar.gz
/tzcode2014j.tar.gz
/tzdata2014j.tar.gz
/tzdata2015a.tar.gz
/tzcode2015a.tar.gz
/tzdata2015b.tar.gz
/tzcode2015b.tar.gz
/tzcode2015c.tar.gz
/tzdata2015c.tar.gz
/tzcode2015d.tar.gz
/tzdata2015d.tar.gz
/tzcode2015e.tar.gz
/tzdata2015e.tar.gz
/tzcode2015f.tar.gz
/tzdata2015f.tar.gz
/tzcode2015g.tar.gz
/tzdata2015g.tar.gz
/tzcode2016a.tar.gz
/tzdata2016a.tar.gz
/tzcode2016b.tar.gz
/tzdata2016b.tar.gz
/tzdata2016c.tar.gz
/tzcode2016c.tar.gz
/tzcode2016d.tar.gz
/tzdata2016d.tar.gz
/tzdata2016e.tar.gz
/tzcode2016e.tar.gz
/tzcode2016f.tar.gz
/tzdata2016f.tar.gz
/tzdata2016g.tar.gz
/tzcode2016g.tar.gz
/tzcode2016h.tar.gz
/tzdata2016h.tar.gz
/tzcode2016i.tar.gz
/tzdata2016i.tar.gz
/tzcode2016j.tar.gz
/tzdata2016j.tar.gz
/tzdata2017a.tar.gz
/tzcode2017a.tar.gz
/tzcode2017b.tar.gz
/tzdata2017b.tar.gz
/tzcode2017c.tar.gz
/tzdata2017c.tar.gz
/tzcode2018c.tar.gz
/tzdata2018c.tar.gz
/tzcode2018d.tar.gz
/tzdata2018d.tar.gz
/tzcode2018e.tar.gz
/tzdata2018e.tar.gz
/tzcode2018g.tar.gz
/tzdata2018g.tar.gz
/tzcode2018i.tar.gz
/tzdata2018i.tar.gz
/tzcode2019a.tar.gz
/tzdata2019a.tar.gz
/tzcode2019b.tar.gz
/tzdata2019b.tar.gz
/tzcode2019c.tar.gz
/tzdata2019c.tar.gz
/tzcode2020a.tar.gz
/tzdata2020a.tar.gz
/tzcode2020b.tar.gz
/tzdata2020b.tar.gz
/tzcode2020d.tar.gz
/tzdata2020d.tar.gz
/tzcode2020f.tar.gz
/tzdata2020f.tar.gz
/tzcode2021a.tar.gz
/tzdata2021a.tar.gz
/tzcode2021b.tar.gz
/tzdata2021b.tar.gz
/tzcode2021c.tar.gz
/tzdata2021c.tar.gz
/tzdata2021e.tar.gz
/tzcode2021e.tar.gz
/tzdata2022a.tar.gz
/tzcode2022a.tar.gz
/tzcode2022b.tar.gz
/tzdata2022b.tar.gz
/tzcode2022c.tar.gz
/tzdata2022c.tar.gz
/tzcode2022d.tar.gz
/tzdata2022d.tar.gz
/tzcode2022e.tar.gz
/tzdata2022e.tar.gz
/tzcode2022f.tar.gz
/tzdata2022f.tar.gz
/tzcode2022g.tar.gz
/tzdata2022g.tar.gz
/tzcode2023a.tar.gz
/tzdata2023a.tar.gz
/tzcode2023b.tar.gz
/tzdata2023b.tar.gz
/tzcode2023c.tar.gz
/tzdata2023c.tar.gz
/tzcode2023d.tar.gz
/tzdata2023d.tar.gz
/tzcode2024a.tar.gz
/tzdata2024a.tar.gz
SOURCES/javazic-1.8-37392f2f5d59.tar.xz
SOURCES/javazic.tar.gz
SOURCES/tzcode2024b.tar.gz
SOURCES/tzdata2024b.tar.gz

4
.tzdata.metadata Normal file
View File

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

View File

@ -1,29 +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,149 +0,0 @@
From b520d20b8122a783f99f088758b78d928f70ee34 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 23 Oct 2017 11:42:45 -0700
Subject: [PROPOSED] Fix Makefile quoting bug
Problem with INSTALLARGS reported by Zefram in:
https://mm.icann.org/pipermail/tz/2017-October/025360.html
Fix similar problems too.
* Makefile (ZIC_INSTALL, VALIDATE_ENV, CC, install)
(INSTALL, version, INSTALLARGS, right_posix, posix_right)
(check_public): Use apostrophes to prevent undesirable
interpretation of names by the shell. We still do not support
directory names containing apostrophes or newlines, but this is
good enough.
* NEWS: Mention this.
---
Makefile | 64 ++++++++++++++++++++++++++++++++--------------------------------
NEWS | 8 ++++++++
2 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/Makefile b/Makefile
index c92edc0..97649ca 100644
--- a/Makefile
+++ b/Makefile
@@ -313,7 +313,7 @@ ZFLAGS=
# How to use zic to install tz binary files.
-ZIC_INSTALL= $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
+ZIC_INSTALL= $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
# The name of a Posix-compliant 'awk' on your system.
AWK= awk
@@ -341,8 +341,8 @@ SGML_CATALOG_FILES= \
VALIDATE = nsgmls
VALIDATE_FLAGS = -s -B -wall -wno-unused-param
VALIDATE_ENV = \
- SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
- SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
+ SGML_CATALOG_FILES='$(SGML_CATALOG_FILES)' \
+ SGML_SEARCH_PATH='$(SGML_SEARCH_PATH)' \
SP_CHARSET_FIXED=YES \
SP_ENCODING=UTF-8
@@ -396,7 +396,7 @@ GZIPFLAGS= -9n
#MAKE= make
cc= cc
-CC= $(cc) -DTZDIR=\"$(TZDIR)\"
+CC= $(cc) -DTZDIR='"$(TZDIR)"'
AR= ar
@@ -473,29 +473,29 @@ all: tzselect yearistype zic zdump libtz.a $(TABDATA)
ALL: all date $(ENCHILADA)
install: all $(DATA) $(REDO) $(MANS)
- mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
- $(DESTDIR)$(LIBDIR) \
- $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
- $(DESTDIR)$(MANDIR)/man8
+ mkdir -p '$(DESTDIR)$(ETCDIR)' '$(DESTDIR)$(TZDIR)' \
+ '$(DESTDIR)$(LIBDIR)' \
+ '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \
+ '$(DESTDIR)$(MANDIR)/man8'
$(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
- cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/.
- cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
- cp libtz.a $(DESTDIR)$(LIBDIR)/.
- $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
- cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
- cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
- cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
+ cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.'
+ cp tzselect zic zdump '$(DESTDIR)$(ETCDIR)/.'
+ cp libtz.a '$(DESTDIR)$(LIBDIR)/.'
+ $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a'
+ cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.'
+ cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.'
+ cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.'
INSTALL: ALL install date.1
- mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
- cp date $(DESTDIR)$(BINDIR)/.
- cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
+ mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1'
+ cp date '$(DESTDIR)$(BINDIR)/.'
+ cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.'
version: $(VERSION_DEPS)
{ (type git) >/dev/null 2>&1 && \
V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
--abbrev=7 --dirty` || \
- V=$(VERSION); } && \
+ V='$(VERSION)'; } && \
printf '%s\n' "$$V" >$@.out
mv $@.out $@
@@ -529,12 +529,12 @@ leapseconds: $(LEAP_DEPS)
# Arguments to pass to submakes of install_data.
# They can be overridden by later submake arguments.
INSTALLARGS = \
- BACKWARD=$(BACKWARD) \
- DESTDIR=$(DESTDIR) \
+ BACKWARD='$(BACKWARD)' \
+ DESTDIR='$(DESTDIR)' \
LEAPSECONDS='$(LEAPSECONDS)' \
PACKRATDATA='$(PACKRATDATA)' \
- TZDIR=$(TZDIR) \
- YEARISTYPE=$(YEARISTYPE) \
+ TZDIR='$(TZDIR)' \
+ YEARISTYPE='$(YEARISTYPE)' \
ZIC='$(ZIC)'
# 'make install_data' installs one set of tz binary files.
@@ -558,16 +558,16 @@ right_only:
# You must replace all of $(TZDIR) to switch from not using leap seconds
# to using them, or vice versa.
right_posix: right_only
- rm -fr $(DESTDIR)$(TZDIR)-leaps
- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
- $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
- $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
+ rm -fr '$(DESTDIR)$(TZDIR)-leaps'
+ ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
posix_right: posix_only
- rm -fr $(DESTDIR)$(TZDIR)-posix
- ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
- $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
- $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
+ rm -fr '$(DESTDIR)$(TZDIR)-posix'
+ ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
+ $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
# This obsolescent rule is present for backwards compatibility with
# tz releases 2014g through 2015g. It should go away eventually.
@@ -764,7 +764,7 @@ set-timestamps.out: $(ENCHILADA)
check_public:
$(MAKE) maintainer-clean
- $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
+ $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL
mkdir -p public.dir
for i in $(TDATA) tzdata.zi; do \
$(zic) -v -d public.dir $$i 2>&1 || exit; \

View File

@ -1,32 +0,0 @@
diff --git a/africa b/africa
index 560f0f2..a0b8657 100644
--- a/africa
+++ b/africa
@@ -788,17 +788,13 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# will resume again at 02:00 on Saturday, August 2, 2014....
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
-# From Milamber (2015-06-08):
-# (Google Translation) The current time of Morocco (GMT + 1) will be suspended
-# from next Sunday until July 19, announced Monday the Ministry of Civil
-# Service and Modernisation of Administration. The hour will thus be delayed
-# 60 minutes Sunday, June 14 at 3:00, the ministry said in a statement, adding
-# that the time will be advanced again 60 minutes Sunday, July 19, 2015 at
-# 2:00. The move comes under 2.12.126 Decree of 26 Jumada I 1433 (18 April
-# 2012) and the decision of the Head of Government of 16 N. 3-29-15 Chaaban
-# 1435 (4 June 2015).
-# Source (french):
-# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
+# From Milamber (2015-06-09):
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
+# (Google Translation): The Ministry of Civil Service and
+# Modernisation of Administration announced the return to the legal
+# time of the Kingdom (GMT). So the time will be delayed for 60
+# minutes from 3:00 am Sunday, June 14, 2015. She will be advanced by
+# 60 minutes (GMT + 1) from 3:00 am Sunday, July 19, 2015.
# From Paul Eggert (2015-06-08):
# For now, guess that later spring and fall transitions will use 2015's rules,
--
2.1.0

View File

@ -1,102 +0,0 @@
diff --git a/africa b/africa
index fd9c089..560f0f2 100644
--- a/africa
+++ b/africa
@@ -788,20 +788,33 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# will resume again at 02:00 on Saturday, August 2, 2014....
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
-# From Paul Eggert (2014-06-05):
-# For now, guess that later spring and fall transitions will use 2014's rules,
+# From Milamber (2015-06-08):
+# (Google Translation) The current time of Morocco (GMT + 1) will be suspended
+# from next Sunday until July 19, announced Monday the Ministry of Civil
+# Service and Modernisation of Administration. The hour will thus be delayed
+# 60 minutes Sunday, June 14 at 3:00, the ministry said in a statement, adding
+# that the time will be advanced again 60 minutes Sunday, July 19, 2015 at
+# 2:00. The move comes under 2.12.126 Decree of 26 Jumada I 1433 (18 April
+# 2012) and the decision of the Head of Government of 16 N. 3-29-15 Chaaban
+# 1435 (4 June 2015).
+# Source (french):
+# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
+
+# From Paul Eggert (2015-06-08):
+# For now, guess that later spring and fall transitions will use 2015's rules,
# and guess that Morocco will switch to standard time at 03:00 the last
-# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
+# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
# Ramadan. To implement this, transition dates for 2015 through 2037 were
# determined by running the following program under GNU Emacs 24.3, with the
# results integrated by hand into the table below.
-# (let ((islamic-year 1436))
+# (let ((islamic-year 1437))
+# (require 'cal-islam)
# (while (< islamic-year 1460)
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-# (saturday 6))
-# (while (/= saturday (mod (setq a (1- a)) 7)))
-# (while (/= saturday (mod b 7))
+# (sunday 0))
+# (while (/= sunday (mod (setq a (1- a)) 7)))
+# (while (/= sunday (mod b 7))
# (setq b (1+ b)))
# (setq a (calendar-gregorian-from-absolute a))
# (setq b (calendar-gregorian-from-absolute b))
@@ -845,32 +858,30 @@ Rule Morocco 2012 only - Aug 20 2:00 1:00 S
Rule Morocco 2013 only - Jul 7 3:00 0 -
Rule Morocco 2013 only - Aug 10 2:00 1:00 S
Rule Morocco 2013 max - Oct lastSun 3:00 0 -
-Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
+Rule Morocco 2014 2021 - Mar lastSun 2:00 1:00 S
Rule Morocco 2014 only - Jun 28 3:00 0 -
Rule Morocco 2014 only - Aug 2 2:00 1:00 S
-Rule Morocco 2015 only - Jun 13 3:00 0 -
-Rule Morocco 2015 only - Jul 18 2:00 1:00 S
-Rule Morocco 2016 only - Jun 4 3:00 0 -
-Rule Morocco 2016 only - Jul 9 2:00 1:00 S
-Rule Morocco 2017 only - May 20 3:00 0 -
-Rule Morocco 2017 only - Jul 1 2:00 1:00 S
-Rule Morocco 2018 only - May 12 3:00 0 -
-Rule Morocco 2018 only - Jun 16 2:00 1:00 S
-Rule Morocco 2019 only - May 4 3:00 0 -
-Rule Morocco 2019 only - Jun 8 2:00 1:00 S
-Rule Morocco 2020 only - Apr 18 3:00 0 -
-Rule Morocco 2020 only - May 30 2:00 1:00 S
-Rule Morocco 2021 only - Apr 10 3:00 0 -
-Rule Morocco 2021 only - May 15 2:00 1:00 S
-Rule Morocco 2022 only - Apr 2 3:00 0 -
-Rule Morocco 2022 only - May 7 2:00 1:00 S
-Rule Morocco 2023 only - Apr 22 2:00 1:00 S
-Rule Morocco 2024 only - Apr 13 2:00 1:00 S
-Rule Morocco 2025 only - Apr 5 2:00 1:00 S
+Rule Morocco 2015 only - Jun 14 3:00 0 -
+Rule Morocco 2015 only - Jul 19 2:00 1:00 S
+Rule Morocco 2016 only - Jun 5 3:00 0 -
+Rule Morocco 2016 only - Jul 10 2:00 1:00 S
+Rule Morocco 2017 only - May 21 3:00 0 -
+Rule Morocco 2017 only - Jul 2 2:00 1:00 S
+Rule Morocco 2018 only - May 13 3:00 0 -
+Rule Morocco 2018 only - Jun 17 2:00 1:00 S
+Rule Morocco 2019 only - May 5 3:00 0 -
+Rule Morocco 2019 only - Jun 9 2:00 1:00 S
+Rule Morocco 2020 only - Apr 19 3:00 0 -
+Rule Morocco 2020 only - May 24 2:00 1:00 S
+Rule Morocco 2021 only - Apr 11 3:00 0 -
+Rule Morocco 2021 only - May 16 2:00 1:00 S
+Rule Morocco 2022 only - May 8 2:00 1:00 S
+Rule Morocco 2023 only - Apr 23 2:00 1:00 S
+Rule Morocco 2024 only - Apr 14 2:00 1:00 S
+Rule Morocco 2025 only - Apr 6 2:00 1:00 S
Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
-Rule Morocco 2035 only - Oct 27 3:00 0 -
-Rule Morocco 2036 only - Oct 18 3:00 0 -
-Rule Morocco 2037 only - Oct 10 3:00 0 -
+Rule Morocco 2036 only - Oct 19 3:00 0 -
+Rule Morocco 2037 only - Oct 4 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
--
2.1.0

View File

@ -1,153 +0,0 @@
From e8171130f9b80ae3c75dfa5e96c47d5dbc0f4aae Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 10 Aug 2022 18:58:08 -0700
Subject: [PROPOSED] Work around macOS awk bug
* ziguard.awk: Replace every regular expression /ERE/ in ordinary
contexts with ($0 ~ /ERE/), to work around a bug in macOS 13.0 awk.
Problem reported by Deborah Goldsmith in:
https://mm.icann.org/pipermail/tz/2022-August/031783.html
---
NEWS | 8 ++++++++
ziguard.awk | 37 ++++++++++++++++++++-----------------
2 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/NEWS b/NEWS
index 6a0d5c50..7291030a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,13 @@
News for the tz database
+Unreleased, experimental changes
+
+ Changes to code
+
+ Work around a bug in macOS 'awk' that broke commands like 'make
+ traditional_tarballs'. (Problem reported by Deborah Goldsmith.)
+
+
Release 2022b - 2022-08-10 15:38:32 -0700
Briefly:
diff --git a/ziguard.awk b/ziguard.awk
index 0728baa5..0556cc4a 100644
--- a/ziguard.awk
+++ b/ziguard.awk
@@ -91,12 +91,13 @@ $1 == "#PACKRATLIST" && $2 == PACKRATLIST {
/^Zone/ { zone = $2 }
DATAFORM != "main" {
- in_comment = /^#/
+ in_comment = $0 ~ /^#/
uncomment = comment_out = 0
# If this line should differ due to Czechoslovakia using negative SAVE values,
# uncomment the desired version and comment out the undesired one.
- if (zone == "Europe/Prague" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) {
+ if (zone == "Europe/Prague" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \
+ && $0 ~ /1947 Feb 23/) {
if (($(in_comment + 2) != "-") == (DATAFORM != "rearguard")) {
uncomment = in_comment
} else {
@@ -106,9 +107,9 @@ DATAFORM != "main" {
# If this line should differ due to Ireland using negative SAVE values,
# uncomment the desired version and comment out the undesired one.
- Rule_Eire = /^#?Rule[\t ]+Eire[\t ]/
+ Rule_Eire = $0 ~ /^#?Rule[\t ]+Eire[\t ]/
Zone_Dublin_post_1968 \
- = (zone == "Europe/Dublin" && /^#?[\t ]+[01]:00[\t ]/ \
+ = (zone == "Europe/Dublin" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \
&& (!$(in_comment + 4) || 1968 < $(in_comment + 4)))
if (Rule_Eire || Zone_Dublin_post_1968) {
if ((Rule_Eire \
@@ -122,9 +123,9 @@ DATAFORM != "main" {
# If this line should differ due to Namibia using negative SAVE values,
# uncomment the desired version and comment out the undesired one.
- Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/
+ Rule_Namibia = $0 ~ /^#?Rule[\t ]+Namibia[\t ]/
Zone_using_Namibia_rule \
- = (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \
+ = (zone == "Africa/Windhoek" && $0 ~ /^#?[\t ]+[12]:00[\t ]/ \
&& ($(in_comment + 2) == "Namibia" \
|| ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \
&& ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \
@@ -142,8 +143,8 @@ DATAFORM != "main" {
# If this line should differ due to Portugal benefiting from %z if supported,
# uncomment the desired version and comment out the undesired one.
- if (/^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) {
- if (/%z/ == (DATAFORM == "vanguard")) {
+ if ($0 ~ /^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) {
+ if (($0 ~ /%z/) == (DATAFORM == "vanguard")) {
uncomment = in_comment
} else {
comment_out = !in_comment
@@ -164,8 +165,8 @@ DATAFORM != "main" {
sub(/-00CHANGE-TO-%z/, "-00")
sub(/[-+][^\t ]+CHANGE-TO-/, "")
} else {
- if (/^[^#]*%z/) {
- stdoff_column = 2 * /^Zone/ + 1
+ if ($0 ~ /^[^#]*%z/) {
+ stdoff_column = 2 * ($0 ~ /^Zone/) + 1
rules_column = stdoff_column + 1
stdoff = get_minutes($stdoff_column)
rules = $rules_column
@@ -184,9 +185,9 @@ DATAFORM != "main" {
dstoff = 20
} else if (((rules == "Cook" || rules == "LH") && NF == 3) \
|| (rules == "Uruguay" \
- && /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) {
+ && $0 ~ /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) {
dstoff = 30
- } else if (rules == "Uruguay" && /[\t ]1974 Mar 10$/) {
+ } else if (rules == "Uruguay" && $0 ~ /[\t ]1974 Mar 10$/) {
dstoff = 90
} else {
dstoff = 60
@@ -222,7 +223,7 @@ DATAFORM != "main" {
stdoff_subst[1] = rounded_stdoff
}
} else if (stdoff_subst[0]) {
- stdoff_column = 2 * /^Zone/ + 1
+ stdoff_column = 2 * ($0 ~ /^Zone/) + 1
stdoff_column_val = $stdoff_column
if (stdoff_column_val == stdoff_subst[0]) {
sub(stdoff_subst[0], stdoff_subst[1])
@@ -233,7 +234,7 @@ DATAFORM != "main" {
# In rearguard form, change the Japan rule line with "Sat>=8 25:00"
# to "Sun>=9 1:00", to cater to zic before 2007 and to older Java.
- if (/^Rule/ && $2 == "Japan") {
+ if ($0 ~ /^Rule/ && $2 == "Japan") {
if (DATAFORM == "rearguard") {
if ($7 == "Sat>=8" && $8 == "25:00") {
sub(/Sat>=8/, "Sun>=9")
@@ -250,7 +251,7 @@ DATAFORM != "main" {
# In rearguard form, change the Morocco lines with negative SAVE values
# to use positive SAVE values.
if ($2 == "Morocco") {
- if (/^Rule/) {
+ if ($0 ~ /^Rule/) {
if ($4 ~ /^201[78]$/ && $6 == "Oct") {
if (DATAFORM == "rearguard") {
sub(/\t2018\t/, "\t2017\t")
@@ -290,8 +291,10 @@ DATAFORM != "main" {
/^Zone/ {
packrat_ignored = FILENAME == PACKRATDATA && PACKRATLIST && !packratlist[$2];
}
-packrat_ignored && !/^Rule/ {
- sub(/^/, "#")
+{
+ if (packrat_ignored && $0 !~ /^Rule/) {
+ sub(/^/, "#")
+ }
}
# If a Link line is followed by a Link or Zone line for the same data, comment
--
2.34.1

View File

@ -1,55 +0,0 @@
diff -Nrup a/australasia b/australasia
--- a/australasia 2013-12-17 10:26:04.000000000 -0500
+++ b/australasia 2014-01-21 11:37:08.135130460 -0500
@@ -354,16 +354,18 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
-# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
-# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am
+# Fiji will start daylight savings on Sunday 27th October, 2013 ...
+# move clocks forward by one hour from 2am
# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
-#
-# From Paul Eggert (2013-09-09):
+
+# From Steffen Thorsen (2013-01-10):
+# Fiji will end DST on 2014-01-19 02:00:
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
+
+# From Paul Eggert (2014-10-10):
# For now, guess that Fiji springs forward the Sunday before the fourth
-# Monday in October. This matches both recent practice and
-# timeanddate.com's current spring-forward prediction.
-# For the January 2014 transition we guessed right while timeanddate.com
-# guessed wrong, so leave the fall-back prediction alone.
+# Monday in October, and springs back the penultimate Sunday in January.
+# This is ad hoc, but matches recent practice.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
@@ -372,7 +374,8 @@ Rule Fiji 2009 only - Nov 29 2:00 1:00 S
Rule Fiji 2010 only - Mar lastSun 3:00 0 -
Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
-Rule Fiji 2012 max - Jan Sun>=18 3:00 0 -
+Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
+Rule Fiji 2014 max - Jan Sun>=18 2:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji FJ%sT # Fiji Time
diff -Nrup a/NEWS b/NEWS
--- a/NEWS 2013-12-17 10:26:04.000000000 -0500
+++ b/NEWS 2014-01-21 11:37:08.136130469 -0500
@@ -13,6 +13,11 @@ Release 2013i - 2013-12-17 07:25:23 -080
In 2004, Cuba began DST on March 28, not April 4.
(Thanks to Steffen Thorsen.)
+ Changes affecting near-future time stamps
+
+ Fiji ends DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
+ (Thanks to Steffen Thorsen.)
+
Changes affecting code
The compile-time flag NOSOLAR has been removed, as nowadays the

View File

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

View File

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

View File

@ -1,15 +1,3 @@
# 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

42
SOURCES/ZoneTest.java Normal file
View File

@ -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 <http://www.gnu.org/licenses/>. */
import java.time.zone.ZoneRulesProvider;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.Locale;
import java.util.Set;
import java.util.TimeZone;
public class ZoneTest {
public static void main(String[] args) {
// This is what failed in OpenJDK's build.tools.cldrconverter.
new GregorianCalendar(TimeZone.getTimeZone("America/Los_Angeles"),
Locale.US).get(Calendar.YEAR);
// In some OpenJDK versions, this exercises a different parser.
Set<String> available = ZoneRulesProvider.getAvailableZoneIds();
boolean errors = false;
if (available.contains("ROC"))
System.out.println("error: ROC zone is present");
if (!available.contains("America/New_York"))
System.out.println("error: America/New_York is missing");
if (errors)
System.exit(1);
}
}

View File

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

View File

@ -1,24 +1,27 @@
Summary: Timezone data
Name: tzdata
Version: 2024a
%define tzdata_version 2024a
%define tzcode_version 2024a
Release: 5%{?dist}
License: LicenseRef-Fedora-Public-Domain AND (GPL-2.0-only WITH ClassPath-exception-2.0)
Version: 2024b
%define tzdata_version 2024b
%define tzcode_version 2024b
Release: 4%{?dist}
License: Public Domain
Group: System Environment/Base
URL: https://www.iana.org/time-zones
Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
Patch002: 0002-Fix-have-snprintf-error.patch
Patch002: 0002-Fix-have-snprintf.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: gawk, glibc, perl-interpreter
BuildRequires: java-devel
BuildRequires: make
BuildRequires: gcc
BuildRequires: glibc-common >= 2.5.90-7
Conflicts: glibc-common <= 2.3.2-63
BuildArchitectures: noarch
ExcludeArch: i686
%description
This package contains data files with rules for various timezones around
@ -26,8 +29,17 @@ the world.
%package java
Summary: Timezone data for Java
Source3: javazic-1.8-37392f2f5d59.tar.xz
Patch100: JDK-8051641.patch
Group: System Environment/Base
Source3: javazic.tar.gz
Source4: javazic-1.8-37392f2f5d59.tar.xz
Source5: ZoneTest.java
Patch100: javazic-fixup.patch
Patch101: rebase-01.patch
Patch102: rebase-02.patch
Patch103: 7090844.patch
Patch104: 7133138.patch
Patch105: 8051641.patch
Patch106: javazic-harden-links.patch
%description java
This package contains timezone information for use by Java runtimes.
@ -35,41 +47,61 @@ This package contains timezone information for use by Java runtimes.
%prep
%setup -q -c -a 1
%patch -p1 -P 2
%if 0%{?rhel}
%patch -p1 -P 3
%endif
%patch002 -p1
%patch003 -p1
%patch004 -p1
%patch005 -p1
# tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK.
# Use rearguard for java
mkdir rearguard
# 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.
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
%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
tar xf %{SOURCE4}
%patch105
%patch106 -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
etcetera backward factory"
pacificnew etcetera backward"
mkdir zoneinfo/{,posix,right}
zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@ -78,31 +110,55 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
# grep -v tz-art.htm tz-link.htm > tz-link.html
# 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 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
# Java 8 tzdata
pushd javazic-1.8
javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java`
javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
popd
java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
-srcdir . -dstfile tzdb.dat \
-verbose \
$JAVA_FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
$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/
%check
echo ============TESTING===============
/usr/bin/env LANG=C make -k VALIDATE=':' check && true
# Create a custom JAVA_HOME, where we can replace tzdb.dat with the
# one just built, for testing.
system_java_home=$(dirname $(readlink -f $(which java)))/..
mkdir -p java_home
cp -Lr $system_java_home/* java_home/.
for tzdb in $(find java_home -name tzdb.dat) ; do
rm $tzdb
cp $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/tzdb.dat $tzdb
done
# Compile the smoke test and run it.
cp %{SOURCE5} .
javac ZoneTest.java
java_home/bin/java ZoneTest
echo ============END TESTING===========
%files
%defattr(-,root,root)
%{_datadir}/zoneinfo
%license LICENSE
%doc README
@ -111,74 +167,66 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
%doc tz-art.html
%files java
%defattr(-,root,root)
%{_datadir}/javazi
%{_datadir}/javazi-1.8
%changelog
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2024a-5
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Wed Oct 09 2024 Patsy Griffin <patsy@redhat.com> - 2024b-4
- Bump release and rebuild to fix a build issue.
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2024a-4
- Bump release for June 2024 mass rebuild
* Thu Oct 03 2024 Patsy Griffin <patsy@redhat.com> - 2024b-3
- Add copyright, patch attribution and build dependencies for
the previous commit. (RHEL-59542)
* Thu Apr 18 2024 Patsy Griffin <patsy@redhat.com> - 2024a-3
- Add java patch to fix incorrect calculations for
Africa/Casablanca starting in 2027. (RHEL-32178)
- Remove hardcoded versioned path to javac.
* Fri Sep 20 2024 Florian Weimer <fweimer@redhat.com> - 2024b-2
- Harden against links to removed zones (RHEL-59542)
* Tue Feb 06 2024 Patsy Griffin <patsy@redhat.com> - 2024a-2
- Correct the bz# for the tzdata-2024 commit.
* Wed Sep 11 2024 Patsy Griffin <patsy@redhat.com> - 2024b-1
- Update to tzdata-2024b
- Improve historical data for Mexico, Mongolia, and Portugal.
- System V names are now obsolescent.
- The main data form now uses %z.
- The code now conforms to RFC 8536 for early timestamps.
- Support POSIX.1-2024, which removes asctime_r and ctime_r.
- Assume POSIX.2-1992 or later for shell scripts.
- SUPPORT_C89 now defaults to 1.
- Include two upstream patches for month names as in April vs Apr.
* Mon Feb 05 2024 Patsy Griffin <patsy@redhat.com> - 2024a-1
* 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.
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023d-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 18 2024 Patsy Griffin <patsy@redhat.com> - 2023d-2
- Migrate License field to SPDX identifiers for
https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2
* Wed Jan 03 2024 Patsy Griffin <patsy@redhat.com> - 2023d-1
* 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.
* Wed Dec 13 2023 Patsy Griffin <patsy@redhat.com> - 2023c-5
- Remove Java 6/7 support for Fedora 40 and RHEL 10 forward.
* Mon Aug 21 2023 Patsy Griffin <patsy@redhat.com> - 2023c-2
- Bump release to test recent process changes. (RHEL-1326)
* Tue Oct 3 2023 David Cantrell <dcantrell@redhat.com> - 2023c-4
- Use the new syntax for the %%patch macro in the spec file
* Mon Jul 24 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2023c-3
- Disable Java 6/7 data in RHEL 10 builds
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2023c-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Mar 29 2023 Patsy Griffin <patsy@redhat.com> - 2023c-1
* Tue Mar 28 2023 Patsy Griffin <patsy@redhat.com> - 2023c-1
- Rebase to tzdata-2023c
- Reinstate Lebanon DST change effective March 25.
- 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.
* Thu Mar 23 2023 Patsy Griffin <patsy@redhat.com> - 2023a-1
* 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.
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2022g-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jan 6 2023 Patsy Griffin <patsy@redhat.com> - 2022g-2
- Include leap-seconds.list in tzdata install. (#2154109)
* Fri Dec 02 2022 Patsy Griffin <patsy@redhat.com> - 2022g-1
* 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
@ -192,70 +240,42 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
- Chihuahua moved to -06 year round starting on 2022-10-30.
- Fiji no longer observes DST.
* Fri Oct 14 2022 Patsy Griffin <patsy@redhat.com> - 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 <patsy@redhat.com> - 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 <patsy@redhat.com> - 2022c-1
* 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.
* Sun Aug 14 2022 Patsy Griffin <patsy@redhat.com> - 2022b-1
* 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.
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022a-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Apr 5 2022 Patsy Griffin <patsy@redhat.com> - 2022a-2
- Update the release for rebuild.
* Fri Jul 15 2022 Patsy Griffin <patsy@redhat.com> - 2022a-3
- Java OpenJDK packages are no longer available on i686.
Exclude i686 builds. (bz #2104108)
* Tue Jun 07 2022 Patsy Griffin <patsy@redhat.com> - 2022a-2
- Include leap-second.list in tzdata install. (#2091390)
* Wed Mar 23 2022 Patsy Griffin <patsy@redhat.com> - 2022a-1
* Fri Apr 1 2022 Patsy Griffin <patsy@redhat.com> - 2022a-1
- Rebase to tzdata-2022a
- 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.
- 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
* Tue Feb 08 2022 Patsy Griffin <patsy@redhat.com> - 2021e-4
- Clean-up changelog.
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2021e-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/Java17
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021e-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Oct 26 2021 Patsy Griffin <patsy@redhat.com> - 2021e-1
* 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.
* Thu Oct 07 2021 Patsy Griffin <patsy@redhat.com> - 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 <patsy@redhat.com> - 2021b-1
- Rebase to tzdata-2021b
* 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.
- Merge more location-based Zones whose timestamps agree since 1970.
@ -270,14 +290,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
- zdump -v now outputs more-useful boundary cases.
- tzfile.5 better matches a draft successor to RFC 8536.
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021a-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jan 25 2021 Patsy Griffin <patsy@redhat.com> - 2021a-1
* Sun Jan 24 2021 Patsy Griffin <patsy@redhat.com> - 2021a-1
- Rebase to tzdata-2021a
- South Sudan will change from +03 to +02 on 2021-02-01.
* Wed Dec 30 2020 Patsy Griffin <patsy@redhat.com> - 2020f-1
* Tue Dec 29 2020 Patsy Griffin <patsy@redhat.com> - 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
@ -286,22 +303,22 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
timestamps since 1970 and was therefore created by mistake,
now moved to the "backward" file.
* Wed Dec 16 2020 Patsy Griffin <patsy@redhat.com> - 2020d-3
- Add 0003-continue-to-ship-posixrules.patch to initialize
POSIXRULES variable.
* Wed Dec 16 2020 Patsy Griffin <patsy@redhat.com> - 2020d-2
- Add conditional support for rhel and eln.
* Fri Oct 23 2020 Patsy Griffin <patsy@redhat.com> - 2020d-1
- Rebase to tzdata-2020d including changes from tzdata-2020c
* Wed Oct 21 2020 Patsy Griffin <patsy@redhat.com> - 2020d-1
- Rebase to tzdata-2020d
- Palestine will end summer time on 2020-10-24 rather than the
predicted 2020-10-31.
* Mon Oct 19 2020 Patsy Griffin <patsy@redhat.com> - 2020c-1
- Rebase to tzdata-2020c
- Fiji starts DST later than usual, on 2020-12-20.
- Rearguard now provides an empty file pacificnew to support
downstream software that expects it.
* Wed Oct 14 2020 Patsy Griffin <patsy@redhat.com> - 2020b-1
* Tue Oct 13 2020 Patsy Griffin <patsy@redhat.com> - 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 <patsy@redhat.com> - 2020b-1
- Rebase to tzdata-2020b
- Yukon timezones represented by America/Whitehorse and
America/Dawson will change time zone rules from -08/-07 to
@ -311,17 +328,7 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
- Remove obsolete files pacificnew, systemv, and yearistype.sh
from the distribution.
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020a-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 2020a-3
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Fri Jun 12 2020 Jiri Vanek <jvanek@redhat.com> - 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 <patsy@redhat.com> - 2020a-1
* Fri Apr 24 2020 Patsy Griffin <patsy@redhat.com> - 2020a-1
- Rebase to tzdata-2020a
- Morocco will spring forward on 2020-05-31 rather than
previously predicted 2020-05-24.
@ -329,51 +336,48 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
effective 2020-03-08.
- America/Godthab was renamed to America/Nuuk.
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2019c-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 17 2020 Patsy Griffin <patsy@redhat.com> - 2019c-2
- Don't build the factory zone for tzdata-java.
Patch provided by Severin Gehwolf <sgehwolf@redhat.com> (#1789468)
* Mon Sep 23 2019 Patsy Griffin <patsy@redhat.com> - 2019c-1
* Wed Sep 11 2019 Patsy Griffin <patsy@redhat.com> - 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.
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2019b-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Jul 09 2019 Patsy Griffin <patsy@redhat.com> - 2019b-1
* Mon Jul 01 2019 Patsy Griffin <patsy@redhat.com> - 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.
* Fri Mar 29 2019 Patsy Griffin Franklin <patsy@redhat.com> - 2019a-1
* Tue Mar 26 2019 Patsy Griffin Franklin <patsy@redhat.com> - 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.
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2018i-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jan 02 2019 Patsy Griffin Franklin <pfrankli@redhat.com> - 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.
* Mon Nov 12 2018 Patsy Griffin Franklin <pfrankli@redhat.com> - 2018g-1
* Mon Oct 29 2018 Patsy Griffin Franklin <pfrankli@redhat.com> - 2018g-1
- Rebase to tzdata-2018g
Includes changes for tzdata-2018f.
- 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
- 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.
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018e-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Sep 28 2018 Patsy Franklin <pfrankli@redhat.com> - 2018e-2
- Add make check for testing.
* Wed May 16 2018 Patsy Franklin <pfrankli@redhat.com> - 2018e-1
* Mon May 14 2018 Patsy Franklin <pfrankli@redhat.com> - 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

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional}

View File

@ -1,42 +0,0 @@
# Patch based on fix in JDK8 tree by Yuka Kamiya from Oracle:
# http://hg.openjdk.java.net/jdk8/tl/jdk/rev/f114bddac6d6
diff -up ./sun/tools/javazic/Mappings.java.sav ./sun/tools/javazic/Mappings.java
--- ./sun/tools/javazic/Mappings.java.sav 2011-11-03 16:31:53.000000000 -0400
+++ ./sun/tools/javazic/Mappings.java 2011-11-03 16:41:44.000000000 -0400
@@ -77,15 +77,17 @@ class Mappings {
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.
- if (zone.size() > 1) {
- ZoneRec zrec = zone.get(zone.size()-2);
+ boolean isExcluded = false;
+ 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) {
excludeList = new ArrayList<String>();
}
excludeList.add(zone.getName());
- continue;
+ isExcluded = true;
+ break;
}
}
@@ -101,9 +103,13 @@ class Mappings {
rawOffsetsIndex.add(i, rawOffset);
Set<String> perRawOffset = new TreeSet<String>();
+ if (!isExcluded) {
+ perRawOffset = new TreeSet<String>();
+ }
+
perRawOffset.add(zonename);
rawOffsetsIndexTable.add(i, perRawOffset);
- } else {
+ } else if (!isExcluded) {
int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
perRawOffset.add(zonename);

View File

@ -1,6 +0,0 @@
summary: CI Gating Plan
discover:
how: fmf
directory: tests
execute:
how: tmt

View File

@ -1,3 +0,0 @@
SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
SHA512 (tzcode2024a.tar.gz) = 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c
SHA512 (tzdata2024a.tar.gz) = 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236

View File

@ -1,63 +0,0 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Makefile of /CoreOS/tzdata/Sanity/tzdata-checker
# Description: Testing tzdata by comparing base pkg with upstream
# Author: Michal Kolar <mkolar@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2018 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
export TEST=/CoreOS/tzdata/Sanity/tzdata-checker
export TESTVERSION=1.0
BUILT_FILES=
FILES=$(METADATA) runtest.sh Makefile PURPOSE zones.min no-beakerlib-wrapper.sh
.PHONY: all install download clean
run: $(FILES) build
./runtest.sh
build: $(BUILT_FILES)
test -x runtest.sh || chmod a+x runtest.sh
clean:
rm -f *~ $(BUILT_FILES)
include /usr/share/rhts/lib/rhts-make.include
$(METADATA): Makefile
@echo "Owner: Michal Kolar <mkolar@redhat.com>" > $(METADATA)
@echo "Name: $(TEST)" >> $(METADATA)
@echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
@echo "Path: $(TEST_DIR)" >> $(METADATA)
@echo "Description: Testing tzdata by comparing base pkg with upstream" >> $(METADATA)
@echo "Type: Sanity" >> $(METADATA)
@echo "TestTime: 1h" >> $(METADATA)
@echo "RunFor: tzdata" >> $(METADATA)
@echo "Requires: tzdata coreutils diffutils findutils gawk gcc glibc-common grep gzip make patch sed tar wget file" >> $(METADATA)
@echo "Priority: Normal" >> $(METADATA)
@echo "License: GPLv2+" >> $(METADATA)
@echo "Confidential: no" >> $(METADATA)
@echo "Destructive: no" >> $(METADATA)
@echo "Releases: -RHEL4" >> $(METADATA)
rhts-lint $(METADATA)

View File

@ -1,11 +0,0 @@
PURPOSE of /CoreOS/tzdata/Sanity/tzdata-checker
Description: Testing tzdata by comparing base pkg with upstream
Author: Michal Kolar <mkolar@redhat.com>
Executing can be modified by these variables:
* NO_BEAKERLIB -- if this variable is set to "1" tescase use wrapper for rl* commands instead of beakerlib.
It could be useful on systems without installed beaker framework.
Example:
NO_BEAKERLIB=1 ./runtest.sh

View File

@ -1,34 +0,0 @@
summary: Testing tzdata by comparing base pkg with upstream
description: |+
Executing can be modified by these variables:
* NO_BEAKERLIB -- if this variable is set to "1" tescase use wrapper for rl* commands instead of beakerlib.
It could be useful on systems without installed beaker framework.
Example:
NO_BEAKERLIB=1 ./runtest.sh
contact:
- Michal Kolar <mkolar@redhat.com>
component:
- tzdata
test: ./runtest.sh
framework: beakerlib
recommend:
- tzdata
- coreutils
- diffutils
- findutils
- gawk
- gcc
- glibc-common
- grep
- gzip
- make
- patch
- sed
- tar
- wget
- file
duration: 1h
extra-summary: /CoreOS/tzdata/Sanity/tzdata-checker
extra-task: /CoreOS/tzdata/Sanity/tzdata-checker

View File

@ -1,72 +0,0 @@
#!/bin/bash
failCounter=0
passCounter=0
rlJournalStart()
{
timeStart=`date +%s.%N`
}
rlShowRunningKernel()
{
printf ":: [ %s ] :: [ \e[36mLOG\e[0m ] :: Kernel version: '%s'\n" `date +%s.%N` `uname -r`
}
rlAssertRpm()
{
if rpm -q $1; then
((passCounter++))
printf ":: [ %s ] :: [ \e[32mPASS\e[0m ] :: Checking for the presence of %s rpm\n" `date +%s.%N` "$1"
printf ":: [ %s ] :: [ \e[36mLOG\e[0m ] :: %s\n" `date +%s.%N` `rpm -q $1`
else
((failCounter++))
printf ":: [ %s ] :: [ \e[31;1mFAIL\e[0m ] :: Checking for the presence of %s rpm\n" `date +%s.%N` "$1"
fi
}
rlRun()
{
eval $1
retVal=$?
if [ "$retVal" != "0" ]; then
((failCounter++))
printf ":: [ %s ] :: [ \e[31;1mFAIL\e[0m ] :: Command '%s'\n" `date +%s.%N` "$1"
else
((passCounter++))
printf ":: [ %s ] :: [ \e[32mPASS\e[0m ] :: Command '%s'\n" `date +%s.%N` "$1"
fi
return $retVal
}
rlLogInfo()
{
printf ":: [ %s ] :: [ \e[33mINFO\e[0m ] :: %s\n" `date +%s.%N` "$1"
}
rlJournalPrintText()
{
timeEnd=`date +%s.%N`
}
rlJournalEnd()
{
printf '\n\n\n::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::\n'
printf ':: TEST PROTOCOL\n'
printf '::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::\n'
printf ':: Duration: %s s\n' `bc <<< "$timeEnd - $timeStart"`
printf ':: Assertions: %i good, %i bad\n:: RESULT: ' $passCounter $failCounter
if [ "$failCounter" != "0" ]; then
printf '\e[31;1mFAIL\e[0m\n'
else
printf '\e[32mPASS\e[0m\n'
fi
}
rlFileSubmit(){ return 0; }
rlPhaseEnd(){ return 0; }
rlPhaseStartCleanup(){ return 0; }
rlPhaseStartSetup(){ return 0; }

View File

@ -1,103 +0,0 @@
#!/bin/bash
# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# runtest.sh of /CoreOS/tzdata/Sanity/tzdata-checker
# Description: Testing tzdata by comparing base pkg with upstream
# Author: Michal Kolar <mkolar@redhat.com>
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#
# Copyright (c) 2018 Red Hat, Inc.
#
# This program is free software: you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation, either version 2 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 General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see http://www.gnu.org/licenses/.
#
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if [ "$NO_BEAKERLIB" == "1" ]; then
. ./no-beakerlib-wrapper.sh || exit 1
else
# Include Beaker environment
. /usr/share/beakerlib/beakerlib.sh || exit 1
fi
PACKAGE="tzdata"
TZDATA_URL="https://data.iana.org/time-zones/releases"
TZDATA_VERSION="${TZDATA_VERSION:-$(rpm -q --qf '%{VERSION}\n' $PACKAGE | head -1)}"
if rlIsFedora; then
DATAFORM="${DATAFORM:-vanguard}"
else
DATAFORM="${DATAFORM:-rearguard}"
fi
YEARS=20 # used for shrink zdump output to reasonable future
hiyear=$((`date +%Y` + $YEARS))
export LC_ALL=C
rlJournalStart
rlPhaseStartSetup
rlShowRunningKernel
rlAssertRpm $PACKAGE
rlRun "TmpDir=\$(mktemp -d)"
rlRun "cp zones.min $TmpDir"
rlRun "pushd $TmpDir"
rlRun "mkdir badzones"
rlPhaseEnd
rlPhaseStartSetup "Build upstream tzdata" # source: https://data.iana.org/time-zones/tz-link.html
rlRun "wget --no-check-certificate ${TZDATA_URL}/tzcode${TZDATA_VERSION}.tar.gz"
rlRun "wget --no-check-certificate ${TZDATA_URL}/tzdata${TZDATA_VERSION}.tar.gz"
rlRun "tar -xzf tzcode*"
rlRun "tar -xzf tzdata*"
rlRun "make DATAFORM=$DATAFORM TOPDIR=./tzdir install"
rlRun "find tzdir/usr/share/zoneinfo -type f | xargs file | grep 'timezone data' | grep -o -E 'zoneinfo/[^:]+' | sed 's|zoneinfo/||' | sort -u >zones.ref"
rlRun "find /usr/share/zoneinfo -type f | xargs file | grep 'timezone data' | grep -o -E 'zoneinfo/[^:]+' | sed 's|zoneinfo/||' | sort -u >zones.cur"
rlRun "comm -12 zones.ref zones.cur >zones.int" # intersection of ref zones with cur zones
rlRun "sort -u zones.min >zones-sorted.min"
rlRun "comm -13 zones.int zones-sorted.min >zones.mis"
rlRun "if [ -s ./zones.mis ]; then cat ./zones.mis; false; fi"
rlLogInfo "Number of time zones: `cat zones.int | wc -l`"
rlPhaseEnd
rlPhaseStartSetup "Test zdump"
for zone in `cat zones.int`; do
if rlIsRHEL "<8"; then # glibc's zdump is out of sync for '-v option'
rlRun "./zdump -v -c 1970,$hiyear $zone >ref"
rlRun "./zdump -v -c 1970,$hiyear /usr/share/zoneinfo/$zone >cur"
sed -i 's|^/usr/share/zoneinfo/||' cur
else
rlRun "./zdump -V -c 1970,$hiyear $zone >ref"
rlRun "zdump -V -c 1970,$hiyear $zone >cur"
fi
# normalize zdump outputs
sed -i 's/\ UTC/\ UT/g' ref cur
if ! rlRun "diff -q ref cur"; then
filezone=`echo $zone | tr '/' '_'`
cp ref ./badzones/${filezone}.ref
cp cur ./badzones/${filezone}.cur
fi
done
rlPhaseEnd
rlPhaseStartCleanup
rlRun "tar -czf badzones.tar.gz ./badzones"
rlRun "rlFileSubmit badzones.tar.gz"
rlRun "popd"
rlRun "rm -r $TmpDir"
rlPhaseEnd
rlJournalPrintText
rlJournalEnd

View File

@ -1,592 +0,0 @@
Africa/Abidjan
Africa/Accra
Africa/Addis_Ababa
Africa/Algiers
Africa/Asmara
Africa/Asmera
Africa/Bamako
Africa/Bangui
Africa/Banjul
Africa/Bissau
Africa/Blantyre
Africa/Brazzaville
Africa/Bujumbura
Africa/Cairo
Africa/Casablanca
Africa/Ceuta
Africa/Conakry
Africa/Dakar
Africa/Dar_es_Salaam
Africa/Djibouti
Africa/Douala
Africa/El_Aaiun
Africa/Freetown
Africa/Gaborone
Africa/Harare
Africa/Johannesburg
Africa/Juba
Africa/Kampala
Africa/Khartoum
Africa/Kigali
Africa/Kinshasa
Africa/Lagos
Africa/Libreville
Africa/Lome
Africa/Luanda
Africa/Lubumbashi
Africa/Lusaka
Africa/Malabo
Africa/Maputo
Africa/Maseru
Africa/Mbabane
Africa/Mogadishu
Africa/Monrovia
Africa/Nairobi
Africa/Ndjamena
Africa/Niamey
Africa/Nouakchott
Africa/Ouagadougou
Africa/Porto-Novo
Africa/Sao_Tome
Africa/Timbuktu
Africa/Tripoli
Africa/Tunis
Africa/Windhoek
America/Adak
America/Anchorage
America/Anguilla
America/Antigua
America/Araguaina
America/Argentina/Buenos_Aires
America/Argentina/Catamarca
America/Argentina/ComodRivadavia
America/Argentina/Cordoba
America/Argentina/Jujuy
America/Argentina/La_Rioja
America/Argentina/Mendoza
America/Argentina/Rio_Gallegos
America/Argentina/Salta
America/Argentina/San_Juan
America/Argentina/San_Luis
America/Argentina/Tucuman
America/Argentina/Ushuaia
America/Aruba
America/Asuncion
America/Atikokan
America/Atka
America/Bahia
America/Bahia_Banderas
America/Barbados
America/Belem
America/Belize
America/Blanc-Sablon
America/Boa_Vista
America/Bogota
America/Boise
America/Buenos_Aires
America/Cambridge_Bay
America/Campo_Grande
America/Cancun
America/Caracas
America/Catamarca
America/Cayenne
America/Cayman
America/Chicago
America/Chihuahua
America/Coral_Harbour
America/Cordoba
America/Costa_Rica
America/Creston
America/Cuiaba
America/Curacao
America/Danmarkshavn
America/Dawson
America/Dawson_Creek
America/Denver
America/Detroit
America/Dominica
America/Edmonton
America/Eirunepe
America/El_Salvador
America/Ensenada
America/Fort_Nelson
America/Fort_Wayne
America/Fortaleza
America/Glace_Bay
America/Godthab
America/Goose_Bay
America/Grand_Turk
America/Grenada
America/Guadeloupe
America/Guatemala
America/Guayaquil
America/Guyana
America/Halifax
America/Havana
America/Hermosillo
America/Indiana/Indianapolis
America/Indiana/Knox
America/Indiana/Marengo
America/Indiana/Petersburg
America/Indiana/Tell_City
America/Indiana/Vevay
America/Indiana/Vincennes
America/Indiana/Winamac
America/Indianapolis
America/Inuvik
America/Iqaluit
America/Jamaica
America/Jujuy
America/Juneau
America/Kentucky/Louisville
America/Kentucky/Monticello
America/Knox_IN
America/Kralendijk
America/La_Paz
America/Lima
America/Los_Angeles
America/Louisville
America/Lower_Princes
America/Maceio
America/Managua
America/Manaus
America/Marigot
America/Martinique
America/Matamoros
America/Mazatlan
America/Mendoza
America/Menominee
America/Merida
America/Metlakatla
America/Mexico_City
America/Miquelon
America/Moncton
America/Monterrey
America/Montevideo
America/Montreal
America/Montserrat
America/Nassau
America/New_York
America/Nipigon
America/Nome
America/Noronha
America/North_Dakota/Beulah
America/North_Dakota/Center
America/North_Dakota/New_Salem
America/Ojinaga
America/Panama
America/Pangnirtung
America/Paramaribo
America/Phoenix
America/Port-au-Prince
America/Port_of_Spain
America/Porto_Acre
America/Porto_Velho
America/Puerto_Rico
America/Punta_Arenas
America/Rainy_River
America/Rankin_Inlet
America/Recife
America/Regina
America/Resolute
America/Rio_Branco
America/Rosario
America/Santa_Isabel
America/Santarem
America/Santiago
America/Santo_Domingo
America/Sao_Paulo
America/Scoresbysund
America/Shiprock
America/Sitka
America/St_Barthelemy
America/St_Johns
America/St_Kitts
America/St_Lucia
America/St_Thomas
America/St_Vincent
America/Swift_Current
America/Tegucigalpa
America/Thule
America/Thunder_Bay
America/Tijuana
America/Toronto
America/Tortola
America/Vancouver
America/Virgin
America/Whitehorse
America/Winnipeg
America/Yakutat
America/Yellowknife
Antarctica/Casey
Antarctica/Davis
Antarctica/DumontDUrville
Antarctica/Macquarie
Antarctica/Mawson
Antarctica/McMurdo
Antarctica/Palmer
Antarctica/Rothera
Antarctica/South_Pole
Antarctica/Syowa
Antarctica/Troll
Antarctica/Vostok
Arctic/Longyearbyen
Asia/Aden
Asia/Almaty
Asia/Amman
Asia/Anadyr
Asia/Aqtau
Asia/Aqtobe
Asia/Ashgabat
Asia/Ashkhabad
Asia/Atyrau
Asia/Baghdad
Asia/Bahrain
Asia/Baku
Asia/Bangkok
Asia/Barnaul
Asia/Beirut
Asia/Bishkek
Asia/Brunei
Asia/Calcutta
Asia/Chita
Asia/Choibalsan
Asia/Chongqing
Asia/Chungking
Asia/Colombo
Asia/Dacca
Asia/Damascus
Asia/Dhaka
Asia/Dili
Asia/Dubai
Asia/Dushanbe
Asia/Famagusta
Asia/Gaza
Asia/Harbin
Asia/Hebron
Asia/Ho_Chi_Minh
Asia/Hong_Kong
Asia/Hovd
Asia/Irkutsk
Asia/Istanbul
Asia/Jakarta
Asia/Jayapura
Asia/Jerusalem
Asia/Kabul
Asia/Kamchatka
Asia/Karachi
Asia/Kashgar
Asia/Kathmandu
Asia/Katmandu
Asia/Khandyga
Asia/Kolkata
Asia/Krasnoyarsk
Asia/Kuala_Lumpur
Asia/Kuching
Asia/Kuwait
Asia/Macao
Asia/Macau
Asia/Magadan
Asia/Makassar
Asia/Manila
Asia/Muscat
Asia/Nicosia
Asia/Novokuznetsk
Asia/Novosibirsk
Asia/Omsk
Asia/Oral
Asia/Phnom_Penh
Asia/Pontianak
Asia/Pyongyang
Asia/Qatar
Asia/Qostanay
Asia/Qyzylorda
Asia/Rangoon
Asia/Riyadh
Asia/Saigon
Asia/Sakhalin
Asia/Samarkand
Asia/Seoul
Asia/Shanghai
Asia/Singapore
Asia/Srednekolymsk
Asia/Taipei
Asia/Tashkent
Asia/Tbilisi
Asia/Tehran
Asia/Tel_Aviv
Asia/Thimbu
Asia/Thimphu
Asia/Tokyo
Asia/Tomsk
Asia/Ujung_Pandang
Asia/Ulaanbaatar
Asia/Ulan_Bator
Asia/Urumqi
Asia/Ust-Nera
Asia/Vientiane
Asia/Vladivostok
Asia/Yakutsk
Asia/Yangon
Asia/Yekaterinburg
Asia/Yerevan
Atlantic/Azores
Atlantic/Bermuda
Atlantic/Canary
Atlantic/Cape_Verde
Atlantic/Faeroe
Atlantic/Faroe
Atlantic/Jan_Mayen
Atlantic/Madeira
Atlantic/Reykjavik
Atlantic/South_Georgia
Atlantic/St_Helena
Atlantic/Stanley
Australia/ACT
Australia/Adelaide
Australia/Brisbane
Australia/Broken_Hill
Australia/Canberra
Australia/Currie
Australia/Darwin
Australia/Eucla
Australia/Hobart
Australia/LHI
Australia/Lindeman
Australia/Lord_Howe
Australia/Melbourne
Australia/NSW
Australia/North
Australia/Perth
Australia/Queensland
Australia/South
Australia/Sydney
Australia/Tasmania
Australia/Victoria
Australia/West
Australia/Yancowinna
Brazil/Acre
Brazil/DeNoronha
Brazil/East
Brazil/West
CET
CST6CDT
Canada/Atlantic
Canada/Central
Canada/Eastern
Canada/Mountain
Canada/Newfoundland
Canada/Pacific
Canada/Saskatchewan
Canada/Yukon
Chile/Continental
Chile/EasterIsland
Cuba
EET
EST
EST5EDT
Egypt
Eire
Etc/GMT
Etc/GMT+0
Etc/GMT+1
Etc/GMT+10
Etc/GMT+11
Etc/GMT+12
Etc/GMT+2
Etc/GMT+3
Etc/GMT+4
Etc/GMT+5
Etc/GMT+6
Etc/GMT+7
Etc/GMT+8
Etc/GMT+9
Etc/GMT-0
Etc/GMT-1
Etc/GMT-10
Etc/GMT-11
Etc/GMT-12
Etc/GMT-13
Etc/GMT-14
Etc/GMT-2
Etc/GMT-3
Etc/GMT-4
Etc/GMT-5
Etc/GMT-6
Etc/GMT-7
Etc/GMT-8
Etc/GMT-9
Etc/GMT0
Etc/Greenwich
Etc/UCT
Etc/UTC
Etc/Universal
Etc/Zulu
Europe/Amsterdam
Europe/Andorra
Europe/Astrakhan
Europe/Athens
Europe/Belfast
Europe/Belgrade
Europe/Berlin
Europe/Bratislava
Europe/Brussels
Europe/Bucharest
Europe/Budapest
Europe/Busingen
Europe/Chisinau
Europe/Copenhagen
Europe/Dublin
Europe/Gibraltar
Europe/Guernsey
Europe/Helsinki
Europe/Isle_of_Man
Europe/Istanbul
Europe/Jersey
Europe/Kaliningrad
Europe/Kiev
Europe/Kirov
Europe/Lisbon
Europe/Ljubljana
Europe/London
Europe/Luxembourg
Europe/Madrid
Europe/Malta
Europe/Mariehamn
Europe/Minsk
Europe/Monaco
Europe/Moscow
Europe/Nicosia
Europe/Oslo
Europe/Paris
Europe/Podgorica
Europe/Prague
Europe/Riga
Europe/Rome
Europe/Samara
Europe/San_Marino
Europe/Sarajevo
Europe/Saratov
Europe/Simferopol
Europe/Skopje
Europe/Sofia
Europe/Stockholm
Europe/Tallinn
Europe/Tirane
Europe/Tiraspol
Europe/Ulyanovsk
Europe/Uzhgorod
Europe/Vaduz
Europe/Vatican
Europe/Vienna
Europe/Vilnius
Europe/Volgograd
Europe/Warsaw
Europe/Zagreb
Europe/Zaporozhye
Europe/Zurich
GB
GB-Eire
GMT
GMT+0
GMT-0
GMT0
Greenwich
HST
Hongkong
Iceland
Indian/Antananarivo
Indian/Chagos
Indian/Christmas
Indian/Cocos
Indian/Comoro
Indian/Kerguelen
Indian/Mahe
Indian/Maldives
Indian/Mauritius
Indian/Mayotte
Indian/Reunion
Iran
Israel
Jamaica
Japan
Kwajalein
Libya
MET
MST
MST7MDT
Mexico/BajaNorte
Mexico/BajaSur
Mexico/General
NZ
NZ-CHAT
Navajo
PRC
PST8PDT
Pacific/Apia
Pacific/Auckland
Pacific/Bougainville
Pacific/Chatham
Pacific/Chuuk
Pacific/Easter
Pacific/Efate
Pacific/Enderbury
Pacific/Fakaofo
Pacific/Fiji
Pacific/Funafuti
Pacific/Galapagos
Pacific/Gambier
Pacific/Guadalcanal
Pacific/Guam
Pacific/Honolulu
Pacific/Johnston
Pacific/Kiritimati
Pacific/Kosrae
Pacific/Kwajalein
Pacific/Majuro
Pacific/Marquesas
Pacific/Midway
Pacific/Nauru
Pacific/Niue
Pacific/Norfolk
Pacific/Noumea
Pacific/Pago_Pago
Pacific/Palau
Pacific/Pitcairn
Pacific/Pohnpei
Pacific/Ponape
Pacific/Port_Moresby
Pacific/Rarotonga
Pacific/Saipan
Pacific/Samoa
Pacific/Tahiti
Pacific/Tarawa
Pacific/Tongatapu
Pacific/Truk
Pacific/Wake
Pacific/Wallis
Pacific/Yap
Poland
Portugal
ROC
ROK
Singapore
Turkey
UCT
US/Alaska
US/Aleutian
US/Arizona
US/Central
US/East-Indiana
US/Eastern
US/Hawaii
US/Indiana-Starke
US/Michigan
US/Mountain
US/Pacific
US/Samoa
UTC
Universal
W-SU
WET
Zulu