- tz - lists.iana.org

Time in Eucla (Western Australia)
by Robert Elz Aug. 13, 2022

Aug. 13, 2022

A friend has relatives driving towards Perth (from eastern AU). They sent him the attached photo (after I asked if they could confirm the time there as they passed through) from the local motel entrance. This is just a confirmation of what we already knew. Photo date is 13 August 2022; since it is a photo of clocks, the time is self evident (note, daylight, not near midnight). kre

1 0

[PROPOSED] Remove zoneinfo2tdf.pl
by Paul Eggert Aug. 12, 2022

Aug. 12, 2022

* Makefile (MISC, VERSION_DEPS): Remove mention of removed file. * NEWS: Mention this. * zoneinfo2tdf.pl: Remove. --- Makefile | 4 ++-- NEWS | 3 +++ zoneinfo2tdf.pl | 53 ------------------------------------------------- 3 files changed, 5 insertions(+), 55 deletions(-) delete mode 100755 zoneinfo2tdf.pl diff --git a/Makefile b/Makefile index 88240ad..ae0f3fd 100644 --- a/Makefile +++ b/Makefile @@ -538,7 +538,7 @@ DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \ leapseconds $(ZONETABLES) AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk \ ziguard.awk zishrink.awk -MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl +MISC= $(AWK_SCRIPTS) TZS_YEAR= 2050 TZS_CUTOFF_FLAG= -c $(TZS_YEAR) TZS= to$(TZS_YEAR).tzs @@ -567,7 +567,7 @@ VERSION_DEPS= \ tzfile.5 tzfile.h tzselect.8 tzselect.ksh \ workman.sh zdump.8 zdump.c zic.8 zic.c \ ziguard.awk zishrink.awk \ - zone.tab zone1970.tab zoneinfo2tdf.pl + zone.tab zone1970.tab # And for the benefit of csh users on systems that assume the user # shell should be used to handle commands in Makefiles. . . diff --git a/NEWS b/NEWS index 9042cd8..4c1c48d 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,9 @@ Unreleased, experimental changes Fix bug with 'zic -d /a/b/c' when /a is unwritable but the directory /a/b already exists. + The script zoneinfo2tdf.pl has been removed, as it was unused and + triggered false malware alarms on some email servers. + Release 2022b - 2022-08-10 15:38:32 -0700 diff --git a/zoneinfo2tdf.pl b/zoneinfo2tdf.pl deleted file mode 100755 index 176fce9..0000000 --- a/zoneinfo2tdf.pl +++ /dev/null @@ -1,53 +0,0 @@ -#! /usr/bin/perl -w -# Summarize .zi input in a .zi-like format. - -# Courtesy Ken Pizzini. - -use strict; - -#This file released to the public domain. - -# Note: error checking is poor; trust the output only if the input -# has been checked by zic. - -my $contZone = ''; -while (<>) { - my $origline = $_; - my @fields = (); - while (s/^\s*((?:"[^"]*"|[^\s#])+)//) { - push @fields, $1; - } - next unless @fields; - - my $type = lc($fields[0]); - if ($contZone) { - @fields >= 3 or warn "bad continuation line"; - unshift @fields, '+', $contZone; - $type = 'zone'; - } - - $contZone = ''; - if ($type eq 'zone') { - # Zone NAME STDOFF RULES/SAVE FORMAT [UNTIL] - my $nfields = @fields; - $nfields >= 5 or warn "bad zone line"; - if ($nfields > 6) { - #this splice is optional, depending on one's preference - #(one big date-time field, or componentized date and time): - splice(@fields, 5, $nfields-5, "@fields[5..$nfields-1]"); - } - $contZone = $fields[1] if @fields > 5; - } elsif ($type eq 'rule') { - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - @fields == 10 or warn "bad rule line"; - } elsif ($type eq 'link') { - # Link TARGET LINK-NAME - @fields == 3 or warn "bad link line"; - } elsif ($type eq 'leap') { - # Leap YEAR MONTH DAY HH:MM:SS CORR R/S - @fields == 7 or warn "bad leap line"; - } else { - warn "Fubar at input line $.: $origline"; - } - print join("\t", @fields), "\n"; -} -- 2.37.1

