- tz - lists.iana.org

[tz-announce] 2018e release of tz code and data available
by Paul Eggert May 4, 2018

May 4, 2018

The 2018e release of the tz code and data is available. It reflects the following changes, which were either circulated on the tz mailing list or are relatively minor technical or administrative changes: Briefly: North Korea switches back to +09 on 2018-05-05. The main format uses negative DST again, for Ireland etc. 'make tarballs' now also builds a rearguard tarball. New 's' and 'd' suffixes in SAVE columns of Rule and Zone lines. Changes to past and future time stamps North Korea switches back from +0830 to +09 on 2018-05-05. (Thanks to Kang Seonghoon, Arthur David Olson, Seo Sanghyeon, and Tim Parenti.) Bring back the negative-DST changes of 2018a, except be more compatible with data parsers that do not support negative DST. Also, this now affects historical time stamps in Namibia and the former Czechoslovakia, not just Ireland. The main format now uses negative DST to model time stamps in Europe/Dublin (from 1971 on), Europe/Prague (1946/7), and Africa/Windhoek (1994/2017). This does not affect UT offsets, only time zone abbreviations and the tm_isdst flag. Also, this does not affect rearguard or vanguard formats; effectively the main format now uses vanguard instead of rearguard format. Data parsers that do not support negative DST can still use data from the rearguard tarball described below. Changes to build procedure The command 'make tarballs' now also builds the tarball tzdataVERSION-rearguard.tar.gz, which is like tzdataVERSION.tar.gz except that it uses rearguard format intended for trailing-edge data parsers. Changes to data format and to code The SAVE column of Rule and Zone lines can now have an 's' or 'd' suffix, which specifies whether the adjusted time is standard time or daylight saving time. If no suffix is given, daylight saving time is used if and only if the SAVE column is nonzero; this is the longstanding behavior. Although this new feature is not used in tzdata, it could be used to specify the legal time in Namibia 1994-2017, as opposed to the popular time (see below). Changes to past time stamps From 1994 through 2017 Namibia observed DST in winter, not summer. That is, it used negative DST, as Ireland still does. This change does not affect UTC offsets; it affects only the tm_isdst flag and the abbreviation used during summer, which is now CAT, not WAST. Although (as noted by Michael Deckers) summer and winter time were both simply called "standard time" in Namibian law, in common practice winter time was considered to be DST (as noted by Stephen Colebourne). The full effect of this change is only in vanguard format; in rearguard and main format, the tm_isdst flag is still zero in winter and nonzero in summer. In 1946/7 Czechoslovakia also observed negative DST in winter. The full effect of this change is only in vanguard format; in rearguard and main formats, it is modeled as plain GMT without daylight saving. Also, the dates of some 1944/5 DST transitions in Czechoslovakia have been changed. Here are links to the release files: https://www.iana.org/time-zones/repository/releases/tzcode2018e.tar.gz https://www.iana.org/time-zones/repository/releases/tzdata2018e.tar.gz https://www.iana.org/time-zones/repository/releases/tzdb-2018e.tar.lz As usual, links to the latest release files are here: https://www.iana.org/time-zones/repository/tzcode-latest.tar.gz https://www.iana.org/time-zones/repository/tzdata-latest.tar.gz https://www.iana.org/time-zones/repository/tzdb-latest.tar.lz Links are also available via plain HTTP, and via FTP from ftp://ftp.iana.org/tz/releases with the same basenames as above. Each release file has a GPG signature, which can be retrieved by appending ".asc" to the above URLs. Copies of these signatures are appended to this message. This release corresponds to commit 4758e88f99c71af65d73ce730e87438466032a5f dated 2018-05-01 23:42:51 -0700 and tagged '2018e' in the development GitHub repository at <https://github.com/eggert/tz>. Here are the SHA-512 checksums for the release files: 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 tzcode2018e.tar.gz d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae tzdata2018e.tar.gz afb7569cc9faef6e3d2be16ceef65f8531ac123dac14e3b40a4f54dab916e930b09eb665458e55f98398c4b8c5d108f34985a42bf711b2170de90d819bf0e630 tzdb-2018e.tar.lz Here are the GPG checksums for the release files: -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJa6V9nAAoJEO2X6Q5iqn40r+EQAJSt3ap8G8swYPzBg6TstckZ tOxrDcGlRu4km6jzIhHelOwj2Sxw8X/0JyRc09xbGbXGE/mv35DrzKC8ijfazu9pg Mr4eOclfFGq8l48aRag86hR33k62K84Xdl0WrwVFVefhlsRel9i6lXnBFcmgHl/C vSwJXyrZ2DgvZH88B6j8qnYkw/BMbsTKLM1L/3EHxKZqq/TCHS19Z1XbbkF6mm/u 73aHHmXEnpSVol+3aekEKuS+PSdc+loYaAMvibBJ34ci2bc1X1HkOPF30dRSTETW pVtKXp1qFtmHRR07I28l7/jEzmI+XPheCswhOKowWqKe59tA2CTiFnkhuBQUmoZS XDjKpcgvrad9RSES1aVAfVn2iCx78Inu0W8UIWZ/eiMOh0taQH3n7K1KBnLwCEKd rAB9ummGRK787XJEe2/xnH/h0lilU7Ye6EddNwuGf5Q3PlS9brDov66dnIUWi76L uPRTufummczt6XcA9YL0zEhwvAzjSSqQzoga7mXBKSIwakRoKXCIoux+EdQOWNOy /VUMH5NIkND+kRcRdqTXs93Whu7SCV14DKi5j1LL39YC8nqGi0q3u8wndm22AhCr ZR9uMv1Qq1iCXb09sIBfdi7bf0S8348jz1deb/d7jgJ4ISBR7v8UiR3Z/JO8hiPR QSP93j37rjAsFyBSWMxq =knlj -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJa6V9nAAoJEO2X6Q5iqn40qYUQAI21DF4x+Qr9uhMf5UL3u/UI BnLTeDqc4t1oLbuuJsbtgausc/m6EIgo2j9+uadXefnguP4fwKHJ2doReuRZ3njI hGnqP2+yCfTRNrZYBU3p6U+/OJq8r/UBsn9aGxNStcZHe6FswnxXWlzpRNbPdNBC nGeYMs2HOQjcdG08BF1sjGm4FC/NS6bugNhs0EcrMLaVa+c0keRWNg9o7Y/SvrZB awFAMz4LhOog2qxhGWtFgSVRAAj5aEDqugOXZL27VszgGPexiAaMCFyQARIHigIw 959D7RYmpeNuEeP6XbzGFgDO6aMbxahoUpP9cCOUI6qKShtDKnY2XkjPmVQiAfjZ zvpsE1dYbWyVTWqWhWL3z0lPCFN6B4eneY6UXY/KtENRl1jEafKN5/7JqKOMBSRo umE1Jy6qSSz5jLuz5pX59iOXWZETIlwtAW6lKe2s6l9xWPL9R8xXoPvbQRadqDxB uANcGZSrKD1jKuybPJa/6BZRF+FlldCkZVVKSSdXuPLF1HhohlvFZqi1WPmWvGd+ s/1+3OhWzB4BHyrp3Wbtj+ZwCtg9UVbJLBM2bgL9nGEyv/1XSxgLJEp3rneIMpJv AMK8rr3XehXLDkXAfx68Mzs3F4lYEdXk6y9f9ZsVj+IdBotwzzjJWeCfnlmJM52y 8cCrPGUjdneFidV9OZ+J =4LFO -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJa6V9pAAoJEO2X6Q5iqn40EBwP/1fxMc1IozcXCWSm+h/XZ3M+ bImmIdf8Ws/FZC5yXHWkU4n3DZN6A2Xf/dDTDaZPeyhL3rjd6ju0zxTsQpxdqRms FrEiqlq2CpIVe+pY4EeowfsFdKVYIxtiTw9BNytaDOIgYxRmokNUQusaHw2qrZg6 t6giUhH6bh1/YgZakFP65WItjESR8Dg4aJ7X1f8BJkSEyy9I2lnyWOG7LwB8xNvS YRPRjkVqdVXzdS9MtqO+U5b9pe1MvU6q0lRAOwUvZsGfB7fULkdQcS1XaYDVRdPA WdMKqn21S+oRHYzX5/BZHE68uGFlufPohikYfSCO6pk8eqDe0xbkOl6fpgjjqTZf wCAcZBBoCP11lH8Omdu8bW6LJ0q1jkwuCZxmLBPwonInoByPO/TeDstYSp39KCv2 +w0pl87uYe6/IEwSC1bH0HBF8kzcEq5q5JVHLyqwOKrAm6Nfm5sC5vWFhk3GmMGU FGpFLnwUJlTefy9X3ds8zEvmCAiFMisu5cciMRwfCLvTHSObRGEXtp5pxpr0VhBf A6Qc+83JPTwhEWdVQMVbEWRkkJNG50xAwOhjJaClXjjlvJqQtpUPHLR7fRaQWvm8 sCXhh+PeWpgIbbzaE7TzkVu9sLUGiIvbLiP2yNMOuoZp+UUnrsSaswbeCl0bkGe3 LSswAxioa5rs8zd8WtZe =/AeX -----END PGP SIGNATURE----- PS. If your tzdata parser does not yet support negative DST offsets,this particular release's data entries are also available in arearguard-format tarball and signature that does not contain suchoffsets. This is intended to be a temporary transition aid for theseparsers. The URLs are: https://web.cs.ucla.edu/~eggert/tz/release/2018e/tzdata2018e-rearguard.tar.… https://web.cs.ucla.edu/~eggert/tz/release/2018e/tzdata2018e-rearguard.tar.… with the following SHA-512 and GPG checksums: dd92cf2d01388d52731db7569360e3c7e673c3189c8cba807d031fb6b6ce8c115d3f4de3be1c7a6b1e038fa919efdd254cdd4f7731c3130b447dee2c7c5814a4 tzdata2018e-rearguard.tar.gz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJa6V9oAAoJEO2X6Q5iqn40jJMP+gKGNy3VBhJ9B2/plNXta2nH M5fAwJphPXutCv2ums0LPVNbi0FWjPo9T2/6Lmy71vyyusW/9ltS+/bECSnmrZRO VEql2UWghxGMaV3Y2wpFI2XGqepQYsT9Xa1tgXUvXHakQPYe5Osx0J3P50F9ROMy kiWR4VSsSE3IZDiZC32HQjcHsREcUtpgYfn943Zr1Go2FRnp2esnbN0eQtTV5vJW uSYWdfSNWNsSqXR9O2cq9kzCeVKxZjjs2hi1adIrQLzQKy26RXUC9f4tepzRrPfT euHiHUrZXE5p2161Q702P1Nw3zPFrA/SHiFZTpP84mri60RVZTWPP21ityktFukt B+Ebkpd7EwyyFFZB1grbnb1uLc2qkM76gKtIPJAtkWEe7BwwwREh9d/92K/L9XTe opehULRUjX65UyOWNUD9dl3aiy1FHQyWAuX3fRF1u2vrh3WSuIHbO0Uq9RCMQtHP VSY45Ldwv3+PGfyaKlQvftqFAFJ2kjmIC7zQZe5HmBIYG8TIyUCS/P17XZzIrEpw aBNrPe4hV63DSVEvBYLHaCPMMIASASBvSZ2S5Rb2HopAzVd6xOYSvGCqwjdtFpr6 1bD4EeIb2wBxPWH8KFZiSDYK/FpfhuZR7teY6bzG+fsZMtzChP4pcQrebMD3RIPZ RBDXrhtfn+5b78wn6VMM =VPo7 -----END PGP SIGNATURE----- _______________________________________________ tz-announce mailing list tz-announce(a)iana.org https://mm.icann.org/mailman/listinfo/tz-announce

