Update.

2005-01-25  Jakub Jelinek  <jakub@redhat.com>

	* stdlib/fmtmsg.c (addseverity): Remove new_string variable.
	(free_mem): Don't free string.
	* stdlib/tst-fmtmsg.c: Include string.h.
	(main): Add some more tests.

2005-01-25  Andreas Schwab  <schwab@suse.de>

	* timezone/asia: Update from tzdata2005c.
	* timezone/backward: Likewise.
	* timezone/leapseconds: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/southamerica: Likewise.

	* timezone/private.h: Update from tzcode2005c.
	* timezone/tzfile.h: Likewise.
	* timezone/zdump.c: Likewise.
	* timezone/zic.c: Likewise.

1 files changed, 90 insertions, 45 deletions

diff --git a/timezone/asia b/timezone/asia
index 3c2c1a1868..32e6e3c45f 100644
--- a/timezone/asia
+++ b/timezone/asia
@@ -1,4 +1,4 @@
-# @(#)asia	7.77
+# @(#)asia	7.78
 
 # This data is by no means authoritative; if you think you know better,
 # go ahead and edit the file (and please send any changes to
@@ -639,7 +639,7 @@ Rule	Zion	1988	only	-	Apr	 9	0:00	1:00	D
 Rule	Zion	1988	only	-	Sep	 3	0:00	0	S
 
 # From Ephraim Silverberg <ephraim@cs.huji.ac.il>
-# (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17 and 2000-07-25):
+# (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, and 2004-12-22):
 
 # According to the Office of the Secretary General of the Ministry of
 # Interior, there is NO set rule for Daylight-Savings/Standard time changes.
@@ -690,13 +690,13 @@ Rule	Zion	1995	only	-	Sep	 3	0:00	0	S
 # time, Haim Ramon.  The official announcement regarding 1996-1998
 # (with the dates for 1997-1998 no longer being relevant) can be viewed at:
 #
-#   ftp://ftp.huji.ac.il/pub/tz/announcements/1996-1998.ramon.ps.gz
+#   ftp://ftp.cs.huji.ac.il/pub/tz/announcements/1996-1998.ramon.ps.gz
 #
 # The dates for 1997-1998 were altered by his successor, Rabbi Eli Suissa.
 #
 # The official announcements for the years 1997-1999 can be viewed at:
 #
-#   ftp://ftp.huji.ac.il/pub/tz/announcements/YYYY.ps.gz
+#   ftp://ftp.cs.huji.ac.il/pub/tz/announcements/YYYY.ps.gz
 #
 #       where YYYY is the relevant year.
 
@@ -716,12 +716,12 @@ Rule	Zion	1999	only	-	Sep	 3	2:00	0	S
 #
 # The official announcement for the start date of 2000 can be viewed at:
 #
-#	ftp://ftp.huji.ac.il/pub/tz/announcements/2000-start.ps.gz
+#	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-start.ps.gz
 #
 # The official announcement for the end date of 2000 and the dates
 # for the years 2001-2004 can be viewed at:
 #
-#	ftp://ftp.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
+#	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Zion	2000	only	-	Apr	14	2:00	1:00	D
@@ -735,52 +735,97 @@ Rule	Zion	2003	only	-	Oct	 3	1:00	0	S
 Rule	Zion	2004	only	-	Apr	 7	1:00	1:00	D
 Rule	Zion	2004	only	-	Sep	22	1:00	0	S
 