1 0

[PROPOSED] Fix bug with 'zic -d /a/b/c' if /a is unwriteable
by Paul Eggert Aug. 12, 2022

Aug. 12, 2022

If the directory /a/b already exists, it is not an error if /a is unwritable when you invoke zic -d /a/b/c. Problem found on Solaris 10, where mkdir("/a", ...) can fail with EACCES in this situation, which POSIX allows. * NEWS: Mention the fix. * private.h (ELOOP) [!ELOOP]: Define to EINVAL. * zic.c (mkdirs): Do not fail merely because mkdir fails with errno == EACCES, as the parent directory may already exist but be unwritable. For example --- NEWS | 2 ++ private.h | 3 +++ zic.c | 9 +++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 7291030a..af99e2b7 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,8 @@ Unreleased, experimental changes Work around a bug in macOS 'awk' that broke commands like 'make traditional_tarballs'. (Problem reported by Deborah Goldsmith.) + Fix bug with 'zic -d /a/b/c' when /a is unwritable but the + directory /a/b already exists. Release 2022b - 2022-08-10 15:38:32 -0700 diff --git a/private.h b/private.h index 9b9389f3..9c31ec54 100644 --- a/private.h +++ b/private.h @@ -168,6 +168,9 @@ # define EINVAL ERANGE #endif +#ifndef ELOOP +# define ELOOP EINVAL +#endif #ifndef ENAMETOOLONG # define ENAMETOOLONG EINVAL #endif diff --git a/zic.c b/zic.c index a29f6792..ff047937 100644 --- a/zic.c +++ b/zic.c @@ -3670,9 +3670,14 @@ mkdirs(char const *argname, bool ancestors) some other process might have made the directory in the meantime. Likewise for ENOSYS, because Solaris 10 mkdir fails with ENOSYS if the - directory is an automounted mount point. */ + directory is an automounted mount point. + Likewise for EACCES, since mkdir can fail + with EACCES merely because the parent directory + is unwritable. Likewise for most other error + numbers. */ int err = errno; - if (err != EEXIST && err != ENOSYS) { + if (err == ELOOP || err == ENAMETOOLONG + || err == ENOENT || err == ENOTDIR) { error(_("%s: Can't create directory %s: %s"), progname, name, strerror(err)); exit(EXIT_FAILURE); -- 2.34.1

1 0

Chile Timezone change
by Juan Luis Orellana Aug. 11, 2022

Aug. 11, 2022

Dear IANA Team, I'm glad I can be in touch with you, this mail has as objective, to ask for a tzdata update package, our Chilean Goverment changed the timezone change date from 09/03/23:59 to 09/10 23:59 (America/Santiago), due to political reasons. Please if you can answer me or guide me to make that change on the files, I'll apretitate that I'm struggling to correct that across from more than a thousand servers. I'll be in touch. Kind regards. Juan Luis Orellana E. +56954151809

4 4

[tz-announce] 2022b release of tz code and data available
by Paul Eggert via tz-announce Aug. 11, 2022

Aug. 11, 2022