1 0

Pyongyang Time transition plan announced
by Seo Sanghyeon May 3, 2018

May 3, 2018

Rodong Sinmun 2018-04-30 announced Pyongyang Time transition plan. https://www.nknews.org/kcna/wp-content/uploads/sites/5/2018/04/rodong-2018-… I won't translate, but even if you don't know Korean it should be easy to confirm that the transition date is 2018-05-05. 2018 is Juche 107. Citation should be Decree No. 2232 of April 30, 2018, of the Presidum of the Supreme People's Assembly, as published in Rodong Sinmun. -- Seo Sanghyeon

7 12

[PROPOSED] Fix typos in 2018e historical NEWS
by Paul Eggert May 3, 2018

May 3, 2018

* NEWS: Fix typos in description of 2018e’s changes to historical timestamps in Namibia and Czechoslovakia. --- NEWS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index e985ce6..90452b7 100644 --- a/NEWS +++ b/NEWS @@ -64,12 +64,12 @@ Release 2018e - 2018-05-01 23:42:51 -0700 both simply called "standard time" in Namibian law, in common practice winter time was considered to be DST (as noted by Stephen Colebourne). The full effect of this change is only in vanguard - format; in rearguard and main format, the tm_isdst flag is still + and main format; in rearguard format, the tm_isdst flag is still zero in winter and nonzero in summer. In 1946/7 Czechoslovakia also observed negative DST in winter. - The full effect of this change is only in vanguard format; in - rearguard and main formats, it is modeled as plain GMT without + The full effect of this change is only in vanguard and main + formats; in rearguard format, it is modeled as plain GMT without daylight saving. Also, the dates of some 1944/5 DST transitions in Czechoslovakia have been changed. -- 2.17.0