-# From Paul Eggert (2000-07-25):
-# Here are guesses for rules after 2004.
-# They are probably wrong, but they are more likely than no DST at all.
+# Yesterday, the Knesset Interior Committee passed a proposed (originally
+# in March 2004) change to the Time Setting Law that would make the dates
+# for DST from 2005 and beyond so that DST starts on the night _after_ the
+# first night of the Passover holiday at midnight until midnight of the
+# Saturday night _before_ the fast of Yom Kippur.
+#
+# Those who can read Hebrew can view the proposal at:
+#
+#	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+.ps
+#
+# The proposal still has to be passed by the Knesset (three readings) for
+# it to become law....
+
+# From Paul Eggert (2004-12-22):
+# For now, guess that the rules proposed on 2004-12-20 will be adopted.
+# This is quite possibly wrong, but it is more likely than no DST at all.
+# I used Ed Reingold's cal-hebrew in GNU Emacs 21.3, along with code
+# written by Ephraim Silverberg, to generate this list.
 # Rule	NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule	Zion	2005	max	-	Apr	 1	1:00	1:00	D
-Rule	Zion	2005	max	-	Oct	 1	1:00	0	S
+Rule	Zion	2005	only	-	Apr	25	0:00	1:00	D
+Rule	Zion	2005	only	-	Oct	 9	0:00	0	S
+Rule	Zion	2006	only	-	Apr	14	0:00	1:00	D
+Rule	Zion	2006	only	-	Oct	 1	0:00	0	S
+Rule	Zion	2007	only	-	Apr	 4	0:00	1:00	D
+Rule	Zion	2007	only	-	Sep	16	0:00	0	S
+Rule	Zion	2008	only	-	Apr	21	0:00	1:00	D
+Rule	Zion	2008	only	-	Oct	 5	0:00	0	S
+Rule	Zion	2009	only	-	Apr	10	0:00	1:00	D
+Rule	Zion	2009	only	-	Sep	27	0:00	0	S
+Rule	Zion	2010	only	-	Mar	31	0:00	1:00	D
+Rule	Zion	2010	only	-	Sep	12	0:00	0	S
+Rule	Zion	2011	only	-	Apr	20	0:00	1:00	D
+Rule	Zion	2011	only	-	Oct	 2	0:00	0	S
+Rule	Zion	2012	only	-	Apr	 8	0:00	1:00	D
+Rule	Zion	2012	only	-	Sep	23	0:00	0	S
+Rule	Zion	2013	only	-	Mar	27	0:00	1:00	D
+Rule	Zion	2013	only	-	Sep	 8	0:00	0	S
+Rule	Zion	2014	only	-	Apr	16	0:00	1:00	D
+Rule	Zion	2014	only	-	Sep	28	0:00	0	S
+Rule	Zion	2015	only	-	Apr	 5	0:00	1:00	D
+Rule	Zion	2015	only	-	Sep	20	0:00	0	S
+Rule	Zion	2016	only	-	Apr	24	0:00	1:00	D
+Rule	Zion	2016	only	-	Oct	 9	0:00	0	S
+Rule	Zion	2017	only	-	Apr	12	0:00	1:00	D
+Rule	Zion	2017	only	-	Sep	24	0:00	0	S
+Rule	Zion	2018	only	-	Apr	 1	0:00	1:00	D
+Rule	Zion	2018	only	-	Sep	16	0:00	0	S
+Rule	Zion	2019	only	-	Apr	21	0:00	1:00	D
+Rule	Zion	2019	only	-	Oct	 6	0:00	0	S
+Rule	Zion	2020	only	-	Apr	10	0:00	1:00	D
+Rule	Zion	2020	only	-	Sep	27	0:00	0	S
+Rule	Zion	2021	only	-	Mar	29	0:00	1:00	D
+Rule	Zion	2021	only	-	Sep	12	0:00	0	S
+Rule	Zion	2022	only	-	Apr	17	0:00	1:00	D
+Rule	Zion	2022	only	-	Oct	 2	0:00	0	S
+Rule	Zion	2023	only	-	Apr	 7	0:00	1:00	D
+Rule	Zion	2023	only	-	Sep	24	0:00	0	S
+Rule	Zion	2024	only	-	Apr	24	0:00	1:00	D
+Rule	Zion	2024	only	-	Oct	 6	0:00	0	S
+Rule	Zion	2025	only	-	Apr	14	0:00	1:00	D
+Rule	Zion	2025	only	-	Sep	28	0:00	0	S
+Rule	Zion	2026	only	-	Apr	 3	0:00	1:00	D
+Rule	Zion	2026	only	-	Sep	20	0:00	0	S
+Rule	Zion	2027	only	-	Apr	23	0:00	1:00	D
+Rule	Zion	2027	only	-	Oct	10	0:00	0	S
+Rule	Zion	2028	only	-	Apr	12	0:00	1:00	D
+Rule	Zion	2028	only	-	Sep	24	0:00	0	S
+Rule	Zion	2029	only	-	Apr	 1	0:00	1:00	D
+Rule	Zion	2029	only	-	Sep	16	0:00	0	S
+Rule	Zion	2030	only	-	Apr	19	0:00	1:00	D
+Rule	Zion	2030	only	-	Oct	 6	0:00	0	S
+Rule	Zion	2031	only	-	Apr	 9	0:00	1:00	D
+Rule	Zion	2031	only	-	Sep	21	0:00	0	S
+Rule	Zion	2032	only	-	Mar	28	0:00	1:00	D
+Rule	Zion	2032	only	-	Sep	12	0:00	0	S
+Rule	Zion	2033	only	-	Apr	15	0:00	1:00	D
+Rule	Zion	2033	only	-	Oct	 2	0:00	0	S
+Rule	Zion	2034	only	-	Apr	 5	0:00	1:00	D
+Rule	Zion	2034	only	-	Sep	17	0:00	0	S
+Rule	Zion	2035	only	-	Apr	25	0:00	1:00	D
+Rule	Zion	2035	only	-	Oct	 7	0:00	0	S
+Rule	Zion	2036	only	-	Apr	13	0:00	1:00	D
+Rule	Zion	2036	only	-	Sep	28	0:00	0	S
+Rule	Zion	2037	only	-	Apr	 1	0:00	1:00	D
+Rule	Zion	2037	only	-	Sep	13	0:00	0	S
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Jerusalem	2:20:56 -	LMT	1880
 			2:20:40	-	JMT	1918	# Jerusalem Mean Time?
 			2:00	Zion	I%sT
 