The 2022b release of the tz code and data is available. This release reflects the following changes: Briefly: Chile's DST is delayed by a week in September 2022. Iran no longer observes DST after 2022. Rename Europe/Kiev to Europe/Kyiv. New zic -R option Vanguard form now uses %z. Finish moving duplicate-since-1970 zones to 'backzone'. New build option PACKRATLIST New tailored_tarballs target, replacing rearguard_tarballs Changes to future timestamps Chile's 2022 DST start is delayed from September 4 to September 11. (Thanks to Juan Correa.) Iran plans to stop observing DST permanently, after it falls back on 2022-09-21. (Thanks to Ali Mirjamali.) Changes to past timestamps Finish moving to 'backzone' the location-based zones whose timestamps since 1970 are duplicates; adjust links accordingly. This change ordinarily affects only pre-1970 timestamps, and with the new PACKRATLIST option it does not affect any timestamps. In this round the affected zones are Antarctica/Vostok, Asia/Brunei, Asia/Kuala_Lumpur, Atlantic/Reykjavik, Europe/Amsterdam, Europe/Copenhagen, Europe/Luxembourg, Europe/Monaco, Europe/Oslo, Europe/Stockholm, Indian/Christmas, Indian/Cocos, Indian/Kerguelen, Indian/Mahe, Indian/Reunion, Pacific/Chuuk, Pacific/Funafuti, Pacific/Majuro, Pacific/Pohnpei, Pacific/Wake and Pacific/Wallis, and the affected links are Arctic/Longyearbyen, Atlantic/Jan_Mayen, Iceland, Pacific/Ponape, Pacific/Truk, and Pacific/Yap. From fall 1994 through fall 1995, Shanks wrote that Crimea's DST transitions were at 02:00 standard time, not at 00:00. (Thanks to Michael Deckers.) Iran adopted standard time in 1935, not 1946. In 1977 it observed DST from 03-21 23:00 to 10-20 24:00; its 1978 transitions were on 03-24 and 08-05, not 03-20 and 10-20; and its spring 1979 transition was on 05-27, not 03-21. (Thanks to Roozbeh Pournader and Francis Santoni.) Chile's observance of -04 from 1946-08-29 through 1947-03-31 was considered DST, not standard time. Santiago and environs had moved their clocks back to rejoin the rest of mainland Chile; put this change at the end of 1946-08-28. (Thanks to Michael Deckers.) Some old, small clock transitions have been removed, as people at the time did not change their clocks. This affects Asia/Hong_Kong in 1904, Asia/Ho_Chi_Minh in 1906, and Europe/Dublin in 1880. Changes to zone name Rename Europe/Kiev to Europe/Kyiv, as "Kyiv" is more common in English now. Spelling of other names in Ukraine has not yet demonstrably changed in common English practice so for now these names retain old spellings, as in other countries (e.g., Europe/Prague not "Praha", and Europe/Sofia not "Sofiya"). Changes to code zic has a new option '-R @N' to output explicit transitions < N. (Need suggested by Almaz Mingaleev.) 'zic -r @N' no longer outputs bad data when N < first transition. (Problem introduced in 2021d and reported by Peter Krefting.) zic now checks its input for NUL bytes and unterminated lines, and now supports input line lengths up to 2048 (not 512) bytes. gmtime and related code now use the abbreviation "UTC" not "GMT". POSIX is being revised to require this. When tzset and related functions set vestigial static variables like tzname, they now prefer specified timestamps to unspecified ones. (Problem reported by Almaz Mingaleev.) zic no longer complains "can't determine time zone abbreviation to use just after until time" when a transition to a new standard time occurs simultanously with the first DST fallback transition. Changes to build procedure Source data in vanguard form now uses the %z notation, introduced in release 2015f. For example, for America/Sao_Paulo vanguard form contains the zone continuation line "-3:00 Brazil %z", which is simpler and more reliable than the line "-3:00 Brazil -03/-02" used in main and rearguard forms. The plan is for the main form to use %z eventually; in the meantime maintainers of zi parsers are encouraged to test the parsers on vanguard.zi. The Makefile has a new PACKRATLIST option to select a subset of 'backzone'. For example, 'make PACKRATDATA=backzone PACKRATLIST=zone.tab' now generates TZif files identical to those of the global-tz project. The Makefile has a new tailored_tarballs target for generating special-purpose tarballs. It generalizes and replaces the rearguard_tarballs target and related targets and macros, which are now obsolescent. 'make install' now defaults LOCALTIME to Factory not GMT, which means the default abbreviation is now "-00" not "GMT". Remove the posix_packrat target, marked obsolescent in 2016a. Here are links to the release files: https://www.iana.org/time-zones/repository/releases/tzcode2022b.tar.gz https://www.iana.org/time-zones/repository/releases/tzdata2022b.tar.gz https://www.iana.org/time-zones/repository/releases/tzdb-2022b.tar.lz The following convenience links are also available, although they may point to the previous release until the relevant caches are refreshed: 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 b61a7acb4d267872f1c5319f30889a927b441b8f dated 2022-08-10 15:38:32 -0700 and tagged '2022b' in the development GitHub repository at <https://github.com/eggert/tz>. Here are the SHA-512 checksums for the release files: 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79 tzcode2022b.tar.gz a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1 tzdata2022b.tar.gz b5bd93401c9586047e865a49b9f7fd0bdf451973be24a433786633f41a1ecc2f7eacdeb78d9a906c3526bfd3b236edab72682e5bc09add42156f8dcc2497694a tzdb-2022b.tar.lz Here are the GPG digital signatures for the release files: -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmL0NEoACgkQ7ZfpDmKq fjTVbw/8Cu33QgaVXIWhyQDv9gFBtGJvgVNa7IL1FP9nz1O6unqjTr57i7sameO0 aTu/v7JiCgIg5fsqqsi5yJQnYn8mZDC4MbOlqBtE237p4BwEZbvii0UWuWo/N4ep KNpbd3ezgOCYYXA+VS4azIW1LRAHhB4ZOvoUZuoRkPfoA5bR1VfZ8NRh0SfVK17R hoeRU7nlDofxHapL5zAqikGROLHhS++PVQ+x0gi5lQmDdHLtXZeiKor/y6sqb8R3 cQt8RyM6GzA9t4rsoUnMGBZIwaLYADJAmxVpBgS1EEwVfL7nx5WLur2ui+BK2GoF nN2QUG/N9TRPPFK722PiFAqoULKWamgUmRFl302TtIbygdaaKd7fxPMmgTL22REw 6qbVamP6Gk6jpG7+/FHusHB1Vz4TiTbSwK0g5UpTrps7QpoCXIU8sbScUXZzPYiY 1V2e9Fnrd2QE2+83guQhY4OX156Z32SPixl+qfK8+MMykibU6PGvCxhwHa7BzYBo X38rmsCri8vo+P27/godd6RBfsAkb8/PtB3Hlo0OGmhyggUMruVB+poip/xK8zJA bbjFB9pwi+gzkXVEkHIMuh5wgXswO+Tko7/P4ZH1t5xocc3BlrSxDvQuAVGb3hZw H3oyG5KP7sX4HCvZ42+3QTX05hFcJFgFtoncEVWAj+fPMJUm/yc= =IUf2 -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmL0NEoACgkQ7ZfpDmKq fjSfew/+P1NUMCiqlH5FlO5YyVGjc3Gxmpb6ToKsFloI7pn4KGlgQFy224VFmCVn ImSlurAuKydmZI6r+JPnjYIx0hcFUK/Wi2Y9tJKMlPDuOrexLa2toDvoXMlhBgQk RH+iaIGk8FC2mP/tdif0pzr43a87zRQiPuJ3MdoXYxEARXmc6wNtk07RS5jMlBUS G8dF2h023pTP3fD04Q77q+wUg3k5UuLw3DWrCCci1oeW/Vp+NzOsMb4vcxaWiH0M ecF0+FMpmqehJdKYZsS29D3aX8acZp3zXlAKoWHRCasCeKcltVEIyHHqdQrrR1SP R/r/OCOhIuOR3f9viPAAo56Obb63M+0siQYJmFy2Jr00lFjAzRIeajrCxSU7vxW7 6ljfdtSK8Ruv9FKrYD1Rdqa6jCpZLs6lnLk54WBStvdzJawjhZibBu3hK9LIagr/ Hb2x3H87swfId8lUZK46kjYhRYU7Jijtu+fPms5Fhrauaj2Dq56DrPyI+LyGKqBz Os0T28QUM6i67Rd0JOoMtDMesx2C/jvy9G09wwDq0mUdqg1OnfWeaUpYwCZJYdo0 Hm+zOPaxXIQph3f/MrFbrmwwggwFdjeCikOAH3uFPDp0UoHrGVq493sIGG3ulPYK 2FErRNNaeAyzniUK/35IqCQBB82GPiw6pxVf/O/HhPjLyUk55lU= =5vEv -----END PGP SIGNATURE----- -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEfjeSqdis99YzvBWI7ZfpDmKqfjQFAmL0NEsACgkQ7ZfpDmKq fjS9Yw/7BgRppySA/2mXbL+EqkGG1tmelEVx1TaHN/E2a/k1yji38Fs5+e0oHikb 95Xy2vApK5qMF0oye6nnsmtV+JquJSzwaQ4YDGLoPOtwCVNQU6WEOSlL7zfQXFsI AQy9x+yoQzevjiA+MK1Xx/s6a0G50uNZNFN1huRd4ENPPEw6qEEgLLo2qaP75uGz SM/RVIMjSTWdTdsefV1l/fIOPEqtX0S7SuldUbZh19NDLUn6vedwnO4i2qn71Guu EvZOr8RNtRpKeKOuyvLd+mKB1o4s3rUU/HlAAOcwJueNFstYH83QtrLKbjomPalI DC3E0x21Zlu3PoMsiaM+3BQknFBhx9JZI/pZz5+mUGlnjuNWTOcvxG9UGtRH+6Gr hVintjNuL2oabTuStxI7iuy+Dy6xbZ82Hs6Zy5xKuLixds/DutIfJHjLpsA3vaj+ PAkvEmPyF9zZY0C7QM3frMjqFc9vXY1114EKkVDknJ1jcOM1hszASgV/I3+j3NkN U2+++Y0fFWrWeGSm6mI5Pc2Z18OYfoIYS7q+k8fb1gzjiEWFav4U1cdm/npRca27 Mhkbbk4obVNyKGkRqpYQ40h99/Nl6uymMYx8N6zVin3tFXY23PeZnlJ6wS1yxOv1 i1g41pviERYjpp6JjBkosv5aVkxA+WKxqoWaE7x6fPXd1D3giAY= =H4rJ -----END PGP SIGNATURE----- PS. If your tzdata parser does not yet support negative DST offsets or times past 24:00, or if it insists on a 'pacificnew' file that is no longer present, this release's data entries can be turned into a rearguard-format tarball that should work even with these older parsers. This is intended to be a temporary transition aid for these parsers. To generate a rearguard-format tarball, obtain the full distribution as described above, and run the command 'make DATAFORM=rearguard tailored_tarballs' on a development host. Or you can run 'make rearguard.zi' to generate a single file that can be fed directly to a parser that works like 'zic'.

