From 631ff42bfc01874ff9d09a7111d7aba7ed6b6141 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Sun, 12 Mar 2017 13:17:28 -0400 Subject: [PATCH 1/6] Resolves: #1431449 Rebase to tzdata-2017a: - Mongolia no longer observes DST - The Magallanes region of Chile will go from -04/-03 to -03 year round, resulting in a new time zone America/Punta_Arenas. --- .gitignore | 2 ++ sources | 8 ++++---- tzdata.spec | 14 ++++++++++---- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 30002f5..e829718 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,5 @@ noarch/ /tzdata2016i.tar.gz /tzcode2016j.tar.gz /tzdata2016j.tar.gz +/tzdata2017a.tar.gz +/tzcode2017a.tar.gz diff --git a/sources b/sources index e2b072b..a3d224d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz -cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz -0684b98eb184fab250b6ca946862078d tzcode2016j.tar.gz -db361d005ac8b30a2d18c5ca38d3e8ab tzdata2016j.tar.gz +SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b +SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 +SHA512 (tzdata2017a.tar.gz) = fe57930711998a0755749a2bf1b32fdbc9e6ee249762017beea52eae7e521236396300fe2d79298fd81eb6d73fb7567884c35995ed248be06188329d937e3873 +SHA512 (tzcode2017a.tar.gz) = 36d744debd5263b6be39b3a9a146b7db1876f216a4bfc62b46631745861a9c03eda3220f213def86c724d3a11c41398c65c2e5d013ff2c1900e7bfc5e7844025 diff --git a/tzdata.spec b/tzdata.spec index 09c6a79..26c72a6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2016j -%define tzdata_version 2016j -%define tzcode_version 2016j -Release: 3%{?dist} +Version: 2017a +%define tzdata_version 2017a +%define tzcode_version 2017a +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones @@ -122,6 +122,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Sun Mar 12 2017 Patsy Franklin - 2017a-1 +- Rebase to tzdata-2017a + - Mongolia no longer observes DST + - Magallanes region of Chile moves from -04/-03 to -03 year round. + This results in a new zone, America/Punta_Arenas. + * Wed Feb 01 2017 Stephen Gallagher - 2016j-3 - Add missing %%license macro From 6089ddc1ae9cda8c2fbc1340cdd10a45502bf909 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Mon, 27 Mar 2017 22:12:22 -0400 Subject: [PATCH 2/6] Resolves: #1434206 - Haiti began observing DST on March 12, 2017. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e829718..2e7df3c 100644 --- a/.gitignore +++ b/.gitignore @@ -154,3 +154,5 @@ noarch/ /tzdata2016j.tar.gz /tzdata2017a.tar.gz /tzcode2017a.tar.gz +/tzcode2017b.tar.gz +/tzdata2017b.tar.gz diff --git a/sources b/sources index a3d224d..422e6ae 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzdata2017a.tar.gz) = fe57930711998a0755749a2bf1b32fdbc9e6ee249762017beea52eae7e521236396300fe2d79298fd81eb6d73fb7567884c35995ed248be06188329d937e3873 -SHA512 (tzcode2017a.tar.gz) = 36d744debd5263b6be39b3a9a146b7db1876f216a4bfc62b46631745861a9c03eda3220f213def86c724d3a11c41398c65c2e5d013ff2c1900e7bfc5e7844025 +SHA512 (tzcode2017b.tar.gz) = 9a73af4b868506d1f6287a8285dea489e68f6828da19509114f9144e2a2019c7fd28f4fb98ea907030d11d011ce3a87d99dbe43bca218beddafff151f0d61df1 +SHA512 (tzdata2017b.tar.gz) = 3e090dba1f52e4c63b4930b28f4bf38b56aabd6728f23094cb5801d10f4e464f17231f17b75b8866714bf98199c166ea840de0787b75b2274aa419a4e14bbc4d diff --git a/tzdata.spec b/tzdata.spec index 26c72a6..6dcb346 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2017a -%define tzdata_version 2017a -%define tzcode_version 2017a +Version: 2017b +%define tzdata_version 2017b +%define tzcode_version 2017b Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -122,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Sun Mar 26 2017 Patsy Franklin - 2017b-1 +- Rebase to tzdata-2017b + - Haiti began observing DST on March 12, 2017. + * Sun Mar 12 2017 Patsy Franklin - 2017a-1 - Rebase to tzdata-2017a - Mongolia no longer observes DST From 41183e1162d15dcc97db7ff452c80b3c38ab3bd8 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Sun, 29 Oct 2017 19:57:18 -0400 Subject: [PATCH 3/6] 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 | 35 ++++-- 5 files changed, 214 insertions(+), 9 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 6dcb346..50187aa 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 +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 @@ -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. + * Sun Mar 26 2017 Patsy Franklin - 2017b-1 - Rebase to tzdata-2017b - Haiti began observing DST on March 12, 2017. From 054fc7e59b5921758d045aca2da8bce40073a451 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Fri, 2 Feb 2018 09:44:22 -0500 Subject: [PATCH 4/6] =?UTF-8?q?Resolves:=20#1535266=20-=20Rebase=20to=20tz?= =?UTF-8?q?data-2018c:=20=20=20-=20S=C3=A3o=20Tom=C3=A9=20and=20Pr=C3=ADnc?= =?UTF-8?q?ipe=20changed=20from=20+00=20to=20+01=20on=20January=201,=20201?= =?UTF-8?q?8=20=20=20-=20Brazil's=20DST=20will=20start=20on=20the=20first?= =?UTF-8?q?=20Sunday=20in=20November=20=20=20-=20Support=20for=20the=20new?= =?UTF-8?q?=20zic=20-t=20option.=20=20=20-=20Add=20back=20pacificnew=20fil?= =?UTF-8?q?e=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 50187aa..d3b2d8f 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 ffb2403601d58ffa31e1821aff46deb250e65716 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Wed, 28 Mar 2018 16:23:32 -0400 Subject: [PATCH 5/6] 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 d3b2d8f..d25f8d1 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 471b0077ab6f8d1afb3187c6d760aa262d08bd67 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Thu, 17 May 2018 16:19:43 -0400 Subject: [PATCH 6/6] 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 d25f8d1..7c4b377 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