system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update.

Browse Source 
2000-02-21  Andreas Jaeger  <aj@suse.de>

	* sysdeps/unix/sysv/linux/bits/in.h (IPV6_RXSRCRT): Renamed to
	IPV6_RTHDR; added IPV6_RTHDR_LOOSE, IPV6_RTHDR_STRICT and
	IPV6_RTHDR_TYPE_0 to synch with RFC 2292.
	* sysdeps/generic/bits/in.h: Likewise.

2000-02-21  Ulrich Drepper  <drepper@redhat.com>

	* po/gl.po: Update from translation team.

	* timezone/antarctica: Update from tzdata2000b.
	* timezone/asia: Likewise.
	* timezone/australasia: Likewise.
	* timezone/europe: Likewise.

	* malloc/malloc.c (vALLOc): Call ptmalloc_init before mEMALIGn
	call to initialize malloc_getpagesize.
	(pvALLOc): Likewise.
This commit is contained in:
Ulrich Drepper 2000-02-22 05:09:06 +00:00
parent 782a9fe711
commit bfaf0bbb7d
11 changed files with 667 additions and 1127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2000-02-21 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/bits/in.h (IPV6_RXSRCRT): Renamed to
IPV6_RTHDR; added IPV6_RTHDR_LOOSE, IPV6_RTHDR_STRICT and
IPV6_RTHDR_TYPE_0 to synch with RFC 2292.
* sysdeps/generic/bits/in.h: Likewise.
2000-02-21 Ulrich Drepper <drepper@redhat.com>
* po/gl.po: Update from translation team.
* timezone/antarctica: Update from tzdata2000b.
* timezone/asia: Likewise.
* timezone/australasia: Likewise.
* timezone/europe: Likewise.
* malloc/malloc.c (vALLOc): Call ptmalloc_init before mEMALIGn
call to initialize malloc_getpagesize.
(pvALLOc): Likewise.
2000-02-20 Ulrich Drepper <drepper@redhat.com>
* po/it.po: Update from translation team.

10
bits/in.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1997 Free Software Foundation, Inc.
/* Copyright (C) 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -66,7 +66,7 @@ struct ip_mreq
#define IPV6_RXINFO 2
#define IPV6_RXHOPOPTS 3
#define IPV6_RXDSTOPTS 4
#define IPV6_RXSRCRT 5
#define IPV6_RTHDR 5
#define IPV6_PKTOPTIONS 6
#define IPV6_CHECKSUM 7
#define IPV6_HOPLIMIT 8
@ -81,3 +81,9 @@ struct ip_mreq
#define IPV6_MULTICAST_LOOP 19
#define IPV6_ADD_MEMBERSHIP 20
#define IPV6_DROP_MEMBERSHIP 21
/* Routing header options for IPv6. */
#define IPV6_RTHDR_LOOSE 0 /* Hop doesn't need to be neighbour. */
#define IPV6_RTHDR_STRICT 1 /* Hop must be a neighbour. */
#define IPV6_RTHDR_TYPE_0 0 /* IPv6 Routing header type 0. */

9
malloc/malloc.c
View File

@ -1,5 +1,5 @@
/* Malloc implementation for multiple threads without lock contention.
Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>
and Doug Lea <dl@cs.oswego.edu>, 1996.
@ -3618,6 +3618,8 @@ Void_t* vALLOc(size_t bytes)
Void_t* vALLOc(bytes) size_t bytes;
#endif
{
if(__malloc_initialized < 0)
ptmalloc_init ();
return mEMALIGn (malloc_getpagesize, bytes);
}
@ -3633,7 +3635,10 @@ Void_t* pvALLOc(size_t bytes)
Void_t* pvALLOc(bytes) size_t bytes;
#endif
{
size_t pagesize = malloc_getpagesize;
size_t pagesize;
if(__malloc_initialized < 0)
ptmalloc_init ();
pagesize = malloc_getpagesize;
return mEMALIGn (pagesize, (bytes + pagesize - 1) & ~(pagesize - 1));
}

2
manual/string.texi
View File

@ -480,7 +480,7 @@ This function has undefined results if the strings overlap.
@end deftypefun
Programmers using the @code{strcat} function (or the following
@code{strncat} function for that matter) can easily be recognize as
@code{strncat} function for that matter) can easily be recognized as
lazy. In almost all situations the lengths of the participating strings
are known. Or at least, one could know them if one keeps track of the
results of the various function calls. But then it is very inefficient

1035
po/gl.po
View File

File diff suppressed because it is too large Load Diff

10
sysdeps/generic/bits/in.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1997 Free Software Foundation, Inc.
/* Copyright (C) 1997, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -66,7 +66,7 @@ struct ip_mreq
#define IPV6_RXINFO 2
#define IPV6_RXHOPOPTS 3
#define IPV6_RXDSTOPTS 4
#define IPV6_RXSRCRT 5
#define IPV6_RTHDR 5
#define IPV6_PKTOPTIONS 6
#define IPV6_CHECKSUM 7
#define IPV6_HOPLIMIT 8
@ -81,3 +81,9 @@ struct ip_mreq
#define IPV6_MULTICAST_LOOP 19
#define IPV6_ADD_MEMBERSHIP 20
#define IPV6_DROP_MEMBERSHIP 21
/* Routing header options for IPv6. */
#define IPV6_RTHDR_LOOSE 0 /* Hop doesn't need to be neighbour. */
#define IPV6_RTHDR_STRICT 1 /* Hop must be a neighbour. */
#define IPV6_RTHDR_TYPE_0 0 /* IPv6 Routing header type 0. */