1 0

[Change] DST dates for Chile will change in 2022-2023
by Juan Correa Aug. 9, 2022

Aug. 9, 2022

Hello there: As of moments ago, the Internal Affairs Ministry (Ministerio del Interior) informed DST for America/Santiago will start on midnight of September 11th; and will end on April 1st, 2023. Magallanes region (America/Punta Arenas) will keep UTC -3 "indefinitely" If I recall correctly, this might alter at least the switch for 2023 This is because on September 4th we will have a voting whether to approve a new Constitution Source: https://twitter.com/min_interior/status/1556981967551209472

3 4

[PROPOSED 1/3] * theory.html: Source data can do subseconds.
by Paul Eggert Aug. 1, 2022

Aug. 1, 2022

--- theory.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/theory.html b/theory.html index bfadc4f0..2b14c511 100644 --- a/theory.html +++ b/theory.html @@ -723,8 +723,8 @@ href="https://www.dissentmagazine.org/blog/booked-a-global-history-of-time-vanes than what the <code><abbr>tz</abbr></code> code can handle. For example, from 1880 to 1916 clocks in Ireland observed Dublin Mean Time (estimated to be <abbr>UT</abbr> - −00:25:21.1), but the <code><abbr>tz</abbr></code> - code cannot represent the fractional second. + −00:25:21.1); although the <code><abbr>tz</abbr></code> + source data can represent the .1 second, TZif files and the code cannot. In practice these old specifications were rarely if ever implemented to subsecond precision. </li> -- 2.34.1

