Here are proposed changes to update Tonga, Brazil, Jordan, and Bulgaria; also included are changes to finalize handling of DST-specifying time zone strings in the absence of a file from which to get information. If nobody squawks, I'll update the tzcode and tzdata files on elsie.nci.nih.gov on Thursday. --ado diff -c -r old/Makefile new/Makefile *** old/Makefile Tue Aug 17 14:09:09 1999 --- new/Makefile Mon Sep 20 16:36:23 1999 *************** *** 29,34 **** --- 29,37 ---- POSIXRULES= America/New_York + # Also see TZDEFRULESTRING below, which takes effect only + # if the time zone files cannot be accessed. + # Everything gets put in subdirectories of. . . TOPDIR= /usr/local *************** *** 96,101 **** --- 99,106 ---- # -DLOCALE_HOME=\"path\" if locales are in "path", not "/usr/lib/locale" # -DHAVE_UNISTD_H=0 if your compiler lacks a "unistd.h" (Microsoft C++ 7?) # -DHAVE_UTMPX_H=1 if your compiler has a "utmpx.h" + # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified + # DST transitions if the time zone files cannot be accessed # -DTZ_DOMAIN=\"foo\" to use "foo" for gettext domain name; default is "tz" # -TTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" *************** *** 156,162 **** # "timeoff" is like "timegm" except that it accepts a second (long) argument # that gives an offset to use when converting to a time_t. # "posix2time" and "time2posix" are described in an included manual page. ! # None of these functions are described in X3J11's current work. # Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0. # These functions may well disappear in future releases of the time # conversion package. --- 161,167 ---- # "timeoff" is like "timegm" except that it accepts a second (long) argument # that gives an offset to use when converting to a time_t. # "posix2time" and "time2posix" are described in an included manual page. ! # None of these functions are described in X3J11's work. # Sun has provided "tzsetwall", "timelocal", and "timegm" in SunOS 4.0. # These functions may well disappear in future releases of the time # conversion package. diff -c -r old/asia new/asia *** old/asia Tue Aug 17 14:45:35 1999 --- new/asia Mon Sep 20 18:13:37 1999 *************** *** 648,658 **** # Since 1938, all Japanese possessions have been like Asia/Tokyo. # Jordan ! # From Steffen Thorsen (1999-05-08): # Jordan do not have DST this year. It also seems that they are not going # to use it the next years either. "We do not need it" was the answer I got # from the Jordan National Information Centre (http://www.nic.gov.jo). # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S Rule Jordan 1973 1975 - Oct 1 0:00 0 - --- 648,676 ---- # Since 1938, all Japanese possessions have been like Asia/Tokyo. # Jordan ! # From Steffen Thorsen [straen@thorsen.priv.no] (1999-05-08): # Jordan do not have DST this year. It also seems that they are not going # to use it the next years either. "We do not need it" was the answer I got # from the Jordan National Information Centre (http://www.nic.gov.jo). # + # From Steffen Thorsen [straen@thorsen.priv.no] (1999-09-09): + # In April I reported that Jordan had stopped using DST. Now the government + # will use DST all year long, as reported in this Jordanian newspaper: + # <a href="http://star.arabia.com/990701/JO9.html"> + # http://star.arabia.com/990701/JO9.html + # </a> + # + # "Summer time is back + # Clocks in Jordan were forwarded one hour on Wednesday at midnight, in + # accordance with the government's decision to implement summer time all + # year round." + # + # It seems that DST was introduced on 30 June at 24:00 (or 1 July 00:00). + # This link might also be of interest: + # <a href="http://star.arabia.com/990624/JO2.html"> + # http://star.arabia.com/990624/JO2.html + # </a> + # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S Rule Jordan 1973 1975 - Oct 1 0:00 0 - *************** *** 676,682 **** Rule Jordan 1995 1998 - Sep Fri>=15 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 ! 2:00 Jordan EE%sT # Kazakhstan # From Paul Eggert (1996-11-22): --- 694,701 ---- Rule Jordan 1995 1998 - Sep Fri>=15 0:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 ! 2:00 Jordan EE%sT 1999 Jul ! 2:00 1:00 EEST # Kazakhstan # From Paul Eggert (1996-11-22): diff -c -r old/australasia new/australasia *** old/australasia Tue Aug 17 14:53:08 1999 --- new/australasia Mon Sep 20 18:15:01 1999 *************** *** 388,397 **** -10:00 - TKT # Tokelau Time # Tonga # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Tongatapu 12:19:20 - LMT 1901 12:20 - TOT 1941 # Tonga Time ! 13:00 - TOT # Tuvalu # Zone NAME GMTOFF RULES FORMAT [UNTIL] --- 388,402 ---- -10:00 - TKT # Tokelau Time # Tonga + # Transition time is a guess--see below + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Tonga 1999 max - Oct Sat>=1 0:00 1:00 S + Rule Tonga 2000 max - Apr Sat>=15 0:00 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Pacific/Tongatapu 12:19:20 - LMT 1901 12:20 - TOT 1941 # Tonga Time ! 13:00 - TOT 1999 ! 13:00 Tonga TO%sT # Tuvalu # Zone NAME GMTOFF RULES FORMAT [UNTIL] *************** *** 1007,1009 **** --- 1012,1038 ---- # He has proposed a one-off move to tropical daylight saving for Tonga from # October to March, which has won approval in principle from the Tongan # Government. + + # From Steffen Thorsen [straen@thorsen.priv.no] (1999-09-09): + # * Tonga will introduce DST in November + # + # I was given this link by John Letts <johnletts@earthlink.net>: + # <a hef="http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.st m"> + # http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.stm + # </a> + # + # I have not been able to find exact dates for the transition in November + # yet. By reading this article it seems like Fiji will be 14 hours ahead + # of UTC as well, but as far as I know Fiji will only be 13 hours ahead + # (12 + 1 hour DST). + + # From Arthur David Olson [arthur_david_olson@nih.gov] (1999-09-20): + # According to <a href="http://www.tongaonline.com/news/sept1799.html> + # http://www.tongaonline.com/news/sept1799.html + # </a>: + # "Daylight Savings Time will take effect on Oct. 2 through April 15, 2000 + # and annually thereafter from the first Saturday in October through the + # third Saturday of April. Under the system approved by Privy Council on + # Sept. 10, clocks must be turned ahead one hour on the opening day and + # set back an hour on the closing date." + # Alas, no indication of the time of day. diff -c -r old/europe new/europe *** old/europe Tue Aug 17 15:20:54 1999 --- new/europe Mon Sep 20 17:44:41 1999 *************** *** 1165,1170 **** --- 1165,1184 ---- # see Yugoslavia # Bulgaria + + # From Steffen Thorsen [straen@thorsen.priv.no] (1999-09-09): + # Sofia should probably use rule "EU" after 1997: + # + # Plamen Simenov <P.Simeonov@cnsys.bg> reports that DST transitions + # are not at midnight, but a few hours later: + # + # A document of Government of Bulgaria (No.94/1997) says: + # EET --> EETDST is in 03:00 Local time in last Sunday of March + # (new=local+1h) + # EETDST --> EET is in 04:00 Local time in last Sunday of October + # (new=local-1h) + # (EETDST = EEST) + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Bulg 1979 only - Mar 31 23:00 1:00 S Rule Bulg 1979 only - Oct 1 1:00 0 - *************** *** 1179,1185 **** 2:00 - EET 1979 Mar 31 23:00 2:00 Bulg EE%sT 1982 Sep 26 2:00 2:00 C-Eur EE%sT 1991 ! 2:00 E-Eur EE%sT # Croatia # see Yugosloavia --- 1193,1200 ---- 2:00 - EET 1979 Mar 31 23:00 2:00 Bulg EE%sT 1982 Sep 26 2:00 2:00 C-Eur EE%sT 1991 ! 2:00 E-Eur EE%sT 1997 ! 2:00 EU EET/EETDST # Croatia # see Yugosloavia diff -c -r old/localtime.c new/localtime.c *** old/localtime.c Tue Aug 17 14:12:02 1999 --- new/localtime.c Mon Sep 20 16:36:23 1999 *************** *** 59,64 **** --- 59,75 ---- static const char gmt[] = "GMT"; + /* + ** The DST rules to use if TZ has no rules and we can't load TZDEFRULES. + ** We default to US rules as of 1999-08-17. + ** POSIX 1003.1 section 8.1.1 says that the default DST rules are + ** implementation dependent; for historical reasons, US rules are a + ** common default. + */ + #ifndef TZDEFRULESTRING + #define TZDEFRULESTRING ",M4.1.0,M10.5.0" + #endif /* !defined TZDEFDST */ + struct ttinfo { /* time type information */ long tt_gmtoff; /* UTC offset in seconds */ int tt_isdst; /* used to set tm_isdst */ *************** *** 734,753 **** if (name == NULL) return -1; } else dstoffset = stdoffset - SECSPERHOUR; - #if 0 - /* - ** XXX--get justification for U.S.-centricism - ** before adopting the following code; - ** also get to document the behavior. - */ if (*name == '\0' && load_result != 0) ! /* ! ** Default to US rules as of 1999-08-17 if TZ has ! ** no rules and we can't load the default rules, ! */ ! name = ",M4.1.0,M10.5.0"; ! ! #endif if (*name == ',' || *name == ';') { struct rule start; struct rule end; --- 745,752 ---- if (name == NULL) return -1; } else dstoffset = stdoffset - SECSPERHOUR; if (*name == '\0' && load_result != 0) ! name = TZDEFRULESTRING; if (*name == ',' || *name == ';') { struct rule start; struct rule end; diff -c -r old/southamerica new/southamerica *** old/southamerica Tue Aug 17 14:09:08 1999 --- new/southamerica Mon Sep 20 17:07:45 1999 *************** *** 350,364 **** # Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG">2,495</a> # (1998-02-10) Rule Brazil 1998 only - Mar 1 0:00 0 - ! # Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2,780</a> (1998-09-11) ! # adopted by the same states as before, ! # specifies only the 1998-10-11 and 1999-02-21 transitions; # after that, these rules are guesses and are quite possibly wrong, # but they are more likely than no DST at all. ! Rule Brazil 1998 max - Oct Sun>=8 0:00 1:00 S ! Rule Brazil 1999 max - Feb Sun>=15 0:00 0 - - # Zone NAME GMTOFF RULES FORMAT [UNTIL] # # Fernando de Noronha --- 350,366 ---- # Decree <a href="http://pcdsh01.on.br/figuras/HV2495.JPG">2,495</a> # (1998-02-10) Rule Brazil 1998 only - Mar 1 0:00 0 - ! # Decree <a href="http://pcdsh01.on.br/figuras/Hv98.jpg">2,780</a> (1998-09-11). ! # specifies only the 1998-10-11 and 1999-02-21 transitions. ! Rule Brazil 1998 only - Oct 11 0:00 1:00 S ! Rule Brazil 1999 only - Feb 21 0:00 0 - ! # Decree <a href="http://pcdsh01.on.br/figuras/HV3150.gif">3,150</a> ! # (1999-08-23) specifies only the 1999-10-03 and 2000-02-27 transitions; # after that, these rules are guesses and are quite possibly wrong, # but they are more likely than no DST at all. ! Rule Brazil 1999 max - Oct Sun>=1 0:00 1:00 S ! Rule Brazil 2000 max - Feb lastSun 0:00 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] # # Fernando de Noronha