1 0

[PROPOSED] Port better to GCC 8
by Paul Eggert May 1, 2018

May 1, 2018

* private.h (ATTRIBUTE_MALLOC): New macro. Use this and related macros starting with GCC 3.0, not GCC 2.96 which was not an official release. * zdump.c (xmalloc): * zic.c (emalloc, ecpyalloc): Use it to pacify -Wsuggest-attribute=malloc with GCC 8. --- private.h | 4 +++- zdump.c | 2 +- zic.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/private.h b/private.h index 705544e..641f905 100644 --- a/private.h +++ b/private.h @@ -342,12 +342,14 @@ typedef unsigned long uintmax_t; #define SIZE_MAX ((size_t) -1) #endif -#if 2 < __GNUC__ + (96 <= __GNUC_MINOR__) +#if 3 <= __GNUC__ # define ATTRIBUTE_CONST __attribute__ ((const)) +# define ATTRIBUTE_MALLOC __attribute__ ((__malloc__)) # define ATTRIBUTE_PURE __attribute__ ((__pure__)) # define ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec)) #else # define ATTRIBUTE_CONST /* empty */ +# define ATTRIBUTE_MALLOC /* empty */ # define ATTRIBUTE_PURE /* empty */ # define ATTRIBUTE_FORMAT(spec) /* empty */ #endif diff --git a/zdump.c b/zdump.c index 1081648..a4d9108 100644 --- a/zdump.c +++ b/zdump.c @@ -136,7 +136,7 @@ sumsize(size_t a, size_t b) /* Return a pointer to a newly allocated buffer of size SIZE, exiting on failure. SIZE should be nonzero. */ -static void * +static void * ATTRIBUTE_MALLOC xmalloc(size_t size) { void *p = malloc(size); diff --git a/zic.c b/zic.c index 90ae1f4..31f1092 100644 --- a/zic.c +++ b/zic.c @@ -447,7 +447,7 @@ memcheck(void *ptr) return ptr; } -static void * +static void * ATTRIBUTE_MALLOC emalloc(size_t size) { return memcheck(malloc(size)); @@ -459,7 +459,7 @@ erealloc(void *ptr, size_t size) return memcheck(realloc(ptr, size)); } -static char * +static char * ATTRIBUTE_MALLOC ecpyalloc (char const *str) { return memcheck(strdup(str)); -- 2.17.0