9 18

IANA timezone database - request to add Omaha, Nebraska
by Bob Wilmes Aug. 1, 2022

Aug. 1, 2022

Hello Paul Eggert, Can you please tell me how I request that Omaha, Nebraska, USA which is in the Americas Central time zone and uses daylight savings time, can be added to the "Olson" timezone database used by Ubuntu? Regards, Bob Wilmes Omaha, Nebraska bobwilmes(a)gmail.com -- Bob Wilmes bobwilmes(a)gmail.com

10 22

Re: [tz] [PROPOSED 3/3] Vanguard form now uses subsecond precision -Brooks
by Steve Allen July 31, 2022

July 31, 2022

On Sat 2022-07-30T13:24:01-0400 Brooks Harris hath writ: > On 2022-07-30 1:01 PM, Paul Eggert via tz wrote: > > Given the other comments in this thread I'm inclined to revert the > > effect of this change, so that vanguard form continues to use integer > > multiples of a second. So I installed the attached further patches, the > > last of which does the reversion. > I think that's best for civil time. But I had a thought. Steve Allen seemed > to like the idea and I'm sympathetic to his needs as astronomer. Maybe > subsecond precision could be added to "right" instead of vanguard? No, tz does not need subsecond precision, not for anyone, not in any era. The French law of 9m 21s is an example. The legislators should have known about the funds which had been expended as part of the two century effort to establish the offset between Greenwich and Paris, and that the disagreements of many 0.1 s in their own lifetimes were from the techniques employed by the astronomers, not from the telegraphs or radios. The sub-second astronomical offsets all date from before the 1970 cutoff. 1970 was when the CCIR was persuaded to assert that one second is close enough for everyone. Historically the best time comparisons had poor precision. Before the 20th century offsets were many 0.1 s or even > 1 s. In the early 20th century offsets were still many 0.01 s or even > 1 s. Attempts to reach a precision of 0.0001 s were not widespread until the International Geophysical Year of 1957/1958. Offsets of many 0.001 s persisted after the adoption of the cesium-based coordinated time because the Soviets used their own coordination scheme and other countries did not convert from UT2 to coordinated cesium time until the late 1960s. tz has rightfully eschewed the notion of trying to track local offsets recorded in Bulletin Horaire and Circular T. The legal time of the US was offset by 0.035 seconds from the BIH at 1958-01-01. The USNO and US NBS did not attempt to bring their time scales into microsecond agreement until 1968. Over a long interval in this century the legal time of Hungary was 50 microseconds different from UTC in most other places because the time lab there declined to perform a reset of their cesium. Thinking of encoding these things is a world of pain that tz does not need. -- Steve Allen <sla(a)ucolick.org> WGS-84 (GPS) UCO/Lick Observatory--ISB 260 Natural Sciences II, Room 165 Lat +36.99855 1156 High Street Voice: +1 831 459 3046 Lng -122.06015 Santa Cruz, CA 95064 https://www.ucolick.org/~sla/ Hgt +250 m

