diff options
| author | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-09-23 14:33:51 +0000 |
|---|---|---|
| committer | Andy Fiddaman <omnios@citrus-it.co.uk> | 2019-09-23 17:06:31 +0000 |
| commit | 4cfdb4666c89a959e76ef077c99ae7fb542dcf71 (patch) | |
| tree | 294ca1a33c4bae5c38daa7383978aa698219fcb4 | |
| parent | c79df70e7f04e3742087189b820b431059193dfe (diff) | |
| download | illumos-joyent-4cfdb4666c89a959e76ef077c99ae7fb542dcf71.tar.gz | |
11744 zone_sun.tab file must remain sorted
Reviewed by: Jim Klimov <jim@cos.ru>
Reviewed by: Marcel Telka <marcel@telka.sk>
Reviewed by: Alexander Pyhalov <apyhalov@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/data/zoneinfo/README.illumos | 4 | ||||
| -rw-r--r-- | usr/src/data/zoneinfo/zone_sun.tab | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/usr/src/data/zoneinfo/README.illumos b/usr/src/data/zoneinfo/README.illumos index 8af2e7fc48..9978e2d96d 100644 --- a/usr/src/data/zoneinfo/README.illumos +++ b/usr/src/data/zoneinfo/README.illumos @@ -49,6 +49,10 @@ diff zone.tab.txt' and see what changed and fix zone_sun.tab appropriately. Usually this means deleting removed entries and adding new ones. +********** IMPORTANT ********** +*** zone_sun.tab must remain sorted. +*** The upstream zone.tab.txt is not always completely in alphabetical order. + After that's done, you'll need to go through the more agonizing process of packaging. To do this, you'll want to look through the differences that have occurred in zone.tab.txt and backward. The contents of backward describe diff --git a/usr/src/data/zoneinfo/zone_sun.tab b/usr/src/data/zoneinfo/zone_sun.tab index 789179f0c6..d5a5691846 100644 --- a/usr/src/data/zoneinfo/zone_sun.tab +++ b/usr/src/data/zoneinfo/zone_sun.tab @@ -355,10 +355,6 @@ RO +4426+02606 Europe/Bucharest - RS +4450+02030 Europe/Belgrade - RU +5443+02030 Europe/Kaliningrad - MSK-01 - Kaliningrad RU +554521+0373704 Europe/Moscow - MSK+00 - Moscow area -# The obsolescent zone.tab format cannot represent Europe/Simferopol well. -# Put it in RU section and list as UA. See "territorial claims" above. -# Programs should use zone1970.tab instead; see above. -UA +4457+03406 Europe/Simferopol - MSK+00 - Crimea RU +5836+04939 Europe/Kirov - MSK+00 - Kirov RU +4621+04803 Europe/Astrakhan - MSK+01 - Astrakhan RU +4844+04425 Europe/Volgograd - MSK+01 - Volgograd @@ -422,6 +418,11 @@ TV -0831+17913 Pacific/Funafuti - TW +2503+12130 Asia/Taipei - TZ -0648+03917 Africa/Dar_es_Salaam - UA +5026+03031 Europe/Kiev - Ukraine (most areas) +# The obsolescent zone.tab format cannot represent Europe/Simferopol well. +# Upstream zoneinfo have put it in RU section but listed it as UA +# However, libzoneinfo relies on this file being sorted and so we place it in +# the UA section. +UA +4457+03406 Europe/Simferopol - MSK+00 - Crimea UA +4837+02218 Europe/Uzhgorod - Ruthenia UA +4750+03510 Europe/Zaporozhye - Zaporozh'ye/Zaporizhia; Lugansk/Luhansk (east) UG +0019+03225 Africa/Kampala - |