From 00f1b9ba49f069d99ae2a3f574814327d9748aaf Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Sun, 29 Oct 2017 19:39:21 -0400 Subject: [PATCH 01/90] Resolves #1507341 - Rebase to tzdata-2017c - Northern Cyprus will revert to using EQ rules on October 29, 2017. - Sudan will switch from +03 to +02 on November 1, 2017. - Tonga will not change it's clocks on Novemeber 5, 2017 ending it's experiment with DST. - Fiji DST will end on January 14, 2018 rather than January 21, 2018. - Namibia - starting September 3, 2017 switches from +)1 with DST to +02 all year. This change takes effect April 1, 2018. - Turks & Caicos changes from -04 all year to -05 with US DST starting on March 11, 2018. Effective change date is November 4, 2018. - tzdata now includes two text versions of the time zone data - tzdata.zi and leapseconds. - Includes two patches to deal with build issues. --- .gitignore | 2 + 0001-Fix-Makefile-quoting-bug.patch | 149 ++++++++++++++++++++++++++++ 0002-Fix-have-snprintf-error.patch | 12 +++ sources | 4 +- tzdata.spec | 37 +++++-- 5 files changed, 194 insertions(+), 10 deletions(-) create mode 100644 0001-Fix-Makefile-quoting-bug.patch create mode 100644 0002-Fix-have-snprintf-error.patch diff --git a/.gitignore b/.gitignore index 2e7df3c..ad3251d 100644 --- a/.gitignore +++ b/.gitignore @@ -156,3 +156,5 @@ noarch/ /tzcode2017a.tar.gz /tzcode2017b.tar.gz /tzdata2017b.tar.gz +/tzcode2017c.tar.gz +/tzdata2017c.tar.gz diff --git a/0001-Fix-Makefile-quoting-bug.patch b/0001-Fix-Makefile-quoting-bug.patch new file mode 100644 index 0000000..868ec9a --- /dev/null +++ b/0001-Fix-Makefile-quoting-bug.patch @@ -0,0 +1,149 @@ +From b520d20b8122a783f99f088758b78d928f70ee34 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +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; \ diff --git a/0002-Fix-have-snprintf-error.patch b/0002-Fix-have-snprintf-error.patch new file mode 100644 index 0000000..cafdf4d --- /dev/null +++ b/0002-Fix-have-snprintf-error.patch @@ -0,0 +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. + +-CFLAGS= ++CFLAGS= -DHAVE_SNPRINTF=1 + + # Linker flags. Default to $(LFLAGS) for backwards compatibility + # to release 2012h and earlier. diff --git a/sources b/sources index 422e6ae..ef2c9d2 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2017b.tar.gz) = 9a73af4b868506d1f6287a8285dea489e68f6828da19509114f9144e2a2019c7fd28f4fb98ea907030d11d011ce3a87d99dbe43bca218beddafff151f0d61df1 -SHA512 (tzdata2017b.tar.gz) = 3e090dba1f52e4c63b4930b28f4bf38b56aabd6728f23094cb5801d10f4e464f17231f17b75b8866714bf98199c166ea840de0787b75b2274aa419a4e14bbc4d +SHA512 (tzcode2017c.tar.gz) = 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb +SHA512 (tzdata2017c.tar.gz) = feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c diff --git a/tzdata.spec b/tzdata.spec index bbfd727..f92343a 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,17 @@ Summary: Timezone data Name: tzdata -Version: 2017b -%define tzdata_version 2017b -%define tzcode_version 2017b -Release: 2%{?dist} +Version: 2017c +%define tzdata_version 2017c +%define tzcode_version 2017c +Release: 1%{?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 -# Add new patches here... + +Patch001: 0001-Fix-Makefile-quoting-bug.patch +Patch002: 0002-Fix-have-snprintf-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl-interpreter @@ -39,7 +41,8 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -# Add new patches here... +%patch001 -p1 +%patch002 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -67,6 +70,9 @@ tar xf %{SOURCE4} echo "%{name}%{tzdata_version}" >> VERSION %build +# Run make to create the tzdata.zi file +make tzdata.zi + FILES="africa antarctica asia australasia europe northamerica southamerica pacificnew etcetera backward" @@ -100,7 +106,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 $RPM_BUILD_ROOT%{_datadir}/zoneinfo +install -p -m 644 zone.tab zone1970.tab iso3166.tab 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/ @@ -113,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zoneinfo %license LICENSE %doc README -%doc Theory +%doc theory.html %doc tz-link.html %files java @@ -122,6 +128,21 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Oct 26 2017 Patsy Franklin - 2017c-1 +- Rebase to tzdata-2017c. + - Northern Cyprus will revert to using EQ rules on October 29, 2017. + - Sudan will switch from +03 to +02 on November 1, 2017. + - Tonga will not change it's clocks on Novemeber 5, 2017 ending it's + experiment with DST. + - Fiji DST will end on January 14, 2018 rather than January 21, 2018. + - Namibia - starting September 3, 2017 switches from +)1 with DST to + +02 all year. This change takes effect April 1, 2018. + - Turks & Caicos changes from -04 all year to -05 with US DST starting + on March 11, 2018. Effective change date is November 4, 2018. + - tzdata now includes two text versions of the time zone data - tzdata.zi + and leapseconds. + - Includes two patches to deal with build issues. + * Thu Jul 27 2017 Fedora Release Engineering - 2017b-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8dba351f413b3a2ffe3568ff5ddd583d4056458d Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Sun, 29 Oct 2017 19:53:30 -0400 Subject: [PATCH 02/90] Resolves #1507341 - Rebase to tzdata-2017c - Northern Cyprus will revert to using EQ rules on October 29, 2017. - Sudan will switch from +03 to +02 on November 1, 2017. - Tonga will not change it's clocks on Novemeber 5, 2017 ending it's experiment with DST. - Fiji DST will end on January 14, 2018 rather than January 21, 2018. - Namibia - starting September 3, 2017 switches from +)1 with DST to +02 all year. This change takes effect April 1, 2018. - Turks & Caicos changes from -04 all year to -05 with US DST starting on March 11, 2018. Effective change date is November 4, 2018. - tzdata now includes two text versions of the time zone data - tzdata.zi and leapseconds. - Includes two patches to deal with build issues. --- .gitignore | 2 + 0001-Fix-Makefile-quoting-bug.patch | 170 ++++++++++++++++++++++++++++ 0002-Fix-have-snprintf-error.patch | 12 ++ sources | 4 +- tzdata.spec | 37 ++++-- 5 files changed, 215 insertions(+), 10 deletions(-) create mode 100644 0001-Fix-Makefile-quoting-bug.patch create mode 100644 0002-Fix-have-snprintf-error.patch diff --git a/.gitignore b/.gitignore index 2e7df3c..ad3251d 100644 --- a/.gitignore +++ b/.gitignore @@ -156,3 +156,5 @@ noarch/ /tzcode2017a.tar.gz /tzcode2017b.tar.gz /tzdata2017b.tar.gz +/tzcode2017c.tar.gz +/tzdata2017c.tar.gz diff --git a/0001-Fix-Makefile-quoting-bug.patch b/0001-Fix-Makefile-quoting-bug.patch new file mode 100644 index 0000000..41e04fd --- /dev/null +++ b/0001-Fix-Makefile-quoting-bug.patch @@ -0,0 +1,170 @@ +From b520d20b8122a783f99f088758b78d928f70ee34 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +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; \ +diff --git a/NEWS b/NEWS +index bd2bec2..75ab095 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,13 @@ + News for the tz database + ++Unreleased, experimental changes ++ ++ Changes to build procedure ++ ++ The Makefile now quotes values like BACKWARD more carefully when ++ passing them to the shell. (Problem reported by Zefram.) ++ ++ + Release 2017c - 2017-10-20 14:49:34 -0700 + + Briefly: +-- +2.13.6 + diff --git a/0002-Fix-have-snprintf-error.patch b/0002-Fix-have-snprintf-error.patch new file mode 100644 index 0000000..cafdf4d --- /dev/null +++ b/0002-Fix-have-snprintf-error.patch @@ -0,0 +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. + +-CFLAGS= ++CFLAGS= -DHAVE_SNPRINTF=1 + + # Linker flags. Default to $(LFLAGS) for backwards compatibility + # to release 2012h and earlier. diff --git a/sources b/sources index 422e6ae..ef2c9d2 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2017b.tar.gz) = 9a73af4b868506d1f6287a8285dea489e68f6828da19509114f9144e2a2019c7fd28f4fb98ea907030d11d011ce3a87d99dbe43bca218beddafff151f0d61df1 -SHA512 (tzdata2017b.tar.gz) = 3e090dba1f52e4c63b4930b28f4bf38b56aabd6728f23094cb5801d10f4e464f17231f17b75b8866714bf98199c166ea840de0787b75b2274aa419a4e14bbc4d +SHA512 (tzcode2017c.tar.gz) = 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb +SHA512 (tzdata2017c.tar.gz) = feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c diff --git a/tzdata.spec b/tzdata.spec index bbfd727..f92343a 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,17 @@ Summary: Timezone data Name: tzdata -Version: 2017b -%define tzdata_version 2017b -%define tzcode_version 2017b -Release: 2%{?dist} +Version: 2017c +%define tzdata_version 2017c +%define tzcode_version 2017c +Release: 1%{?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 -# Add new patches here... + +Patch001: 0001-Fix-Makefile-quoting-bug.patch +Patch002: 0002-Fix-have-snprintf-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl-interpreter @@ -39,7 +41,8 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -# Add new patches here... +%patch001 -p1 +%patch002 -p1 mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -67,6 +70,9 @@ tar xf %{SOURCE4} echo "%{name}%{tzdata_version}" >> VERSION %build +# Run make to create the tzdata.zi file +make tzdata.zi + FILES="africa antarctica asia australasia europe northamerica southamerica pacificnew etcetera backward" @@ -100,7 +106,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 $RPM_BUILD_ROOT%{_datadir}/zoneinfo +install -p -m 644 zone.tab zone1970.tab iso3166.tab 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/ @@ -113,7 +119,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/zoneinfo %license LICENSE %doc README -%doc Theory +%doc theory.html %doc tz-link.html %files java @@ -122,6 +128,21 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Oct 26 2017 Patsy Franklin - 2017c-1 +- Rebase to tzdata-2017c. + - Northern Cyprus will revert to using EQ rules on October 29, 2017. + - Sudan will switch from +03 to +02 on November 1, 2017. + - Tonga will not change it's clocks on Novemeber 5, 2017 ending it's + experiment with DST. + - Fiji DST will end on January 14, 2018 rather than January 21, 2018. + - Namibia - starting September 3, 2017 switches from +)1 with DST to + +02 all year. This change takes effect April 1, 2018. + - Turks & Caicos changes from -04 all year to -05 with US DST starting + on March 11, 2018. Effective change date is November 4, 2018. + - tzdata now includes two text versions of the time zone data - tzdata.zi + and leapseconds. + - Includes two patches to deal with build issues. + * Thu Jul 27 2017 Fedora Release Engineering - 2017b-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 7dab738a4a647d86ce34d81d2131e739aa7491e9 Mon Sep 17 00:00:00 2001 From: Bruno Goncalves Date: Tue, 31 Oct 2017 11:25:10 +0100 Subject: [PATCH 03/90] Add CI tests using the standard test interface --- tests/inventory | 3 + tests/sanity/Makefile | 73 ++++++++ tests/sanity/PURPOSE | 1 + tests/sanity/dates.txt | 10 ++ tests/sanity/expected.results | 320 ++++++++++++++++++++++++++++++++++ tests/sanity/runtest.sh | 28 +++ tests/sanity/timezones.txt | 32 ++++ tests/sanity/tzdata-test.sh | 50 ++++++ tests/tests.yml | 13 ++ 9 files changed, 530 insertions(+) create mode 100755 tests/inventory create mode 100644 tests/sanity/Makefile create mode 100644 tests/sanity/PURPOSE create mode 100644 tests/sanity/dates.txt create mode 100644 tests/sanity/expected.results create mode 100644 tests/sanity/runtest.sh create mode 100644 tests/sanity/timezones.txt create mode 100755 tests/sanity/tzdata-test.sh create mode 100644 tests/tests.yml diff --git a/tests/inventory b/tests/inventory new file mode 100755 index 0000000..93eafb6 --- /dev/null +++ b/tests/inventory @@ -0,0 +1,3 @@ +#!/bin/bash +export TEST_DOCKER_EXTRA_ARGS="-v /dev:/dev --privileged" +exec merge-standard-inventory "$@" diff --git a/tests/sanity/Makefile b/tests/sanity/Makefile new file mode 100644 index 0000000..5181434 --- /dev/null +++ b/tests/sanity/Makefile @@ -0,0 +1,73 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/tzdata/sanity +# Description: Basic sanity test +# Author: John Poelstra +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2006 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/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# The toplevel namespace within which the test lives. +TOPLEVEL_NAMESPACE=/CoreOS + +# The name of the package under test: +PACKAGE_NAME=tzdata + +# The path of the test below the package: +RELATIVE_PATH=sanity + +# Version of the Test. Used with make tag. +export TESTVERSION=1.4 + +# The combined namespace of the test. +#export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH) +export TEST=/CoreOS/tzdata/sanity +.PHONY: all install download clean + +BUILT_FILES= +FILES=$(METADATA) tzdata-test.sh runtest.sh PURPOSE timezones.txt expected.results dates.txt + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x ./runtest.sh + chmod a+x ./tzdata-test.sh + +clean: + rm -f *~ *.rpm $(BUILT_FILES) + +# Include Common Makefile +include /usr/share/rhts/lib/rhts-make.include + +# Generate the testinfo.desc here: +$(METADATA): Makefile + @touch $(METADATA) + @echo "Owner: Karel Volny " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "License: GPLv2+" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Description: Basic sanity test for the tzdata package">> $(METADATA) + @echo "TestTime: 1m" >> $(METADATA) + @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA) + @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA) + @echo "Type: Regression" >> $(METADATA) +# You may need other fields here; see the documentation + rhts-lint $(METADATA) diff --git a/tests/sanity/PURPOSE b/tests/sanity/PURPOSE new file mode 100644 index 0000000..c87ebfd --- /dev/null +++ b/tests/sanity/PURPOSE @@ -0,0 +1 @@ +This is a simple regression test of tzdata which tests the installed version against expected values. diff --git a/tests/sanity/dates.txt b/tests/sanity/dates.txt new file mode 100644 index 0000000..88d4735 --- /dev/null +++ b/tests/sanity/dates.txt @@ -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/expected.results b/tests/sanity/expected.results new file mode 100644 index 0000000..645a868 --- /dev/null +++ b/tests/sanity/expected.results @@ -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/runtest.sh b/tests/sanity/runtest.sh new file mode 100644 index 0000000..995b04f --- /dev/null +++ b/tests/sanity/runtest.sh @@ -0,0 +1,28 @@ +#!/bin/sh +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/tzdata/sanity +# Description: Basic sanity test +# Author: John Poelstra +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2006 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/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +rhts-run-simple-test $TEST ./tzdata-test.sh diff --git a/tests/sanity/timezones.txt b/tests/sanity/timezones.txt new file mode 100644 index 0000000..df2b323 --- /dev/null +++ b/tests/sanity/timezones.txt @@ -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 diff --git a/tests/sanity/tzdata-test.sh b/tests/sanity/tzdata-test.sh new file mode 100755 index 0000000..4d08a61 --- /dev/null +++ b/tests/sanity/tzdata-test.sh @@ -0,0 +1,50 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# tzdata-test.sh of /CoreOS/tzdata/sanity +# Description: Basic sanity test +# Original author: Ulrich Drepper +# Modified and broken into separate files by: John Poelstra +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2006 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/. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +ZONES="timezones.txt" +DATES="dates.txt" +EXPECTED="expected.results" +GENERATED="$(mktemp)" + +cat $ZONES | while read timezone; do + echo "timezone == $timezone" | tee -a $OUTPUTFILE + cat $DATES | while read datetime; do + echo "datetime == $datetime" | tee -a $OUTPUTFILE + printf "%s %s -> %s\n" "$timezone" "$datetime" "$(env TZ=$timezone date -d \ + "$datetime")" | tee -a $OUTPUTFILE | tee -a $GENERATED + done +done + +if diff -u $EXPECTED $GENERATED +then + echo "Test PASSED" | tee -a $OUTPUTFILE +else + echo "Test FAILED" | tee -a $OUTPUTFILE + 2>&1 | tee -a $OUTPUTFILE + exit 1 +fi diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..224460f --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +--- +# Tests for classic and container +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + - container + - atomic + tests: + - sanity + required_packages: + - which From 7b508c803fa23e23cb711c5e109d7e09f131bf4b Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Fri, 2 Feb 2018 09:41:45 -0500 Subject: [PATCH 04/90] =?UTF-8?q?Resolves:=20#1535266=20-=20Rebase=20to=20?= =?UTF-8?q?tzdata-2018c:=20=20=20-=20S=C3=A3o=20Tom=C3=A9=20and=20Pr=C3=AD?= =?UTF-8?q?ncipe=20changed=20from=20+00=20to=20+01=20on=20January=201,=202?= =?UTF-8?q?018=20=20=20-=20Brazil's=20DST=20will=20start=20on=20the=20firs?= =?UTF-8?q?t=20Sunday=20in=20November=20=20=20-=20Support=20for=20the=20ne?= =?UTF-8?q?w=20zic=20-t=20option.=20=20=20-=20Add=20back=20pacificnew=20fi?= =?UTF-8?q?le=20omitted=20in=20tzdata-2018a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 18 ++++++++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ad3251d..e1645bf 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,5 @@ noarch/ /tzdata2017b.tar.gz /tzcode2017c.tar.gz /tzdata2017c.tar.gz +/tzcode2018c.tar.gz +/tzdata2018c.tar.gz diff --git a/sources b/sources index ef2c9d2..b272d41 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2017c.tar.gz) = 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb -SHA512 (tzdata2017c.tar.gz) = feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c +SHA512 (tzcode2018c.tar.gz) = 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2 +SHA512 (tzdata2018c.tar.gz) = 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835 diff --git a/tzdata.spec b/tzdata.spec index f92343a..48f1c01 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2017c -%define tzdata_version 2017c -%define tzcode_version 2017c +Version: 2018c +%define tzdata_version 2018c +%define tzcode_version 2018c Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -10,7 +10,6 @@ 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-Makefile-quoting-bug.patch Patch002: 0002-Fix-have-snprintf-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,7 +40,6 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch001 -p1 %patch002 -p1 mkdir javazic @@ -81,7 +79,7 @@ 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 -grep -v tz-art.htm tz-link.htm > tz-link.html +# grep -v tz-art.htm tz-link.htm > tz-link.html # Java 6/7 tzdata pushd javazic @@ -121,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT %doc README %doc theory.html %doc tz-link.html +%doc tz-art.html %files java %defattr(-,root,root) @@ -128,6 +127,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Feb 01 2018 Patsy Franklin - 2018c-1 +- Rebase to tzdata-2018c: + - São Tomé and Príncipe changed from +00 to +01 on January 1, 2018 + - Brazil's DST will start on the first Sunday in November + - Support for the new zic -t option. + - Add back pacificnew file omitted in tzdata-2018a + * Thu Oct 26 2017 Patsy Franklin - 2017c-1 - Rebase to tzdata-2017c. - Northern Cyprus will revert to using EQ rules on October 29, 2017. From b5aa649107c7b0e6c09c0f06b4437f620f74aab6 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Fri, 2 Feb 2018 09:44:10 -0500 Subject: [PATCH 05/90] =?UTF-8?q?Resolves:=20#1535266=20-=20Rebase=20to=20?= =?UTF-8?q?tzdata-2018c:=20=20=20-=20S=C3=A3o=20Tom=C3=A9=20and=20Pr=C3=AD?= =?UTF-8?q?ncipe=20changed=20from=20+00=20to=20+01=20on=20January=201,=202?= =?UTF-8?q?018=20=20=20-=20Brazil's=20DST=20will=20start=20on=20the=20firs?= =?UTF-8?q?t=20Sunday=20in=20November=20=20=20-=20Support=20for=20the=20ne?= =?UTF-8?q?w=20zic=20-t=20option.=20=20=20-=20Add=20back=20pacificnew=20fi?= =?UTF-8?q?le=20omitted=20in=20tzdata-2018a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 18 ++++++++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ad3251d..e1645bf 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,5 @@ noarch/ /tzdata2017b.tar.gz /tzcode2017c.tar.gz /tzdata2017c.tar.gz +/tzcode2018c.tar.gz +/tzdata2018c.tar.gz diff --git a/sources b/sources index ef2c9d2..b272d41 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2017c.tar.gz) = 0d8c3e07b0de9015a137602450468ceb6358312a50eeda2a860882367107b8ba9ef275880b292570a671b9910afc54e6209e1e642387d246bc9c08c4ff660ffb -SHA512 (tzdata2017c.tar.gz) = feb5c544e617b30c73a397e5a1c51f9847d0fddf1dfa0f9ace2e6f686786f09b666937b2048e07075c84593fc584bd5a25d639fce70eca9735267df28621ab4c +SHA512 (tzcode2018c.tar.gz) = 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2 +SHA512 (tzdata2018c.tar.gz) = 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835 diff --git a/tzdata.spec b/tzdata.spec index f92343a..48f1c01 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2017c -%define tzdata_version 2017c -%define tzcode_version 2017c +Version: 2018c +%define tzdata_version 2018c +%define tzcode_version 2018c Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -10,7 +10,6 @@ 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-Makefile-quoting-bug.patch Patch002: 0002-Fix-have-snprintf-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -41,7 +40,6 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch001 -p1 %patch002 -p1 mkdir javazic @@ -81,7 +79,7 @@ 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 -grep -v tz-art.htm tz-link.htm > tz-link.html +# grep -v tz-art.htm tz-link.htm > tz-link.html # Java 6/7 tzdata pushd javazic @@ -121,6 +119,7 @@ rm -rf $RPM_BUILD_ROOT %doc README %doc theory.html %doc tz-link.html +%doc tz-art.html %files java %defattr(-,root,root) @@ -128,6 +127,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Thu Feb 01 2018 Patsy Franklin - 2018c-1 +- Rebase to tzdata-2018c: + - São Tomé and Príncipe changed from +00 to +01 on January 1, 2018 + - Brazil's DST will start on the first Sunday in November + - Support for the new zic -t option. + - Add back pacificnew file omitted in tzdata-2018a + * Thu Oct 26 2017 Patsy Franklin - 2017c-1 - Rebase to tzdata-2017c. - Northern Cyprus will revert to using EQ rules on October 29, 2017. From 0e16a242a710574c7a3d84e022983dd67c7ae7bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:49:26 +0000 Subject: [PATCH 06/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 48f1c01..14c4037 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2018c %define tzdata_version 2018c %define tzcode_version 2018c -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones @@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2018c-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Feb 01 2018 Patsy Franklin - 2018c-1 - Rebase to tzdata-2018c: - São Tomé and Príncipe changed from +00 to +01 on January 1, 2018 From 1cfd494af2362fcfe61876a562fe5a9e2e750763 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 00:46:00 +0100 Subject: [PATCH 07/90] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- tzdata.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 14c4037..584113d 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -12,7 +12,6 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz Patch002: 0002-Fix-have-snprintf-error.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel BuildRequires: glibc-common >= 2.5.90-7 From 2b00b80dcdfa5eecb4b5d0f81103c15d15275ede Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:56:44 +0100 Subject: [PATCH 08/90] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- tzdata.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 584113d..c6ae368 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -108,9 +108,6 @@ 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/ -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %{_datadir}/zoneinfo From 0c753df57b3e8445a64f245a3b7a2418a0770158 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Wed, 28 Mar 2018 16:20:15 -0400 Subject: [PATCH 09/90] Resolves: #1560131 - Rebase to tzdata-2018d: - DST for Asia/Gaza and Asia/Hebron has changed from March 31 to March 24. - Antarctica/Casey station changed to UTC+8 on March 11. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 ++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e1645bf..aa65342 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,5 @@ noarch/ /tzdata2017c.tar.gz /tzcode2018c.tar.gz /tzdata2018c.tar.gz +/tzcode2018d.tar.gz +/tzdata2018d.tar.gz diff --git a/sources b/sources index b272d41..e64a5c0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018c.tar.gz) = 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2 -SHA512 (tzdata2018c.tar.gz) = 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835 +SHA512 (tzcode2018d.tar.gz) = e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930 +SHA512 (tzdata2018d.tar.gz) = ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b diff --git a/tzdata.spec b/tzdata.spec index c6ae368..6172723 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2018c -%define tzdata_version 2018c -%define tzcode_version 2018c -Release: 2%{?dist} +Version: 2018d +%define tzdata_version 2018d +%define tzcode_version 2018d +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones @@ -123,6 +123,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Mar 28 2018 Patsy Franklin - 2018d-1 +- Rebase to tzdata-2018d: + - DST for Asia/Gaza and Asia/Hebron has changed + from March 31 to March 24. + - Antarctica/Casey station changed to UTC+8 on March 11. + * Fri Feb 09 2018 Fedora Release Engineering - 2018c-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 25bc6960c95419a3d30dc23d5c3880bc26334076 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Wed, 28 Mar 2018 16:23:09 -0400 Subject: [PATCH 10/90] Resolves: #1560131 - Rebase to tzdata-2018d: - DST for Asia/Gaza and Asia/Hebron has changed from March 31 to March 24. - Antarctica/Casey station changed to UTC+8 on March 11. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e1645bf..aa65342 100644 --- a/.gitignore +++ b/.gitignore @@ -160,3 +160,5 @@ noarch/ /tzdata2017c.tar.gz /tzcode2018c.tar.gz /tzdata2018c.tar.gz +/tzcode2018d.tar.gz +/tzdata2018d.tar.gz diff --git a/sources b/sources index b272d41..e64a5c0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018c.tar.gz) = 21988e876479e38661d41ea4c7b5218ba14b979739d7ba8d49a2d343bb9f37c654056ab21c046a6652715f012e4ca33c4aa109b1ec3ac5d0244dd3a7ea9ed6d2 -SHA512 (tzdata2018c.tar.gz) = 0575c87c9ffcde7b7f62b0df928d8a0e8d93f832b5ef7227b3d8431686f851f1fd5372c7e768f2979830352433b31df7f3979a00c28ea3973a3a0987ebbfb835 +SHA512 (tzcode2018d.tar.gz) = e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930 +SHA512 (tzdata2018d.tar.gz) = ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b diff --git a/tzdata.spec b/tzdata.spec index 48f1c01..b1732a2 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2018c -%define tzdata_version 2018c -%define tzcode_version 2018c +Version: 2018d +%define tzdata_version 2018d +%define tzcode_version 2018d Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -127,6 +127,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Wed Mar 28 2018 Patsy Franklin - 2018d-1 +- Rebase to tzdata-2018d: + - DST for Asia/Gaza and Asia/Hebron has changed + from March 31 to March 24. + - Antarctica/Casey station changed to UTC+8 on March 11. + * Thu Feb 01 2018 Patsy Franklin - 2018c-1 - Rebase to tzdata-2018c: - São Tomé and Príncipe changed from +00 to +01 on January 1, 2018 From c686966346a4f3f637b078cc351fcbedd2804120 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Thu, 17 May 2018 16:21:50 -0400 Subject: [PATCH 11/90] Resolves: #1574758 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 the "vanguard" data implementation which includes negative DST offsets. However, we are continuing to provide the "rearguard" format for data which does not use negative DST offsets to provide better compatibility with existing tools. We intend to transition to the "vanguard" data implementation in the future. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 34 +++++++++++++++++++++++++++++++--- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index aa65342..f0fd88e 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,5 @@ noarch/ /tzdata2018c.tar.gz /tzcode2018d.tar.gz /tzdata2018d.tar.gz +/tzcode2018e.tar.gz +/tzdata2018e.tar.gz diff --git a/sources b/sources index e64a5c0..2198b31 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018d.tar.gz) = e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930 -SHA512 (tzdata2018d.tar.gz) = ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b +SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 +SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae diff --git a/tzdata.spec b/tzdata.spec index b1732a2..5f91cd6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2018d -%define tzdata_version 2018d -%define tzcode_version 2018d +Version: 2018e +%define tzdata_version 2018e +%define tzcode_version 2018e Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -40,8 +40,26 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 +# 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 +tar zxf tzdata%{version}-rearguard.tar.gz + %patch002 -p1 +# Run make to create the tzdata.zi file +make DATAFORM=rearguard tzdata.zi + mkdir javazic tar zxf %{SOURCE3} -C javazic pushd javazic @@ -127,6 +145,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Wed May 16 2018 Patsy Franklin - 2018e-1 +- Rebase to tzdata-2018e + - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018. + - In this update, the upstream project now defaults to using + the "vanguard" data implementation which includes negative DST offsets. + However, we are continuing to provide the "rearguard" format + for data which does not use negative DST offsets to provide + better compatibility with existing tools. We intend to transition + to the "vanguard" data implementation in the future. + * Wed Mar 28 2018 Patsy Franklin - 2018d-1 - Rebase to tzdata-2018d: - DST for Asia/Gaza and Asia/Hebron has changed From 08b149a3ff191ed2f5c45eb5b2fbc5c80c197f48 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Wed, 23 May 2018 17:15:18 -0400 Subject: [PATCH 12/90] Resolves: #1574758 - 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 the "vanguard" data implementation which includes negative DST offsets. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index aa65342..f0fd88e 100644 --- a/.gitignore +++ b/.gitignore @@ -162,3 +162,5 @@ noarch/ /tzdata2018c.tar.gz /tzcode2018d.tar.gz /tzdata2018d.tar.gz +/tzcode2018e.tar.gz +/tzdata2018e.tar.gz diff --git a/sources b/sources index e64a5c0..2198b31 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018d.tar.gz) = e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930 -SHA512 (tzdata2018d.tar.gz) = ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b +SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 +SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae diff --git a/tzdata.spec b/tzdata.spec index 6172723..38c41ec 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2018d -%define tzdata_version 2018d -%define tzcode_version 2018d +Version: 2018e +%define tzdata_version 2018e +%define tzcode_version 2018e Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -123,6 +123,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed May 16 2018 Patsy Franklin - 2018e-1 +- Rebase to tzdata-2018e + - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018. + - In this update, the upstream project now defaults to using + the "vanguard" data implementation which includes negative DST offsets. + * Wed Mar 28 2018 Patsy Franklin - 2018d-1 - Rebase to tzdata-2018d: - DST for Asia/Gaza and Asia/Hebron has changed From 03daa4f41b8fd341444ab82fb8f313fb6256b1c0 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:40:25 -0500 Subject: [PATCH 13/90] Remove needless use of %defattr --- tzdata.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 38c41ec..4bb9b80 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -109,7 +109,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %files -%defattr(-,root,root) %{_datadir}/zoneinfo %license LICENSE %doc README @@ -118,7 +117,6 @@ 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 From c7ebcd619f08a4a9594505fa4b175fb49b932569 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:06:23 +0000 Subject: [PATCH 14/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 4bb9b80..21e3d98 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2018e %define tzdata_version 2018e %define tzcode_version 2018e -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones @@ -121,6 +121,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2018e-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed May 16 2018 Patsy Franklin - 2018e-1 - Rebase to tzdata-2018e - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018. From 6395daa28e6dcd26702680ba49edf178310563eb Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Mon, 12 Nov 2018 11:43:50 -0500 Subject: [PATCH 15/90] Rebase to tzdata-2018g - Morocco will change from UTC+00/+01 to permanent +01 effective 2018-10-27. - Includes changes for tzdata-2018f. - Volgograd will change from UTC+03 to UTC+04 on 2018-10-28 at 02:00. - Fiji will end DST on 2019-01-13 instead of the 2019-01-20 as previously predicted. - Most of Chile will end DST on the first Saturday in April at 24:00 and restart DST on the first Saturday in September at 24:00. - Morocco will change from UTC+00/+01 to permanent +01 effective 2018-10-27. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 37 +++++++++++++++++++++++++++++++------ 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f0fd88e..acb4ae4 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,5 @@ noarch/ /tzdata2018d.tar.gz /tzcode2018e.tar.gz /tzdata2018e.tar.gz +/tzcode2018g.tar.gz +/tzdata2018g.tar.gz diff --git a/sources b/sources index 2198b31..d4eb179 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 -SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae +SHA512 (tzcode2018g.tar.gz) = 58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484 +SHA512 (tzdata2018g.tar.gz) = 92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa diff --git a/tzdata.spec b/tzdata.spec index 21e3d98..c101b02 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2018e -%define tzdata_version 2018e -%define tzcode_version 2018e -Release: 2%{?dist} +Version: 2018g +%define tzdata_version 2018g +%define tzcode_version 2018g +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones @@ -41,6 +41,15 @@ This package contains timezone information for use by Java runtimes. %patch002 -p1 +# tzdata-2018g introduce 25:00 transition times. This breaks OpenJDK. +# Use rearguard for tzdata-2018g java +mkdir rearguard +make VERSION=%{version} tzdata%{version}-rearguard.tar.gz +mv tzdata2018g-rearguard.tar.gz rearguard +pushd rearguard +tar zxf tzdata%{version}-rearguard.tar.gz +popd + mkdir javazic tar zxf %{SOURCE3} -C javazic pushd javazic @@ -80,6 +89,12 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES # grep -v tz-art.htm tz-link.htm > tz-link.html +# tzdata-2018g uses 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/pacificnew rearguard/etcetera \ + rearguard/backward" + # Java 6/7 tzdata pushd javazic javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java` @@ -87,7 +102,7 @@ popd java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ -d javazi \ - $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward + $JAVA_FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward # Java 8 tzdata pushd javazic-1.8 @@ -97,7 +112,7 @@ popd java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ -srcdir . -dstfile tzdb.dat \ -verbose \ - $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward + $JAVA_FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward %install rm -fr $RPM_BUILD_ROOT @@ -121,6 +136,16 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Nov 12 2018 Patsy Griffin Franklin - 2018g-1 +- Rebase to tzdata-2018g + Includes changes for tzdata-2018f. + - Volgograd will change from UTC+03 to UTC+04 on 2018-10-28 at 02:00. + - Fiji will end DST on 2019-01-13 instead of the 2019-01-20 as + previously predicted. + - Most of Chile will end DST on the first Saturday in April at 24:00 + and restart DST on the first Saturday in September at 24:00. + - Morocco will change from UTC+00/+01 to permanent +01 effective 2018-10-27. + * Sat Jul 14 2018 Fedora Release Engineering - 2018e-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 086bc0a9a8b2f157631dfac9a9d9987a53e187da Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Mon, 12 Nov 2018 18:17:57 -0500 Subject: [PATCH 16/90] Rebase to tzdata-2018g - Morocco will change from UTC+00/+01 to permanent +01 effective 2018-10-27. - Includes changes for tzdata-2018f. - Volgograd will change from UTC+03 to UTC+04 on 2018-10-28 at 02:00. - Fiji will end DST on 2019-01-13 instead of the 2019-01-20 as previously predicted. - Most of Chile will end DST on the first Saturday in April at 24:00 and restart DST on the first Saturday in September at 24:00. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 18 ++++++++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f0fd88e..acb4ae4 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,5 @@ noarch/ /tzdata2018d.tar.gz /tzcode2018e.tar.gz /tzdata2018e.tar.gz +/tzcode2018g.tar.gz +/tzdata2018g.tar.gz diff --git a/sources b/sources index 2198b31..d4eb179 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 -SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae +SHA512 (tzcode2018g.tar.gz) = 58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484 +SHA512 (tzdata2018g.tar.gz) = 92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa diff --git a/tzdata.spec b/tzdata.spec index 5f91cd6..1e4d245 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2018e -%define tzdata_version 2018e -%define tzcode_version 2018e +Version: 2018g +%define tzdata_version 2018g +%define tzcode_version 2018g Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -58,7 +58,7 @@ tar zxf tzdata%{version}-rearguard.tar.gz %patch002 -p1 # Run make to create the tzdata.zi file -make DATAFORM=rearguard tzdata.zi +make DATAFORM=rearguard VERSION=%{version} tzdata.zi mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -145,6 +145,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Sun Oct 28 2018 Patsy Griffin Franklin - 2018g-1 +- Rebase to tzdata-2018g + Includes changes for tzdata-2018f. + - Volgograd will change from UTC+03 to UTC+04 on 2018-10-28 at 02:00. + - Fiji will end DST on 2019-01-13 instead of the 2019-01-20 as + previously predicted. + - Most of Chile will end DST on the first Saturday in April at 24:00 + and restart DST on the first Saturday in September at 24:00. + - Morocco will change from UTC+00/+01 to permanent +01 effective 2018-10-27. + * Wed May 16 2018 Patsy Franklin - 2018e-1 - Rebase to tzdata-2018e - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018. From 4562d38537a5e91097cc1128985a390752667551 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Wed, 16 Jan 2019 11:23:45 -0500 Subject: [PATCH 17/90] =?UTF-8?q?-=20Rebase=20to=20tzdata-2018i=20(include?= =?UTF-8?q?s=20changes=20from=20tzdata-2018h)=20=20=20-=20S=C3=A3o=20Tom?= =?UTF-8?q?=C3=A9=20and=20Pr=C3=ADncipe=20changed=20from=20UTC+01=20to=20U?= =?UTF-8?q?TC+00=20on=202019-01-01.=20=20=20-=20Qyzylorda,=20Kazakhstan=20?= =?UTF-8?q?changed=20from=20UTC+06=20to=20UTC+05=20on=202018-12-21.=20=20?= =?UTF-8?q?=20-=20Created=20a=20new=20zone=20Asia/Qostanay=20since=20Qosta?= =?UTF-8?q?nay,=20Kazakhstan=20didn't=20=20=20=20=20transition=20with=20th?= =?UTF-8?q?e=20Qyzylorda=20change.=20=20=20-=20Metlakatla,=20Alaska=20will?= =?UTF-8?q?=20observe=20PST=20for=20this=20winter=20only.=20=20=20-=20Pred?= =?UTF-8?q?ict=20that=20Morocco=20will=20continue=20to=20adjust=20clocks?= =?UTF-8?q?=20around=20Ramadan.=20=20=20-=20Also=20include=20predictions?= =?UTF-8?q?=20for=20Iran=20from=202038=20through=202090.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 +++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index acb4ae4..d884dd4 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,5 @@ noarch/ /tzdata2018e.tar.gz /tzcode2018g.tar.gz /tzdata2018g.tar.gz +/tzcode2018i.tar.gz +/tzdata2018i.tar.gz diff --git a/sources b/sources index d4eb179..c893706 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018g.tar.gz) = 58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484 -SHA512 (tzdata2018g.tar.gz) = 92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa +SHA512 (tzcode2018i.tar.gz) = 1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d +SHA512 (tzdata2018i.tar.gz) = 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a diff --git a/tzdata.spec b/tzdata.spec index c101b02..5d93cc1 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2018g -%define tzdata_version 2018g -%define tzcode_version 2018g +Version: 2018i +%define tzdata_version 2018i +%define tzcode_version 2018i Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -41,11 +41,11 @@ This package contains timezone information for use by Java runtimes. %patch002 -p1 -# tzdata-2018g introduce 25:00 transition times. This breaks OpenJDK. -# Use rearguard for tzdata-2018g java +# tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. +# Use rearguard for java mkdir rearguard make VERSION=%{version} tzdata%{version}-rearguard.tar.gz -mv tzdata2018g-rearguard.tar.gz rearguard +mv tzdata%{version}-rearguard.tar.gz rearguard pushd rearguard tar zxf tzdata%{version}-rearguard.tar.gz popd @@ -89,7 +89,7 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES # grep -v tz-art.htm tz-link.htm > tz-link.html -# tzdata-2018g uses 25:00 which breaks java - use the rearguard files for java +# 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/pacificnew rearguard/etcetera \ From f4bb770ac276b0f348e77518d144e2a62e75d2f4 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 18/90] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- tzdata.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 5d93cc1..03e9282 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -5,7 +5,6 @@ Version: 2018i %define tzcode_version 2018i Release: 1%{?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 @@ -24,7 +23,6 @@ the world. %package java Summary: Timezone data for Java -Group: System Environment/Base Source3: javazic.tar.gz Source4: javazic-1.8-37392f2f5d59.tar.xz Patch100: javazic-fixup.patch From 17e87c871c962de1b595fb9af39733804784cf04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:36:46 +0000 Subject: [PATCH 19/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 03e9282..a8543ba 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2018i %define tzdata_version 2018i %define tzcode_version 2018i -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -134,6 +134,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2018i-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Nov 12 2018 Patsy Griffin Franklin - 2018g-1 - Rebase to tzdata-2018g Includes changes for tzdata-2018f. From 21b31541e98d563d929a4df380b46c3a3e729381 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Fri, 29 Mar 2019 22:25:16 -0400 Subject: [PATCH 20/90] Resolves: #1692680 - 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 15 +++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index d884dd4..6b4a96a 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,5 @@ noarch/ /tzdata2018g.tar.gz /tzcode2018i.tar.gz /tzdata2018i.tar.gz +/tzcode2019a.tar.gz +/tzdata2019a.tar.gz diff --git a/sources b/sources index c893706..4a48bae 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018i.tar.gz) = 1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d -SHA512 (tzdata2018i.tar.gz) = 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a +SHA512 (tzcode2019a.tar.gz) = 7cc76ce6be4a67c3e1b2222cb632d2de9dabb76899793a938f87a1d4bb20e462cabdae9e3b986aaabaa400795370510095d236dbad5aff4c192d0887f0ecedf5 +SHA512 (tzdata2019a.tar.gz) = d8eb5b2b68abee08bd2b0d2134bce85b5c0aee85168e9697a607604ed5be7d1539ac60fda9b37e0c9c793ef6251978bc250563a0af59497fde775499964bb5aa diff --git a/tzdata.spec b/tzdata.spec index a8543ba..c068ca4 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2018i -%define tzdata_version 2018i -%define tzcode_version 2018i -Release: 2%{?dist} +Version: 2019a +%define tzdata_version 2019a +%define tzcode_version 2019a +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 @@ -134,6 +134,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Mar 29 2019 Patsy Griffin Franklin - 2019a-1 +- Rebase to tzdata-2019a + - Palestine will start DST on 2019-03-30, rather than 2019-03-23 as + previously predicted. + - Metlakatla rejoined Alaska time on 2019-01-20, ending its observances + of Pacific standard time. + * Sun Feb 03 2019 Fedora Release Engineering - 2018i-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b85b6bdd8707aee609789b93806b1405e24b3dd2 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Tue, 9 Jul 2019 23:11:42 -0400 Subject: [PATCH 21/90] Resolves: #1725907 - Rebase to tzdata-2019b - Brazil will no longer observe DST going forward. - The 2019 spring transition for Palestine occurred 03-29, not 03-30. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6b4a96a..42e97c1 100644 --- a/.gitignore +++ b/.gitignore @@ -170,3 +170,5 @@ noarch/ /tzdata2018i.tar.gz /tzcode2019a.tar.gz /tzdata2019a.tar.gz +/tzcode2019b.tar.gz +/tzdata2019b.tar.gz diff --git a/sources b/sources index 4a48bae..63c6133 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2019a.tar.gz) = 7cc76ce6be4a67c3e1b2222cb632d2de9dabb76899793a938f87a1d4bb20e462cabdae9e3b986aaabaa400795370510095d236dbad5aff4c192d0887f0ecedf5 -SHA512 (tzdata2019a.tar.gz) = d8eb5b2b68abee08bd2b0d2134bce85b5c0aee85168e9697a607604ed5be7d1539ac60fda9b37e0c9c793ef6251978bc250563a0af59497fde775499964bb5aa +SHA512 (tzcode2019b.tar.gz) = bcfb417fe3b7c39e702da0090291db0489744f733010ae183007fce5e441bfce885fb25ed11730cf7f363572e107d7ff0c4b38691bb99def2d8cf7017c05720f +SHA512 (tzdata2019b.tar.gz) = c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc diff --git a/tzdata.spec b/tzdata.spec index c068ca4..879020a 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2019a -%define tzdata_version 2019a -%define tzcode_version 2019a +Version: 2019b +%define tzdata_version 2019b +%define tzcode_version 2019b Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -134,6 +134,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Jul 09 2019 Patsy Griffin - 2019b-1 +- Rebase to tzdata-2019b + - Brazil will no longer observe DST going forward. + - The 2019 spring transition for Palestine occurred 03-29, not 03-30. + * Fri Mar 29 2019 Patsy Griffin Franklin - 2019a-1 - Rebase to tzdata-2019a - Palestine will start DST on 2019-03-30, rather than 2019-03-23 as From 2d1a8a5270faa0a07d76a7127c2cf97afb1fba25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:15:44 +0000 Subject: [PATCH 22/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 879020a..1f4370c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2019b %define tzdata_version 2019b %define tzcode_version 2019b -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -134,6 +134,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2019b-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jul 09 2019 Patsy Griffin - 2019b-1 - Rebase to tzdata-2019b - Brazil will no longer observe DST going forward. From 92f74b8c8a4466565dcdd554adeaeaf80091ab9a Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Thu, 26 Sep 2019 22:02:24 -0400 Subject: [PATCH 23/90] Resolves: #1751373 - 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 18 ++++++++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 42e97c1..2f3f6b9 100644 --- a/.gitignore +++ b/.gitignore @@ -172,3 +172,5 @@ noarch/ /tzdata2019a.tar.gz /tzcode2019b.tar.gz /tzdata2019b.tar.gz +/tzcode2019c.tar.gz +/tzdata2019c.tar.gz diff --git a/sources b/sources index 63c6133..5d6720f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2019b.tar.gz) = bcfb417fe3b7c39e702da0090291db0489744f733010ae183007fce5e441bfce885fb25ed11730cf7f363572e107d7ff0c4b38691bb99def2d8cf7017c05720f -SHA512 (tzdata2019b.tar.gz) = c0104078d994e501d80a41bea31364b1390a75c2fbf42968a8343a090e2ac2eddbc58770ca470b192ea19dec89fcc634141a1de703ea2ffa0325176a64afe1fc +SHA512 (tzcode2019c.tar.gz) = 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b +SHA512 (tzdata2019c.tar.gz) = 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 diff --git a/tzdata.spec b/tzdata.spec index 1f4370c..b51a03a 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2019b -%define tzdata_version 2019b -%define tzcode_version 2019b -Release: 2%{?dist} +Version: 2019c +%define tzdata_version 2019c +%define tzcode_version 2019c +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 @@ -78,7 +78,7 @@ echo "%{name}%{tzdata_version}" >> VERSION make tzdata.zi FILES="africa antarctica asia australasia europe northamerica southamerica - pacificnew etcetera backward" + pacificnew etcetera backward factory" mkdir zoneinfo/{,posix,right} zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES @@ -91,7 +91,7 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ rearguard/australasia rearguard/europe rearguard/northamerica \ rearguard/southamerica rearguard/pacificnew rearguard/etcetera \ - rearguard/backward" + rearguard/backward rearguard/factory" # Java 6/7 tzdata pushd javazic @@ -134,6 +134,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Sep 23 2019 Patsy Griffin - 2019c-1 +- Rebase to tzdata-2019c + - Fiji will observe DST from 2019-11-10 to 2020-01-12. + - Norfolk Island will begin observing Australian-style DST on 2019-10-06. +- Add Factory back in to be more consistent with upstream. + * Sat Jul 27 2019 Fedora Release Engineering - 2019b-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 71d3266c7b87ed919d18ad2667db734f9b435273 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Sun, 19 Jan 2020 20:31:36 -0500 Subject: [PATCH 24/90] Resolves: #1789468 - Don't build the factory zone for tzdata-java. Patch provided by Severin Gehwolf (#1789468) --- tzdata.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index b51a03a..8ae9350 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2019c %define tzdata_version 2019c %define tzcode_version 2019c -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -91,7 +91,7 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ rearguard/australasia rearguard/europe rearguard/northamerica \ rearguard/southamerica rearguard/pacificnew rearguard/etcetera \ - rearguard/backward rearguard/factory" + rearguard/backward" # Java 6/7 tzdata pushd javazic @@ -134,6 +134,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Jan 17 2020 Patsy Griffin - 2019c-2 +- Don't build the factory zone for tzdata-java. + Patch provided by Severin Gehwolf (#1789468) + * Mon Sep 23 2019 Patsy Griffin - 2019c-1 - Rebase to tzdata-2019c - Fiji will observe DST from 2019-11-10 to 2020-01-12. From 534ecfeaffe8aa31f163c3de265663b6747c8dd8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:22:51 +0000 Subject: [PATCH 25/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 8ae9350..8af5de3 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2019c %define tzdata_version 2019c %define tzcode_version 2019c -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 @@ -134,6 +134,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2019c-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Patsy Griffin - 2019c-2 - Don't build the factory zone for tzdata-java. Patch provided by Severin Gehwolf (#1789468) From 582b815ba53a2e68809d2e5e42e1d30ff01ac148 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Tue, 5 May 2020 08:39:34 -0400 Subject: [PATCH 26/90] Resolves: #1827523 - Rebase to tzdata-2020a - Morocco will spring forward on 2020-05-31 rather than previously predicted 2020-05-24. - Canada's Yukon region changed to year round UTC -07 effective 2020-03-08. - America/Godthab was renamed to America/Nuuk. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 16 ++++++++++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2f3f6b9..a3c2842 100644 --- a/.gitignore +++ b/.gitignore @@ -174,3 +174,5 @@ noarch/ /tzdata2019b.tar.gz /tzcode2019c.tar.gz /tzdata2019c.tar.gz +/tzcode2020a.tar.gz +/tzdata2020a.tar.gz diff --git a/sources b/sources index 5d6720f..aee7575 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2019c.tar.gz) = 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b -SHA512 (tzdata2019c.tar.gz) = 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565 +SHA512 (tzcode2020a.tar.gz) = 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2 +SHA512 (tzdata2020a.tar.gz) = 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d diff --git a/tzdata.spec b/tzdata.spec index 8af5de3..683fe92 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2019c -%define tzdata_version 2019c -%define tzcode_version 2019c -Release: 3%{?dist} +Version: 2020a +%define tzdata_version 2020a +%define tzcode_version 2020a +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 @@ -134,6 +134,14 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Apr 30 2020 Patsy Griffin - 2020a-1 +- Rebase to tzdata-2020a + - Morocco will spring forward on 2020-05-31 rather than + previously predicted 2020-05-24. + - Canada's Yukon region changed to year round UTC -07 + effective 2020-03-08. + - America/Godthab was renamed to America/Nuuk. + * Fri Jan 31 2020 Fedora Release Engineering - 2019c-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6f42f9312b6ada5ae84603e54a721cc6916eba80 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 12 Jun 2020 08:18:47 +0200 Subject: [PATCH 27/90] BUmped source/target to build with jdk11 --- tzdata.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 683fe92..4b2b7bf 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2020a %define tzdata_version 2020a %define tzcode_version 2020a -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -95,7 +95,7 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ # Java 6/7 tzdata pushd javazic -javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java` +javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java` popd java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ @@ -104,7 +104,7 @@ java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ # Java 8 tzdata pushd javazic-1.8 -javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java` +javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java` popd java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ @@ -134,6 +134,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Jun 12 2020 Jiri Vanek - 2020a-2 +- bumped source/target to 1.6 for tzdata for jdk6/7 +- bumped source/target to 1.8 for tzdata for jdk8 + * Thu Apr 30 2020 Patsy Griffin - 2020a-1 - Rebase to tzdata-2020a - Morocco will spring forward on 2020-05-31 rather than From bbc6d75d81b7f2e5b722282d65d875773e44f9ec Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 07:54:03 +0200 Subject: [PATCH 28/90] Rebuilt for JDK-11 --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 4b2b7bf..fec517f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2020a %define tzdata_version 2020a %define tzcode_version 2020a -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 @@ -134,6 +134,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Jul 11 2020 Jiri Vanek - 2020a-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Fri Jun 12 2020 Jiri Vanek - 2020a-2 - bumped source/target to 1.6 for tzdata for jdk6/7 - bumped source/target to 1.8 for tzdata for jdk8 From 3617c890dd7707e0b432b0c5617cc90adda40ef5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:07:35 +0000 Subject: [PATCH 29/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index fec517f..433f7ab 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2020a %define tzdata_version 2020a %define tzcode_version 2020a -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 @@ -134,6 +134,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2020a-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jiri Vanek - 2020a-3 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 58d77a3f15398c4048d0fc300b14157e9c947e15 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 14 Oct 2020 18:15:30 -0400 Subject: [PATCH 30/90] Resolves: #1886114 Rebase to tzdata-2020b - Yukon timezones represented by America/Whitehorse and America/Dawson will change time zone rules from -08/-07 to permanent -07 on 2020-11-01, not on 2020-03-08 as 2020a had it. - The most recent winter(+08)/summer(+11) transition for Casey Station, Antarctica was 2020-10-04 00:01. - Remove obsolete files pacificnew, systemv, and yearistype.sh from the distribution. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 22 ++++++++++++++++------ 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a3c2842..7b2a10e 100644 --- a/.gitignore +++ b/.gitignore @@ -176,3 +176,5 @@ noarch/ /tzdata2019c.tar.gz /tzcode2020a.tar.gz /tzdata2020a.tar.gz +/tzcode2020b.tar.gz +/tzdata2020b.tar.gz diff --git a/sources b/sources index aee7575..e84890a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2020a.tar.gz) = 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2 -SHA512 (tzdata2020a.tar.gz) = 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d +SHA512 (tzcode2020b.tar.gz) = 04849f196430717962cbeedf11bbba592c304eaff5d67350c936af83dc8e8cb4cedc1c5f461c984aef05124d6c0f13a874789dff77b85a4b399faf80d75537e0 +SHA512 (tzdata2020b.tar.gz) = 27ade698e61881e637ab04834633595cfbdb08fd97177e9731093165d1268a64dffa0570b5e137b9daa4374e6c6827ed01c476074ec61ec0b9a44a7f23479be9 diff --git a/tzdata.spec b/tzdata.spec index 433f7ab..b241324 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2020a -%define tzdata_version 2020a -%define tzcode_version 2020a -Release: 4%{?dist} +Version: 2020b +%define tzdata_version 2020b +%define tzcode_version 2020b +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 @@ -78,7 +78,7 @@ echo "%{name}%{tzdata_version}" >> VERSION make tzdata.zi FILES="africa antarctica asia australasia europe northamerica southamerica - pacificnew etcetera backward factory" + etcetera backward factory" mkdir zoneinfo/{,posix,right} zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES @@ -90,7 +90,7 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES # 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/pacificnew rearguard/etcetera \ + rearguard/southamerica rearguard/etcetera \ rearguard/backward" # Java 6/7 tzdata @@ -134,6 +134,16 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Oct 14 2020 Patsy Griffin - 2020b-1 +- Rebase to tzdata-2020b + - Yukon timezones represented by America/Whitehorse and + America/Dawson will change time zone rules from -08/-07 to + permanent -07 on 2020-11-01, not on 2020-03-08 as 2020a had it. + - The most recent winter(+08)/summer(+11) transition for Casey Station, + Antarctica was 2020-10-04 00:01. + - Remove obsolete files pacificnew, systemv, and yearistype.sh + from the distribution. + * Wed Jul 29 2020 Fedora Release Engineering - 2020a-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 401ee85cdee5017fd0833554bf766ef54882a2ef Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Fri, 23 Oct 2020 09:06:03 -0400 Subject: [PATCH 31/90] Resolves: #1886114 - Rebase to tzdata-2020d including changes from tzdata-2020c - Palestine will end summer time on 2020-10-24 rather than the predicted 2020-10-31. - Fiji starts DST later than usual, on 2020-12-20. - Rearguard now provides an empty file pacificnew to support downstream software that expects it. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 +++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7b2a10e..8f942fc 100644 --- a/.gitignore +++ b/.gitignore @@ -178,3 +178,5 @@ noarch/ /tzdata2020a.tar.gz /tzcode2020b.tar.gz /tzdata2020b.tar.gz +/tzcode2020d.tar.gz +/tzdata2020d.tar.gz diff --git a/sources b/sources index e84890a..fa3803d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2020b.tar.gz) = 04849f196430717962cbeedf11bbba592c304eaff5d67350c936af83dc8e8cb4cedc1c5f461c984aef05124d6c0f13a874789dff77b85a4b399faf80d75537e0 -SHA512 (tzdata2020b.tar.gz) = 27ade698e61881e637ab04834633595cfbdb08fd97177e9731093165d1268a64dffa0570b5e137b9daa4374e6c6827ed01c476074ec61ec0b9a44a7f23479be9 +SHA512 (tzcode2020d.tar.gz) = 315ce86574780d89482761298137b2871a21cb4391886abdc9f29c6cc09e8b8f6585f96d3f4dfef8d7b54e24720214f5c77144114ad58cc91aa5bbde350c0f9b +SHA512 (tzdata2020d.tar.gz) = 362e4569a666b0776614be3f63f1fe3d5ae259055e7051c9875f36023db9c52b0c5a10c19067114443a4cf2bf92475f8a0aebdf79bac836d967527fcdea4e9b6 diff --git a/tzdata.spec b/tzdata.spec index b241324..b83232e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2020b -%define tzdata_version 2020b -%define tzcode_version 2020b +Version: 2020d +%define tzdata_version 2020d +%define tzcode_version 2020d Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -134,6 +134,14 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Oct 23 2020 Patsy Griffin - 2020d-1 +- Rebase to tzdata-2020d including changes from tzdata-2020c + - Palestine will end summer time on 2020-10-24 rather than the + predicted 2020-10-31. + - Fiji starts DST later than usual, on 2020-12-20. + - Rearguard now provides an empty file pacificnew to support + downstream software that expects it. + * Wed Oct 14 2020 Patsy Griffin - 2020b-1 - Rebase to tzdata-2020b - Yukon timezones represented by America/Whitehorse and From deebbac60fd436192c8978f271bc5f49dbe61228 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 16 Dec 2020 13:33:31 -0500 Subject: [PATCH 32/90] Resolves: #1890396 - Add conditional support for rhel and eln rearguard format. --- tzdata.spec | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index b83232e..da0b77f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,13 +3,16 @@ Name: tzdata Version: 2020d %define tzdata_version 2020d %define tzcode_version 2020d -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain 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 +%if 0%{?rhel} || 0%{?eln} +Patch003: 0003-continue-to-ship-posixrules.patch +%endif BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel @@ -38,6 +41,9 @@ This package contains timezone information for use by Java runtimes. %setup -q -c -a 1 %patch002 -p1 +%if 0%{?rhel} || 0%{?eln} +%patch003 -p1 +%endif # tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. # Use rearguard for java @@ -48,6 +54,11 @@ pushd rearguard tar zxf tzdata%{version}-rearguard.tar.gz popd +%if 0%{?rhel} || 0%{?eln} +# Use rearguard for rhel (overwrite default vangaurd data) +tar zxf rearguard/tzdata%{version}-rearguard.tar.gz +%endif + mkdir javazic tar zxf %{SOURCE3} -C javazic pushd javazic @@ -75,7 +86,12 @@ echo "%{name}%{tzdata_version}" >> VERSION %build # Run make to create the tzdata.zi file +rm tzdata.zi +%if 0%{?rhel} || 0%{?eln} +make VERSION=%{version} DATAFORM=rearguard tzdata.zi +%else make tzdata.zi +%endif FILES="africa antarctica asia australasia europe northamerica southamerica etcetera backward factory" @@ -134,7 +150,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog -* Wed Oct 23 2020 Patsy Griffin - 2020d-1 +* Mon Nov 23 2020 Patsy Griffin - 2020d-2 +- Add conditional support for rhel and eln. + +* Fri Oct 23 2020 Patsy Griffin - 2020d-1 - Rebase to tzdata-2020d including changes from tzdata-2020c - Palestine will end summer time on 2020-10-24 rather than the predicted 2020-10-31. From e3138a9a8bb19f82ba570dd82592bdaa1fabe831 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 16 Dec 2020 14:22:48 -0500 Subject: [PATCH 33/90] Add 0003-continue-to-ship-posixrules.patch to initialize POSIXRULES variable. --- 0003-continue-to-ship-posixrules.patch | 13 +++++++++++++ tzdata.spec | 8 ++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 0003-continue-to-ship-posixrules.patch diff --git a/0003-continue-to-ship-posixrules.patch b/0003-continue-to-ship-posixrules.patch new file mode 100644 index 0000000..1755352 --- /dev/null +++ b/0003-continue-to-ship-posixrules.patch @@ -0,0 +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 + # make zonenames + # to get a list of the values you can use for POSIXRULES. + +-POSIXRULES= - ++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 diff --git a/tzdata.spec b/tzdata.spec index da0b77f..c6d9078 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2020d %define tzdata_version 2020d %define tzcode_version 2020d -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 @@ -150,7 +150,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog -* Mon Nov 23 2020 Patsy Griffin - 2020d-2 +* Wed Dec 16 2020 Patsy Griffin - 2020d-3 +- Add 0003-continue-to-ship-posixrules.patch to initialize + POSIXRULES variable. + +* Wed Dec 16 2020 Patsy Griffin - 2020d-2 - Add conditional support for rhel and eln. * Fri Oct 23 2020 Patsy Griffin - 2020d-1 From 0ffd0de3710ff4a3cef1ff884b937b072e22494e Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 30 Dec 2020 10:04:24 -0500 Subject: [PATCH 34/90] Resolves: #1910176 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 - Volgograd changes time zone from UTC+04 to UTC+03 on 2020-12-27. - Australia/Currie is identical to Australia/Hobart for all timestamps since 1970 and was therefore created by mistake, now moved to the "backward" file. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 17 +++++++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8f942fc..13437d2 100644 --- a/.gitignore +++ b/.gitignore @@ -180,3 +180,5 @@ noarch/ /tzdata2020b.tar.gz /tzcode2020d.tar.gz /tzdata2020d.tar.gz +/tzcode2020f.tar.gz +/tzdata2020f.tar.gz diff --git a/sources b/sources index fa3803d..ce15cb3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2020d.tar.gz) = 315ce86574780d89482761298137b2871a21cb4391886abdc9f29c6cc09e8b8f6585f96d3f4dfef8d7b54e24720214f5c77144114ad58cc91aa5bbde350c0f9b -SHA512 (tzdata2020d.tar.gz) = 362e4569a666b0776614be3f63f1fe3d5ae259055e7051c9875f36023db9c52b0c5a10c19067114443a4cf2bf92475f8a0aebdf79bac836d967527fcdea4e9b6 +SHA512 (tzcode2020f.tar.gz) = 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed +SHA512 (tzdata2020f.tar.gz) = dd312def18c807452fda2e697514e2064c5f51ebdbedd0cfe6f231252c76ee5d4409f653b295ed5657b7d30b868690047fdb70a10942e69eaa40b77473e3f9ca diff --git a/tzdata.spec b/tzdata.spec index c6d9078..69eac75 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2020d -%define tzdata_version 2020d -%define tzcode_version 2020d -Release: 3%{?dist} +Version: 2020f +%define tzdata_version 2020f +%define tzcode_version 2020f +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 @@ -150,6 +150,15 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Dec 30 2020 Patsy Griffin - 2020f-1 +- Rebase to tzdata-2020f including changes for tzdata-2020e + - tzdata-2020f fixes a bug in tzdata-2020e that caused an + invalid zi file in rearguard format + - Volgograd changes time zone from UTC+04 to UTC+03 on 2020-12-27. + - Australia/Currie is identical to Australia/Hobart for all + timestamps since 1970 and was therefore created by mistake, + now moved to the "backward" file. + * Wed Dec 16 2020 Patsy Griffin - 2020d-3 - Add 0003-continue-to-ship-posixrules.patch to initialize POSIXRULES variable. From 3a089c8107ed00127668092eecaa6676c5f13314 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Jan 2021 01:26:43 +0000 Subject: [PATCH 35/90] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- tzdata.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/tzdata.spec b/tzdata.spec index 69eac75..4bc56f7 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -14,6 +14,7 @@ Patch002: 0002-Fix-have-snprintf-error.patch Patch003: 0003-continue-to-ship-posixrules.patch %endif +BuildRequires: make BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel BuildRequires: glibc-common >= 2.5.90-7 From b45a392bdc1f7acf0f766fe1ad3a34a01c0f691a Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Mon, 25 Jan 2021 21:29:04 -0500 Subject: [PATCH 36/90] Resolves: #1920117 Rebase to tzdata-2021a - South Sudan will change from +03 to +02 on 2021-02-01. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 13437d2..6807054 100644 --- a/.gitignore +++ b/.gitignore @@ -182,3 +182,5 @@ noarch/ /tzdata2020d.tar.gz /tzcode2020f.tar.gz /tzdata2020f.tar.gz +/tzcode2021a.tar.gz +/tzdata2021a.tar.gz diff --git a/sources b/sources index ce15cb3..c532355 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2020f.tar.gz) = 5f6bf1b508434842eb9dacacc744b5f3375c35b88e401ef372b5fde80ad2f523484fe52a6e99460e402230406ebf6a9261a97efde45a610f8e8085893d55c4ed -SHA512 (tzdata2020f.tar.gz) = dd312def18c807452fda2e697514e2064c5f51ebdbedd0cfe6f231252c76ee5d4409f653b295ed5657b7d30b868690047fdb70a10942e69eaa40b77473e3f9ca +SHA512 (tzcode2021a.tar.gz) = bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45 +SHA512 (tzdata2021a.tar.gz) = 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 diff --git a/tzdata.spec b/tzdata.spec index 4bc56f7..895ef98 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2020f -%define tzdata_version 2020f -%define tzcode_version 2020f +Version: 2021a +%define tzdata_version 2021a +%define tzcode_version 2021a Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -151,6 +151,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Jan 25 2021 Patsy Griffin - 2021a-1 +- Rebase to tzdata-2021a + - South Sudan will change from +03 to +02 on 2021-02-01. + * Wed Dec 30 2020 Patsy Griffin - 2020f-1 - Rebase to tzdata-2020f including changes for tzdata-2020e - tzdata-2020f fixes a bug in tzdata-2020e that caused an From 678eeb6dc2bec6b450c6cd6609462cbda1abc970 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Tue, 23 Mar 2021 12:43:09 +0000 Subject: [PATCH 37/90] init FMF CI gating --- .fmf/version | 1 + gating.yaml | 20 + plans/ci.fmf | 6 + tests/inventory | 3 - tests/sanity/Makefile | 73 --- tests/sanity/PURPOSE | 1 - tests/sanity/dates.txt | 10 - tests/sanity/expected.results | 320 ---------- tests/sanity/runtest.sh | 28 - tests/sanity/timezones.txt | 32 - tests/sanity/tzdata-test.sh | 50 -- tests/tests.yml | 13 - tests/tzdata-checker/Makefile | 63 ++ tests/tzdata-checker/PURPOSE | 11 + tests/tzdata-checker/main.fmf | 34 ++ tests/tzdata-checker/no-beakerlib-wrapper.sh | 72 +++ tests/tzdata-checker/runtest.sh | 102 ++++ tests/tzdata-checker/zones.min | 592 +++++++++++++++++++ 18 files changed, 901 insertions(+), 530 deletions(-) create mode 100644 .fmf/version create mode 100644 gating.yaml create mode 100644 plans/ci.fmf delete mode 100755 tests/inventory delete mode 100644 tests/sanity/Makefile delete mode 100644 tests/sanity/PURPOSE delete mode 100644 tests/sanity/dates.txt delete mode 100644 tests/sanity/expected.results delete mode 100644 tests/sanity/runtest.sh delete mode 100644 tests/sanity/timezones.txt delete mode 100755 tests/sanity/tzdata-test.sh delete mode 100644 tests/tests.yml create mode 100644 tests/tzdata-checker/Makefile create mode 100644 tests/tzdata-checker/PURPOSE create mode 100644 tests/tzdata-checker/main.fmf create mode 100644 tests/tzdata-checker/no-beakerlib-wrapper.sh create mode 100755 tests/tzdata-checker/runtest.sh create mode 100644 tests/tzdata-checker/zones.min diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..14943f1 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,20 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation} +--- !Policy +product_versions: + - rhel-8 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional} +--- !Policy +product_versions: + - rhel-9 +decision_context: osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1-gating.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..1ad2c12 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,6 @@ +summary: CI Gating Plan +discover: + how: fmf + directory: tests +execute: + how: beakerlib diff --git a/tests/inventory b/tests/inventory deleted file mode 100755 index 93eafb6..0000000 --- a/tests/inventory +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export TEST_DOCKER_EXTRA_ARGS="-v /dev:/dev --privileged" -exec merge-standard-inventory "$@" diff --git a/tests/sanity/Makefile b/tests/sanity/Makefile deleted file mode 100644 index 5181434..0000000 --- a/tests/sanity/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/tzdata/sanity -# Description: Basic sanity test -# Author: John Poelstra -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2006 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/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# The toplevel namespace within which the test lives. -TOPLEVEL_NAMESPACE=/CoreOS - -# The name of the package under test: -PACKAGE_NAME=tzdata - -# The path of the test below the package: -RELATIVE_PATH=sanity - -# Version of the Test. Used with make tag. -export TESTVERSION=1.4 - -# The combined namespace of the test. -#export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH) -export TEST=/CoreOS/tzdata/sanity -.PHONY: all install download clean - -BUILT_FILES= -FILES=$(METADATA) tzdata-test.sh runtest.sh PURPOSE timezones.txt expected.results dates.txt - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x ./runtest.sh - chmod a+x ./tzdata-test.sh - -clean: - rm -f *~ *.rpm $(BUILT_FILES) - -# Include Common Makefile -include /usr/share/rhts/lib/rhts-make.include - -# Generate the testinfo.desc here: -$(METADATA): Makefile - @touch $(METADATA) - @echo "Owner: Karel Volny " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Description: Basic sanity test for the tzdata package">> $(METADATA) - @echo "TestTime: 1m" >> $(METADATA) - @echo "RunFor: $(PACKAGE_NAME)" >> $(METADATA) - @echo "Requires: $(PACKAGE_NAME)" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) -# You may need other fields here; see the documentation - rhts-lint $(METADATA) diff --git a/tests/sanity/PURPOSE b/tests/sanity/PURPOSE deleted file mode 100644 index c87ebfd..0000000 --- a/tests/sanity/PURPOSE +++ /dev/null @@ -1 +0,0 @@ -This is a simple regression test of tzdata which tests the installed version against expected values. diff --git a/tests/sanity/dates.txt b/tests/sanity/dates.txt deleted file mode 100644 index 88d4735..0000000 --- a/tests/sanity/dates.txt +++ /dev/null @@ -1,10 +0,0 @@ -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/expected.results b/tests/sanity/expected.results deleted file mode 100644 index 645a868..0000000 --- a/tests/sanity/expected.results +++ /dev/null @@ -1,320 +0,0 @@ -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/runtest.sh b/tests/sanity/runtest.sh deleted file mode 100644 index 995b04f..0000000 --- a/tests/sanity/runtest.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/tzdata/sanity -# Description: Basic sanity test -# Author: John Poelstra -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2006 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/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -rhts-run-simple-test $TEST ./tzdata-test.sh diff --git a/tests/sanity/timezones.txt b/tests/sanity/timezones.txt deleted file mode 100644 index df2b323..0000000 --- a/tests/sanity/timezones.txt +++ /dev/null @@ -1,32 +0,0 @@ -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 diff --git a/tests/sanity/tzdata-test.sh b/tests/sanity/tzdata-test.sh deleted file mode 100755 index 4d08a61..0000000 --- a/tests/sanity/tzdata-test.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# tzdata-test.sh of /CoreOS/tzdata/sanity -# Description: Basic sanity test -# Original author: Ulrich Drepper -# Modified and broken into separate files by: John Poelstra -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2006 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/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -ZONES="timezones.txt" -DATES="dates.txt" -EXPECTED="expected.results" -GENERATED="$(mktemp)" - -cat $ZONES | while read timezone; do - echo "timezone == $timezone" | tee -a $OUTPUTFILE - cat $DATES | while read datetime; do - echo "datetime == $datetime" | tee -a $OUTPUTFILE - printf "%s %s -> %s\n" "$timezone" "$datetime" "$(env TZ=$timezone date -d \ - "$datetime")" | tee -a $OUTPUTFILE | tee -a $GENERATED - done -done - -if diff -u $EXPECTED $GENERATED -then - echo "Test PASSED" | tee -a $OUTPUTFILE -else - echo "Test FAILED" | tee -a $OUTPUTFILE - 2>&1 | tee -a $OUTPUTFILE - exit 1 -fi diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 224460f..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Tests for classic and container -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - - atomic - tests: - - sanity - required_packages: - - which diff --git a/tests/tzdata-checker/Makefile b/tests/tzdata-checker/Makefile new file mode 100644 index 0000000..9e297af --- /dev/null +++ b/tests/tzdata-checker/Makefile @@ -0,0 +1,63 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/tzdata/Sanity/tzdata-checker +# Description: Testing tzdata by comparing base pkg with upstream +# Author: Michal Kolar +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# 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 " > $(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) diff --git a/tests/tzdata-checker/PURPOSE b/tests/tzdata-checker/PURPOSE new file mode 100644 index 0000000..70ca68b --- /dev/null +++ b/tests/tzdata-checker/PURPOSE @@ -0,0 +1,11 @@ +PURPOSE of /CoreOS/tzdata/Sanity/tzdata-checker +Description: Testing tzdata by comparing base pkg with upstream +Author: Michal Kolar + +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 + diff --git a/tests/tzdata-checker/main.fmf b/tests/tzdata-checker/main.fmf new file mode 100644 index 0000000..f9ed60f --- /dev/null +++ b/tests/tzdata-checker/main.fmf @@ -0,0 +1,34 @@ +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 +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 diff --git a/tests/tzdata-checker/no-beakerlib-wrapper.sh b/tests/tzdata-checker/no-beakerlib-wrapper.sh new file mode 100644 index 0000000..b73e207 --- /dev/null +++ b/tests/tzdata-checker/no-beakerlib-wrapper.sh @@ -0,0 +1,72 @@ +#!/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; } diff --git a/tests/tzdata-checker/runtest.sh b/tests/tzdata-checker/runtest.sh new file mode 100755 index 0000000..eedc833 --- /dev/null +++ b/tests/tzdata-checker/runtest.sh @@ -0,0 +1,102 @@ +#!/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 +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# 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 + rlRun "./zdump -v -c 1970,$hiyear $zone >ref" + if uname -r | egrep -o -q '\.el5'; then # glibc's zdump is out of sync for RHEL5 + 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 >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 diff --git a/tests/tzdata-checker/zones.min b/tests/tzdata-checker/zones.min new file mode 100644 index 0000000..92353a3 --- /dev/null +++ b/tests/tzdata-checker/zones.min @@ -0,0 +1,592 @@ +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 From a92868eaaea994cf7707e40233f8f8b4c6c8710f Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Wed, 19 May 2021 15:43:27 +0000 Subject: [PATCH 38/90] drop unwanted scratch build rule for gating --- gating.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 14943f1..4581d72 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,7 +5,6 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: baseos-qe.koji-build.scratch-build.validation} --- !Policy product_versions: - rhel-8 From 0f2be9269cfa1e5631a23076eac4d28a4c225195 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:52:28 +0000 Subject: [PATCH 39/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 895ef98..50011d6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2021a %define tzdata_version 2021a %define tzcode_version 2021a -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -151,6 +151,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2021a-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Patsy Griffin - 2021a-1 - Rebase to tzdata-2021a - South Sudan will change from +03 to +02 on 2021-02-01. From c1c7aed6464460ab060ed09cd87ad8723cd5d296 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Sun, 26 Sep 2021 15:38:14 -0400 Subject: [PATCH 40/90] Resolves: #2007807 Rebase to tzdata-2021b - Jordan now starts DST on February's last Thursday. - Samoa no longer observes DST. - Merge more location-based Zones whose timestamps agree since 1970. - Move some backward-compatibility links to 'backward'. - Rename Pacific/Enderbury to Pacific/Kanton. - Correct many pre-1993 transitions in Malawi, Portugal, etc. - zic now creates each output file or link atomically. - zic -L no longer omits the POSIX TZ string in its output. - zic fixes for truncation and leap second table expiration. - zic now follows POSIX for TZ strings using all-year DST. - Fix some localtime crashes and bugs in obscure cases. - zdump -v now outputs more-useful boundary cases. - tzfile.5 better matches a draft successor to RFC 8536. --- .gitignore | 2 ++ 0001-Fix-Jan-Mayen-typo.patch | 29 +++++++++++++++++++++++++++++ sources | 4 ++-- tzdata.spec | 26 ++++++++++++++++++++++---- 4 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 0001-Fix-Jan-Mayen-typo.patch diff --git a/.gitignore b/.gitignore index 6807054..09de820 100644 --- a/.gitignore +++ b/.gitignore @@ -184,3 +184,5 @@ noarch/ /tzdata2020f.tar.gz /tzcode2021a.tar.gz /tzdata2021a.tar.gz +/tzcode2021b.tar.gz +/tzdata2021b.tar.gz diff --git a/0001-Fix-Jan-Mayen-typo.patch b/0001-Fix-Jan-Mayen-typo.patch new file mode 100644 index 0000000..6e60061 --- /dev/null +++ b/0001-Fix-Jan-Mayen-typo.patch @@ -0,0 +1,29 @@ +From 2a7c7c5873ff0eb725e8eafad04f6af6ada66dc6 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +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 diff --git a/sources b/sources index c532355..06f46a1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2021a.tar.gz) = bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45 -SHA512 (tzdata2021a.tar.gz) = 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 +SHA512 (tzcode2021b.tar.gz) = 00fca7508cfbc42123065fe8087397c9dd2acbdda96f3bb0936187825348cf13538f1893f2d02bd8bfa3465427ca7a9a65451baffe39889bc58ba0a77a047806 +SHA512 (tzdata2021b.tar.gz) = ca61d64af5ae791f337533c09d2b4f7caa645ecab7b9d13e9bcafc47c7c68535abe7c103c56bbd41d6bd913a8607f9c5187c8ce8a91b4891a750a643f89c8b51 diff --git a/tzdata.spec b/tzdata.spec index 50011d6..cf3b1d4 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,14 +1,15 @@ Summary: Timezone data Name: tzdata -Version: 2021a -%define tzdata_version 2021a -%define tzcode_version 2021a -Release: 2%{?dist} +Version: 2021b +%define tzdata_version 2021b +%define tzcode_version 2021b +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 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 %if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch @@ -41,6 +42,7 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 +%patch001 -p1 %patch002 -p1 %if 0%{?rhel} || 0%{?eln} %patch003 -p1 @@ -151,6 +153,22 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Sep 25 2021 Patsy Griffin - 2021b-1 +- Rebase to tzdata-2021b + - Jordan now starts DST on February's last Thursday. + - Samoa no longer observes DST. + - Merge more location-based Zones whose timestamps agree since 1970. + - Move some backward-compatibility links to 'backward'. + - Rename Pacific/Enderbury to Pacific/Kanton. + - Correct many pre-1993 transitions in Malawi, Portugal, etc. + - zic now creates each output file or link atomically. + - zic -L no longer omits the POSIX TZ string in its output. + - zic fixes for truncation and leap second table expiration. + - zic now follows POSIX for TZ strings using all-year DST. + - Fix some localtime crashes and bugs in obscure cases. + - 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 - 2021a-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 591834e67e2f25780265d917454aab585fdebc3c Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 7 Oct 2021 12:58:38 -0400 Subject: [PATCH 41/90] Resolves: #2009906 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 15 ++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 09de820..eb4923b 100644 --- a/.gitignore +++ b/.gitignore @@ -186,3 +186,5 @@ noarch/ /tzdata2021a.tar.gz /tzcode2021b.tar.gz /tzdata2021b.tar.gz +/tzcode2021c.tar.gz +/tzdata2021c.tar.gz diff --git a/sources b/sources index 06f46a1..cadbc5d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2021b.tar.gz) = 00fca7508cfbc42123065fe8087397c9dd2acbdda96f3bb0936187825348cf13538f1893f2d02bd8bfa3465427ca7a9a65451baffe39889bc58ba0a77a047806 -SHA512 (tzdata2021b.tar.gz) = ca61d64af5ae791f337533c09d2b4f7caa645ecab7b9d13e9bcafc47c7c68535abe7c103c56bbd41d6bd913a8607f9c5187c8ce8a91b4891a750a643f89c8b51 +SHA512 (tzcode2021c.tar.gz) = 9ed7677744058c58656b47d77d464bad6ef503f2892b53c6abe694e68e73fa123dfc5c11bbcbbb7798f0a6bf1da72b81f8f1c63670839b967e15e58d6d36adad +SHA512 (tzdata2021c.tar.gz) = e8de3a17c38f530b2ec39605699742dd32da5ee92ecf64accaaa5b012a1dac51d1f594adc52660602c3425016520346ab6ad614fa475eb310e17ccdcae93e6ca diff --git a/tzdata.spec b/tzdata.spec index cf3b1d4..9281f56 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,14 @@ Summary: Timezone data Name: tzdata -Version: 2021b -%define tzdata_version 2021b -%define tzcode_version 2021b +Version: 2021c +%define tzdata_version 2021c +%define tzcode_version 2021c 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 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 %if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch @@ -42,7 +41,6 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch001 -p1 %patch002 -p1 %if 0%{?rhel} || 0%{?eln} %patch003 -p1 @@ -153,6 +151,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Oct 07 2021 Patsy Griffin - 2021c-1 +- Rebase to tzdata-2021c + - Revert most 2021b changes to the 'backward' file. + - Fix 'zic -b fat' bug in pre-1970 32-bit data reported in tzdata-2021b. + - Fix two Link line typos from tzdata-2021b. + - Distribute the new SECURITY file. + * Sat Sep 25 2021 Patsy Griffin - 2021b-1 - Rebase to tzdata-2021b - Jordan now starts DST on February's last Thursday. From 7be0c6341a614119eb429ab5eb081c64d4f7bb8b Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 28 Oct 2021 18:05:28 -0400 Subject: [PATCH 42/90] Resolves: #2014708 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 13 ++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index eb4923b..bbb9d85 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,5 @@ noarch/ /tzdata2021b.tar.gz /tzcode2021c.tar.gz /tzdata2021c.tar.gz +/tzdata2021e.tar.gz +/tzcode2021e.tar.gz diff --git a/sources b/sources index cadbc5d..8307dce 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2021c.tar.gz) = 9ed7677744058c58656b47d77d464bad6ef503f2892b53c6abe694e68e73fa123dfc5c11bbcbbb7798f0a6bf1da72b81f8f1c63670839b967e15e58d6d36adad -SHA512 (tzdata2021c.tar.gz) = e8de3a17c38f530b2ec39605699742dd32da5ee92ecf64accaaa5b012a1dac51d1f594adc52660602c3425016520346ab6ad614fa475eb310e17ccdcae93e6ca +SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 +SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a diff --git a/tzdata.spec b/tzdata.spec index 9281f56..f8ac5b0 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2021c -%define tzdata_version 2021c -%define tzcode_version 2021c +Version: 2021e +%define tzdata_version 2021e +%define tzcode_version 2021e Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -151,6 +151,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Oct 26 2021 Patsy Griffin - 2021e-1 +- Rebase to tzdata-2021e - supersedes tzdata-2021d + - Pacific/Fiji suspended DST for the 2021/2022 season. + - 'zic -r' now marks unspecified timestamps with "-00". + - Palestine will fall back 2021-10-29 at 01:00, rather + than the predicted 2021-10-30. + * Thu Oct 07 2021 Patsy Griffin - 2021c-1 - Rebase to tzdata-2021c - Revert most 2021b changes to the 'backward' file. From 942077dc851175e273360d6b49eedebe19117c42 Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Fri, 5 Nov 2021 14:28:03 +0000 Subject: [PATCH 43/90] tests/tzdata-checker: modify to resolve different glibcs zdump behavior --- tests/tzdata-checker/runtest.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/tzdata-checker/runtest.sh b/tests/tzdata-checker/runtest.sh index eedc833..af24c09 100755 --- a/tests/tzdata-checker/runtest.sh +++ b/tests/tzdata-checker/runtest.sh @@ -73,12 +73,13 @@ rlJournalStart rlPhaseStartSetup "Test zdump" for zone in `cat zones.int`; do - rlRun "./zdump -v -c 1970,$hiyear $zone >ref" - if uname -r | egrep -o -q '\.el5'; then # glibc's zdump is out of sync for RHEL5 + 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 >cur" + rlRun "./zdump -V -c 1970,$hiyear $zone >ref" + rlRun "zdump -V -c 1970,$hiyear $zone >cur" fi # normalize zdump outputs From c300514ed794dbcb6c4404a891fd35521b8e2348 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:21:22 +0000 Subject: [PATCH 44/90] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index f8ac5b0..aff0b1a 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2021e %define tzdata_version 2021e %define tzcode_version 2021e -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -151,6 +151,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2021e-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Oct 26 2021 Patsy Griffin - 2021e-1 - Rebase to tzdata-2021e - supersedes tzdata-2021d - Pacific/Fiji suspended DST for the 2021/2022 season. From 3372efffde398b3e665011ae4cb1007fe7e7ea00 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sun, 6 Feb 2022 00:31:45 +0100 Subject: [PATCH 45/90] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index aff0b1a..71d2d0a 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2021e %define tzdata_version 2021e %define tzcode_version 2021e -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 @@ -151,6 +151,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Feb 05 2022 Jiri Vanek - 2021e-3 +- Rebuilt for java-17-openjdk as system jdk + * Sat Jan 22 2022 Fedora Release Engineering - 2021e-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 150c8a0b8d3e56d2ead9aa11de35307c399744a0 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 8 Feb 2022 16:24:58 +0100 Subject: [PATCH 46/90] building 6+7 tzdata by jdk8, norma tzdata by 17 --- tzdata.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 71d2d0a..9c74b27 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -17,6 +17,7 @@ Patch003: 0003-continue-to-ship-posixrules.patch BuildRequires: make BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel +BuildRequires: java-1.8.0-devel BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -112,7 +113,7 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ # Java 6/7 tzdata pushd javazic -javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java` +/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} \ @@ -121,7 +122,7 @@ java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ # Java 8 tzdata pushd javazic-1.8 -javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java` +/usr/lib/jvm/java-17-openjdk/bin/javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java` popd java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ @@ -153,6 +154,8 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %changelog * Sat Feb 05 2022 Jiri Vanek - 2021e-3 - Rebuilt for java-17-openjdk as system jdk +- to keep the legacy tzdata, now build requires both jdk8 and system. +- I recomed to put legacy tz data to separate subpkg or to drop them all * Sat Jan 22 2022 Fedora Release Engineering - 2021e-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 0518e2714a2d52dfc6e63b1c668ad79bef940664 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 8 Feb 2022 16:29:50 +0100 Subject: [PATCH 47/90] Improved changelog message to keep the legacy tzdata, now build requires both jdk8 and system jdk. I recommend to put legacy tz data to separate subpkg or to drop them at all. Also I would recomend to rename legacy tzdat.to versioned ones (eg avazi-1.7) and to keep future, rolling tzdata unversioned, as javazi only --- tzdata.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 9c74b27..45bc67b 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -154,8 +154,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %changelog * Sat Feb 05 2022 Jiri Vanek - 2021e-3 - Rebuilt for java-17-openjdk as system jdk -- to keep the legacy tzdata, now build requires both jdk8 and system. -- I recomed to put legacy tz data to separate subpkg or to drop them all +- to keep the legacy tzdata, now build requires both jdk8 and system jdk. +- I recommend to put legacy tz data to separate subpkg or to drop them at all. +- Also I would recomend to rename legacy tzdat.to versioned ones (eg avazi-1.7) and to keep future, rolling tzdata unversioned, as javazi only * Sat Jan 22 2022 Fedora Release Engineering - 2021e-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 916b33e9944fca528887a8927562c8c74909faef Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Tue, 8 Feb 2022 15:09:43 -0500 Subject: [PATCH 48/90] Clean-up changelog. --- tzdata.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 45bc67b..1e9798c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2021e %define tzdata_version 2021e %define tzcode_version 2021e -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 @@ -152,11 +152,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Feb 08 2022 Patsy Griffin - 2021e-4 +- Clean-up changelog. + * Sat Feb 05 2022 Jiri Vanek - 2021e-3 -- Rebuilt for java-17-openjdk as system jdk -- to keep the legacy tzdata, now build requires both jdk8 and system jdk. -- I recommend to put legacy tz data to separate subpkg or to drop them at all. -- Also I would recomend to rename legacy tzdat.to versioned ones (eg avazi-1.7) and to keep future, rolling tzdata unversioned, as javazi only +- Rebuilt for https://fedoraproject.org/wiki/Changes/Java17 * Sat Jan 22 2022 Fedora Release Engineering - 2021e-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 82c446964256242bb35df671bb41d4bb7d200cf4 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 23 Mar 2022 19:59:32 -0400 Subject: [PATCH 49/90] Resolves: #2064770 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 ++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bbb9d85..3425c90 100644 --- a/.gitignore +++ b/.gitignore @@ -190,3 +190,5 @@ noarch/ /tzdata2021c.tar.gz /tzdata2021e.tar.gz /tzcode2021e.tar.gz +/tzdata2022a.tar.gz +/tzcode2022a.tar.gz diff --git a/sources b/sources index 8307dce..9c44d2d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 -SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a +SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9 +SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed diff --git a/tzdata.spec b/tzdata.spec index 1e9798c..e1eea33 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2021e -%define tzdata_version 2021e -%define tzcode_version 2021e -Release: 4%{?dist} +Version: 2022a +%define tzdata_version 2022a +%define tzcode_version 2022a +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 @@ -152,6 +152,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Mar 23 2022 Patsy Griffin - 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. + * Tue Feb 08 2022 Patsy Griffin - 2021e-4 - Clean-up changelog. From c2f0800cd546b05ca161857fd9944902a6701aee Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Tue, 7 Jun 2022 14:55:20 -0400 Subject: [PATCH 50/90] Resolves: #2091390 Include leap-second.list in tzdata install. --- tzdata.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index e1eea33..80cd9a6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2022a %define tzdata_version 2022a %define tzcode_version 2022a -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -134,7 +134,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/ @@ -152,6 +152,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Jun 07 2022 Patsy Griffin - 2022a-2 +- Include leap-second.list in tzdata install. (#2091390) + * Wed Mar 23 2022 Patsy Griffin - 2022a-1 - Rebase to tzdata-2022a - Palestine springs forward on 2022-03-27, not 2022-03-26. From 63886a70694fed4268e252ec77c53e346cfee157 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Mon, 18 Jul 2022 13:36:19 -0400 Subject: [PATCH 51/90] Resolves: #2104108 Exclude i686 builds: Java OpenJDK packages are no longer available on i686. --- tzdata.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 80cd9a6..be59ec7 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2022a %define tzdata_version 2022a %define tzcode_version 2022a -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 @@ -21,6 +21,7 @@ BuildRequires: java-1.8.0-devel BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch +ExcludeArch: i686 %description This package contains data files with rules for various timezones around @@ -152,6 +153,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Jul 15 2022 Patsy Griffin - 2022a-3 +- Java OpenJDK packages are no longer available on i686. + Exclude i686 builds. (bz #2104108) + * Tue Jun 07 2022 Patsy Griffin - 2022a-2 - Include leap-second.list in tzdata install. (#2091390) From 880d83aaf756f790f07053a37e27469ea261747c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:12:37 +0000 Subject: [PATCH 52/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index be59ec7..69dc357 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2022a %define tzdata_version 2022a %define tzcode_version 2022a -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 @@ -153,6 +153,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2022a-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 15 2022 Patsy Griffin - 2022a-3 - Java OpenJDK packages are no longer available on i686. Exclude i686 builds. (bz #2104108) From 0c873b05ffe4cbf329eee116f9cb4e08a6c203ea Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Sun, 14 Aug 2022 22:45:42 -0400 Subject: [PATCH 53/90] Resolves: #2117429 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. --- .gitignore | 2 + 0001-Work-around-awk-bug-1.patch | 153 +++++++++++++++++++++++++++++++ sources | 4 +- tzdata.spec | 17 +++- 4 files changed, 170 insertions(+), 6 deletions(-) create mode 100644 0001-Work-around-awk-bug-1.patch diff --git a/.gitignore b/.gitignore index 3425c90..6a3c12c 100644 --- a/.gitignore +++ b/.gitignore @@ -192,3 +192,5 @@ noarch/ /tzcode2021e.tar.gz /tzdata2022a.tar.gz /tzcode2022a.tar.gz +/tzcode2022b.tar.gz +/tzdata2022b.tar.gz diff --git a/0001-Work-around-awk-bug-1.patch b/0001-Work-around-awk-bug-1.patch new file mode 100644 index 0000000..304accc --- /dev/null +++ b/0001-Work-around-awk-bug-1.patch @@ -0,0 +1,153 @@ +From e8171130f9b80ae3c75dfa5e96c47d5dbc0f4aae Mon Sep 17 00:00:00 2001 +From: Paul Eggert +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 + diff --git a/sources b/sources index 9c44d2d..6d8aeed 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9 -SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed +SHA512 (tzcode2022b.tar.gz) = 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79 +SHA512 (tzdata2022b.tar.gz) = a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1 diff --git a/tzdata.spec b/tzdata.spec index 69dc357..862b2a9 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,14 +1,15 @@ Summary: Timezone data Name: tzdata -Version: 2022a -%define tzdata_version 2022a -%define tzcode_version 2022a -Release: 4%{?dist} +Version: 2022b +%define tzdata_version 2022b +%define tzcode_version 2022b +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 Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz +Patch001: 0001-Work-around-awk-bug-1.patch Patch002: 0002-Fix-have-snprintf-error.patch %if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch @@ -43,6 +44,7 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 +%patch001 -p1 %patch002 -p1 %if 0%{?rhel} || 0%{?eln} %patch003 -p1 @@ -153,6 +155,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sun Aug 14 2022 Patsy Griffin - 2022b-1 +- Rebase to tzdata-2022b + - Chile transitions to DST on 2022-09-11, not 2022-09-04 + - 'make install' now defaults LOCALTIME to Factory rather than GMT + - More zones that are the same since 1970 have been moved to backzone. + - Include patch for awk workaround. + * Sat Jul 23 2022 Fedora Release Engineering - 2022a-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 45155faa87efbfa3dd3ea714d762dcc0b3440344 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Mon, 22 Aug 2022 21:12:07 -0400 Subject: [PATCH 54/90] Resolves: #2118513 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 13 ++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6a3c12c..d843391 100644 --- a/.gitignore +++ b/.gitignore @@ -194,3 +194,5 @@ noarch/ /tzcode2022a.tar.gz /tzcode2022b.tar.gz /tzdata2022b.tar.gz +/tzcode2022c.tar.gz +/tzdata2022c.tar.gz diff --git a/sources b/sources index 6d8aeed..7e121c7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022b.tar.gz) = 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79 -SHA512 (tzdata2022b.tar.gz) = a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1 +SHA512 (tzcode2022c.tar.gz) = 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06 +SHA512 (tzdata2022c.tar.gz) = e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b diff --git a/tzdata.spec b/tzdata.spec index 862b2a9..b488d27 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,14 @@ Summary: Timezone data Name: tzdata -Version: 2022b -%define tzdata_version 2022b -%define tzcode_version 2022b +Version: 2022c +%define tzdata_version 2022c +%define tzcode_version 2022c 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 Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz -Patch001: 0001-Work-around-awk-bug-1.patch Patch002: 0002-Fix-have-snprintf-error.patch %if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch @@ -44,7 +43,6 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch001 -p1 %patch002 -p1 %if 0%{?rhel} || 0%{?eln} %patch003 -p1 @@ -155,6 +153,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Aug 22 2022 Patsy Griffin - 2022c-1 +- Rebase to tzdata-2022c - supersedes tzdata-2022b + - Add a work-around for an awk bug in FreeBSD, macOS, etc. + - Improve tzselect with respect to intercontinental Zones. + * Sun Aug 14 2022 Patsy Griffin - 2022b-1 - Rebase to tzdata-2022b - Chile transitions to DST on 2022-09-11, not 2022-09-04 From 733d4236cfff804265f175567e9ff0cce3f0115f Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Sun, 25 Sep 2022 16:02:04 -0400 Subject: [PATCH 55/90] Resolves: #2129499 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'. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d843391..da22f57 100644 --- a/.gitignore +++ b/.gitignore @@ -196,3 +196,5 @@ noarch/ /tzdata2022b.tar.gz /tzcode2022c.tar.gz /tzdata2022c.tar.gz +/tzcode2022d.tar.gz +/tzdata2022d.tar.gz diff --git a/sources b/sources index 7e121c7..c1e5897 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022c.tar.gz) = 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06 -SHA512 (tzdata2022c.tar.gz) = e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b +SHA512 (tzcode2022d.tar.gz) = 54491ef8dbab7c41754eb3f2990b8ccb2a10960098c7d78d94375d7f1362540f0d71ba77a46bcaf95f419f8d01a23bdf940cdc9c7906c23ad6c40cd1c788b1c2 +SHA512 (tzdata2022d.tar.gz) = f0d9f1dc6b7613598a861a3860f249e5beff75d8c4bb12bae21018ee617044cf25065dff08f81b0e6ed2c43602f2166dd6407a989a369a004e068260f2eece30 diff --git a/tzdata.spec b/tzdata.spec index b488d27..80f39c0 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022c -%define tzdata_version 2022c -%define tzcode_version 2022c +Version: 2022d +%define tzdata_version 2022d +%define tzcode_version 2022d Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sun Sep 25 2022 Patsy Griffin - 2022d-1 +- Rebase to tzdata-2022d + - Palestine DST transition will be on October 29, 2022, + not October 28, 2022. + - Europe/Uzhgorod and Europe/Zaporozhye are moved to 'backzone'. + * Mon Aug 22 2022 Patsy Griffin - 2022c-1 - Rebase to tzdata-2022c - supersedes tzdata-2022b - Add a work-around for an awk bug in FreeBSD, macOS, etc. From 6d241a3fe3f2c45b102af1460f7b5813972bcf88 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Fri, 14 Oct 2022 15:47:22 -0400 Subject: [PATCH 56/90] Resolves: #2134955 Rebase to tzdata-2022e - Jordan and Syria cancelled the DST transition planned for 2022-10-28, remaining at +03 permanently. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index da22f57..8f7f52d 100644 --- a/.gitignore +++ b/.gitignore @@ -198,3 +198,5 @@ noarch/ /tzdata2022c.tar.gz /tzcode2022d.tar.gz /tzdata2022d.tar.gz +/tzcode2022e.tar.gz +/tzdata2022e.tar.gz diff --git a/sources b/sources index c1e5897..db1eaf4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022d.tar.gz) = 54491ef8dbab7c41754eb3f2990b8ccb2a10960098c7d78d94375d7f1362540f0d71ba77a46bcaf95f419f8d01a23bdf940cdc9c7906c23ad6c40cd1c788b1c2 -SHA512 (tzdata2022d.tar.gz) = f0d9f1dc6b7613598a861a3860f249e5beff75d8c4bb12bae21018ee617044cf25065dff08f81b0e6ed2c43602f2166dd6407a989a369a004e068260f2eece30 +SHA512 (tzcode2022e.tar.gz) = 7b3771bfa024d0bf445256f4d837a046eaba910ca3f2a5b4fcaf72ddd5fe34a9318a68f94ee09c0de120f3bdea41e9a16b0e82763896df8a6254ced0b454c060 +SHA512 (tzdata2022e.tar.gz) = 3b63ba2662930ee13dec79290f57545d71d21d4ddb76f94498a7096edaee0b3150e501c221c4d596df6af7c1d770c211f88feb5add13c5e3bed979218b4544da diff --git a/tzdata.spec b/tzdata.spec index 80f39c0..4b145b4 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022d -%define tzdata_version 2022d -%define tzcode_version 2022d +Version: 2022e +%define tzdata_version 2022e +%define tzcode_version 2022e Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Oct 14 2022 Patsy Griffin - 2022e-1 +- Rebase to tzdata-2022e + - Jordan and Syria cancelled the DST transition planned + for 2022-10-28, remaining at +03 permanently. + * Sun Sep 25 2022 Patsy Griffin - 2022d-1 - Rebase to tzdata-2022d - Palestine DST transition will be on October 29, 2022, From 59c16d506952460cdb6ea717a5b9d9fed5d590db Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Mon, 31 Oct 2022 00:00:56 -0400 Subject: [PATCH 57/90] Resolves: #2138478 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8f7f52d..04e7e92 100644 --- a/.gitignore +++ b/.gitignore @@ -200,3 +200,5 @@ noarch/ /tzdata2022d.tar.gz /tzcode2022e.tar.gz /tzdata2022e.tar.gz +/tzcode2022f.tar.gz +/tzdata2022f.tar.gz diff --git a/sources b/sources index db1eaf4..48b67f7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022e.tar.gz) = 7b3771bfa024d0bf445256f4d837a046eaba910ca3f2a5b4fcaf72ddd5fe34a9318a68f94ee09c0de120f3bdea41e9a16b0e82763896df8a6254ced0b454c060 -SHA512 (tzdata2022e.tar.gz) = 3b63ba2662930ee13dec79290f57545d71d21d4ddb76f94498a7096edaee0b3150e501c221c4d596df6af7c1d770c211f88feb5add13c5e3bed979218b4544da +SHA512 (tzcode2022f.tar.gz) = 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b +SHA512 (tzdata2022f.tar.gz) = 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6 diff --git a/tzdata.spec b/tzdata.spec index 4b145b4..e4beca5 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022e -%define tzdata_version 2022e -%define tzcode_version 2022e +Version: 2022f +%define tzdata_version 2022f +%define tzcode_version 2022f Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Oct 31 2022 Patsy Griffin - 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. + * Fri Oct 14 2022 Patsy Griffin - 2022e-1 - Rebase to tzdata-2022e - Jordan and Syria cancelled the DST transition planned From 20504f53d961da29145727d8a53258a23e56cee0 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Fri, 2 Dec 2022 11:50:04 -0500 Subject: [PATCH 58/90] Resolves: #2149397 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 +++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 04e7e92..46da8c6 100644 --- a/.gitignore +++ b/.gitignore @@ -202,3 +202,5 @@ noarch/ /tzdata2022e.tar.gz /tzcode2022f.tar.gz /tzdata2022f.tar.gz +/tzcode2022g.tar.gz +/tzdata2022g.tar.gz diff --git a/sources b/sources index 48b67f7..253accf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022f.tar.gz) = 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b -SHA512 (tzdata2022f.tar.gz) = 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6 +SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a +SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65 diff --git a/tzdata.spec b/tzdata.spec index e4beca5..6d5e9c7 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022f -%define tzdata_version 2022f -%define tzcode_version 2022f +Version: 2022g +%define tzdata_version 2022g +%define tzcode_version 2022g Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,14 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Dec 02 2022 Patsy Griffin - 2022g-1 +- Rebase to tzdata-2022g + - The northern edge of the Mexican state of Chihuahua will + change time zone to agree with nearby US locations on + 2022-11-30. + - Added a new Zone America/Ciudad_Juarez that splits from + America/Ojinaga. + * Mon Oct 31 2022 Patsy Griffin - 2022f-1 - Rebase to tzdata-2022f - Mexico will stop observing DST except near the US border. From 0000e76ad3d49f99552b70d70c963ff0059607fe Mon Sep 17 00:00:00 2001 From: Michal Kolar Date: Thu, 15 Dec 2022 11:25:03 +0000 Subject: [PATCH 59/90] plans/ci.fmf: fix deprecated fmf plan attribute --- plans/ci.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..85710d6 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -3,4 +3,4 @@ discover: how: fmf directory: tests execute: - how: beakerlib + how: tmt From 598030b446f11e1240a394e1c06ebb1eae21eed9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:37:01 +0000 Subject: [PATCH 60/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 6d5e9c7..50f1830 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2022g %define tzdata_version 2022g %define tzcode_version 2022g -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -153,6 +153,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2022g-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 02 2022 Patsy Griffin - 2022g-1 - Rebase to tzdata-2022g - The northern edge of the Mexican state of Chihuahua will From cf284c4e87ddf22cef7d5775b877d622eb749953 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 7 Mar 2023 07:42:02 +0100 Subject: [PATCH 61/90] Unconditionally include 0003-continue-to-ship-posixrules.patch This makes it possible to create a RHEL-compatible source RPM on non-RHEL distributions. The patch is still included/skipped at build time due to the remaining conditionals. --- tzdata.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 50f1830..25a5f04 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -10,9 +10,7 @@ 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 -%if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch -%endif BuildRequires: make BuildRequires: gawk, glibc, perl-interpreter From ed5061e02f9e7ca4878bfe955326a7f0e3003b50 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 7 Mar 2023 11:37:04 +0100 Subject: [PATCH 62/90] Drop %{eln} conditions ELN defines %{rhel}, so these conditions are redundant. --- tzdata.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 25a5f04..82e4194 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -42,7 +42,7 @@ This package contains timezone information for use by Java runtimes. %setup -q -c -a 1 %patch002 -p1 -%if 0%{?rhel} || 0%{?eln} +%if 0%{?rhel} %patch003 -p1 %endif @@ -55,7 +55,7 @@ pushd rearguard tar zxf tzdata%{version}-rearguard.tar.gz popd -%if 0%{?rhel} || 0%{?eln} +%if 0%{?rhel} # Use rearguard for rhel (overwrite default vangaurd data) tar zxf rearguard/tzdata%{version}-rearguard.tar.gz %endif @@ -88,7 +88,7 @@ echo "%{name}%{tzdata_version}" >> VERSION %build # Run make to create the tzdata.zi file rm tzdata.zi -%if 0%{?rhel} || 0%{?eln} +%if 0%{?rhel} make VERSION=%{version} DATAFORM=rearguard tzdata.zi %else make tzdata.zi From 4910381f7ad14f1d75d72ae16ee430244abab3c2 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 23 Mar 2023 15:03:53 -0400 Subject: [PATCH 63/90] Resolves: #2181027 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. --- .gitignore | 2 ++ 0003-continue-to-ship-posixrules.patch | 12 ++++++------ sources | 4 ++-- tzdata.spec | 14 ++++++++++---- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 46da8c6..bbfc0cd 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,5 @@ noarch/ /tzdata2022f.tar.gz /tzcode2022g.tar.gz /tzdata2022g.tar.gz +/tzcode2023a.tar.gz +/tzdata2023a.tar.gz diff --git a/0003-continue-to-ship-posixrules.patch b/0003-continue-to-ship-posixrules.patch index 1755352..fa905d3 100644 --- a/0003-continue-to-ship-posixrules.patch +++ b/0003-continue-to-ship-posixrules.patch @@ -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 diff --git a/sources b/sources index 253accf..58d053f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a -SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65 +SHA512 (tzcode2023a.tar.gz) = d45fc677a0a32ae807bf421faceff675565ee15e3ff42d3a4121df10e1f7855ac16b27fbc28bd365f93c57f40c5bdf19cde88546f7090cfab7676cac0a5516a4 +SHA512 (tzdata2023a.tar.gz) = 10aadd6eba50f63f427399281065ba34cb474f6a854f8dc7a6f4f1343b1474a05f22b69b1e113ea67bb5f3f479253610a16b89d9dfa157bf0fde4c69aa3d6493 diff --git a/tzdata.spec b/tzdata.spec index 82e4194..457b52b 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2022g -%define tzdata_version 2022g -%define tzcode_version 2022g -Release: 2%{?dist} +Version: 2023a +%define tzdata_version 2023a +%define tzcode_version 2023a +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 @@ -151,6 +151,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Mar 23 2023 Patsy Griffin - 2023a-1 +- Rebase to tzdata-2023a + - Egypt reintroduced DST, from April through October. + - Morocco springs forward April 23, not April 30. + - Palestine delayed the start of DST this year. + * Sat Jan 21 2023 Fedora Release Engineering - 2022g-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 4b3576e50cb375418efc77713d3364092ddd5523 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Fri, 24 Mar 2023 10:08:31 -0400 Subject: [PATCH 64/90] Resolves: #2181427 Rebase to tzdata-2023b - Lebanon will transition to DST on April 20/21, not March 25/26. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bbfc0cd..edecf92 100644 --- a/.gitignore +++ b/.gitignore @@ -206,3 +206,5 @@ noarch/ /tzdata2022g.tar.gz /tzcode2023a.tar.gz /tzdata2023a.tar.gz +/tzcode2023b.tar.gz +/tzdata2023b.tar.gz diff --git a/sources b/sources index 58d053f..b3fcd80 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2023a.tar.gz) = d45fc677a0a32ae807bf421faceff675565ee15e3ff42d3a4121df10e1f7855ac16b27fbc28bd365f93c57f40c5bdf19cde88546f7090cfab7676cac0a5516a4 -SHA512 (tzdata2023a.tar.gz) = 10aadd6eba50f63f427399281065ba34cb474f6a854f8dc7a6f4f1343b1474a05f22b69b1e113ea67bb5f3f479253610a16b89d9dfa157bf0fde4c69aa3d6493 +SHA512 (tzcode2023b.tar.gz) = 94058ceabfdaa62eeff9be804a030f0eb95b4099b62fbb7e55557e8b934c8d883f488a3a6996331e24aebd147d66c19a73fb925a3dd929c630a9e11b51003b7f +SHA512 (tzdata2023b.tar.gz) = 0f697b872ef02109d2098db12d0effc834b2ac5438921e0867f2c70987f305a47dc3eac720c344bb3757c902a7653109621e943564bdfbf00937077c311aa29b diff --git a/tzdata.spec b/tzdata.spec index 457b52b..b1e1623 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2023a -%define tzdata_version 2023a -%define tzcode_version 2023a +Version: 2023b +%define tzdata_version 2023b +%define tzcode_version 2023b Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -151,6 +151,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Mar 24 2023 Patsy Griffin - 2023b-1 +- Rebase to tzdata-2023b + - Lebanon will transition to DST on April 20/21, not March 25/26. + * Thu Mar 23 2023 Patsy Griffin - 2023a-1 - Rebase to tzdata-2023a - Egypt reintroduced DST, from April through October. From b796b9666129c72f3095e835ec309b23fe3553c7 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 29 Mar 2023 10:36:25 -0400 Subject: [PATCH 65/90] Resolves: #2182501 Rebase to tzdata-2023c - Reinstate Lebanon DST change effective March 25. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index edecf92..a323947 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,5 @@ noarch/ /tzdata2023a.tar.gz /tzcode2023b.tar.gz /tzdata2023b.tar.gz +/tzcode2023c.tar.gz +/tzdata2023c.tar.gz diff --git a/sources b/sources index b3fcd80..35c485b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2023b.tar.gz) = 94058ceabfdaa62eeff9be804a030f0eb95b4099b62fbb7e55557e8b934c8d883f488a3a6996331e24aebd147d66c19a73fb925a3dd929c630a9e11b51003b7f -SHA512 (tzdata2023b.tar.gz) = 0f697b872ef02109d2098db12d0effc834b2ac5438921e0867f2c70987f305a47dc3eac720c344bb3757c902a7653109621e943564bdfbf00937077c311aa29b +SHA512 (tzcode2023c.tar.gz) = fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 +SHA512 (tzdata2023c.tar.gz) = 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 diff --git a/tzdata.spec b/tzdata.spec index b1e1623..f182c2c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2023b -%define tzdata_version 2023b -%define tzcode_version 2023b +Version: 2023c +%define tzdata_version 2023c +%define tzcode_version 2023c Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -151,6 +151,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Mar 29 2023 Patsy Griffin - 2023c-1 +- Rebase to tzdata-2023c + - Reinstate Lebanon DST change effective March 25. + * Fri Mar 24 2023 Patsy Griffin - 2023b-1 - Rebase to tzdata-2023b - Lebanon will transition to DST on April 20/21, not March 25/26. From ff6fbf58ade1d1f86c74248786dce02d3fa2ca3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 16:55:42 +0000 Subject: [PATCH 66/90] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index f182c2c..3f30ef6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2023c %define tzdata_version 2023c %define tzcode_version 2023c -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -151,6 +151,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2023c-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Mar 29 2023 Patsy Griffin - 2023c-1 - Rebase to tzdata-2023c - Reinstate Lebanon DST change effective March 25. From af5c6d18873cc91135b407ccb1589503de0e113e Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 24 Jul 2023 15:15:19 -0400 Subject: [PATCH 67/90] 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 68/90] 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 69/90] 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 70/90] 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 71/90] 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 72/90] 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 73/90] 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 74/90] 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 75/90] 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 76/90] 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 77/90] 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 78/90] 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 79/90] 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 80/90] 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 81/90] 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 82/90] 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 83/90] 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 84/90] 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 85/90] 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 86/90] 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 87/90] 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 88/90] 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 89/90] 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 90/90] 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