10
sysdeps/unix/sysv/linux/bits/in.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -99,7 +99,7 @@ struct in_pktinfo
#define IPV6_PKTINFO 2
#define IPV6_HOPOPTS 3
#define IPV6_DSTOPTS 4
#define IPV6_RXSRCRT 5
#define IPV6_RTHDR 5
#define IPV6_PKTOPTIONS 6
#define IPV6_CHECKSUM 7
#define IPV6_HOPLIMIT 8
@ -126,3 +126,9 @@ struct in_pktinfo
/* Socket level values for IPv6. */
#define SOL_IPV6 41
#define SOL_ICMPV6 58
/* Routing header options for IPv6. */
#define IPV6_RTHDR_LOOSE 0 /* Hop doesn't need to be neighbour. */
#define IPV6_RTHDR_STRICT 1 /* Hop must be a neighbour. */
#define IPV6_RTHDR_TYPE_0 0 /* IPv6 Routing header type 0. */

8
timezone/antarctica
View File

@ -1,4 +1,4 @@
# @(#)antarctica 7.17
# @(#)antarctica 7.18
# From Paul Eggert (1999-11-15):
# To keep things manageable, we list only locations occupied year-round; see
@ -47,6 +47,10 @@ Rule ChileAQ 2000 max - Mar Sun>=9 0:00 0 -
# Australia - territories
# Heard Island, McDonald Islands (uninhabited)
# previously sealers and scientific personnel wintered
# <a href="http://www.dstc.qut.edu.au/DST/marg/daylight.html">
# Margaret Turner reports
# </a> (1999-09-30) that they're UTC+5, with no DST;
# presumably this is when they have visitors.
#
# year-round bases
# Casey, Bailey Peninsula, -6617+11032, since 1969
@ -210,7 +214,7 @@ Rule NZAQ 1990 max - Mar Sun>=15 2:00s 0 S
# Rothera, Adelaide Island, -6734-6808, since 1976-12-01
# Uruguay - year round base
# Artigas, King George Island, -9621104-0585107
# Artigas, King George Island, -621104-0585107
# USA - year-round bases
#

39
timezone/asia
View File

@ -1,4 +1,4 @@
# @(#)asia 7.51
# @(#)asia 7.54
# 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
@ -526,7 +526,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 and 1998-12-28):
# (1997-03-04, 1998-03-16, 1998-12-28, and 2000-01-17):
# According to the Office of the Secretary General of the Ministry of
# Interior, there is NO set rule for Daylight-Savings/Standard time changes.
@ -540,7 +540,11 @@ Rule Zion 1988 only - Sep 3 0:00 0 S
# conflicts with the Jewish New Year. Starting in 1999, the change to
# daylight savings time will still be on a Friday morning but from
# 2 a.m. IST to 3 a.m. IDT; furthermore, the change back to standard time
# will now also be on a Friday morning from 2 a.m. IDT to 1 a.m. IST.
# will now also be on a Friday morning from 2 a.m. IDT to 1 a.m. IST for
# 1999 only. In the years from 2000 to 2002, the change back will be from
# 2 a.m. IDT to 1 a.m. IST the morning after the Jewish festival of
# Shmini Atzeret (i.e. the morning of the 23rd of Tishrei in the lunar
# Hebrew calendar).
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Zion 1989 only - Apr 30 0:00 1:00 D
@ -588,18 +592,29 @@ Rule Zion 1998 only - Sep 6 0:00 0 S
Rule Zion 1999 only - Apr 2 2:00 1:00 D
Rule Zion 1999 only - Sep 3 2:00 0 S
# Due to imminent elections in 1999, there are no dates for the year 2000
# and beyond. There was a move to legislate the DST rules in Israel, but
# due to the government's fall, it most likely won't be brought to the Knesset
# for first reading before the elections and will probably be altered by the
# newly elected government.
# Minister of Interior, Natan Sharansky, has announced the dates for
# the years 2000-2002. However, sources inside the ministry have noted
# that the end date of 2000 and both dates of 2001-2002 should be regarded
# as tentative pending final approval.
#
# The official announcement for the years 2000-2001 can be viewed at:
#
# ftp://ftp.huji.ac.il/pub/tz/announcements/2000-2002.ps.gz
# From Paul Eggert (1999-01-30):
# Here are guesses for rules after 1999.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Zion 2000 only - Apr 14 2:00 1:00 D
Rule Zion 2000 only - Oct 22 2:00 0 S
Rule Zion 2001 only - Apr 6 2:00 1:00 D
Rule Zion 2001 only - Oct 10 2:00 0 S
Rule Zion 2002 only - Mar 29 2:00 1:00 D
Rule Zion 2002 only - Sep 29 2:00 0 S
# From Paul Eggert (2000-01-17):
# Here are guesses for rules after 2002.
# They are probably wrong, but they are more likely than no DST at all.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Zion 2000 max - Apr Fri>=1 2:00 1:00 D
Rule Zion 2000 max - Sep Fri>=1 2:00 0 S
Rule Zion 2003 max - Mar Fri>=25 2:00 1:00 D
Rule Zion 2003 max - Oct 1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Jerusalem 2:20:56 - LMT 1880

39
timezone/australasia
View File

