- Scope of the
tz
database
- - Names of time zone rulesets
+ - Names of timezones
- Time zone abbreviations
- Accuracy of the
tz
database
@@ -31,13 +35,13 @@
all computer-based clocks that track civil time.
It organizes time zone and daylight saving time
data by partitioning the world into regions
+href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones">timezones
whose clocks all agree about timestamps that occur after the POSIX Epoch
(1970-01-01 00:00:00 UTC).
-The database labels each such region with a notable location and
+The database labels each timezone with a notable location and
records all known clock transitions for that location.
Although 1970 is a somewhat-arbitrary cutoff, there are significant
challenges to moving the cutoff earlier even by a decade or two, due
@@ -46,7 +50,24 @@
-Clock transitions before 1970 are recorded for each such location,
+Each timezone typically corresponds to a geographical region that is
+smaller than a traditional time zone, because clocks in a timezone
+all agree after 1970 whereas a traditional time zone merely
+specifies current standard time. For example, applications that deal
+with current and future timestamps in the traditional North
+American mountain time zone can choose from the timezones
+America/Denver which observes US-style daylight saving
+time, America/Mazatlan which observes Mexican-style DST,
+and America/Phoenix which does not observe DST.
+Applications that also deal with past timestamps in the mountain time
+zone can choose from over a dozen timezones, such as
+America/Boise, America/Edmonton, and
+America/Hermosillo, each of which currently uses mountain
+time but differs from other timezones for some timestamps after 1970.
+
+
+
+Clock transitions before 1970 are recorded for each timezone,
because most systems support timestamps before 1970 and could
misbehave if data entries were omitted for pre-1970 transitions.
However, the database is not designed for and does not suffice for
@@ -73,30 +94,36 @@
Because the database's scope encompasses real-world changes to civil
timekeeping, its model for describing time is more complex than the
standard and daylight saving times supported by POSIX.
-A tz region corresponds to a ruleset that can
+A tz timezone corresponds to a ruleset that can
have more than two changes per year, these changes need not merely
flip back and forth between two alternatives, and the rules themselves
can change at times.
-Whether and when a tz region changes its
-clock, and even the region's notional base offset from UTC, are variable.
-It does not always make sense to talk about a region's
-"base offset", since it is not necessarily a single number.
+Whether and when a timezone changes its
+clock, and even the timezone's notional base offset from UTC, are variable.
+It does not always make sense to talk about a timezone's
+"base offset", which is not necessarily a single number.
- Names of time zone rulesets
+ Names of timezones
-Each tz region has a unique name that
-corresponds to a set of time zone rules.
+Each timezone has a unique name.
Inexperienced users are not expected to select these names unaided.
Distributors should provide documentation and/or a simple selection
-interface that explains the names; for one example, see the
+interface that explains each name via a map or via descriptive text like
+"Ruthenia" instead of the timezone name "Europe/Uzhgorod".
+If geolocation information is available, a selection interface can
+locate the user on a timezone map or prioritize names that are
+geographically close. For an example selection interface, see the
tzselect program in the tz code.
The Unicode Common Locale Data
Repository contains data that may be useful for other selection
-interfaces.
+interfaces; it maps timezone names like Europe/Uzhgorod
+to CLDR names like uauzh which are in turn mapped to
+locale-dependent strings like "Uzhhorod", "Ungvár", "Ужгород", and
+"乌日哥罗德".
@@ -106,12 +133,12 @@
-
- Uniquely identify every region where clocks have agreed since 1970.
+ Uniquely identify every timezone where clocks have agreed since 1970.
This is essential for the intended use: static clocks keeping local
civil time.
-
- Indicate to experts where that region is.
+ Indicate to experts where the timezone's clocks typically are.
-
Be robust in the presence of political changes.
@@ -131,9 +158,8 @@
Names normally have the form
AREA/LOCATION, where
-AREA is the name of a continent or ocean, and
-LOCATION is the name of a specific location within that
-region.
+AREA is a continent or ocean, and
+LOCATION is a specific location within the area.
North and South America share the same area, 'America'.
Typical names are 'Africa/Cairo',
'America/New_York', and 'Pacific/Honolulu'.
@@ -144,7 +170,7 @@
Here are the general guidelines used for
-choosing tz region names,
+choosing timezone names,
in decreasing order of importance:
@@ -196,9 +222,9 @@
country or territory.
-
- If all the clocks in a region have agreed since 1970,
- do not bother to include more than one location
- even if subregions' clocks disagreed before 1970.
+ If all the clocks in a timezone have agreed since 1970,
+ do not bother to include more than one timezone
+ even if some of the clocks disagreed before 1970.
Otherwise these tables would become annoyingly large.
-
@@ -212,7 +238,7 @@
Keep locations compact.
Use cities or small islands, not countries or regions, so that any
future changes do not split individual locations into different
-
tz regions.
+ timezones.
E.g., prefer Europe/Paris to Europe/France,
since
France
@@ -220,10 +246,10 @@
-
Use mainstream English spelling, e.g., prefer
-
Europe/Rome to Europe/Roma, and
+ Europe/Rome to Europa/Roma, and
prefer Europe/Athens to the Greek
- Europe/Αθήνα or the Romanized
- Europe/Athína.
+ Ευρώπη/Αθήνα or the Romanized
+ Evrópi/Athína.
The POSIX file name restrictions encourage this guideline.
-
@@ -274,9 +300,9 @@
The file 'zone1970.tab' lists geographical locations used
-to name tz regions.
+to name timezones.
It is intended to be an exhaustive list of names for geographic
-regions as described above; this is a subset of the names in the data.
+regions as described above; this is a subset of the timezones in the data.
Although a 'zone1970.tab' location's
longitude
corresponds to
@@ -381,7 +407,7 @@
EST/EDT/EWT/EPT/EDDT Eastern [North America],
EET/EEST Eastern European,
GST Guam,
- HST/HDT Hawaii,
+ HST/HDT/HWT/HPT Hawaii,
HKT/HKST Hong Kong,
IST India,
IST/GMT Irish,
@@ -398,6 +424,7 @@
NZST/NZDT New Zealand 1946–present,
PKT/PKST Pakistan,
PST/PDT/PWT/PPT/PDDT Pacific,
+ PST/PDT Philippine,
SAST South Africa,
SST Samoa,
WAT/WAST West Africa,
@@ -453,7 +480,7 @@
A few abbreviations also follow the pattern that
- GMT/BST established for time in the UK.
+ GMT/BST established for time in the UK.
They are:
CMT/BST for Calamarca Mean Time and Bolivian Summer Time
1890–1932,
@@ -473,7 +500,7 @@
-
If there is no common English abbreviation, use numeric offsets like
-
-05 and +0830 that are generated
+ -05 and +0530 that are generated
by zic's %z notation.
-
@@ -488,8 +515,8 @@
usage.
-
- Use a consistent style in a
tz region's history.
- For example, if history tends to use numeric
+ Use a consistent style in a timezone's history.
+ For example, if a history tends to use numeric
abbreviations and a particular entry could go either way, use a
numeric abbreviation.
@@ -501,7 +528,7 @@
The leading '-' is a flag that the UT offset is in
some sense undefined; this notation is derived
from Internet
- RFC 3339.
+ RFC 3339.
@@ -543,7 +570,7 @@
The pre-1970 entries in this database cover only a tiny sliver of how
clocks actually behaved; the vast majority of the necessary
information was lost or never recorded.
- Thousands more tz regions would be needed if
+ Thousands more timezones would be needed if
the tz database's scope were extended to
cover even just the known or guessed history of standard time; for
example, the current single entry for France would need to split
@@ -608,19 +635,19 @@
-
The
tz database does not record the
- earliest time for which a tz region's
+ earliest time for which a timezone's
data entries are thereafter valid for every location in the region.
For example, Europe/London is valid for all locations
in its region after GMT was made the standard time,
but the date of standardization (1880-08-02) is not in the
tz database, other than in commentary.
- For many tz regions the earliest time of
+ For many timezones the earliest time of
validity is unknown.
-
The
tz database does not record a
region's boundaries, and in many cases the boundaries are not known.
- For example, the tz region
+ For example, the timezone
America/Kentucky/Louisville represents a region
around the city of Louisville, the boundaries of which are
unclear.
@@ -664,13 +691,20 @@
way to specify Easter, these exceptional years are entered as
separate tz Rule lines, even though the
legal rules did not change.
+ When transitions are known but the historical rules behind them are not,
+ the database contains Zone and Rule
+ entries that are intended to represent only the generated
+ transitions, not any underlying historical rules; however, this
+ intent is recorded at best only in commentary.
-
- The
tz database models pre-standard time
+ The tz database models time
using the proleptic
- Gregorian calendar and local mean time, but many people used
- other calendars and other timescales.
+ Gregorian calendar with days containing 24 equal-length hours
+ numbered 00 through 23, except when clock transitions occur.
+ Pre-standard time is modeled as local mean time.
+ However, historically many people used other calendars and other timescales.
For example, the Roman Empire used
the Julian
calendar,
@@ -677,6 +711,19 @@
and Roman
timekeeping had twelve varying-length daytime hours with a
non-hour-based system at night.
+ And even today, some local practices diverge from the Gregorian
+ calendar with 24-hour days. These divergences range from
+ relatively minor, such as Japanese bars giving times like "24:30" for the
+ wee hours of the morning, to more-significant differences such as the
+ east African practice of starting the day at dawn, renumbering
+ the Western 06:00 to be 12:00. These practices are largely outside
+ the scope of the tz code and data, which
+ provide only limited support for date and time localization
+ such as that required by POSIX. If DST is not used a different time zone
+ can often do the trick; for example, in Kenya a TZ setting
+ like <-03>3 or America/Cayenne starts
+ the day six hours later than Africa/Nairobi does.
-
Early clocks were less reliable, and data entries do not represent
@@ -710,7 +757,7 @@
historical solar time
to more than about one-hour accuracy.
See: Stephenson FR, Morrison LV, Hohenkerk CY.
- Measurement of
+ Measurement of
the Earth's rotation: 720 BC to AD 2015.
Proc Royal Soc A. 2016 Dec 7;472:20160404.
Also see: Espenak F. tz database's
LMT offsets should not be considered meaningful, and
-should not prompt creation of
tz regions
+should not prompt creation of timezones
merely because two locations
differ in LMT or transitioned to standard time at
different dates.
@@ -798,7 +845,7 @@
- std and dst
-
are 3 or more characters specifying the standard
- and daylight saving time (DST) zone names.
+ and daylight saving time (DST) zone abbreviations.
Starting with POSIX.1-2001, std and dst
may also be in a quoted form like '
<+09>';
this allows "+" and "-" in the names.
@@ -870,38 +917,38 @@
TZ='Pacific/Auckland'
-
- POSIX does not define the exact meaning of
TZ values like
+ POSIX does not define the DST transitions
+ for TZ values like
"EST5EDT".
- Typically the current US DST rules
- are used to interpret such values, but this means that the
- US DST rules are compiled into each
- program that does time conversion.
- This means that when
- US time conversion rules change (as in the United
- States in 1987), all programs that do time conversion must be
+ Traditionally the current US DST rules
+ were used to interpret such values, but this meant that the
+ US DST rules were compiled into each
+ program that did time conversion. This meant that when
+ US time conversion rules changed (as in the United
+ States in 1987), all programs that did time conversion had to be
recompiled to ensure proper results.
-
The
TZ environment variable is process-global, which
makes it hard to write efficient, thread-safe applications that
- need access to multiple time zone rulesets.
+ need access to multiple timezones.
-
In POSIX, there is no tamper-proof way for a process to learn the
system's best idea of local wall clock.
- (This is important for applications that an administrator wants
+ This is important for applications that an administrator wants
used only at certain times – without regard to whether the
user has fiddled the
TZ environment variable.
While an administrator can "do everything in UT" to
get around the problem, doing so is inconvenient and precludes
- handling daylight saving time shifts - as might be required to
- limit phone calls to off-peak hours.)
+ handling daylight saving time shifts – as might be required to
+ limit phone calls to off-peak hours.
-
POSIX provides no convenient and efficient way to determine
the UT offset and time zone abbreviation of arbitrary
- timestamps, particularly for
tz regions
+ timestamps, particularly for timezones
that do not fit into the POSIX model.
-
@@ -919,7 +966,7 @@
Unsigned 32-bit integers are used on one or two platforms, and 36-bit
and 40-bit integers are also used occasionally.
Although earlier POSIX versions allowed
time_t to be a
- floating-point type, this was not supported by any practical systems,
+ floating-point type, this was not supported by any practical system,
and POSIX.1-2013 and the tz code both
require time_t to be an integer type.
@@ -931,15 +978,16 @@
-
The TZ environment variable is used in generating
- the name of a binary file from which time-related information is read
+ the name of a file from which time-related information is read
(or is interpreted à la POSIX); TZ is no longer
- constrained to be a three-letter time zone
- abbreviation followed by a number of hours and an optional three-letter
- daylight time zone abbreviation.
+ constrained to be a string containing abbreviations
+ and numeric data as described above.
+ The file's format is TZif,
+ a timezone information format that contains binary data.
The daylight saving time rules to be used for a
- particular tz region are encoded in the
- binary file; the format of the file
- allows U.S., Australian, and other rules to be encoded, and
+ particular timezone are encoded in the
+ TZif file; the format of the file allows US,
+ Australian, and other rules to be encoded, and
allows for situations where more than two time zone
abbreviations are used.
@@ -949,15 +997,15 @@
might cause "old" programs (that expect TZ to have a
certain form) to operate incorrectly; consideration was given to using
some other environment variable (for example, TIMEZONE)
- to hold the string used to generate the binary file's name.
+ to hold the string used to generate the TZif file's name.
In the end, however, it was decided to continue using
TZ: it is widely used for time zone purposes;
separately maintaining both TZ
and TIMEZONE seemed a nuisance; and systems where
"new" forms of TZ might cause problems can simply
- use TZ values such as "EST5EDT" which
- can be used both by "new" programs (à la POSIX) and "old"
- programs (as zone names and offsets).
+ use legacy TZ values such as "EST5EDT" which
+ can be used by "new" programs as well as by "old" programs that
+ assume pre-POSIX TZ values.
-
@@ -972,7 +1020,7 @@
Functions
tzalloc, tzfree,
localtime_rz, and mktime_z for
more-efficient thread-safe applications that need to use multiple
- time zone rulesets.
+ timezones.
The tzalloc and tzfree functions
allocate and free objects of type timezone_t,
and localtime_rz and mktime_z are
@@ -1093,8 +1141,9 @@
standardization proposals.
-
- Other time conversion proposals, in particular the one developed
- by folks at Hewlett Packard, offer a wider selection of functions
+ Other time conversion proposals, in particular those supported by the
+ Time Zone
+ Database Parser, offer a wider selection of functions
that provide capabilities beyond those provided here.
The absence of such functions from this package is not meant to
discourage the development, standardization, or use of such
@@ -1116,8 +1165,8 @@
-
- A set of
tz region names as per
- "Names of time zone rulesets" above.
+ A set of timezone names as per
+ "Names of timezones" above.
-
Library functions described in "Time and date
@@ -1186,7 +1235,7 @@
Time and time zones on other planets
Some people's work schedules
-use Mars time.
+use Mars time.
Jet Propulsion Laboratory (JPL) coordinators kept Mars time on
and off during the
Mars
@@ -1218,7 +1267,7 @@
Each landed mission on Mars has adopted a different reference for
-solar time keeping, so there is no real standard for Mars time zones.
+solar timekeeping, so there is no real standard for Mars time zones.
For example, the
Mars
Exploration Rover project (2004) defined two time zones "Local
@@ -1290,7 +1339,7 @@
Matt Williams,
"How
long is a day on the other planets of the solar system?"
- (2017-04-27).
+ (2016-01-20).
--- contrib/tzdata/version.orig
+++ contrib/tzdata/version
@@ -1 +1 @@
-2018e
+2018g
--- contrib/tzdata/yearistype.sh.orig
+++ contrib/tzdata/yearistype.sh
@@ -1,4 +1,5 @@
#! /bin/sh
+: 'Determine whether year is of appropriate type (this file is obsolete).'
: 'This file is in the public domain, so clarified as of'
: '2006-07-17 by Arthur David Olson.'
--- contrib/tzdata/ziguard.awk.orig
+++ contrib/tzdata/ziguard.awk
@@ -80,6 +80,13 @@
if (comment_out) {
sub(/^/, "#")
}
+
+ # In rearguard format, 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 (!vanguard && $1 == "Rule" && $7 == "Sat>=8" && $8 == "25:00") {
+ sub(/Sat>=8/, "Sun>=9")
+ sub(/25:00/, " 1:00")
+ }
}
# If a Link line is followed by a Zone line for the same data, comment
--- contrib/tzdata/zishrink.awk.orig
+++ contrib/tzdata/zishrink.awk
@@ -6,28 +6,146 @@
# 'zic' should treat this script's output as if it were identical to
# this script's input.
+# Record a hash N for the new name NAME, checking for collisions.
-# Return a new rule name.
-# N_RULE_NAMES keeps track of how many rule names have been generated.
+function record_hash(n, name)
+{
+ if (used_hashes[n]) {
+ printf "# ! collision: %s %s\n", used_hashes[n], name
+ exit 1
+ }
+ used_hashes[n] = name
+}
-function gen_rule_name(alphabet, base, rule_name, n, digit)
+# Return a shortened rule name representing NAME,
+# and record this relationship to the hash table.
+
+function gen_rule_name(name, n)
{
- alphabet = ""
- alphabet = alphabet "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- alphabet = alphabet "abcdefghijklmnopqrstuvwxyz"
- alphabet = alphabet "!$%&'()*+,./:;<=>?@[\\]^_`{|}~"
- base = length(alphabet)
- rule_name = ""
- n = n_rule_names++
+ # Use a simple memonic: the first two letters.
+ n = substr(name, 1, 2)
+ record_hash(n, name)
+ # printf "# %s = %s\n", n, name
+ return n
+}
- do {
- n -= rule_name && n <= base
- digit = n % base
- rule_name = substr(alphabet, digit + 1, 1) rule_name
- n = (n - digit) / base
- } while (n);
+function prehash_rule_names(name)
+{
+ # Rule names are not part of the tzdb API, so substitute shorter
+ # ones. Shortening them consistently from one release to the next
+ # simplifies comparison of the output. That being said, the
+ # 1-letter names below are not standardized in any way, and can
+ # change arbitrarily from one release to the next, as the main goal
+ # here is compression not comparison.
- return rule_name
+ # Abbreviating these rules names to one letter saved the most space
+ # circa 2018e.
+ rule["Arg"] = "A"
+ rule["Brazil"] = "B"
+ rule["Canada"] = "C"
+ rule["Denmark"] = "D"
+ rule["EU"] = "E"
+ rule["France"] = "F"
+ rule["GB-Eire"] = "G"
+ rule["Halifax"] = "H"
+ rule["Italy"] = "I"
+ rule["Jordan"] = "J"
+ rule["Egypt"] = "K" # "Kemet" in ancient Egyptian
+ rule["Libya"] = "L"
+ rule["Morocco"] = "M"
+ rule["Neth"] = "N"
+ rule["Poland"] = "O" # arbitrary
+ rule["Palestine"] = "P"
+ rule["Cuba"] = "Q" # Its start sounds like "Q".
+ rule["Russia"] = "R"
+ rule["Syria"] = "S"
+ rule["Turkey"] = "T"
+ rule["Uruguay"] = "U"
+ rule["Vincennes"] = "V"
+ rule["Winn"] = "W"
+ rule["Mongol"] = "X" # arbitrary
+ rule["NT_YK"] = "Y"
+ rule["Zion"] = "Z"
+ rule["Austria"] = "a"
+ rule["Belgium"] = "b"
+ rule["C-Eur"] = "c"
+ rule["Algeria"] = "d" # country code DZ
+ rule["E-Eur"] = "e"
+ rule["Taiwan"] = "f" # Formosa
+ rule["Greece"] = "g"
+ rule["Hungary"] = "h"
+ rule["Iran"] = "i"
+ rule["StJohns"] = "j"
+ rule["Chatham"] = "k" # arbitrary
+ rule["Lebanon"] = "l"
+ rule["Mexico"] = "m"
+ rule["Tunisia"] = "n" # country code TN
+ rule["Moncton"] = "o" # arbitrary
+ rule["Port"] = "p"
+ rule["Albania"] = "q" # arbitrary
+ rule["Regina"] = "r"
+ rule["Spain"] = "s"
+ rule["Toronto"] = "t"
+ rule["US"] = "u"
+ rule["Louisville"] = "v" # ville
+ rule["Iceland"] = "w" # arbitrary
+ rule["Chile"] = "x" # arbitrary
+ rule["Para"] = "y" # country code PY
+ rule["Romania"] = "z" # arbitrary
+ rule["Macau"] = "_" # arbitrary
+
+ # Use ISO 3166 alpha-2 country codes for remaining names that are countries.
+ # This is more systematic, and avoids collisions (e.g., Malta and Moldova).
+ rule["Armenia"] = "AM"
+ rule["Aus"] = "AU"
+ rule["Azer"] = "AZ"
+ rule["Barb"] = "BB"
+ rule["Dhaka"] = "BD"
+ rule["Bulg"] = "BG"
+ rule["Bahamas"] = "BS"
+ rule["Belize"] = "BZ"
+ rule["Swiss"] = "CH"
+ rule["Cook"] = "CK"
+ rule["PRC"] = "CN"
+ rule["Cyprus"] = "CY"
+ rule["Czech"] = "CZ"
+ rule["Germany"] = "DE"
+ rule["DR"] = "DO"
+ rule["Ecuador"] = "EC"
+ rule["Finland"] = "FI"
+ rule["Fiji"] = "FJ"
+ rule["Falk"] = "FK"
+ rule["Ghana"] = "GH"
+ rule["Guat"] = "GT"
+ rule["Hond"] = "HN"
+ rule["Haiti"] = "HT"
+ rule["Eire"] = "IE"
+ rule["Iraq"] = "IQ"
+ rule["Japan"] = "JP"
+ rule["Kyrgyz"] = "KG"
+ rule["ROK"] = "KR"
+ rule["Latvia"] = "LV"
+ rule["Lux"] = "LX"
+ rule["Moldova"] = "MD"
+ rule["Malta"] = "MT"
+ rule["Mauritius"] = "MU"
+ rule["Namibia"] = "NA"
+ rule["Nic"] = "NI"
+ rule["Norway"] = "NO"
+ rule["Peru"] = "PE"
+ rule["Phil"] = "PH"
+ rule["Pakistan"] = "PK"
+ rule["Sudan"] = "SD"
+ rule["Salv"] = "SV"
+ rule["Tonga"] = "TO"
+ rule["Vanuatu"] = "VU"
+
+ # Avoid collisions.
+ rule["Detroit"] = "Dt" # De = Denver
+
+ for (name in rule) {
+ record_hash(rule[name], name)
+ }
}
# Process an input line and save it for later output.
@@ -106,7 +224,7 @@
i = field[1] == "Z" ? 4 : field[1] == "Li" ? 0 : 2
if (i && field[i] ~ /^[^-+0-9]/) {
if (!rule[field[i]])
- rule[field[i]] = gen_rule_name()
+ rule[field[i]] = gen_rule_name(field[i])
field[i] = rule[field[i]]
}
@@ -144,8 +262,53 @@
}
BEGIN {
+ # Files that the output normally depends on.
+ default_dep["africa"] = 1
+ default_dep["antarctica"] = 1
+ default_dep["asia"] = 1
+ default_dep["australasia"] = 1
+ default_dep["backward"] = 1
+ default_dep["etcetera"] = 1
+ default_dep["europe"] = 1
+ default_dep["factory"] = 1
+ default_dep["northamerica"] = 1
+ default_dep["southamerica"] = 1
+ default_dep["systemv"] = 1
+ default_dep["ziguard.awk"] = 1
+ default_dep["zishrink.awk"] = 1
+
+ # Output a version string from 'version' and related configuration variables
+ # supported by tzdb's Makefile. If you change the makefile or any other files
+ # that affect the output of this script, you should append '-SOMETHING'
+ # to the contents of 'version', where SOMETHING identifies what was changed.
+
+ ndeps = split(deps, dep)
+ ddeps = ""
+ for (i = 1; i <= ndeps; i++) {
+ if (default_dep[dep[i]]) {
+ default_dep[dep[i]]++
+ } else {
+ ddeps = ddeps " " dep[i]
+ }
+ }
+ for (d in default_dep) {
+ if (default_dep[d] == 1) {
+ ddeps = ddeps " !" d
+ }
+ }
print "# version", version
+ if (dataform != "main") {
+ print "# dataform", dataform
+ }
+ if (redo != "posix_right") {
+ print "# redo " redo
+ }
+ if (ddeps) {
+ print "# ddeps" ddeps
+ }
print "# This zic input file is in the public domain."
+
+ prehash_rule_names()
}
/^[\t ]*[^#\t ]/ {
--- contrib/tzdata/zone.tab.orig
+++ contrib/tzdata/zone.tab
@@ -1,9 +1,9 @@
-# tz zone descriptions (deprecated version)
+# tzdb timezone descriptions (deprecated version)
#
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
-# From Paul Eggert (2014-07-31):
+# From Paul Eggert (2018-06-27):
# This file is intended as a backward-compatibility aid for older programs.
# New programs should use zone1970.tab. This file is like zone1970.tab (see
# zone1970.tab's comments), but with the following additional restrictions:
@@ -12,13 +12,13 @@
# 2. The first data column contains exactly one country code.
#
# Because of (2), each row stands for an area that is the intersection
-# of a region identified by a country code and of a zone where civil
+# of a region identified by a country code and of a timezone where civil
# clocks have agreed since 1970; this is a narrower definition than
# that of zone1970.tab.
#
-# This table is intended as an aid for users, to help them select time
-# zone data entries appropriate for their practical needs. It is not
-# intended to take or endorse any position on legal or territorial claims.
+# This table is intended as an aid for users, to help them select timezones
+# appropriate for their practical needs. It is not intended to take or
+# endorse any position on legal or territorial claims.
#
#country-
#code coordinates TZ comments
@@ -268,7 +268,7 @@
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar
-MO +2214+11335 Asia/Macau
+MO +221150+1133230 Asia/Macau
MP +1512+14545 Pacific/Saipan
MQ +1436-06105 America/Martinique
MR +1806-01557 Africa/Nouakchott
--- contrib/tzdata/zone1970.tab.orig
+++ contrib/tzdata/zone1970.tab
@@ -1,36 +1,36 @@
-# tz zone descriptions
+# tzdb timezone descriptions
#
# This file is in the public domain.
#
-# From Paul Eggert (2017-10-01):
-# This file contains a table where each row stands for a zone where
-# civil time stamps have agreed since 1970. Columns are separated by
+# From Paul Eggert (2018-06-27):
+# This file contains a table where each row stands for a timezone where
+# civil timestamps have agreed since 1970. Columns are separated by
# a single tab. Lines beginning with '#' are comments. All text uses
# UTF-8 encoding. The columns of the table are as follows:
#
-# 1. The countries that overlap the zone, as a comma-separated list
+# 1. The countries that overlap the timezone, as a comma-separated list
# of ISO 3166 2-character country codes.
# See the file '/usr/share/misc/iso3166'.
-# 2. Latitude and longitude of the zone's principal location
+# 2. Latitude and longitude of the timezone's principal location
# in ISO 6709 sign-degrees-minutes-seconds format,
# either ±DDMM±DDDMM or ±DDMMSS±DDDMMSS,
# first latitude (+ is north), then longitude (+ is east).
-# 3. Zone name used in value of TZ environment variable.
-# Please see the theory.html file for how zone names are chosen.
-# If multiple zones overlap a country, each has a row in the
+# 3. Timezone name used in value of TZ environment variable.
+# Please see the theory.html file for how these names are chosen.
+# If multiple timezones overlap a country, each has a row in the
# table, with each column 1 containing the country code.
-# 4. Comments; present if and only if a country has multiple zones.
+# 4. Comments; present if and only if a country has multiple timezones.
#
-# If a zone covers multiple countries, the most-populous city is used,
+# If a timezone covers multiple countries, the most-populous city is used,
# and that country is listed first in column 1; any other countries
# are listed alphabetically by country code. The table is sorted
# first by country code, then (if possible) by an order within the
# country that (1) makes some geographical sense, and (2) puts the
-# most populous zones first, where that does not contradict (1).
+# most populous timezones first, where that does not contradict (1).
#
-# This table is intended as an aid for users, to help them select time
-# zone data entries appropriate for their practical needs. It is not
-# intended to take or endorse any position on legal or territorial claims.
+# This table is intended as an aid for users, to help them select timezones
+# appropriate for their practical needs. It is not intended to take or
+# endorse any position on legal or territorial claims.
#
#country-
#codes coordinates TZ comments
@@ -232,7 +232,7 @@
MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas)
MN +4801+09139 Asia/Hovd Bayan-Ölgii, Govi-Altai, Hovd, Uvs, Zavkhan
MN +4804+11430 Asia/Choibalsan Dornod, Sükhbaatar
-MO +2214+11335 Asia/Macau
+MO +221150+1133230 Asia/Macau
MQ +1436-06105 America/Martinique
MT +3554+01431 Europe/Malta
MU -2010+05730 Indian/Mauritius
--- contrib/tzdata/zoneinfo2tdf.pl.orig
+++ contrib/tzdata/zoneinfo2tdf.pl
@@ -1,4 +1,5 @@
#! /usr/bin/perl -w
+# Summarize .zi input in a .zi-like format.
# Courtesy Ken Pizzini.