-# From Ephraim Silverberg (2003-03-23):
-#
-# Minister of Interior Poraz has announced that he will respect the law
-# passed in July 2000 (proposed at the time jointly by himself and
-# then-MK David Azulai [Shas]) fixing the dates for 2000-2004.  Hence,
-# the dates for 2003 and 2004 remain unchanged....
-#
-# As far as 2005 and beyond, no dates have been set.  However, the
-# minister has mentioned that he wishes to propose to move Israel's
-# timezone in 2005 from GMT+2 to GMT+3 and upon that have DST during
-# the summer months (i.e. GMT+4).  However, no legislation in this
-# direction is expected until the latter part of 2004 which is a long
-# time off in terms of Israeli politics.
-
-# (2004-09-20):
-# The latest rumour, however, is that in 2005, when the clock changes to
-# Daylight Saving Time (date as yet unknown), the move will be a two-hour leap
-# forward (from UTC+0200 to UTC+0400) and then, in the fall, the clock will
-# move back only an hour to UTC+0300 thus effectively moving Israel's timezone
-# from UTC+0200 to UTC+0300.  However, no actual draft has been put before the
-# Knesset (Israel's Parliament) though the intention is to do so this
-# month [2004-09].
-
-# (2004-09-26):
-# Even though the draft law for the above did pass the Ministerial Committee
-# for Legislative Matters three months ago, it was voted down in today's
-# Cabinet meeting.  The current suggestion is to keep the current timezone at
-# UTC+0200 but have an extended period of Daylight Saving Time (UTC+0300) from
-# the beginning of Passover holiday in the spring to after the Tabernacle
-# holiday in the fall (i.e. the dates of which are governed by the Hebrew
-# calendar but this means at least 184 days of DST).  However, this is only a
-# suggestion that was raised in today's cabinet meeting and has not yet been
-# drafted.
-
 
 
 ###############################################################################