@ -1,4 +1,4 @@
# @(#)australasia 7.54
# @(#)australasia 7.55
# This file also includes Pacific islands.
# Notes are at the end of this file
@ -151,11 +151,13 @@ Zone Australia/Broken_Hill 9:25:48 - LMT 1895 Feb
Rule LH 1981 1984 - Oct lastSun 2:00s 1:00 -
Rule LH 1982 1985 - Mar Sun>=1 2:00s 0 -
Rule LH 1985 only - Oct lastSun 2:00s 0:30 -
Rule LH 1986 1991 - Mar Sun>=15 2:00s 0 -
Rule LH 1986 1989 - Mar Sun>=15 2:00s 0 -
Rule LH 1986 only - Oct 19 2:00s 0:30 -
Rule LH 1987 max - Oct lastSun 2:00s 0:30 -
Rule LH 1992 1995 - Mar Sun>=1 2:00s 0 -
Rule LH 1987 1999 - Oct lastSun 2:00s 0:30 -
Rule LH 1990 1995 - Mar Sun>=1 2:00s 0 -
Rule LH 1996 max - Mar lastSun 2:00s 0 -
Rule LH 2000 only - Aug lastSun 2:00s 0:30 -
Rule LH 2001 max - Oct lastSun 2:00s 0:30 -
Zone Australia/Lord_Howe 10:36:20 - LMT 1895 Feb
10:00 - EST 1981 Mar
10:30 LH LHST
@ -164,7 +166,7 @@ Zone Australia/Lord_Howe 10:36:20 - LMT 1895 Feb
#
# Ashmore Is, Cartier
# no indigenous inhabitants; only seasonal caretakers
# no information; probably like Australia/Perth
# like Australia/Perth, says Turner
#
# Coral Sea Is
# no indigenous inhabitants; only meteorologists
@ -173,10 +175,7 @@ Zone Australia/Lord_Howe 10:36:20 - LMT 1895 Feb
# Macquarie
# permanent occupation (scientific station) since 1948;
# sealing and penguin oil station operated 1888/1917
# <a href="http://www.bom.gov.au/faq/faqgen.htm">
# The Australian Bureau of Meteorology FAQ
# </a> (1999-09-27) writes that Macquarie Island follows Tasmanian practice
# irrespective of any local use of DST. This is unclear; ignore it for now.
# like Australia/Hobart, says Turner
# Christmas
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@ -505,6 +504,10 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# Australia
# <a href="http://www.dstc.qut.edu.au/DST/marg/daylight.html">
# Australia's Daylight Saving Times
# </a>, by Margaret Turner, summarizes daylight saving issues in Australia.
# From John Mackin (1991-03-06):
# We in Australia have _never_ referred to DST as `daylight' time.
# It is called `summer' time. Now by a happy coincidence, `summer'
@ -843,11 +846,19 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
# Lord Howe Island is located off the New South Wales coast, and is half an
# hour ahead of NSW time.
# From Paul Eggert (1995-12-19):
# For Lord Howe we use Shanks through 1991.
# Lord Howe is part of NSW, so we'll guess it has used the same transition
# times as NSW since 1991, even though Shanks writes that Lord Howe went
# with Victoria when NSW and Victoria disagreed in 1982.
# From James Lonergan, Secretary, Lord Howe Island Board (2000-01-27):
# Lord Howe Island summer time in 2000/2001 will commence on the same
# date as the rest of NSW (i.e. 2000-08-27). For your information the
# Lord Howe Island Board (controlling authority for the Island) is
# seeking the community's views on various options for summer time
# arrangements on the Island, e.g. advance clocks by 1 full hour
# instead of only 30 minutes. Dependant on the wishes of residents
# the Board may approach the NSW government to change the existing
# arrangements. The starting date for summer time on the Island will
# however always coincide with the rest of NSW.
# From Paul Eggert (2000-01-31):
# For Lord Howe we use Shanks through 1989, and Lonergan thereafter.
###############################################################################

612
timezone/europe
View File