3 3

[PROPOSED] Check that ziguard substitutions revert
by Paul Eggert July 29, 2022

July 29, 2022

Add a check that substitutions to vanguard or rearguard form can be reverted. This supports possible future uses when continental files are in vanguard form and you want rearguard (or vice versa). * Makefile (check): Depend on ... (check_ziguard): ... this new target. * ziguard.awk: Fix some in_comment typos, as these column numbers do not depend on whether we’re in a comment. Use sub(X,Y) instead of $I = Y to preserve whitespace. Fix Japan and Morocco substitutions so that they are reversible. --- Makefile | 9 ++++++++- ziguard.awk | 58 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index e3e5c0dd..52d7fdbe 100644 --- a/Makefile +++ b/Makefile @@ -754,7 +754,7 @@ tzselect: tzselect.ksh version check: check_character_set check_white_space check_links \ check_name_lengths check_slashed_abbrs check_sorted \ - check_tables check_web check_zishrink check_tzs + check_tables check_web check_ziguard check_zishrink check_tzs check_character_set: $(ENCHILADA) test ! '$(UTF8_LOCALE)' || \ @@ -839,6 +839,13 @@ check_theory.html check_tz-art.html check_tz-how-to.html check_tz-link.html: test ! -s $@.out || { cat $@.out; exit 1; } mv $@.out $@ +check_ziguard: rearguard.zi vanguard.zi ziguard.awk + $(AWK) -v DATAFORM=rearguard -f ziguard.awk vanguard.zi | \ + diff -u rearguard.zi - + $(AWK) -v DATAFORM=vanguard -f ziguard.awk rearguard.zi | \ + diff -u vanguard.zi - + touch $@ + # Check that zishrink.awk does not alter the data, and that ziguard.awk # preserves main-format data. check_zishrink: check_zishrink_posix check_zishrink_right diff --git a/ziguard.awk b/ziguard.awk index 171b952d..c39e0d65 100644 --- a/ziguard.awk +++ b/ziguard.awk @@ -134,8 +134,7 @@ DATAFORM != "main" { || in_comment + 3 == NF)))) if (Rule_Namibia || Zone_using_Namibia_rule) { if ((Rule_Namibia \ - ? ($(in_comment + 9) ~ /^-/ \ - || ($(in_comment + 9) == 0 && $(in_comment + 10) == "CAT")) \ + ? ($9 ~ /^-/ || ($9 == 0 && $10 == "CAT")) \ : $(in_comment + 1) == "2:00" && $(in_comment + 2) == "Namibia") \ == (DATAFORM != "rearguard")) { uncomment = in_comment @@ -219,43 +218,66 @@ DATAFORM != "main" { stdoff_column = 2 * /^Zone/ + 1 stdoff_column_val = $stdoff_column if (stdoff_column_val == stdoff_subst[0]) { - $stdoff_column = stdoff_subst[1] + sub(stdoff_subst[0], stdoff_subst[1]) if (until_subst[0] && $NF == until_subst[0]) { - $NF = until_subst[1] + sub(until_subst[0], until_subst[1]) } } else if (stdoff_column_val != stdoff_subst[1]) { stdoff_subst[0] = 0 } } - if (DATAFORM == "rearguard") { - - # 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") { + # 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 (DATAFORM == "rearguard") { if ($7 == "Sat>=8" && $8 == "25:00") { sub(/Sat>=8/, "Sun>=9") sub(/25:00/, " 1:00") } + } else { + if ($7 == "Sun>=9" && $8 == "1:00") { + sub(/Sun>=9/, "Sat>=8") + sub(/ 1:00/, "25:00") + } } + } - # In rearguard form, change the Morocco lines with negative SAVE values - # to use positive SAVE values. - if ($2 == "Morocco") { - if (/^Rule/) { - if ($4 == 2018 && $6 == "Oct") { + # In rearguard form, change the Morocco lines with negative SAVE values + # to use positive SAVE values. + if ($2 == "Morocco") { + if (/^Rule/) { + if ($4 ~ /^201[78]$/ && $6 == "Oct") { + if (DATAFORM == "rearguard") { sub(/\t2018\t/, "\t2017\t") + } else { + sub(/\t2017\t/, "\t2018\t") } - if (2019 <= $3) { - if ($9 == "0") { + } + + if (2019 <= $3) { + if ($8 == "2:00") { + if (DATAFORM == "rearguard") { sub(/\t0\t/, "\t1:00\t") } else { + sub(/\t1:00\t/, "\t0\t") + } + } else { + if (DATAFORM == "rearguard") { sub(/\t-1:00\t/, "\t0\t") + } else { + sub(/\t0\t/, "\t-1:00\t") } } } - if ($1 == "1:00" && $3 == "+01/+00") { - sub(/1:00\tMorocco\t\+01\/\+00$/, "0:00\tMorocco\t+00/+01") + } + if ($1 ~ /^[+0-9-]/ && NF == 3) { + if (DATAFORM == "rearguard") { + sub(/1:00\tMorocco/, "0:00\tMorocco") + sub(/\t\+01\/\+00$/, "\t+00/+01") + } else { + sub(/0:00\tMorocco/, "1:00\tMorocco") + sub(/\t\+00\/+01$/, "\t+01/+00") } } } -- 2.34.1

1 0