Here are proposed changes to the time zone package; the executive summary: Makefile change GCC_DEBUG_FLAGS rule for more warnings africa Egypt abandons DST in 2011 (and forward) (thanks to Alexander Krivenyshev) localtime.c recode increment_overflow and long_increment_overflow to eliminate gcc warnings (thanks to Paul Eggert) europe eliminate doubled words (thanks to Jim Meyering) southamerica eliminate doubled words (thanks to Jim Meyering) The "africa" changes do affect time stamps in Egypt in 2011 (and forward). Given the short notice on the Egyptian changes...if no problems are found, the ftp site will be updated on 2011-04-25. (Then maybe silly season will be over and I can clear out the non-time-sensitive stuff from the pipeline.) --ado diff -r -c old/Makefile new/Makefile *** old/Makefile Thu Dec 16 12:11:21 2010 --- new/Makefile Thu Apr 14 12:42:47 2011 *************** *** 1,5 **** # <pre> ! # @(#)Makefile 8.9 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. --- 1,5 ---- # <pre> ! # @(#)Makefile 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. *************** *** 116,122 **** # -DZIC_MAX_ABBR_LEN_WO_WARN=3 # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) ! GCC_DEBUG_FLAGS = -Dlint -g -O -fno-common \ -Wall -Wcast-qual -Wconversion -Wmissing-prototypes \ -Wnested-externs -Wpointer-arith -Wshadow \ -Wtraditional # -Wstrict-prototypes -Wwrite-strings --- 116,122 ---- # -DZIC_MAX_ABBR_LEN_WO_WARN=3 # (or some other number) to set the maximum time zone abbreviation length # that zic will accept without a warning (the default is 6) ! GCC_DEBUG_FLAGS = -Dlint -g -O3 -fno-common \ -Wall -Wcast-qual -Wconversion -Wmissing-prototypes \ -Wnested-externs -Wpointer-arith -Wshadow \ -Wtraditional # -Wstrict-prototypes -Wwrite-strings diff -r -c old/africa new/africa *** old/africa Wed Mar 30 15:29:23 2011 --- new/africa Wed Apr 20 12:48:41 2011 *************** *** 1,5 **** # <pre> ! # @(#)africa 8.30 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. --- 1,5 ---- # <pre> ! # %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. *************** *** 212,218 **** Rule Egypt 1990 1994 - May 1 1:00 1:00 S # IATA (after 1990) says transitions are at 0:00. # Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29. ! Rule Egypt 1995 max - Apr lastFri 0:00s 1:00 S Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: --- 212,232 ---- Rule Egypt 1990 1994 - May 1 1:00 1:00 S # IATA (after 1990) says transitions are at 0:00. # Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29. ! ! # From Alexander Krivenyshev (2011-04-20): ! # "...Egypt's interim cabinet decided on Wednesday to cancel daylight ! # saving time after a poll posted on its website showed the majority of ! # Egyptians would approve the cancellation." ! # ! # Egypt to cancel daylight saving time ! # <a href="http://www.almasryalyoum.com/en/node/407168"> ! # http://www.almasryalyoum.com/en/node/407168 ! # </a> ! # or ! # <a href="http://www.worldtimezone.com/dst_news/dst_news_egypt04.html"> ! # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html ! # </a> ! Rule Egypt 1995 2010 - Apr lastFri 0:00s 1:00 S Rule Egypt 1995 2005 - Sep lastThu 23:00s 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: *************** *** 313,319 **** Rule Egypt 2009 only - Aug 20 23:00s 0 - Rule Egypt 2010 only - Aug 11 0:00 0 - Rule Egypt 2010 only - Sep 10 0:00 1:00 S ! Rule Egypt 2010 max - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo 2:05:00 - LMT 1900 Oct --- 327,333 ---- Rule Egypt 2009 only - Aug 20 23:00s 0 - Rule Egypt 2010 only - Aug 11 0:00 0 - Rule Egypt 2010 only - Sep 10 0:00 1:00 S ! Rule Egypt 2010 only - Sep lastThu 23:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo 2:05:00 - LMT 1900 Oct diff -r -c old/europe new/europe *** old/europe Thu Mar 31 16:04:14 2011 --- new/europe Thu Apr 14 16:07:06 2011 *************** *** 1,5 **** # <pre> ! # @(#)europe 8.31 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. --- 1,5 ---- # <pre> ! # @(#)europe 8.32 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. *************** *** 146,152 **** # A monument to Willett was unveiled on 1927-05-21, in an open space in # a 45-acre wood near Chislehurst, Kent that was purchased by popular # subscription and open to the public. On the south face of the monolith, ! # designed by G. W. Miller, is the the William Willett Memorial Sundial, # which is permanently set to Summer Time. # From Winston Churchill (1934-04-28): --- 146,152 ---- # A monument to Willett was unveiled on 1927-05-21, in an open space in # a 45-acre wood near Chislehurst, Kent that was purchased by popular # subscription and open to the public. On the south face of the monolith, ! # designed by G. W. Miller, is the...William Willett Memorial Sundial, # which is permanently set to Summer Time. # From Winston Churchill (1934-04-28): *************** *** 1786,1792 **** # # All these events predate our cutoff date of 1970. Unless we can # come up with more definitive info about the timekeeping during the ! # war years it's probably best just do do the following for now: Link Europe/Oslo Arctic/Longyearbyen # Poland --- 1786,1792 ---- # # All these events predate our cutoff date of 1970. Unless we can # come up with more definitive info about the timekeeping during the ! # war years it's probably best just do...the following for now: Link Europe/Oslo Arctic/Longyearbyen # Poland diff -r -c old/localtime.c new/localtime.c *** old/localtime.c Tue Jan 25 16:08:41 2011 --- new/localtime.c Fri Apr 15 16:32:47 2011 *************** *** 5,11 **** #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 8.16"; #endif /* !defined NOID */ #endif /* !defined lint */ --- 5,11 ---- #ifndef lint #ifndef NOID ! static char elsieid[] = "@(#)localtime.c 8.17"; #endif /* !defined NOID */ #endif /* !defined lint */ *************** *** 1613,1643 **** #endif /* !defined WRONG */ /* ! ** Simplified normalize logic courtesy Paul Eggert. */ static int ! increment_overflow(number, delta) ! int * number; ! int delta; { ! int number0; ! number0 = *number; ! *number += delta; ! return (*number < number0) != (delta < 0); } static int ! long_increment_overflow(number, delta) ! long * number; ! int delta; { ! long number0; ! number0 = *number; ! *number += delta; ! return (*number < number0) != (delta < 0); } static int --- 1613,1651 ---- #endif /* !defined WRONG */ /* ! ** Normalize logic courtesy Paul Eggert. */ static int ! increment_overflow(ip, j) ! int * const ip; ! int j; { ! register int const i = *ip; ! /* ! ** If i >= 0 there can only be overflow if i + j > INT_MAX ! ** or if j > INT_MAX - i; given i >= 0, INT_MAX - i cannot overflow. ! ** If i < 0 there can only be overflow if i + j < INT_MIN ! ** or if j < INT_MIN - i; given i < 0, INT_MIN - i cannot overflow. ! */ ! if ((i >= 0) ? (j > INT_MAX - i) : (j < INT_MIN - i)) ! return TRUE; ! *ip += j; ! return FALSE; } static int ! long_increment_overflow(lp, m) ! long * const lp; ! int const m; { ! register long const l = *lp; ! if ((l >= 0) ? (m > LONG_MAX - l) : (m < LONG_MIN - l)) ! return TRUE; ! *lp += m; ! return FALSE; } static int diff -r -c old/southamerica new/southamerica *** old/southamerica Wed Apr 6 17:14:53 2011 --- new/southamerica Thu Apr 14 16:07:06 2011 *************** *** 1,5 **** # <pre> ! # @(#)southamerica 8.48 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. --- 1,5 ---- # <pre> ! # @(#)southamerica 8.49 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. *************** *** 745,751 **** # # As a result of the above Decree I believe the America/Rio_Branco # timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall ! # be created to represent the the west side of the Para State. I # suggest this new timezone be called Santarem as the most # important/populated city in the affected area. # --- 745,751 ---- # # As a result of the above Decree I believe the America/Rio_Branco # timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall ! # be created to represent the...west side of the Para State. I # suggest this new timezone be called Santarem as the most # important/populated city in the affected area. #