@ -1,4 +1,4 @@
# @(#)europe 7.67
# @(#)europe 7.69
# 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
@ -162,586 +162,15 @@
# Howse writes (p 157) `DBST'; let's assume this is a typo.
# From Peter Ilieve <peter@aldie.co.uk> (1998-04-19):
# The following list attempts to show the complete history of Summer Time
# legislation in the United Kingdom, and has quite a bit to say about
# the Isle of Man and the Channel Islands as well.
#
# Things that I have not personally seen are marked (???). Things that
# I haven't seen but Joseph Myers has are marked (jsm). The problem
# with finding old Orders (rather than Acts) is that nobody seems to
# keep the actual documents themselves, not even the Government. They
# get bound into annual volumes, which are published, but by the time
# this happens the Orders are mainly spent as the years they refer
# to have come and gone, so they don't get included in the annual
# volumes.
#
# Thanks are due to my learned legal friend Lorna Montgomerie, who dug out
# the dusty old statutes, to Melanie Allison of the Ministry of Defence,
# who provided the wartime regulations and a snippet of Hansard explaining
# why double summer time started on a Monday in 1945 (it was Easter),
# and to Joseph Myers <jsm28@cam.ac.uk>, who tracked down the Orders
# up to 1945, some of the old Acts, and the first five EC Directives.
#
# Some definitions:
#
# Great Britain: England, Scotland and Wales
# United Kingdom: Great Britain plus Ireland (up to 1922) or Northern
# Ireland (since 1922)
# S.I.: Statutory Instrument, the modern name for secondary legislation
# S.R.&O.: Statutory Rules and Orders, the older name for secondary legislation
#
# Unless otherwise specified, Acts and secondary legislation are assumed
# to apply throughout the United Kingdom, but not to the Isle of Man
# or the Channel Islands.
#
# Some of the Acts and Orders I found in various libraries, and I don't
# have copies. When I looked at them I was looking for dates and not things
# like whether they applied to the Bailiwick of Jersey. I will try to
# check these documents again.
#
# ---
#
# - The Statutes (Definition of Time) Act, 1880 (43 & 44 Vict. c. 9)
#
# Defined Greenwich mean time to be the standard time in Great Britain
# and Dublin mean time to be the standard time in Ireland, superseding
# various forms of local mean time.
#
# - The Statutory Time Act, 1883 (???)
#
# An Act of Tynwald, the Isle of Man Parliament. It appears to have
# defined the standard time on the Isle of Man as GMT but as I haven't
# seen it I don't know if it used Greenwich mean time, some other definition,
# or just said that Isle of Man time would be the same as in Great Britain.
#
# - The Isle of Man (War Legislation) Act, 1914 (4 & 5 Geo. 5. c. 62)
#
# Gives the power, by Order in Council, to extend wartime legislation
# to the Isle of Man.
#
# - The Summer Time Act, 1916 (6 & 7 Geo. 5. c. 14)
#
# Introduced Summer Time for the first time, in Great Britain and Ireland.
# Specified a one hour offset from GMT (DMT in Ireland), dates of
# Sunday 21 May and Sunday 1 October and times of 02:00 (GMT/DMT).
# Gave a power to make Orders in subsequent years, for the duration
# of the then current war.
#
# - The Time (Ireland) Act, 1916 (6 & 7 Geo. 5. c. 45)
#
# This abolished Dublin mean time at 02:00 DMT on Sunday 1 October 1916,
# bringing the whole of the United Kingdom onto GMT. As Ireland was behind
# GMT/BST at 02:00 DMT on 1 Oct Great Britain had already put the clocks back.
# Using Paul Eggert's suggestion of IST for Irish Summer Time and the figure
# derived from Whitman for the offset of IST from GMT (00:34:39) the sequence
# would have been:
# Dublin London
# 02:34:38 IST 02:59:59 BST
# 02:34:39 IST 02:00:00 GMT
# 02:59:59 IST 02:25:20 GMT
# 02:25:21 GMT 02:25:21 GMT
# with the transition 03:00:00 IST -> 02:00:00 DMT -> 02:25:21 GMT all at once.
#
# - S.R.&O. 1916, No. 382
#
# An Order made under the Isle of Man (War Legislation) Act, 1914
# extending the Summer Time Act, 1916 to the Isle of Man. Dated
# 23 May 1916, two days after the start of Summer Time, but it says that
# the Act is deemed to have taken effect in the Isle of Man at the same
# time as it took effect in the United Kingdom.
#
# - S.R.&O. 1917, No. 362
#
# An Order made under the Summer Time Act, 1916 giving dates
# for Summer Time in 1917 of Sunday 8 April to Monday 17 September,
# both at 02:00 GMT. Note that Summer Time ends on a Monday.
#
# - S.R.&O. 1917, No. 358
#
# An Order made under the Summer Time (Isle of Man) Act, 1916
# (the thing created by S.R.&O. 1916, No. 382) specifying the same
# dates of 8 April to 17 September, at 02:00 GMT for the Isle of Man.
#
# - S.R.&O. 1918, No. 274
#
# An Order made under the Summer Time Act, 1916 giving dates
# for Summer Time in 1918 of Sunday 24 March to Monday 30 September,
# both at 02:00 GMT.
#
# - S.R.&O. 1918, No. 429
#
# The matching Isle of Man Order for 1918 with the same dates and times.
#
# - The Termination of the Present War (Definition) Act, 1918
# (8 & 9 Geo. 5. c. 59)
#
# This gave power to specify a legal end date for the war just ended,
# which would affect things like the Summer Time Act, 1916, which applied
# only in wartime. This date was to be close to the date of formal
# ratification of the treaty or treaties of peace.
#
# - S.R.&O. 1919, No. 297
#
# An Order made under the Summer Time Act, 1916 giving dates
# for Summer Time in 1919 of Sunday 30 March to Monday 29 September,
# both at 02:00 GMT.
#
# - S.R.&O. 1919, No. 366
#
# The matching Isle of Man Order for 1919 with the same dates and times.
#
# - S.R.&O. 1920, No. 458
#
# An Order made under the Summer Time Act, 1916 giving dates
# for Summer Time in 1920 of Sunday 28 March to Monday 27 September,
# both at 02:00 GMT.
#
# - S.R.&O. 1920, No. 573
#
# The matching Isle of Man Order for 1920 with the same dates and times.
#
# - S.R.&O. 1920, No. 1844
#
# An Order modifying both S.R.&O. 1920, No. 458 and S.R.&O. 1920, No. 573 to
# change the end date for Summer Time from Monday 27 September to
# Monday 25 October (the time remaining 02:00 GMT). The 1989 Green
# Paper (Cm 722) says this was done because of a coal strike.
#
# - The War Emergency Laws (Continuance) Act, 1920 (10 Geo. 5. c. 5)
#
# This extends the power to make Orders under the Summer Time Act, 1916
# for a period of 12 months after the termination of the war.
# Came into force on 31 March 1920. Although the war had been over for more
# than 12 months by then the legal end date had not yet been set.
#
# - S.R.&O. 1921, No. 363
#
# An Order made under the Summer Time Act, 1916 and the War
# Emergency Laws (Continuance) Act, 1920 giving dates for Summer Time
# in 1921 of Sunday 3 April to Monday 3 October, both at 02:00 GMT.
#
# - S.R.&O. 1921, No. 364
#
# The matching Isle of Man Order for 1921 with the same dates and times.
#
# - S.R.&O. 1922, No. 264
#
# An Order made under the Summer Time Act, 1916 and the War
# Emergency Laws (Continuance) Act, 1920 giving dates for Summer Time
# in 1921 of Sunday 26 March to Sunday 8 October, both at 02:00 GMT.
# It also mentions the arrangements for defining the legal end date
# for the late war. An Order was made on 10 August 1921, under the
# Termination of the Present War (Definition) Act, 1918, setting
# a date of 31 August 1921. This means the powers of the Summer Time
# Act, 1916 would finally expire on 31 August 1922.
#
# - S.R.&O. 1922, No. 290 (???)
#
# This is probably the matching Isle of Man Order.
#
# - The Summer Time Act, 1922 (12 & 13 Geo. 5. c. 22)
#
# This specifies an offset of 1 hour and dates of the day after the third
# Saturday in April, unless that be Easter, in which case it is the day after
# the second Saturday, and the day after the third Saturday in September.
# The time is 02:00 GMT. It applied in 1922 and 1923, and longer if Parliament
# so approved. It applied to the Isle of Man and the Channel Islands as well.
# Came into Force on 20 July 1920. Note the reversion to ending on a Sunday.
#
# - S.R.&O. 1922, No. 1205
#
# An Order made under the War Emergency Laws (Continuance) Act, 1920
# dated 13 October 1922. It revokes (among other things) the Order extending
# the Summer Time Act, 1916 to the Isle of Man.
#
# - The Expiring Laws Continuance Act, 1923 (13 & 14 Geo. 5. c. 37)
#
# This extended the Summer Time Act, 1922 (among other things) until
# 31 December 1924.
#
# - The Expiring Laws Continuance Act, 1924 (15 Geo. 5. c. 1) (jsm)
#
# This further extended the Summer Time Act, 1922 (among other things) until
# 31 December 1925.
#
# - The Time Act (Northern Ireland), 1924 (14 & 15 Geo. 5. c. 24 (N.I.))
#
# This Act says that while it remains in force, any Act or Order relating
# to the time for general purposes in Great Britain shall also apply
# in Northern Ireland, and the Time (Ireland) Act, 1916 shall have effect
# accordingly.
#
# - The Summer Time Act, 1925 (15 & 16 Geo. 5. c. 64)
#
# This makes the 1922 Act permanent, with a change to the end date to the
# day after the first Saturday in October. Came into force on 7 August 1925.
#
# - The Emergency Powers (Defence) Act, 1939 (2 & 3 Geo. 6. c. 62) (???)
#
# I haven't seen this one. It presumably gave the Government powers to
# do all manner of things during the newly started war.
#
# - The Defence (Summer Time) Regulations, 1939, S.R.&O. 1939, No. 1379
#
# These were made under the Emergency Powers (Defence) Act, 1939.
# They change the end date to be the day after the third Saturday in November.
#
# - S.R.&O. 1940, No. 172
#
# An Order in Council amending the Defence (Summer Time) Regulations, 1939.
# It changed the start date to the day after the fourth Saturday in February
# (ie. 25 Feb 1940).
#
# - S.R.&O. 1940, No. 1883
#
# Another Order amending the Defence (Summer Time) Regulations, 1939.
# This continues summer time throughout the year after it starts in 1940.
#
# - S.R.&O. 1941, No. 476
#
# Another Order amending the Defence (Summer Time) Regulations, 1939.
# This introduces double summer time, starting at 01:00 GMT on the day after
# the first Saturday in May and ending at 01:00 GMT on the day after the
# second Saturday in August, offset another hour from normal summer time,
# which continues throughout the rest of the year.
#
# - S.R.&O. 1942, No. 506
#
# Another Order amending the Defence (Summer Time) Regulations, 1939.
# This changes the start date of Double Summer Time to the day after the first
# Saturday in April, bringing it forward from May.
#
# - S.R.&O. 1944, No. 932
#
# Another Order amending the Defence (Summer Time) Regulations, 1939.
# This changed the end date of Double Summer Time to the day after the
# third Saturday in September (ie. 17 September 1944).
#
# - S.R.&O. 1945, No. 312
#
# Another Order amending the Defence (Summer Time) Regulations, 1939.
# This changes the start and end dates of Double Summer Time to the
# day after the first Sunday in April and the day after the second Saturday
# in July (ie. Mon 2 April to Sun 15 July).
#
# I have this quote from Hansard (the official record of the United Kingdom
# Parliament), Oral Answers, 1 March 1945, cols 1559--60, explaining the
# unusual start on a Monday:
#
# `58. Major Sir Goronwy Owen asked the Secretary of State for the Home
# Department if he is now able to state the Government's proposals
# regarding double summer time.
#
# [two other similar questions omitted]
#
# Mr. H. Morrison: The Government, in reviewing the matter, have
# considered, [...] the conclusion has been reached that the adoption of
# double summer time from the beginning of April is essential to the
# maintenance of the war effort. [...] As 1st April is Easter Sunday,
# when very early services are held in many churches, it is proposed that
# double summer time shall start not in the night preceding Easter
# Sunday, but in the night of Sunday-Monday so that it will operate from
# Monday, 2nd April.'
#
# - S.R.&O. 1945, No. 1208
#
# An Order under the Emergency Powers (Defence) Acts, 1939 and 1940 revoking
# a long list of things, including the Defence (Summer Time) Regulations, 1939.
# This meant that Summer Time reverted to being set by the 1922 and 1925 Acts.
# It was made on 28 September, early enough to end Summer Time on the
# date defined by the 1925 Act: 7 October.
#
# - The Summer Time Act, 1947 (10 & 11 Geo. 6. c. 16)
#
# Came into force on 11 March 1947. Amended the Summer Time Acts, 1922 and
# 1925 to change the dates of Summer Time and to introduce Double Summer Time
# (although it doesn't give this, or any, name for this period of 2 hour
# offset from GMT). Dates are given for 1947 only and are: 02:00 GMT Sunday
# 16 March, 01:00 GMT Sunday 13 April, 01:00 GMT Sunday 10 August, and 02:00
# Sunday 2 November. It gave a power to make Orders for subsequent years,
# both to vary the dates and to continue Double Summer Time. It applied
# to the Isle of Man and the Channel Islands.
#
# - Summer Time Order, 1948 (S.I. 1948/495)
#
# An Order made under the Summer Time Act, 1947. Gave dates for 1948 of
# 14 March and 31 October, both at 02:00 GMT.
#
# Although the 1947 Act had legislated for Double Summer Time, this was
# not continued after 1947.
#
# - Summer Time Order, 1949 (S.I. 1949/373)
#
# Another Order made under the Summer Time Act, 1947. Gave dates for 1949
# of 3 April and 30 October, both at 02:00 GMT.
#
# - Summer Time Order, 1950 (S.I. 1950/518)
#
# Another Order made under the Summer Time Act, 1947. Gave dates for 1950
# of 16 April and 22 October, both at 02:00 GMT.
#
# - Summer Time Order, 1951 (S.I. 1951/430)
#
# Another Order made under the Summer Time Act, 1947. Gave dates for 1951
# of 15 April and 21 October, both at 02:00 GMT.
#
# - Summer Time Order, 1952 (S.I. 1952/451)
#
# Another Order made under the Summer Time Act, 1947. Gave dates for 1952
# of 20 April and 26 October, both at 02:00 GMT.
#
# This is the last of this run of Orders, so for 1953 things reverted
# to the 1922 and 1925 Acts.
#
# - The Interpretation Act (Northern Ireland), 1954 (1954 c. 33 (N.I.)) (???)
#
# I presume that section 39 of this Act is similar to section 9 of the
# Interpretation Act, 1978 (listed below) in specifying GMT as the
# legal time in Northern Ireland, replacing the Time (Ireland) Act, 1916.
#
# - Summer Time Order, 1961 (S.I. 1961/71)
#
# Specified dates of 26 March and 29 October (02:00 GMT) for 1961
#
# - Summer Time (1962) Order, 1961 (S.I. 1961/2465)
#
# Specified dates of 25 March to 28 October (02:00 GMT) for 1962.
#
# - Summer Time Order, 1963 (S.I. 1963/81)
#
# Specified dates of 31 March to 27 October (02:00 GMT) for 1963.
#
# - Summer Time (1964) Order, 1963 (S.I. 1963/2101)
#
# Specified dates of 22 March to 25 October (02:00 GMT) for 1964.
#
# - Summer Time Order, 1964 (S.I. 1964/1201)
#
# Specified dates for three years (all 02:00 GMT):
# 1965: 21 March to 24 October
# 1966: 20 March to 23 October
# 1967: 19 March to 29 October
#
# - Summer Time Order, 1967 (S.I. 1967/1148)
# - Summer Time Order, 1968 (S.I. 1968/117)
#
# The first of these specifies dates for 1968 of 18 February for the United
# Kingdom but 7 April for the Isle of Man, both ending on 27 October,
# all at 02:00 GMT. The second Order changes the Isle of Man start date
# to 18 February to match the United Kingdom.
#
# - The British Standard Time Act 1968 (1968 c. 45)
#
# This came into force on 27 October 1968 and continued summer time throughout
# the year. It expired at 02:00 GMT on 31 October 1971, as specified in the
# Act, as Parliament did not move to make this experment permanent.
# It applied to the Isle of Man and the Channel Islands.
#
# Interestingly, it says baldly `This Act shall come into force on
# 27 October 1968', without giving a time. As S1 of the Act merely
# stated that `The time for general purposes in the United Kingdom
# (to be known as British standard time) shall be one hour in
# advance of Greenwich mean time throughout the year; ...' you could
# possibly argue that the start time of BStandardT was 00:00 1968-10-27,
# especially as the Act repealed the Summer Time Acts 1916--1947 in toto,
# thereby destroying the authority of the Summer Time Order specifying
# summer time in 1968.
#
# - The Manx Time Act 1968
#
# This is an Act of Tynwald (the Isle of Man Parliament) that said that
# henceforth Manx time would be the same as the time in Great Britain.
#
# - The Summer Time Act 1972 (1972 c. 6)
#
# This specified a reversion to normal Summer Time behaviour with a start
# date of the day after the third Saturday in March, unless that is Easter,
# when it is the day after the second Saturday, and an end date of the day
# after the fourth Saturday in October. Times are at 02:00 GMT, offset is
# 1 hour. It gives the power to make Orders to vary these dates and
# times. This Act is still in force and is the legal authority for
# implementing the EC Directives in the United Kingdom.
#
# - The Interpretation Act 1978 (1978 c. 30)
#
# Section 9 of this Act replaces section 1 of the Statutes (Definition of
# Time) Act, 1880 with very similar wording maintaining GMT as the legal
# time in Great Britain. This does not apply in Northern Ireland (it
# has its own Interpretation Act listed above).
#
# - Council Directive of 22 July 1980 on summertime arrangements (80/737/EEC)
#
# The first of the European Directives on Summer Time. It specified start
# dates for 1981 and 1982. No agreement had been reached on end dates.
# Only dates were given, there was no rule like `last Sunday in March'.
# The main change for the United Kingdom was a move to a 01:00 GMT change
# time. The dates:
# 1981: 29 March
# 1982: 28 March
#
# - Summer Time Order, 1980 (S.I. 1980/1089)
#
# Specified dates for 1981 and 1982, with the start dates as in the
# EC Directive and all times 01:00 GMT:
# 1981: 29 March to 25 October
# 1982: 28 March to 24 October
#
# - Second Council Directive of 10 June 1982 on summertime arrangements
# (82/399/EEC)
#
# The next European Directive. Specified dates for three years, 1983 to 1985.
# Agreement still hadn't been reached on a common end date, and wouldn't
# be until 1994 with the appeareance of the seventh Directive with a common
# date for 1996 and beyond, but this time the Directive gave two sets of
# end dates. The start date was specified by rule: the last Sunday in March.
# All times were 01:00 GMT. The end dates were given without rule, as:
# 1983: 25 September or 23 October
# 1984: 30 September or 28 october
# 1985: 29 September or 27 October
#
# - Summer Time Order, 1982 (S.I. 1982/1673)
#
# Implemented the second EC Directive, using the October end dates.
# 1983: 27 March to 23 October
# 1984: 25 March to 28 october
# 1985: 31 March to 27 October
#
# - Third Council Directive of 12 December 1984 on summertime arrangements
# (84/634/EEC)
#
# Specified start dates of the last Sunday in March and two sets of end
# dates, last Sunday in September and fourth Sunday in October, all at
# 01:00 GMT. The end dates were also specified as dates:
# 1986: 28 September or 26 October
# 1987: 27 September or 25 October
# 1988: 25 September or 23 October
#
# - Summer Time Order, 1986 (S.I. 1986/223)
#
# Implemented the third EC Directive, using the October end dates.
# 1986: 30 March to 26 October
# 1987: 29 March to 25 October
# 1988: 27 March to 23 October
#
# - Council Directive of 20 December 1985 amending Directive 84/634/EEC
# on summertime arrangements (85/582/EEC)
#
# This was to do with the accession of Spain and Portugal to the EEC.
# The previous directve had used wording like `Member States belonging
# to the zero (Greenwich) time zone' when refering to the different
# sets of end dates. Portugal was in that time zone but was not going
# to follow the United Kingdom and Ireland dates, so the text was reworded
# without any change to the dates themselves.
#
# - Fourth Council Directive of 22 December 1987 on summertime arrangements
# (88/14/EEC)
#
# This Directive covered only a single year: 1989. My guess is that
# this was because 1989 was one of the years when the historic United Kingdom
# end date of the Sunday after the fourth Saturday in October differed from
# the rule in the previous Directive of the fourth Sunday in October.
# All times are 01:00 GMT. No rule was specified, specific dates were given:
# 1989: 26 March to 24 September or 29 October
#
# - Summer Time Order, 1988 (S.I. 1988/931)
#
# Implemented the dates of 26 March to 29 October for 1989.
#
# - Fifth Council Directive of 21 December 1988 on summertime arrangements
# (89/47/EEC)
#
# Covered the three years 1990 to 1992. All times are 01:00 GMT. Gave both
# rules (last Sunday in March, last Sunday in September or fourth Sunday
# in October) and specific dates:
# 1990: 25 March to 30 September or 28 October
# 1991: 31 March to 29 September or 27 October
# 1992: 29 March to 27 September or 25 October
#
# - Summer Time Order, 1989 (S.I. 1989/985)
#
# Implemented the fifth Directive using the October end dates.
#
# - Sixth Council Directive 92/20/EEC of 26 March 1992 on summertime
# arrangements
#
# Covered the two years 1993 and 1994. All times are 01:00 GMT. Specified
# both rules (same as the fifth Directive) and specific dates:
# 1993: 28 March to 26 September or 24 October
# 1994: 27 March to 25 September or 23 October
#
# - Summer Time Order, 1992 (S.I. 1992/1729)
#
# Implemented the sixth Directive using the October end dates.
#
# - Seventh Directive 94/21/EC of the European Parliament and of the Council
# of 30 May 1994 on summer-time arrangements
#
# Covered the three years 1995 to 1997. Agreement had finally been reached
# on a common end date, to start in 1996. Both rules and dates were given.
# The rules were the same last Sunday in March to last Sunday in September
# or fourth Sunday in October for 1995, with the end rule changing to the
# last Sunday in October for 1996 and 1997. The year 1995 was another of
# the tricky ones where the EC and traditional United Kingdom rules differed
# but this time the UK changed on the fourth Sunday, 22 October, earlier
# than usual. All times are 01:00 GMT. Specific dates were also given:
# 1995: 26 March to 24 September or 22 October
# 1996: 31 March to 27 October
# 1997: 30 March to 26 October
#
# - Summer Time Order 1994 (S.I. 1994/2798)
#
# Implements the seventh Directive using the October end date in 1995.
# Applies also to the Bailiwick of Guernsey but not to the Bailiwick of
# Jersey or the Isle of Man, which have their own (unspecified) legislation
# on the subject.
#
# - Eighth Directive 97/44/EC of the European Parliament and of the Council
# of 22 July 1997 on summer-time arrangements
#
# Covers four years: 1998 to 2001. All times are 01:00 GMT. Specifies both
# rules, last Sunday in March and last Sunday in October, and specific dates:
# 1998: 29 March to 25 October
# 1999: 28 March to 31 October
# 2000: 26 March to 29 October
# 2001: 25 March to 28 October
#
# <a href="http://www.hmso.gov.uk/si/si1997/97298201.htm">
# - Summer Time Order 1997 (S.I. 1997/2982)
# </a>
#
# Implements the eighth Directive. Has the same text about the Isle of Man,
# Guernsey and Jersey as the 1994 Order.
# Peter Ilieve <peter@aldie.co.uk> (1998-04-19) described at length
# the history of summer time legislation in the United Kingdom.
# Since 1998 Joseph S. Myers <jsm28@cam.ac.uk> has been updating
# and extending this list, which can be found in
# <a href="http://student.cusu.cam.ac.uk/~jsm28/british-time/">
# History of legal time in Britain
# </a> (2000-02-12).
# From Joseph S. Myers (1999-09-02):
# I today found the 1916 summer time orders for the Channel Islands in
# the Public Record Office (HO 45/10811/312364).... Alderney,
# Jersey and Guernsey all enacted summer time for 1916 (and the
# enactment for the Isle of Man is already noted). This doesn't
# complete the resolution of timekeeping in the Channel Islands, since
# 1917-1921 need to be resolved for the Channel Islands, and it isn't
# clear whether the islands were using GMT or local time then. The
# changes in Alderney and Guernsey were at the same 2am GMT time as
# for Great Britain; the order for Jersey is more interesting.
#
# From Paul Eggert (1999-10-22):
# Mark Brader kindly translated the 1916 Jersey order from the French.
# It says that the 1916 transitions were 05-20 and 09-30 at midnight.
# No doubt this was 24:00, two or three hours earlier than Great Britain.
# It also says that after 1916 they'll sync with Great Britain.
# From Joseph S. Myers (1999-09-28):
# I have the 1918 orders for Guernsey, Alderney (both changing on same
# dates as UK, 2am GMT) and Sark (same dates; start and end at 2am,
# start "temps de Greenwich" (not specified as "temps moyen de
# Greenwich" which was used in the other orders) and end in an
# unspecified zone). For Jersey the same file (Public Record Office: HO
# 45/10892/357138) includes letters to the effect that in 1918 and 1919
# the States of Jersey agreed the same start and end dates as the UK
# (times unspecified, and it was the 1916 Jersey order that specified
# change at midnight of an unspecified zone).
# From Joseph S. Myers <jsm28@hermes.cam.ac.uk> (1998-01-06):
# From Joseph S. Myers <jsm28@cam.ac.uk> (1998-01-06):
#
# The legal time in the UK outside of summer time is definitely GMT, not UTC;
# see Lord Tanlaw's speech
@ -749,19 +178,11 @@
# (Lords Hansard 11 June 1997 columns 964 to 976)
# </a>.
# From Paul Eggert (1999-09-20):
# From Paul Eggert (2000-02-17):
#
# The date `20 April 1924' in the table of ``Summer Time: A
# Consultation Document'' (Cm 722, 1989) table is a transcription error;
# 20 April was an Easter Sunday. Shanks has 13 April, the correct date.
# Also, the table is not quite right for 1925 through 1938; the correct rules
# (which Shanks uses) are given in the Summer Time Acts of 1922 and 1925.
# Shanks and the UK Government paper disagree about the Apr 1956 transition;
# since we have no other data, and since Shanks was correct in the other
# points of disagreement about London, we'll believe Shanks for now.
# Also, for lack of other data, we'll follow Shanks for Eire in 1940-1948.
# For lack of other data, we'll follow Shanks for Eire in 1940-1948.
#
# Given Peter Ilieve's comments, the following claims by Shanks are incorrect:
# Given Ilieve and Myers's data, the following claims by Shanks are incorrect:
# * Wales did not switch from GMT to daylight saving time until
# 1921 Apr 3, when they began to conform with the rest of Great Britain.
# Actually, Wales was identical after 1880.
@ -830,8 +251,8 @@ Rule GB-Eire 1921 only - Apr 3 2:00s 1:00 BST
Rule GB-Eire 1921 only - Oct 3 2:00s 0 GMT
# S.R.&O. 1922, No. 264
Rule GB-Eire 1922 only - Mar 26 2:00s 1:00 BST
# The Summer Time Act, 1922
Rule GB-Eire 1922 only - Oct 8 2:00s 0 GMT
# The Summer Time Act, 1922
Rule GB-Eire 1923 only - Apr Sun>=16 2:00s 1:00 BST
Rule GB-Eire 1923 1924 - Sep Sun>=16 2:00s 0 GMT
Rule GB-Eire 1924 only - Apr Sun>=9 2:00s 1:00 BST
@ -1326,6 +747,11 @@ Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik
# for all member states until 2001. Brussels has yet to decide what to do
# after that.
# From Mart Oruaas (2000-01-29):
# Regulation no. 301 (1999-10-12) obsoletes previous regulation
# no. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
# the year round. The regulation is effective 1999-11-01.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Tallinn 1:39:00 - LMT 1880
1:39:00 - TMT 1918 Feb # Tallinn Mean Time
@ -1337,7 +763,7 @@ Zone Europe/Tallinn 1:39:00 - LMT 1880
3:00 Russia MSK/MSD 1989 Mar 26 2:00s
2:00 1:00 EEST 1989 Sep 24 2:00s
2:00 C-Eur EE%sT 1998 Sep 22
2:00 EU EE%sT 2000
2:00 EU EE%sT 1999 Nov 1
2:00 - EET
# Finland