1 0

[PROPOSED] Use GCC 8 for debugging
by Paul Eggert April 30, 2018

April 30, 2018

* Makefile (GCC_DEBUG_FLAGS): Use flags appropriate for GCC 8. --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3ac1a67..21fa488 100644 --- a/Makefile +++ b/Makefile @@ -236,14 +236,16 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ $(GCC_INSTRUMENT) \ -Wall -Wextra \ -Walloc-size-larger-than=100000 -Warray-bounds=2 \ - -Wbad-function-cast -Wcast-align -Wdate-time \ + -Wbad-function-cast -Wcast-align=strict -Wdate-time \ -Wdeclaration-after-statement -Wdouble-promotion \ -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \ -Winit-self -Wjump-misses-init -Wlogical-op \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ -Wold-style-definition -Woverlength-strings -Wpointer-arith \ - -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \ + -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=4 \ + -Wstringop-truncation -Wsuggest-attribute=cold \ -Wsuggest-attribute=const -Wsuggest-attribute=format \ + -Wsuggest-attribute=malloc \ -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \ -Wtrampolines -Wundef -Wuninitialized -Wunused \ -Wvariadic-macros -Wvla -Wwrite-strings \ -- 2.17.0

1 0

DPRK to revert to UTC+9 from UTC+8:30
by Kang Seonghoon April 30, 2018

