diff options
| -rw-r--r-- | usr/src/data/zoneinfo/asia | 20 | ||||
| -rw-r--r-- | usr/src/data/zoneinfo/europe | 37 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-data-zoneinfo.mf | 2 |
3 files changed, 40 insertions, 19 deletions
diff --git a/usr/src/data/zoneinfo/asia b/usr/src/data/zoneinfo/asia index 0c026318d4..3f6e95c201 100644 --- a/usr/src/data/zoneinfo/asia +++ b/usr/src/data/zoneinfo/asia @@ -1464,17 +1464,17 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880 # of the Japanese wanted to scrap daylight-saving time, as opposed to 30% who # wanted to keep it.) -# From Paul Eggert (2006-03-22): -# Shanks & Pottenger write that DST in Japan during those years was as follows: +# From Takayuki Nikai (2018-01-19): +# The source of information is Japanese law. +# http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00219480428029.htm +# http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00719500331039.htm +# ... In summary, it is written as follows. From 24:00 on the first Saturday +# in May, until 0:00 on the day after the second Saturday in September. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Japan 1948 only - May Sun>=1 2:00 1:00 D -Rule Japan 1948 1951 - Sep Sat>=8 2:00 0 S -Rule Japan 1949 only - Apr Sun>=1 2:00 1:00 D -Rule Japan 1950 1951 - May Sun>=1 2:00 1:00 D -# but the only locations using it (for birth certificates, presumably, since -# their audience is astrologers) were US military bases. For now, assume -# that for most purposes daylight-saving time was observed; otherwise, what -# would have been the point of the 1951 poll? +Rule Japan 1948 only - May Sat>=1 24:00 1:00 D +Rule Japan 1948 1951 - Sep Sun>=9 0:00 0 S +Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D +Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D # From Hideyuki Suzuki (1998-11-09): # 'Tokyo' usually stands for the former location of Tokyo Astronomical diff --git a/usr/src/data/zoneinfo/europe b/usr/src/data/zoneinfo/europe index 8d10dde91a..6c1ccbe455 100644 --- a/usr/src/data/zoneinfo/europe +++ b/usr/src/data/zoneinfo/europe @@ -508,16 +508,19 @@ Link Europe/London Europe/Jersey Link Europe/London Europe/Guernsey Link Europe/London Europe/Isle_of_Man +# From Paul Eggert (2018-01-19): # 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. # 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 -Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 GMT -Rule Eire 1981 max - Mar lastSun 1:00u 0 IST -Rule Eire 1981 1989 - Oct Sun>=23 1:00u -1:00 GMT -Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 GMT -Rule Eire 1996 max - Oct lastSun 1:00u -1:00 GMT +#Rule Eire 1971 only - Oct 31 2:00u -1:00 GMT +#Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 IST +#Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 GMT +#Rule Eire 1981 max - Mar lastSun 1:00u 0 IST +#Rule Eire 1981 1989 - Oct Sun>=23 1:00u -1:00 GMT +#Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 GMT +#Rule Eire 1996 max - Oct lastSun 1:00u -1:00 GMT # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2 @@ -530,7 +533,25 @@ 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 - 1:00 Eire IST/GMT +# From Paul Eggert (2018-01-18): +# The next line should look like this: +# 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. + 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/usr/src/pkg/manifests/system-data-zoneinfo.mf b/usr/src/pkg/manifests/system-data-zoneinfo.mf index 4c7fdbbe66..6c190e77ac 100644 --- a/usr/src/pkg/manifests/system-data-zoneinfo.mf +++ b/usr/src/pkg/manifests/system-data-zoneinfo.mf @@ -16,7 +16,7 @@ # set name=pkg.fmri \ - value=pkg:/system/data/zoneinfo@2018.1,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) + value=pkg:/system/data/zoneinfo@2018.3,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) set name=pkg.description value="timezone information" set name=pkg.summary value="Timezone Information" set name=info.classification value=org.opensolaris.category.2008:System/Core |