April 30, 2018

On 2018-04-29 (+09:00), according to Yoon Young-chan, senior presidental secretary for public relations of South Korea, has announced that North Korea will revert its time zone from UTC+8:30 (PYT; Pyongyang Time) back to UTC+9 (KST; Korea Standard Time), in lieu of the recent Panmunjom Declaration. Yet another time to change tzdata? Source: South and North agreed to unify PYT to KST, Yonhap News http://m.yna.co.kr/kr/contents/?cid=AKR20180429018500001 (no English translation exists right now) -- -- Kang Seonghoon | https://mearie.org/ -- Opinions expressed in this email do not necessarily represent the views of my employer. --

4 4

North Korea timezone to become GMT+9 from May 5 2018
by Phake Nick April 30, 2018

April 30, 2018

The URL to the announcement cannot be directly copied, but you can access www.kcna.kp then select "English" on top right hand corner, and then there will be an article titled "SPA Presidium of DPRK Decides to Reset Pyongyang Time" which talk about the upcoming change in time in North Korea. Media outside North Korea have reported about it too. However, there are no info with respect to exactly which moment in May 5 are they switching their timezone

3 3

North Korea to match South Korea's time zone
by Arthur David Olson April 29, 2018

April 29, 2018

A tweet from Jef Poskanzer... https://twitter.com/jef_poskanzer/status/990430801903865856 ...alerted me to North Korea's plan to match South Korea's time zone. An AP item on the matter... https://apnews.com/301adfec088647c1b1cbc69eb4b0949a ...cites South Korean President Moon Jae-in's spokesperson Yoon Young-chan; referring to North Korean leader Kim Jong Un, " Yoon said Kim...revealed plans to re-adjust its current time zone to match the South’s." No word in the AP item on specifics of the plan. @dashdashado

2 1

[PROPOSED] Support zi parsers that mishandle negative DST offsets
by Paul Eggert April 23, 2018

April 23, 2018

This is intended to provide a way to support both clients that require data to have only positive DST offsets, and clients that do not have this restriction. * Makefile (XDST, SDST): New macros. (TZDATA_ZI_DEPS): Add zidst.awk. (DSTDATA_ZI_DEPS): New macro. (all): Depend on fulldata.zi and pdstdata.zi. (fulldata.zi pdstdata.zi): New rule. (tzdata.zi): Use $(XDST)data.zi instead of reading original source. (check_zishrink): Check zidst.awk, too. (clean): Remove all *.zi files, not just tzdata.zi. * NEWS, europe: Mention this. * zidst.awk: New file. --- Makefile | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++----------- NEWS | 30 ++++++++++++++++++++++++++++++ europe | 39 ++++++++++++++++++++++----------------- zidst.awk | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 154 insertions(+), 28 deletions(-) create mode 100644 zidst.awk diff --git a/Makefile b/Makefile index 8c84cd9..92ddb80 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,26 @@ VERSION= unknown # Email address for bug reports. BUGEMAIL= tz(a)iana.org +# To install the full data, which can contain daylight saving time +# offsets that are negative (relative to standard time), use +# XDST= full +# To install data containing only positive daylight saving time +# offsets, but otherwise as close to the full data as practical, use +# XDST= pdst +XDST= pdst +# Parsers requiring DST offsets to be positive should use the file +# pdstdata.zi, which contains almost all the data of 'africa' etc., +# except with positive DST offsets. This works around a problem that +# was discovered in January 2018 with negative DST in tests for ICU +# and OpenJDK. See: +# https://mm.icann.org/pipermail/tz/2018-January/025825.html +# https://mm.icann.org/pipermail/tz/2018-January/025822.html +# Currently the 'africa' etc. files use pdst form if comments are +# ignored, to ease transition for parsers that do not support +# negative DST offsets. This is intended to change to full form at +# some point, so that full-featured zi parsers that use the 'africa' +# files will get the full data without changing anything. + # Change the line below for your time zone (after finding the zone you want in # the time zone files, or adding it to a time zone file). # Alternately, if you discover you've got the wrong time zone, you can just @@ -463,7 +483,8 @@ TDATA= $(YDATA) $(NDATA) $(BACKWARD) ZONETABLES= zone1970.tab zone.tab TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list -TZDATA_ZI_DEPS= zishrink.awk version $(TDATA) $(PACKRATDATA) +TZDATA_ZI_DEPS= zidst.awk zishrink.awk version $(TDATA) $(PACKRATDATA) +DSTDATA_ZI_DEPS= zidst.awk $(TDATA) $(PACKRATDATA) DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \ leapseconds yearistype.sh $(ZONETABLES) AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk @@ -500,7 +521,8 @@ VERSION_DEPS= \ SHELL= /bin/sh -all: tzselect yearistype zic zdump libtz.a $(TABDATA) +all: tzselect yearistype zic zdump libtz.a $(TABDATA) \ + fulldata.zi pdstdata.zi ALL: all date $(ENCHILADA) @@ -535,11 +557,15 @@ version: $(VERSION_DEPS) printf '%s\n' "$$V" >$@.out mv $@.out $@ -# This file can be tailored by setting BACKWARD, PACKRATDATA, etc. -tzdata.zi: $(TZDATA_ZI_DEPS) +# These files can be tailored by setting BACKWARD, PACKRATDATA, etc. +fulldata.zi pdstdata.zi: $(DSTDATA_ZI_DEPS) + $(AWK) -v outfile='$@' -f zidst.awk $(TDATA) $(PACKRATDATA) \ + >$@.out + mv $@.out $@ +tzdata.zi: $(XDST)data.zi version version=`sed 1q version` && \ LC_ALL=C $(AWK) -v version="$$version" -f zishrink.awk \ - $(TDATA) $(PACKRATDATA) >$@.out + $(XDST)data.zi >$@.out mv $@.out $@ version.h: version @@ -721,17 +747,32 @@ check_tzs: $(TZS) $(TZS_NEW) check_web: tz-how-to.html $(VALIDATE_ENV) $(VALIDATE) $(VALIDATE_FLAGS) tz-how-to.html -# Check that tzdata.zi generates the same binary data that its sources do. -check_zishrink: tzdata.zi zic leapseconds $(PACKRATDATA) $(TDATA) +# The format of the source files, either full or pdst. +# Currently they are in pdst format, but this is expected to change. +SDST = pdst + +# Check that zishrink.awk does not alter the data, and that zidst.awk +# preserves $(SDST) data. +check_zishrink: zic leapseconds $(PACKRATDATA) $(TDATA) \ + $(XDST)data.zi tzdata.zi for type in posix right; do \ - mkdir -p time_t.dir/$$type time_t.dir/$$type-shrunk && \ + mkdir -p time_t.dir/$$type time_t.dir/$$type-$(SDST) \ + time_t.dir/$$type-shrunk && \ case $$type in \ right) leap='-L leapseconds';; \ *) leap=;; \ esac && \ - $(ZIC) $$leap -d time_t.dir/$$type $(TDATA) && \ - $(AWK) '/^Rule/' $(TDATA) | \ + $(ZIC) $$leap -d time_t.dir/$$type $(XDST)data.zi && \ + $(AWK) '/^Rule/' $(XDST)data.zi | \ $(ZIC) $$leap -d time_t.dir/$$type - $(PACKRATDATA) && \ + case $(XDST) in \ + $(SDST)) \ + $(ZIC) $$leap -d time_t.dir/$$type-$(SDST) $(TDATA) && \ + $(AWK) '/^Rule/' $(TDATA) | \ + $(ZIC) $$leap -d time_t.dir/$$type-$(SDST) \ + $(XDST)data.zi && \ + diff -r time_t.dir/$$type time_t.dir/$$type-$(SDST);; \ + esac && \ $(ZIC) $$leap -d time_t.dir/$$type-shrunk tzdata.zi && \ diff -r time_t.dir/$$type time_t.dir/$$type-shrunk || exit; \ done @@ -741,7 +782,7 @@ clean_misc: rm -f core *.o *.out \ date tzselect version.h zdump zic yearistype libtz.a clean: clean_misc - rm -fr *.dir tzdata.zi tzdb-*/ $(TZS_NEW) + rm -fr *.dir *.zi tzdb-*/ $(TZS_NEW) maintainer-clean: clean @echo 'This command is intended for maintainers to use; it' diff --git a/NEWS b/NEWS index 4f763c0..c455f3c 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,36 @@ News for the tz database Unreleased, experimental changes + Briefly: + Support zi parsers that mishandle negative DST offsets + + Changes to build procedure + + The new XDST macro in the Makefile lets the installer choose + XDST=full, which allows arbitrary DST offsets in the data, or + XDST=pdst, which allows only positive DST offsets. Choosing + XDST=full is arguably more correct for Ireland, which observes + Irish Standard Time (IST, UTC+01) in summer and GMT (UTC) in + winter. Choosing XDST=pdst is better for zoneinfo parsers that do + not work well with negative DST offsets, notably OpenJDK+CLDR. + On platforms using tzcode or similar APIs, XDST should not affect + any behavior other than that depending on the tm_isdst flag. + + For now this change does not affect client-visible behavior by + default, as the Makefile defaults to XDST=pdst and uncommented + parts of the data source files contain only pdst-format data. + After a bit of time for testing, XDST=full and full-format source + files are planned to become the default, so that parsers that + support negative DST offsets can get full data without changing + their build procedures. Parsers requiring positive DST offsets + should use the new file pdstdata.zi instead of tzdata.zi or the + source files 'africa' etc.: pdstdata.zi is pdst-compatible, it is + automatically built from the data source files, and it will + continue to be pdst-compatible regardless of XDST. To get + full-format data now, use the new file fulldata.zi, which will + continue to be full-format regardless of XDST. To get the format + selected by XDST, use tzdata.zi. + Changes to code The code is a bit more portable to MS-Windows. (Thanks to Manuela diff --git a/europe b/europe index 6c1ccbe..5aeda33 100644 --- a/europe +++ b/europe @@ -508,11 +508,27 @@ Link Europe/London Europe/Jersey Link Europe/London Europe/Guernsey Link Europe/London Europe/Isle_of_Man -# From Paul Eggert (2018-01-19): +# From Paul Eggert (2018-01-30): +# In January 2018 we discovered that the negative DST offsets in the +# Eire rules cause problems with tests for ICU: +# https://mm.icann.org/pipermail/tz/2018-January/025825.html +# and with tests for OpenJDK: +# https://mm.icann.org/pipermail/tz/2018-January/025822.html +# To work around this problem, zidst.awk translates the following data +# lines into two forms. First, fulldata.zi contains the full data, +# which includes negative DST offsets. Second, pdstdata.zi uses a +# traditional approximation for Irish time stamps after 1971-10-31 +# 02:00 UTC; although this approximation has tm_isdst flags that are +# the reverse of the full data, its UTC offsets are correct and this +# suffices for ICU and OpenJDK. Although this source file currently +# has pdstdata.zi lines active and fulldata.zi lines commented out, +# this is intended to change in the near future and downstream code +# should not rely on it. +# # The following is like GB-Eire and EU, except with standard time in # summer and negative daylight saving time in winter. -# Although currently commented out, this will need to become uncommented -# once the ICU/OpenJDK workaround is removed; see below. +# This rule set is active in fulldata.zi and is commented out in +# pdstdata.zi. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S #Rule Eire 1971 only - Oct 31 2:00u -1:00 GMT #Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 IST @@ -533,24 +549,13 @@ Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2 0:00 1:00 IST 1947 Nov 2 2:00s 0:00 - GMT 1948 Apr 18 2:00s 0:00 GB-Eire GMT/IST 1968 Oct 27 -# From Paul Eggert (2018-01-18): -# The next line should look like this: +# The next line is active in fulldata.zi and commented out in pdstdata.zi. # 1:00 Eire IST/GMT -# However, in January 2018 we discovered that the Eire rules cause -# problems with tests for ICU: -# https://mm.icann.org/pipermail/tz/2018-January/025825.html -# and with tests for OpenJDK: -# https://mm.icann.org/pipermail/tz/2018-January/025822.html -# To work around this problem, use a traditional approximation for -# time stamps after 1971-10-31 02:00 UTC, to give ICU and OpenJDK -# developers breathing room to fix bugs. This approximation has -# correct UTC offsets, but results in tm_isdst flags are the reverse -# of what they should be. This workaround is temporary and should be -# removed reasonably soon. +# These three lines are active in pdstdata.zi and commented out in +# fulldata.zi. 1:00 - IST 1971 Oct 31 2:00u 0:00 GB-Eire GMT/IST 1996 0:00 EU GMT/IST -# End of workaround for ICU and OpenJDK bugs. ############################################################################### diff --git a/zidst.awk b/zidst.awk new file mode 100644 index 0000000..7885e9a --- /dev/null +++ b/zidst.awk @@ -0,0 +1,50 @@ +# Convert tzdata source into full or positive-DST form + +# Contributed by Paul Eggert. This file is in the public domain. + +# This is not a general-purpose converter; it is designed for current tzdata. +# +# When converting to full form, the output can use negative DST offsets. +# +# When converting to positive-DST form, the output uses only positive +# DST offsets. The idea is for the output data to simulate the +# behavior of the input data as best it can within the constraints of +# positive DST offsets. +# +# In the input, lines requiring the full format are commented #[full] +# and the positive DST near-equivalents are commented #[pdst]. + +BEGIN { + dst_type["full"] = 1 + dst_type["pdst"] = 1 + + # The command line should set OUTFILE to the name of the output file, + # which should start with either "full" or "pdst". + todst = substr(outfile, 1, 4) + if (!dst_type[todst]) exit 1 +} + +/^Zone/ { zone = $2 } + +{ + in_comment = /^#/ + + # Test whether this line should differ between the full and the pdst versions. + Rule_Eire = /^#?Rule[\t ]+Eire[\t ]/ + Zone_Dublin_post_1968 \ + = (zone == "Europe/Dublin" && /^#?[\t ]+[01]:00[\t ]/ \ + && (!$(in_comment + 4) || 1968 < $(in_comment + 4))) + + # If so, uncomment the desired version and comment out the undesired one. + if (Rule_Eire || Zone_Dublin_post_1968) { + if ((Rule_Eire \ + || (Zone_Dublin_post_1968 && $(in_comment + 3) == "IST/GMT")) \ + == (todst == "full")) { + sub(/^#/, "") + } else if (/^[^#]/) { + sub(/^/, "#") + } + } +} + +{ print } -- 2.14.3

7 14

[PATCH] Fix ziguard.awk Namibia invalid assumption
by Paul Eggert April 22, 2018

April 22, 2018

* ziguard.awk: Don’t assume input is in rearguard format. --- ziguard.awk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ziguard.awk b/ziguard.awk index 7cdceab..dbe64d6 100644 --- a/ziguard.awk +++ b/ziguard.awk @@ -63,7 +63,11 @@ outfile != "main.zi" { || (1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \ || in_comment + 3 == NF)) if (Rule_Namibia || Zone_using_Namibia_rule) { - if (in_comment == vanguard) { + if ((Rule_Namibia \ + ? ($(in_comment + 9) ~ /^-/ \ + || ($(in_comment + 9) == 0 && $(in_comment + 10) == "CAT")) \ + : $(in_comment + 1) == "2:00" && $(in_comment + 2) == "Namibia") \ + == vanguard) { uncomment = in_comment } else { comment_out = !in_comment -- 2.14.3

1 0