svn commit: r290697 - head/contrib/tzdata
Author: edwin Date: Thu Nov 12 03:25:04 2015 New Revision: 290697 URL: https://svnweb.freebsd.org/changeset/base/290697 Log: MFV of 290695,tzdata2015g Update to tzdata2015g: Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25. Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time. Fiji's 2016 fall-back transition is scheduled for January 17, not 24. Fort Nelson, British Columbia will not fall back on 2015-11-01. It has effectively been on MST (-0700) since it advanced its clocks on 2015-03-08. New zone America/Fort_Nelson. Modified: head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/northamerica head/contrib/tzdata/zone.tab head/contrib/tzdata/zone1970.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaThu Nov 12 03:24:12 2015(r290696) +++ head/contrib/tzdata/asiaThu Nov 12 03:25:04 2015(r290697) @@ -131,7 +131,8 @@ ZoneAsia/Yerevan2:58:00 - LMT 1924 May # Azerbaijan # From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23): # According to the resolution of Cabinet of Ministers, 1997 -# Resolution available at: http://aif.az/docs/daylight_res.pdf +# From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17). +# http://code.az/files/daylight_res.pdf # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Azer1997max - Mar lastSun 4:00 1:00S Rule Azer1997max - Oct lastSun 5:00 0 - @@ -1717,11 +1718,12 @@ RuleROK 19871988- Oct Sun>=8 3:000 S # the 8:30 time zone on August 15, one example: # http://www.bbc.com/news/world-asia-33815049 # -# From Paul Eggert (2015-08-07): -# No transition time is specified; assume 00:00. +# From Paul Eggert (2015-08-15): +# Bells rang out midnight (00:00) Friday as part of the celebrations. See: +# Talmadge E. North Korea celebrates new time zone, 'Pyongyang Time' +# http://news.yahoo.com/north-korea-celebrates-time-zone-pyongyang-time-164038128.html # There is no common English-language abbreviation for this time zone. -# Use %z rather than invent one. We can't assume %z works everywhere yet, -# so for now substitute its output manually. +# Use KST, as that's what we already use for 1954-1961 in ROK. # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Seoul 8:27:52 - LMT 1908 Apr 1 @@ -1735,7 +1737,7 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 A 8:30- KST 1912 Jan 1 9:00- JCST1937 Oct 1 9:00- JST 1945 Aug 24 - 9:00- KST 2015 Aug 15 + 9:00- KST 2015 Aug 15 00:00 8:30- KST ### Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Thu Nov 12 03:24:12 2015 (r290696) +++ head/contrib/tzdata/australasia Thu Nov 12 03:25:04 2015 (r290697) @@ -335,10 +335,17 @@ Zone Indian/Cocos6:27:40 - LMT 1900 # DST will start Nov. 2 this year. # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-NOVEMBER-2ND.aspx -# From Paul Eggert (2014-10-20): +# From a government order dated 2015-08-26 and published as Legal Notice No. 77 +# in the Government of Fiji Gazette Supplement No. 24 (2015-08-28), +# via Ken Rylander (2015-09-02): +# the daylight saving period is 1 hour in advance of the standard time +# commencing at 2.00 am on Sunday 1st November, 2015 and ending at +# 3.00 am on Sunday 17th January, 2016. + +# From Paul Eggert (2015-09-01): # For now, guess DST from 02:00 the first Sunday in November to -# 03:00 the first Sunday on or after January 18. Although ad hoc, it -# matches this year's plan and seems more likely to match future +# 03:00 the third Sunday in January. Although ad hoc, it matches +# transitions since late 2014 and seems more likely to match future # practice than guessing no DST. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S @@ -351,7 +358,7 @@ RuleFiji2011only- Mar Sun>=1 3:000 Rule Fiji20122013- Jan Sun>=18 3:000 - Rule Fiji2014only- Jan Sun>=18 2:000 - Rule Fiji2014max - Nov Sun>=1 2:001:00S -Rule Fiji2015max - Jan Sun>=18 3:000 - +Rule
svn commit: r286750 - head/contrib/tzdata
Author: edwin Date: Thu Aug 13 23:57:44 2015 New Revision: 286750 URL: https://svnweb.freebsd.org/changeset/base/286750 Log: MFV of 286748,tzdata2015f Update to tzdata2015f: Changes affecting future time stamps North Korea switches to +0830 on 2015-08-15. (Thanks to Steffen Thorsen.) The abbreviation remains KST. (Thanks to Robert Elz.) Uruguay no longer observes DST. (Thanks to Steffen Thorsen and Pablo Camargo.) Changes affecting past and future time stamps Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC. (Thanks to Roman Tudos.) Modified: head/contrib/tzdata/africa head/contrib/tzdata/asia head/contrib/tzdata/europe head/contrib/tzdata/leap-seconds.list head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab head/contrib/tzdata/zone1970.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Thu Aug 13 23:57:15 2015(r286749) +++ head/contrib/tzdata/africa Thu Aug 13 23:57:44 2015(r286750) @@ -538,7 +538,7 @@ ZoneAfrica/Tripoli 0:52:44 - LMT 1920 # From Alex Krivenyshev (2008-07-11): # Seems that English language article The revival of daylight saving -# time: Energy conservation?-# No. 16578 (07/11/2008) was originally +# time: Energy conservation?- No. 16578 (07/11/2008) was originally # published on Monday, June 30, 2008... # # I guess that article in French Le gouvernement avance l'introduction @@ -670,7 +670,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Here is a link to official document from Royaume du Maroc Premier Ministre, # Ministère de la Modernisation des Secteurs Publics # -# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967) +# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 June 1967) # concerning the amendment of the legal time, the Ministry of Modernization of # Public Sectors announced that the official time in the Kingdom will be # advanced 60 minutes from Sunday 31 May 2009 at midnight. Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaThu Aug 13 23:57:15 2015(r286749) +++ head/contrib/tzdata/asiaThu Aug 13 23:57:44 2015(r286750) @@ -6,7 +6,7 @@ # t...@iana.org for general use in the future). For more, please see # the file CONTRIBUTING in the tz distribution. -# From Paul Eggert (2014-10-31): +# From Paul Eggert (2015-08-08): # # Unless otherwise specified, the source for data through 1990 is: # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -43,7 +43,7 @@ # 2:00 EET EEST Eastern European Time # 2:00 IST IDT Israel # 3:00 AST ADT Arabia* -# 3:30 IRST IRDT Iran +# 3:30 IRST IRDT Iran* # 4:00 GSTGulf* # 5:30 ISTIndia # 7:00 ICTIndochina, most times and locations* @@ -52,10 +52,11 @@ # 8:00 CSTChina # 8:00 IDTIndochina, 1943-45, 1947-55, 1960-75 (some locations)* # 8:00 JWST Western Standard Time (Japan, 1896/1937)* +# 8:30 KST KDT Korea when at +0830* # 9:00 JCST Central Standard Time (Japan, 1896/1937) # 9:00 WITeast Indonesia (Waktu Indonesia Timur) # 9:00 JST JDT Japan -# 9:00 KST KDT Korea +# 9:00 KST KDT Korea when at +09 # 9:30 ACST Australian Central Standard Time # # See the 'europe' file for Russia and Turkey in Asia. @@ -1027,7 +1028,7 @@ Zone Asia/Jayapura9:22:48 - LMT 1932 No # # From Roozbeh Pournader (2007-11-05): # This is quoted from Official Gazette of the Islamic Republic of -# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24 +# Iran, Volume 63, No. 18242, dated Tuesday 1386/6/24 # [2007-10-16]. I am doing the best translation I can:... # The official time of the country will be moved forward for one hour # on the 24 hours of the first day of the month of Farvardin and will @@ -1557,7 +1558,7 @@ Zone Asia/Amman 2:23:44 - LMT 1931 # - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00. # - Oral switched from +5:00 to +4:00 in spring 1989. -# From Kazakhstan Embassy's News Bulletin #11 +# From Kazakhstan Embassy's News Bulletin No. 11 # http://www.kazsociety.org.uk/news/2005/03/30.htm (2005-03-21): # The Government of Kazakhstan passed a resolution March 15 abolishing # daylight saving time citing lack of economic benefits and health @@ -1711,6 +1712,17 @@ Rule ROK 19871988- Oct Sun=8 3:000 S # # For Pyongyang we have no information; guess no changes since World War II. +# From Steffen Thorsen (2015-08-07): +# According to many news
svn commit: r284397 - head/contrib/tzdata
Author: edwin Date: Mon Jun 15 00:59:47 2015 New Revision: 284397 URL: https://svnweb.freebsd.org/changeset/base/284397 Log: MFV of 284395,tzdata2015e Update to tzdata2015e: Changes affecting future time stamps Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00, not 06-13 and 07-18 as we had guessed. (Thanks to Milamber.) Assume Cayman Islands will observe DST starting next year, using US rules. Although it isn't guaranteed, it is the most likely. Modified: head/contrib/tzdata/africa head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone1970.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Mon Jun 15 00:55:03 2015(r284396) +++ head/contrib/tzdata/africa Mon Jun 15 00:59:47 2015(r284397) @@ -338,9 +338,10 @@ Rule Egypt 2007only- Sep Thu=1 24:00 # time this summer, and carry out studies on the possibility of canceling the # practice altogether in future years. # -# From Paul Eggert (2015-04-20): -# For now, assume DST will be canceled. Any resumption would likely -# use different rules anyway. +# From Paul Eggert (2015-04-24): +# Yesterday the office of Egyptian President El-Sisi announced his +# decision to abandon DST permanently. See Ahram Online 2015-04-24. +# http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx Rule Egypt 2008only- Aug lastThu 24:00 0 - Rule Egypt 2009only- Aug 20 24:00 0 - @@ -787,20 +788,41 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # will resume again at 02:00 on Saturday, August 2, 2014 # http://www.mmsp.gov.ma/fr/actualites.aspx?id=586 -# From Paul Eggert (2014-06-05): -# For now, guess that later spring and fall transitions will use 2014's rules, +# From Milamber (2015-06-08): +# (Google Translation) The hour will thus be delayed 60 minutes +# Sunday, June 14 at 3:00, the ministry said in a statement, adding +# that the time will be advanced again 60 minutes Sunday, July 19, +# 2015 at 2:00. The move comes under 2.12.126 Decree of 26 Jumada I +# 1433 (18 April 2012) and the decision of the Head of Government of +# 16 N. 3-29-15 Chaaban 1435 (4 June 2015). +# Source (french): +# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ +# +# From Milamber (2015-06-09): +# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863 +# +# From Michael Deckers (2015-06-09): +# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go +# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch +# I think the patch is correct and the quoted text is wrong; the text in +# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/ agrees +# with the patch. + +# From Paul Eggert (2015-06-08): +# For now, guess that later spring and fall transitions will use 2015's rules, # and guess that Morocco will switch to standard time at 03:00 the last -# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after -# Ramadan. To implement this, transition dates for 2015 through 2037 were +# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after +# Ramadan. To implement this, transition dates for 2016 through 2037 were # determined by running the following program under GNU Emacs 24.3, with the # results integrated by hand into the table below. -# (let ((islamic-year 1436)) +# (let ((islamic-year 1437)) +# (require 'cal-islam) # (while ( islamic-year 1460) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) # (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) -# (saturday 6)) -# (while (/= saturday (mod (setq a (1- a)) 7))) -# (while (/= saturday (mod b 7)) +# (sunday 0)) +# (while (/= sunday (mod (setq a (1- a)) 7))) +# (while (/= sunday (mod b 7)) # (setq b (1+ b))) # (setq a (calendar-gregorian-from-absolute a)) # (setq b (calendar-gregorian-from-absolute b)) @@ -844,32 +866,30 @@ Rule Morocco 2012only- Aug 20 2:00 1: Rule Morocco 2013only- Jul 7 3:00 0 - Rule Morocco 2013only- Aug 10 2:00 1:00S Rule Morocco 2013max - Oct lastSun 3:00 0 - -Rule Morocco 20142022- Mar lastSun 2:00 1:00S +Rule Morocco 20142021- Mar lastSun 2:00 1:00S Rule Morocco 2014only- Jun 28 3:00 0 - Rule Morocco 2014only- Aug 2 2:00 1:00S -Rule Morocco 2015only- Jun 13 3:00 0 - -Rule
svn commit: r283079 - head/contrib/tzdata
Author: edwin Date: Mon May 18 21:05:11 2015 New Revision: 283079 URL: https://svnweb.freebsd.org/changeset/base/283079 Log: MFV of 283077,tzdata2015d Update to tzdata2015d: Release 2015d - 2015-04-24 08:09:46 -0700 Changes affecting future time stamps Egypt will not observe DST in 2015 and will consider canceling it permanently. For now, assume no DST indefinitely. (Thanks to Ahmed Nazmy and Tim Parenti.) Change affecting past and future time zone abbreviations The abbreviations for Hawaii-Aleutian standard and daylight times have been changed from HAST/HADT to HST/HDT, as per US Government Printing Office style. This affects only America/Adak since 1983, as America/Honolulu was already using the new style. Modified: head/contrib/tzdata/africa head/contrib/tzdata/northamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Mon May 18 21:03:25 2015(r283078) +++ head/contrib/tzdata/africa Mon May 18 21:05:11 2015(r283079) @@ -328,35 +328,20 @@ Rule Egypt 2007only- Sep Thu=1 24:00 # http://almogaz.com/news/weird-news/2015/04/05/1947105 ... # http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html -# From Paul Eggert (2015-04-08): -# For now, guess that later spring and fall transitions will use -# 2014's rules, and guess that Egypt will switch to standard time at -# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the -# first Friday after Ramadan. To implement this, -# transition dates for 2015 through 2037 were determined by running -# the following program under GNU Emacs 24.4, with the results integrated -# by hand into the table below. Ramadan again intrudes on the guessed -# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff. -# (let ((islamic-year 1436)) -# (while ( islamic-year 1460) -# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) -# (friday 5)) -# (while (/= friday (mod a 7)) -# (setq a (1- a))) -# (while (/= friday (mod b 7)) -# (setq b (1+ b))) -# (setq a (1- a)) -# (setq b (1- b)) -# (setq a (calendar-gregorian-from-absolute a)) -# (setq b (calendar-gregorian-from-absolute b)) -# (insert -#(format -# (concat Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t0\t-\n -# Rule\tEgypt\t%d\tonly\t-\t%s\t%2d\t24:00\t1:00\tS\n) -# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) -# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b) -# (setq islamic-year (+ 1 islamic-year +# From Ahmed Nazmy (2015-04-20): +# Egypt's ministers cabinet just announced ... that it will cancel DST at +# least for 2015. +# +# From Tim Parenti (2015-04-20): +# http://english.ahram.org.eg/WriterArticles/NewsContentP/1/128195/Egypt/No-daylight-saving-this-summer-Egypts-prime-minist.aspx +# Egypt's cabinet agreed on Monday not to switch clocks for daylight saving +# time this summer, and carry out studies on the possibility of canceling the +# practice altogether in future years. +# +# From Paul Eggert (2015-04-20): +# For now, assume DST will be canceled. Any resumption would likely +# use different rules anyway. + Rule Egypt 2008only- Aug lastThu 24:00 0 - Rule Egypt 2009only- Aug 20 24:00 0 - Rule Egypt 2010only- Aug 10 24:00 0 - @@ -365,22 +350,7 @@ Rule Egypt 2010only- Sep lastThu 24:00 Rule Egypt 2014only- May 15 24:00 1:00S Rule Egypt 2014only- Jun 26 24:00 0 - Rule Egypt 2014only- Jul 31 24:00 1:00S -Rule Egypt 2014max - Sep lastThu 24:00 0 - -Rule Egypt 20152019- Apr lastThu 24:00 1:00S -Rule Egypt 2015only- Jun 11 24:00 0 - -Rule Egypt 2015only- Jul 23 24:00 1:00S -Rule Egypt 2016only- Jun 2 24:00 0 - -Rule Egypt 2016only- Jul 7 24:00 1:00S -Rule Egypt 2017only- May 25 24:00 0 - -Rule Egypt 2017only- Jun 29 24:00 1:00S -Rule Egypt 2018only- May 10 24:00 0 - -Rule Egypt 2018only- Jun 14 24:00 1:00S -Rule Egypt 2019only- May 2 24:00 0 - -Rule Egypt 2019only- Jun 6 24:00 1:00S -Rule Egypt 2020only-
svn commit: r283042 - head/contrib/tzdata
Author: edwin
Date: Mon May 18 01:59:02 2015
New Revision: 283042
URL: https://svnweb.freebsd.org/changeset/base/283042
Log:
MFV of 283040,tzdata{2015c}
Update to tzdata2015c:
Release 2015c - 2015-04-11 08:55:55 -0700
Changes affecting future time stamps
Egypt's spring-forward transition is at 24:00 on April's last Thursday,
not 00:00 on April's last Friday. 2015's transition will therefore be on
Thursday, April 30 at 24:00, not Friday, April 24 at 00:00. Similar fixes
apply to 2026, 2037, 2043, etc. (Thanks to Steffen Thorsen.)
Modified:
head/contrib/tzdata/africa
head/contrib/tzdata/antarctica
head/contrib/tzdata/backward
head/contrib/tzdata/europe
head/contrib/tzdata/northamerica
head/contrib/tzdata/southamerica
Directory Properties:
head/contrib/tzdata/ (props changed)
Modified: head/contrib/tzdata/africa
==
--- head/contrib/tzdata/africa Mon May 18 01:57:52 2015(r283041)
+++ head/contrib/tzdata/africa Mon May 18 01:59:02 2015(r283042)
@@ -319,13 +319,22 @@ Rule Egypt 2007only- Sep Thu=1
24:00
# above) says DST had no affect on electricity consumption. There is
# no information about when DST will end this fall. See:
#
http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
-#
+
+# From Steffen Thorsen (2015-04-08):
+# Egypt will start DST on midnight after Thursday, April 30, 2015.
+# This is based on a law (no 35) from May 15, 2014 saying it starts the last
+# Thursday of April Clocks will still be turned back for Ramadan, but
+# dates not yet announced
+# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
+# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
+
+# From Paul Eggert (2015-04-08):
# For now, guess that later spring and fall transitions will use
-# 2010's rules, and guess that Egypt will switch to standard time at
+# 2014's rules, and guess that Egypt will switch to standard time at
# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the
# first Friday after Ramadan. To implement this,
# transition dates for 2015 through 2037 were determined by running
-# the following program under GNU Emacs 24.3, with the results integrated
+# the following program under GNU Emacs 24.4, with the results integrated
# by hand into the table below. Ramadan again intrudes on the guessed
# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff.
# (let ((islamic-year 1436))
@@ -357,7 +366,7 @@ RuleEgypt 2014only- May 15
24:00 1:00
Rule Egypt 2014only- Jun 26 24:00 0 -
Rule Egypt 2014only- Jul 31 24:00 1:00S
Rule Egypt 2014max - Sep lastThu 24:00 0 -
-Rule Egypt 20152019- Apr lastFri 0:00s 1:00S
+Rule Egypt 20152019- Apr lastThu 24:00 1:00S
Rule Egypt 2015only- Jun 11 24:00 0 -
Rule Egypt 2015only- Jul 23 24:00 1:00S
Rule Egypt 2016only- Jun 2 24:00 0 -
@@ -371,7 +380,7 @@ RuleEgypt 2019only- Jun 6
24:00 1:00
Rule Egypt 2020only- May 28 24:00 1:00S
Rule Egypt 2021only- May 13 24:00 1:00S
Rule Egypt 2022only- May 5 24:00 1:00S
-Rule Egypt 2023max - Apr lastFri 0:00s 1:00S
+Rule Egypt 2023max - Apr lastThu 24:00 1:00S
# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
Zone Africa/Cairo2:05:09 - LMT 1900 Oct
Modified: head/contrib/tzdata/antarctica
==
--- head/contrib/tzdata/antarctica Mon May 18 01:57:52 2015
(r283041)
+++ head/contrib/tzdata/antarctica Mon May 18 01:59:02 2015
(r283042)
@@ -15,41 +15,6 @@
# I made up all time zone abbreviations mentioned here; corrections welcome!
# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
-# These rules are stolen from the 'southamerica' file.
-# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S
-Rule ArgAQ 19641966- Mar 1 0:000 -
-Rule ArgAQ 19641966- Oct 15 0:001:00S
-Rule ArgAQ 1967only- Apr 2 0:000 -
-Rule ArgAQ 19671968- Oct Sun=1 0:001:00S
-Rule ArgAQ 19681969- Apr Sun=1 0:000 -
-Rule ArgAQ 1974only- Jan 23 0:001:00S
-Rule ArgAQ 1974only- May 1 0:000 -
-Rule
svn commit: r280413 - head/contrib/tzdata
Author: edwin
Date: Tue Mar 24 05:52:28 2015
New Revision: 280413
URL: https://svnweb.freebsd.org/changeset/base/280413
Log:
MFV of 280411,tzdata{2015b}
Release 2015b - 2015-03-19 23:28:11 -0700
Changes affecting future time stamps
Mongolia will start observing DST again this year, from the last
Saturday in March at 02:00 to the last Saturday in September at 00:00.
(Thanks to Ganbold Tsagaankhuu.)
Palestine will start DST on March 28, not March 27. Also,
correct the fall 2014 transition from September 26 to October 24.
Adjust future predictions accordingly. (Thanks to Steffen Thorsen.)
Changes affecting past time stamps
The 1982 zone shift in Pacific/Easter has been corrected, fixing a 2015a
regression. (Thanks to Stuart Bishop for reporting the problem.)
Some more zones have been turned into links, when they differed
from existing zones only for older time stamps. As usual,
these changes affect UTC offsets in pre-1970 time stamps only.
Their old contents have been moved to the 'backzone' file.
The affected zones are: America/Antigua, America/Cayman,
Pacific/Midway, and Pacific/Saipan.
Changes affecting time zone abbreviations
Correct the 1992-2010 DST abbreviation in Volgograd from MSK to MSD.
(Thanks to Hank W.)
Modified:
head/contrib/tzdata/asia
head/contrib/tzdata/australasia
head/contrib/tzdata/europe
head/contrib/tzdata/leap-seconds.list
head/contrib/tzdata/northamerica
head/contrib/tzdata/southamerica
Directory Properties:
head/contrib/tzdata/ (props changed)
Modified: head/contrib/tzdata/asia
==
--- head/contrib/tzdata/asiaTue Mar 24 05:50:39 2015(r280412)
+++ head/contrib/tzdata/asiaTue Mar 24 05:52:28 2015(r280413)
@@ -1904,6 +1904,13 @@ Zone Indian/Maldives 4:54:00 - LMT 1880
# was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
# this is almost surely wrong.
+# From Ganbold Tsagaankhuu (2015-03-10):
+# It seems like yesterday Mongolian Government meeting has concluded to use
+# daylight saving time in Mongolia Starting at 2:00AM of last Saturday of
+# March 2015, daylight saving time starts. And 00:00AM of last Saturday of
+# September daylight saving time ends. Source:
+# http://zasag.mn/news/view/8969
+
# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S
Rule Mongol 19831984- Apr 1 0:001:00S
Rule Mongol 1983only- Oct 1 0:000 -
@@ -1924,6 +1931,8 @@ Rule Mongol 19841998- Sep lastSun
0:00
Rule Mongol 2001only- Apr lastSat 2:001:00S
Rule Mongol 20012006- Sep lastSat 2:000 -
Rule Mongol 20022006- Mar lastSat 2:001:00S
+Rule Mongol 2015max - Mar lastSat 2:001:00S
+Rule Mongol 2015max - Sep lastSat 0:000 -
# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
# Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
@@ -2342,13 +2351,19 @@ ZoneAsia/Karachi4:28:12 - LMT 1907
# official source...:
# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
-# From Paul Eggert (2013-09-24):
-# For future dates, guess the last Thursday in March at 24:00 through
-# the first Friday on or after September 21 at 00:00. This is consistent with
-# the predictions in today's editions of the following URLs,
-# which are for Gaza and Hebron respectively:
-# http://www.timeanddate.com/worldclock/timezone.html?n=702
-# http://www.timeanddate.com/worldclock/timezone.html?n=2364
+# From Steffen Thorsen (2015-03-03):
+# Sources such as http://www.alquds.com/news/article/view/id/548257
+# and http://www.raya.ps/ar/news/890705.html say Palestine areas will
+# start DST on 2015-03-28 00:00 which is one day later than expected.
+#
+# From Paul Eggert (2015-03-03):
+# http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
+# says that the fall 2014 transition was Oct 23 at 24:00.
+# For future dates, guess the last Friday in March at 24:00 through
+# the first Friday on or after October 21 at 00:00. This is consistent with
+# the predictions in today's editions of the following URLs:
+# http://www.timeanddate.com/time/change/gaza-strip/gaza
+# http://www.timeanddate.com/time/change/west-bank/hebron
# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S
Rule EgyptAsia 1957only- May 10 0:001:00S
@@ -2374,9 +2389,11 @@ Rule Palestine 2011only- Apr 1
0:011
Rule Palestine 2011only- Aug 1 0:000 -
Rule Palestine 2011only- Aug 30 0:001:00S
svn commit: r279706 - head/contrib/tzdata
Author: edwin
Date: Fri Mar 6 21:45:35 2015
New Revision: 279706
URL: https://svnweb.freebsd.org/changeset/base/279706
Log:
MFV of 279704,tzdata{2015a}
Release 2015a - 2015-01-29
Changes affecting future time stamps
The Mexican state of Quintana Roo, represented by America/Cancun,
will shift from Central Time with DST to Eastern Time without DST
on 2015-02-01 at 02:00. (Thanks to Steffen Thorsen and Gwillim Law.)
Chile will not change clocks in April or thereafter; its new standard time
will be its old daylight saving time. This affects America/Santiago,
Pacific/Easter, and Antarctica/Palmer. (Thanks to Juan Correa.)
New leap second 2015-06-30 23:59:60 UTC as per IERS Bulletin C 49.
(Thanks to Tim Parenti.)
Changes affecting past time stamps
Iceland observed DST in 1919 and 1921, and its 1939 fallback
transition was Oct. 29, not Nov. 29. Remove incorrect data from
Shanks about time in Iceland between 1837 and 1908.
Some more zones have been turned into links, when they differed
from existing zones only for older time stamps. As usual,
these changes affect UTC offsets in pre-1970 time stamps only.
Their old contents have been moved to the 'backzone' file.
The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
and Asia/Muscat.
Modified:
head/contrib/tzdata/antarctica
head/contrib/tzdata/asia
head/contrib/tzdata/backward
head/contrib/tzdata/europe
head/contrib/tzdata/leap-seconds.list
head/contrib/tzdata/northamerica
head/contrib/tzdata/southamerica
head/contrib/tzdata/zone.tab
head/contrib/tzdata/zone1970.tab
Directory Properties:
head/contrib/tzdata/ (props changed)
Modified: head/contrib/tzdata/antarctica
==
--- head/contrib/tzdata/antarctica Fri Mar 6 21:43:40 2015
(r279705)
+++ head/contrib/tzdata/antarctica Fri Mar 6 21:45:35 2015
(r279706)
@@ -47,8 +47,8 @@ Rule ChileAQ 2009only- Mar Sun=9 3:00
Rule ChileAQ 2010only- Apr Sun=1 3:00u 0 -
Rule ChileAQ 2011only- May Sun=2 3:00u 0 -
Rule ChileAQ 2011only- Aug Sun=16 4:00u 1:00S
-Rule ChileAQ 2012max - Apr Sun=23 3:00u 0 -
-Rule ChileAQ 2012max - Sep Sun=2 4:00u 1:00S
+Rule ChileAQ 20122015- Apr Sun=23 3:00u 0 -
+Rule ChileAQ 20122014- Sep Sun=2 4:00u 1:00S
# Argentina - year-round bases
# Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
@@ -354,9 +354,10 @@ Zone Antarctica/Rothera0 - zzz 1976 Dec
#
# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
Zone Antarctica/Palmer 0 - zzz 1965
- -4:00 ArgAQ AR%sT 1969 Oct 5
+ -4:00 ArgAQ AR%sT 1969 Oct 5
-3:00 ArgAQ AR%sT 1982 May
- -4:00 ChileAQ CL%sT
+ -4:00 ChileAQ CL%sT 2015 Apr 26 3:00u
+ -3:00 - CLT
#
#
# McMurdo Station, Ross Island, since 1955-12
Modified: head/contrib/tzdata/asia
==
--- head/contrib/tzdata/asiaFri Mar 6 21:43:40 2015(r279705)
+++ head/contrib/tzdata/asiaFri Mar 6 21:45:35 2015(r279706)
@@ -145,10 +145,7 @@ Zone Asia/Baku 3:19:24 - LMT 1924
May 2
4:00AzerAZ%sT
# Bahrain
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Bahrain3:22:20 - LMT 1920 # Manamah
- 4:00- GST 1972 Jun
- 3:00- AST
+# See Asia/Qatar.
# Bangladesh
# From Alexander Krivenyshev (2009-05-13):
@@ -1731,9 +1728,7 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 A
###
# Kuwait
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Kuwait 3:11:56 - LMT 1950
- 3:00- AST
+# See Asia/Riyadh.
# Laos
# See Asia/Bangkok.
@@ -1954,12 +1949,7 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920
5:45- NPT # Nepal Time
# Oman
-
-# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
-
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Muscat 3:54:24 - LMT 1920
- 4:00- GST
+# See Asia/Dubai.
# Pakistan
@@ -2453,6 +2443,7 @@ Zone Asia/Manila -15:56:00 - LMT 1844 De
Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
4:00
svn commit: r274559 - head/contrib/tzdata
Author: edwin
Date: Sun Nov 16 01:00:39 2014
New Revision: 274559
URL: https://svnweb.freebsd.org/changeset/base/274559
Log:
MFV of 274557,tzdata{2014j}
Release 2014j - 2014-11-10 17:37:11 -0800
Changes affecting current and future time stamps
Turks Caicos' switch from US eastern time to UTC-4 year-round
did not occur on 2014-11-02 at 02:00. It's currently scheduled
for 2015-11-01 at 02:00. (Thanks to Chris Walton.)
Changes affecting past time stamps
Many pre-1989 time stamps have been corrected for Asia/Seoul and
Asia/Pyongyang, based on sources for the Korean-language Wikipedia
entry for time in Korea. (Thanks to Sanghyuk Jung.) Also, no
longer guess that Pyongyang mimicked Seoul time after World War II,
as this is politically implausible.
Some more zones have been turned into links, when they differed
from existing zones only for older time stamps. As usual,
these changes affect UTC offsets in pre-1970 time stamps only.
Their old contents have been moved to the 'backzone' file.
The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
Africa/Mogadishu, Indian/Antananarivo, Indian/Comoro, and
Indian/Mayotte.
Changes affecting commentary
The commentary is less enthusiastic about Shanks as a source,
and is more careful to distinguish UT from UTC.
Modified:
head/contrib/tzdata/africa
head/contrib/tzdata/asia
head/contrib/tzdata/australasia
head/contrib/tzdata/europe
head/contrib/tzdata/northamerica
head/contrib/tzdata/southamerica
Directory Properties:
head/contrib/tzdata/ (props changed)
Modified: head/contrib/tzdata/africa
==
--- head/contrib/tzdata/africa Sun Nov 16 00:50:02 2014(r274558)
+++ head/contrib/tzdata/africa Sun Nov 16 01:00:39 2014(r274559)
@@ -6,20 +6,19 @@
# t...@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2014-10-31):
#
-# A good source for time zone historical data outside the U.S. is
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Another source occasionally used is Edward W. Whitman, World Time
Differences,
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -65,7 +64,6 @@
# 3:00 CASTCentral Africa Summer Time (no longer used)
# 3:00 SASTSouth Africa Summer Time (no longer used)
# 3:00 EAT East Africa Time
-# 4:00 EASTEast Africa Summer Time (no longer used)
# Algeria
# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S
@@ -146,9 +144,7 @@ ZoneAfrica/Ndjamena 1:00:12 - LMT 1912
1:00- WAT
# Comoros
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro
- 3:00- EAT
+# See Africa/Nairobi.
# Democratic Republic of the Congo
# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
@@ -172,9 +168,7 @@ Link Africa/Abidjan Africa/Sao_Tome # S�
Link Africa/Abidjan Atlantic/St_Helena # St Helena
# Djibouti
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul
- 3:00- EAT
+# See Africa/Nairobi.
###
@@ -387,27 +381,8 @@ Zone Africa/Cairo2:05:09 - LMT 1900 Oct
# See Africa/Lagos.
# Eritrea
-# Zone NAMEGMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Asmara 2:35:32 - LMT 1870
- 2:35:32 - AMT 1890# Asmara Mean Time
- 2:35:20 - ADMT1936 May 5 # Adis Dera MT
- 3:00- EAT
-
# Ethiopia
-# From Paul Eggert (2014-07-31):
-# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
-# 12-hour clock
svn commit: r273718 - head/contrib/tzdata
Author: edwin Date: Mon Oct 27 05:50:02 2014 New Revision: 273718 URL: https://svnweb.freebsd.org/changeset/base/273718 Log: Merge of 273518, tzdata2014i Upgrade to 2014i Lots of historical data Pacific/Fiji will go into DST from 2014-11-02 to 2015-01-18 Pacific/Bougainville will go from UTC+10 to UTC+11. Europe/Minsk will go from FET to MSK. Modified: head/contrib/tzdata/africa head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/backward head/contrib/tzdata/europe head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab head/contrib/tzdata/zone1970.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Mon Oct 27 04:09:23 2014(r273717) +++ head/contrib/tzdata/africa Mon Oct 27 05:50:02 2014(r273718) @@ -1,9 +1,10 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. -# This data is by no means authoritative; if you think you know better, +# This file is by no means authoritative; if you think you know better, # go ahead and edit the file (and please send any changes to -# t...@iana.org for general use in the future). +# t...@iana.org for general use in the future). For more, please see +# the file CONTRIBUTING in the tz distribution. # From Paul Eggert (2013-02-21): # @@ -25,8 +26,8 @@ # I found in the UCLA library. # # For data circa 1899, a common source is: -# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 -# http://www.jstor.org/stable/1774359. +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94. +# http://www.jstor.org/stable/1774359 # # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). @@ -93,9 +94,9 @@ Rule Algeria 1980only- Oct 31 2:00 0 # Shanks Pottenger give 0:09:20 for Paris Mean Time; go with Howse's # more precise 0:09:21. # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 - 0:09:21 - PMT 1911 Mar 11# Paris Mean Time - 0:00Algeria WE%sT 1940 Feb 25 2:00 +Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:01 + 0:09:21 - PMT 1911 Mar 11 # Paris Mean Time + 0:00Algeria WE%sT 1940 Feb 25 2:00 1:00Algeria CE%sT 1946 Oct 7 0:00- WET 1956 Jan 29 1:00- CET 1963 Apr 14 @@ -105,82 +106,57 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 M 1:00- CET # Angola -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Luanda 0:52:56 - LMT 1892 - 0:52:04 - AOT 1911 May 26 # Angola Time - 1:00- WAT - # Benin -# Whitman says they switched to 1:00 in 1946, not 1934; -# go with Shanks Pottenger. -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Porto-Novo 0:10:28 - LMT 1912 - 0:00- GMT 1934 Feb 26 - 1:00- WAT +# See Africa/Lagos. # Botswana -# From Paul Eggert (2013-02-21): -# Milne says they were regulated by the Cape Town Signal in 1899; -# assume they switched to 2:00 when Cape Town did. -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Gaborone 1:43:40 - LMT 1885 - 1:30- SAST1903 Mar - 2:00- CAT 1943 Sep 19 2:00 - 2:001:00CAST1944 Mar 19 2:00 - 2:00- CAT +# See Africa/Maputo. # Burkina Faso # See Africa/Abidjan. # Burundi -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Bujumbura 1:57:28 - LMT 1890 - 2:00- CAT +# See Africa/Maputo. # Cameroon -# Whitman says they switched to 1:00 in 1920; go with Shanks Pottenger. -# Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Douala 0:38:48 - LMT 1912 - 1:00- WAT +# See Africa/Lagos. # Cape Verde +# +# Shanks gives 1907 for the transition to CVT. +# Perhaps the 1911-05-26 Portuguese decree +# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf +# merely made it official? +# # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Atlantic/Cape_Verde -1:34:04 -LMT 1907# Praia +Zone Atlantic/Cape_Verde -1:34:04 -LMT 1907# Praia -2:00 - CVT 1942 Sep
svn commit: r267473 - head/contrib/tzdata
Author: edwin Date: Sat Jun 14 11:34:39 2014 New Revision: 267473 URL: http://svnweb.freebsd.org/changeset/base/267473 Log: MFV of 267471, tzdata2014e Fix historical data for Egypt. Better prediction for future Egypt / Morocco changes. Update to Cocos / Cook islands. Fix historical data for Russia. Modified: head/contrib/tzdata/africa head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/northamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Sat Jun 14 11:31:31 2014(r267472) +++ head/contrib/tzdata/africa Sat Jun 14 11:34:39 2014(r267473) @@ -239,13 +239,13 @@ Rule Egypt 19901994- May 1 1:001:00 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html # /a Rule Egypt 19952010- Apr lastFri 0:00s 1:00S -Rule Egypt 19952005- Sep lastThu 23:00s 0 - +Rule Egypt 19952005- Sep lastThu 24:00 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: # Egypt will turn back clocks by one hour at the midnight of Thursday # after observing the daylight saving time since May. # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf -Rule Egypt 2006only- Sep 21 23:00s 0 - +Rule Egypt 2006only- Sep 21 24:00 0 - # From Dirk Losch (2007-08-14): # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. @@ -254,7 +254,7 @@ RuleEgypt 2006only- Sep 21 23:00s 0 - # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm -Rule Egypt 2007only- Sep Thu=1 23:00s 0 - +Rule Egypt 2007only- Sep Thu=1 24:00 0 - # From Abdelrahman Hassan (2007-09-06): # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter # than the year of the Gregorian calendar, Ramadan shifts earlier each @@ -342,46 +342,77 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # From Gunther Vermier (2015-05-13): # our Egypt office confirms that the change will be at 15 May midnight (24:00) -# From Paul Eggert (2014-05-13): +# From Imed Chihi (2014-06-04): +# We have finally located a precise official reference about the DST changes +# in Egypt. The Ministers Cabinet decision is explained at +# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ... +# [T]his (Arabic) site is not accessible outside Egypt, but the page ... +# translates into: With regard to daylight saving time, it is scheduled to +# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014, +# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014, +# and re-established again at the end of the month of Ramadan, at twelve +# o'clock on the evening of Thursday, 31 JUL 2014. This statement has been +# reproduced by other (more accessible) sites[, e.g.,]... +# http://elgornal.net/news/news.aspx?id=4699258 + +# From Paul Eggert (2014-06-04): # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says # the change is because of blackouts in Cairo, even though Ahram Online (cited -# above) says DST had no affect on electricity consumption. The AP story says -# DST will not be observed during Ramadan. There is no information about when -# DST will end. See: +# above) says DST had no affect on electricity consumption. There is +# no information about when DST will end this fall. See: # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 # -# For now, guess that later transitions will use 2010's rules, and that -# Egypt will agree with Morocco (see below) about the date Ramadan starts and -# ends, though (unlike Morocco) it will switch at 00:00 standard time. In -# Egypt the spring-forward transitions are removed for 2020-2022, when the -# guessed spring-forward date falls during the estimated Ramadan, and all -# transitions removed for 2023-2038, where the estimated Ramadan falls entirely -# outside the guessed daylight-saving time. Ramadan intrudes on the guessed -# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. - -Rule Egypt 2008only- Aug lastThu 23:00s 0 - -Rule Egypt 2009only- Aug 20 23:00s 0 - -Rule Egypt 2010only- Aug 11 0:000 - -Rule Egypt 2010only- Sep 10 0:001:00S -Rule Egypt
svn commit: r267452 - head/contrib/tzdata
Author: edwin Date: Fri Jun 13 23:56:47 2014 New Revision: 267452 URL: http://svnweb.freebsd.org/changeset/base/267452 Log: Vendor import of tzdata2014e changes Fix historical data for Egypt. Better prediction for future Egypt / Morocco changes. Update to Cocos / Cook islands. Fix historical data for Russia. Obtained from:ftp://ftp.iana.org/tz/releases/ Modified: head/contrib/tzdata/africa head/contrib/tzdata/australasia head/contrib/tzdata/etcetera head/contrib/tzdata/europe head/contrib/tzdata/factory head/contrib/tzdata/leapseconds head/contrib/tzdata/northamerica head/contrib/tzdata/zone.tab Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Fri Jun 13 22:33:41 2014(r267451) +++ head/contrib/tzdata/africa Fri Jun 13 23:56:47 2014(r267452) @@ -239,13 +239,13 @@ Rule Egypt 19901994- May 1 1:001:00 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html # /a Rule Egypt 19952010- Apr lastFri 0:00s 1:00S -Rule Egypt 19952005- Sep lastThu 23:00s 0 - +Rule Egypt 19952005- Sep lastThu 24:00 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: # Egypt will turn back clocks by one hour at the midnight of Thursday # after observing the daylight saving time since May. # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf -Rule Egypt 2006only- Sep 21 23:00s 0 - +Rule Egypt 2006only- Sep 21 24:00 0 - # From Dirk Losch (2007-08-14): # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. @@ -254,7 +254,7 @@ RuleEgypt 2006only- Sep 21 23:00s 0 - # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm -Rule Egypt 2007only- Sep Thu=1 23:00s 0 - +Rule Egypt 2007only- Sep Thu=1 24:00 0 - # From Abdelrahman Hassan (2007-09-06): # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter # than the year of the Gregorian calendar, Ramadan shifts earlier each @@ -342,46 +342,77 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # From Gunther Vermier (2015-05-13): # our Egypt office confirms that the change will be at 15 May midnight (24:00) -# From Paul Eggert (2014-05-13): +# From Imed Chihi (2014-06-04): +# We have finally located a precise official reference about the DST changes +# in Egypt. The Ministers Cabinet decision is explained at +# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ... +# [T]his (Arabic) site is not accessible outside Egypt, but the page ... +# translates into: With regard to daylight saving time, it is scheduled to +# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014, +# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014, +# and re-established again at the end of the month of Ramadan, at twelve +# o'clock on the evening of Thursday, 31 JUL 2014. This statement has been +# reproduced by other (more accessible) sites[, e.g.,]... +# http://elgornal.net/news/news.aspx?id=4699258 + +# From Paul Eggert (2014-06-04): # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says # the change is because of blackouts in Cairo, even though Ahram Online (cited -# above) says DST had no affect on electricity consumption. The AP story says -# DST will not be observed during Ramadan. There is no information about when -# DST will end. See: +# above) says DST had no affect on electricity consumption. There is +# no information about when DST will end this fall. See: # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 # -# For now, guess that later transitions will use 2010's rules, and that -# Egypt will agree with Morocco (see below) about the date Ramadan starts and -# ends, though (unlike Morocco) it will switch at 00:00 standard time. In -# Egypt the spring-forward transitions are removed for 2020-2022, when the -# guessed spring-forward date falls during the estimated Ramadan, and all -# transitions removed for 2023-2038, where the estimated Ramadan falls entirely -# outside the guessed daylight-saving time. Ramadan intrudes on the guessed -# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. - -Rule Egypt 2008only- Aug lastThu 23:00s 0 - -Rule Egypt 2009only- Aug 20 23:00s 0 - -Rule Egypt 2010only
svn commit: r267455 - head/contrib/tzdata
Author: edwin Date: Sat Jun 14 00:16:50 2014 New Revision: 267455 URL: http://svnweb.freebsd.org/changeset/base/267455 Log: MFV of tzdata2014e Fix historical data for Egypt. Better prediction for future Egypt / Morocco changes. Update to Cocos / Cook islands. Fix historical data for Russia. Modified: Directory Properties: head/contrib/tzdata/ (props changed) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r267460 - head/contrib/tzdata
Author: edwin Date: Sat Jun 14 01:18:02 2014 New Revision: 267460 URL: http://svnweb.freebsd.org/changeset/base/267460 Log: Undo commit r267455, which was done in the wrong directory. Modified: head/contrib/tzdata/africa head/contrib/tzdata/australasia head/contrib/tzdata/etcetera head/contrib/tzdata/europe head/contrib/tzdata/factory head/contrib/tzdata/leapseconds head/contrib/tzdata/northamerica head/contrib/tzdata/zone.tab Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Sat Jun 14 01:03:24 2014(r267459) +++ head/contrib/tzdata/africa Sat Jun 14 01:18:02 2014(r267460) @@ -239,13 +239,13 @@ Rule Egypt 19901994- May 1 1:001:00 # http://www.worldtimezone.com/dst_news/dst_news_egypt04.html # /a Rule Egypt 19952010- Apr lastFri 0:00s 1:00S -Rule Egypt 19952005- Sep lastThu 24:00 0 - +Rule Egypt 19952005- Sep lastThu 23:00s 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: # Egypt will turn back clocks by one hour at the midnight of Thursday # after observing the daylight saving time since May. # http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf -Rule Egypt 2006only- Sep 21 24:00 0 - +Rule Egypt 2006only- Sep 21 23:00s 0 - # From Dirk Losch (2007-08-14): # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. @@ -254,7 +254,7 @@ RuleEgypt 2006only- Sep 21 24:00 0 - # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm -Rule Egypt 2007only- Sep Thu=1 24:00 0 - +Rule Egypt 2007only- Sep Thu=1 23:00s 0 - # From Abdelrahman Hassan (2007-09-06): # Due to the Hijri (lunar Islamic calendar) year being 11 days shorter # than the year of the Gregorian calendar, Ramadan shifts earlier each @@ -342,77 +342,46 @@ Rule Egypt 2007only- Sep Thu=1 24:00 # From Gunther Vermier (2015-05-13): # our Egypt office confirms that the change will be at 15 May midnight (24:00) -# From Imed Chihi (2014-06-04): -# We have finally located a precise official reference about the DST changes -# in Egypt. The Ministers Cabinet decision is explained at -# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ... -# [T]his (Arabic) site is not accessible outside Egypt, but the page ... -# translates into: With regard to daylight saving time, it is scheduled to -# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014, -# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014, -# and re-established again at the end of the month of Ramadan, at twelve -# o'clock on the evening of Thursday, 31 JUL 2014. This statement has been -# reproduced by other (more accessible) sites[, e.g.,]... -# http://elgornal.net/news/news.aspx?id=4699258 - -# From Paul Eggert (2014-06-04): +# From Paul Eggert (2014-05-13): # Sarah El Deeb and Lee Keath of AP report that the Egyptian government says # the change is because of blackouts in Cairo, even though Ahram Online (cited -# above) says DST had no affect on electricity consumption. There is -# no information about when DST will end this fall. See: +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: # http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 # -# For now, guess that later spring and fall transitions will use -# 2010's rules, and guess that Egypt will switch to standard time at -# 24:00 the last Thursday before Ramadan, and back to DST at 00:00 the -# first Friday after Ramadan. To implement this, -# transition dates for 2015 through 2037 were determined by running -# the following program under GNU Emacs 24.3, with the results integrated -# by hand into the table below. Ramadan again intrudes on the guessed -# DST starting in 2038, but that's beyond our somewhat-arbitrary cutoff. -# (let ((islamic-year 1436)) -# (while ( islamic-year 1460) -# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (calendar-islamic-to-absolute (list 10 1 islamic-year))) -# (friday 5)) -# (while (/= friday (mod a 7)) -# (setq a (1- a))) -# (while (/= friday (mod b 7)) -# (setq b (1+ b))) -# (setq a (1- a)) -# (setq b (1- b)) -# (setq a
svn commit: r265978 - head/contrib/tzdata
Author: edwin Date: Tue May 13 21:25:59 2014 New Revision: 265978 URL: http://svnweb.freebsd.org/changeset/base/265978 Log: MFV of 265975, tzdata2014c - Egypt will go into DST on 15 May 2014 Modified: head/contrib/tzdata/africa head/contrib/tzdata/asia head/contrib/tzdata/europe Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Tue May 13 21:24:55 2014(r265977) +++ head/contrib/tzdata/africa Tue May 13 21:25:59 2014(r265978) @@ -335,11 +335,54 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html # /a +# From Ahmad El-Dardiry (2014-05-07): +# Egypt is to change back to Daylight system on May 15 +# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx + +# From Gunther Vermier (2015-05-13): +# our Egypt office confirms that the change will be at 15 May midnight (24:00) + +# From Paul Eggert (2014-05-13): +# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says +# the change is because of blackouts in Cairo, even though Ahram Online (cited +# above) says DST had no affect on electricity consumption. The AP story says +# DST will not be observed during Ramadan. There is no information about when +# DST will end. See: +# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 +# +# For now, guess that later transitions will use 2010's rules, and that +# Egypt will agree with Morocco (see below) about the date Ramadan starts and +# ends, though (unlike Morocco) it will switch at 00:00 standard time. In +# Egypt the spring-forward transitions are removed for 2020-2022, when the +# guessed spring-forward date falls during the estimated Ramadan, and all +# transitions removed for 2023-2038, where the estimated Ramadan falls entirely +# outside the guessed daylight-saving time. Ramadan intrudes on the guessed +# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010only- Sep lastThu 23:00s 0 - +Rule Egypt 2014only- May 15 24:00 1:00S +Rule Egypt 2014only- Jun 29 0:00s 0 - +Rule Egypt 2014only- Jul 29 0:00s 1:00S +Rule Egypt 2014max - Sep lastThu 23:00s 0 - +Rule Egypt 20152019- Apr lastFri 0:00s 1:00S +Rule Egypt 2015only- Jun 18 0:00s 0 - +Rule Egypt 2015only- Jul 18 0:00s 1:00S +Rule Egypt 2016only- Jun 7 0:00s 0 - +Rule Egypt 2016only- Jul 7 0:00s 1:00S +Rule Egypt 2017only- May 27 0:00s 0 - +Rule Egypt 2017only- Jun 26 0:00s 1:00S +Rule Egypt 2018only- May 16 0:00s 0 - +Rule Egypt 2018only- Jun 15 0:00s 1:00S +Rule Egypt 2019only- May 6 0:00s 0 - +Rule Egypt 2019only- Jun 5 0:00s 1:00S +Rule Egypt 2020only- May 24 0:00s 1:00S +Rule Egypt 2021only- May 13 0:00s 1:00S +Rule Egypt 2022only- May 3 0:00s 1:00S +Rule Egypt 2023max - Apr lastFri 0:00s 1:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:09 - LMT 1900 Oct Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaTue May 13 21:24:55 2014(r265977) +++ head/contrib/tzdata/asiaTue May 13 21:25:59 2014(r265978) @@ -1347,22 +1347,6 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 3 # Jordan will switch to winter time on Friday, October 27. # -# From Phil Pizzey (2009-04-02): -# ...I think I may have spotted an error in the timezone data for -# Jordan. -# The current (2009d) asia file shows Jordan going to daylight -# saving -# time on the last Thursday in March. -# -# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S -# -# However timeanddate.com, which I usually find reliable, shows Jordan -# going to daylight saving time on the last Friday in March since 2002. -# Please see -# a
svn commit: r263901 - head/contrib/tzdata
Author: edwin Date: Sat Mar 29 04:15:11 2014 New Revision: 263901 URL: http://svnweb.freebsd.org/changeset/base/263901 Log: MFV for 263899, tzdata2014b - Update antartica. - Comments about historical data for Hawaii. - Update details for Crimea on 30 March - Move location data Simferopol. Modified: head/contrib/tzdata/africa head/contrib/tzdata/antarctica head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Sat Mar 29 04:12:34 2014(r263900) +++ head/contrib/tzdata/africa Sat Mar 29 04:15:11 2014(r263901) @@ -868,7 +868,10 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # Another source (specifying the time for start and end in the decree): # http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html -# From Paul Eggert (2013-10-03): +# From Sebastien Willemijns (2014-03-18): +# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp + +# From Paul Eggert (2014-03-19): # To estimate what the Moroccan government will do in future years, # transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: Modified: head/contrib/tzdata/antarctica == --- head/contrib/tzdata/antarctica Sat Mar 29 04:12:34 2014 (r263900) +++ head/contrib/tzdata/antarctica Sat Mar 29 04:15:11 2014 (r263901) @@ -230,24 +230,41 @@ Zone Antarctica/Syowa 0 - zzz 1957 Jan 2 # year-round base # Scott Base, Ross Island, since 1957-01. # See Pacific/Auckland. -# -# These rules for New Zealand are stolen from the 'australasia' file. -# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S -Rule NZAQ1974only- Nov 3 2:00s 1:00D -Rule NZAQ19751988- Oct lastSun 2:00s 1:00D -Rule NZAQ1989only- Oct 8 2:00s 1:00D -Rule NZAQ19902006- Oct Sun=1 2:00s 1:00D -Rule NZAQ1975only- Feb 23 2:00s 0 S -Rule NZAQ19761989- Mar Sun=1 2:00s 0 S -Rule NZAQ19902007- Mar Sun=15 2:00s 0 S -Rule NZAQ2007max - Sep lastSun 2:00s 1:00D -Rule NZAQ2008max - Apr Sun=1 2:00s 0 S # Norway - territories # Bouvet (never inhabited) # # claims # Peter I Island (never inhabited) +# +# year-round base +# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12 +# +# From Paul-Inge Flakstad (2014-03-10): +# I recently had a long dialog about this with the developer of timegenie.com. +# In the absence of specific dates, he decided to choose some likely ones: +# GMT +1 - From March 1 to the last Sunday in March +# GMT +2 - From the last Sunday in March until the last Sunday in October +# GMT +1 - From the last Sunday in October until November 7 +# GMT +0 - From November 7 until March 1 +# The dates for switching to and from UTC+0 will probably not be absolutely +# correct, but they should be quite close to the actual dates. +# +# From Paul Eggert (2014-03-21): +# The CET-switching Troll rules require zic from tzcode 2014b or later, so as +# suggested by Bengt-Inge Larsson comment them out for now, and approximate +# with only UTC and CEST. Uncomment them when 2014b is more prevalent. +# +# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S +#Rule Troll 2005max - Mar 1 1:00u 1:00CET +Rule Troll 2005max - Mar lastSun 1:00u 2:00CEST +#Rule Troll 2005max - Oct lastSun 1:00u 1:00CET +#Rule Troll 2004max - Nov 7 1:00u 0:00UTC +# Remove the following line when uncommenting the above '#Rule' lines. +Rule Troll 2004max - Oct lastSun 1:00u 0:00UTC +# Zone NAMEGMTOFF RULES FORMAT [UNTIL] +Zone Antarctica/Troll 0 - zzz 2005 Feb 12 + 0:00Troll %s # Poland - year-round base # Arctowski, King George Island, -620945-0582745, since 1977 Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Sat Mar 29 04:12:34 2014 (r263900) +++ head/contrib/tzdata/australasia Sat Mar 29 04:15:11 2014 (r263901) @@ -763,14 +763,29 @@ Zone Pacific/Funafuti 11:56:52 - LMT 190 # Johnston # -# From Paul Eggert (2013-09-03): +# From Paul Eggert (2014-03-11): +# Sometimes Johnston kept
svn commit: r263041 - head/contrib/tzdata
Author: edwin Date: Tue Mar 11 20:32:23 2014 New Revision: 263041 URL: http://svnweb.freebsd.org/changeset/base/263041 Log: MFV of 263039, tzdata2014a: - Fix historical info about asia/Zion, Ukraine - Fiji starts DST at 02:00 instead of 03:00 - Turkey will move to DST at 31 March this year. Modified: head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaTue Mar 11 20:30:30 2014(r263040) +++ head/contrib/tzdata/asiaTue Mar 11 20:32:23 2014(r263041) @@ -1090,8 +1090,13 @@ Rule Zion1986only- May 18 0:001:00D Rule Zion1986only- Sep 7 0:000 S Rule Zion1987only- Apr 15 0:001:00D Rule Zion1987only- Sep 13 0:000 S -Rule Zion1988only- Apr 9 0:001:00D -Rule Zion1988only- Sep 3 0:000 S + +# From Avigdor Finkelstein (2014-03-05): +# I check the Parliament (Knesset) records and there it's stated that the +# [1988] transition should take place on Saturday night, when the Sabbath +# ends and changes to Sunday. +Rule Zion1988only- Apr 10 0:001:00D +Rule Zion1988only- Sep 4 0:000 S # From Ephraim Silverberg # (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, 2004-12-22, Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Tue Mar 11 20:30:30 2014 (r263040) +++ head/contrib/tzdata/australasia Tue Mar 11 20:32:23 2014 (r263041) @@ -354,16 +354,18 @@ Zone Indian/Cocos6:27:40 - LMT 1900 # http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=6702catid=71Itemid=155 # From the Fijian Government Media Center (2013-08-30) via David Wheeler: -# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am -# on Sunday 19th January, 2014 move clocks forward by one hour from 2am +# Fiji will start daylight savings on Sunday 27th October, 2013 ... +# move clocks forward by one hour from 2am # http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx -# -# From Paul Eggert (2013-09-09): + +# From Steffen Thorsen (2013-01-10): +# Fiji will end DST on 2014-01-19 02:00: +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx + +# From Paul Eggert (2014-01-10): # For now, guess that Fiji springs forward the Sunday before the fourth -# Monday in October. This matches both recent practice and -# timeanddate.com's current spring-forward prediction. -# For the January 2014 transition we guessed right while timeanddate.com -# guessed wrong, so leave the fall-back prediction alone. +# Monday in October, and springs back the penultimate Sunday in January. +# This is ad hoc, but matches recent practice. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Fiji19981999- Nov Sun=1 2:001:00S @@ -372,7 +374,8 @@ RuleFiji2009only- Nov 29 2:001:00S Rule Fiji2010only- Mar lastSun 3:000 - Rule Fiji2010max - Oct Sun=21 2:001:00S Rule Fiji2011only- Mar Sun=1 3:000 - -Rule Fiji2012max - Jan Sun=18 3:000 - +Rule Fiji20122013- Jan Sun=18 3:000 - +Rule Fiji2014max - Jan Sun=18 2:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji11:55:44 - LMT 1915 Oct 26 # Suva 12:00 FijiFJ%sT # Fiji Time Modified: head/contrib/tzdata/europe == --- head/contrib/tzdata/europe Tue Mar 11 20:30:30 2014(r263040) +++ head/contrib/tzdata/europe Tue Mar 11 20:32:23 2014(r263041) @@ -2745,14 +2745,18 @@ ZoneEurope/Zurich 0:34:08 - LMT 1853 Ju # According to the articles linked below, Turkey will change into summer # time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27. # This change is due to a nationwide exam on 27th. -# -# a href=http://www.worldbulletin.net/?aType=haberArticleID=70872; # http://www.worldbulletin.net/?aType=haberArticleID=70872 -# /a # Turkish: -# a
svn commit: r257681 - head/contrib/tzdata
Author: edwin Date: Tue Nov 5 06:32:23 2013 New Revision: 257681 URL: http://svnweb.freebsd.org/changeset/base/257681 Log: MFV of 255902, tzdata2013f MFV of 257651, tzdata2013h tzdata2013f - Jordan goes to winter time on the last Friday in October. - Tocantins in Brazil will not go into summer time in October. - Indonesian time zones renames. - Lots of cleanups in with regarding to links and historical data. tzdata2013h - Libya didn't go back to DST. - Fix Morocco 2038 issue. - Brazil/Acre and Western Amazonas are chaning timezones. Added: head/contrib/tzdata/leap-seconds.list - copied unchanged from r255902, vendor/tzdata/dist/leap-seconds.list Modified: head/contrib/tzdata/africa head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/backward head/contrib/tzdata/etcetera head/contrib/tzdata/europe head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Tue Nov 5 06:18:50 2013(r257680) +++ head/contrib/tzdata/africa Tue Nov 5 06:32:23 2013(r257681) @@ -451,6 +451,14 @@ Zone Africa/Monrovia -0:43:08 - LMT 1882 # (either two days before them or five days after them, so as to fall on # lastFri instead of lastSun). +# From Even Scharning (2013-10-25): +# The scheduled end of DST in Libya on Friday, October 25, 2013 was +# cancelled yesterday +# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/ +# +# From Paul Eggert (2013-10-25): +# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2. + # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Libya 1951only- Oct 14 2:001:00S Rule Libya 1952only- Jan 1 0:000 - @@ -467,8 +475,8 @@ RuleLibya 19871989- Apr 1 0:001:00 Rule Libya 19871989- Oct 1 0:000 - Rule Libya 1997only- Apr 4 0:001:00S Rule Libya 1997only- Oct 4 0:000 - -Rule Libya 2013max - Mar lastFri 1:001:00S -Rule Libya 2013max - Oct lastFri 2:000 - +Rule Libya 2013only- Mar lastFri 1:001:00S +Rule Libya 2013only- Oct lastFri 2:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00Libya CE%sT 1959 @@ -479,7 +487,8 @@ ZoneAfrica/Tripoli 0:52:44 - LMT 1920 2:00- EET 1996 Sep 30 1:00Libya CE%sT 1997 Oct 4 2:00- EET 2012 Nov 10 2:00 - 1:00Libya CE%sT + 1:00Libya CE%sT 2013 Oct 25 2:00 + 2:00- EET # Madagascar # Zone NAMEGMTOFF RULES FORMAT [UNTIL] @@ -684,15 +693,6 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # http://www.google.com/search?hl=enq=Conseil+de+gouvernement+maroc+heure+avancebtnG=Search # /a -# From Alex Krivenyshev (2008-05-09): -# Is Western Sahara (part which administrated by Morocco) going to follow -# Morocco DST changes? Any information? What about other part of -# Western Sahara - under administration of POLISARIO Front (also named -# SADR Saharawi Arab Democratic Republic)? - -# From Arthur David Olson (2008-05-09): -# XXX--guess that it is only Morocco for now; guess only 2008 for now. - # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 # and September 1. They originally planned to observe DST to near the end @@ -858,13 +858,23 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # transitions would be 2013-07-07 and 2013-08-10; see: # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 -# From Paul Eggert (2013-07-03): +# From Steffen Thorsen (2013-09-28): +# Morocco extends DST by one month, on very short notice, just 1 day +# before it was going to end. There is a new decree (2.13.781) for +# this, where DST from now on goes from last Sunday of March at 02:00 +# to last Sunday of October at 03:00, similar to EU rules. Official +# source (French): +# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013 +# Another source (specifying the time for start and end in the decree): +# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html + +# From Paul Eggert
svn commit: r253009 - head/contrib/tzdata
Author: edwin Date: Sun Jul 7 22:23:59 2013 New Revision: 253009 URL: http://svnweb.freebsd.org/changeset/base/253009 Log: MFV of tzdata2013d, 253008 - Morocco: announced that the year's Ramadan daylight-savings transitions would be 2013-07-07 and 2013-08-10. - Israel: As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the second day of the Jewish Rosh Hashana holiday, in which case DST ends a day later (i.e. at 02:00 the first Monday after October 2). [Rosh Hashana holidays are factored in until 2100.] Modified: head/contrib/tzdata/africa head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Sun Jul 7 22:18:08 2013(r253008) +++ head/contrib/tzdata/africa Sun Jul 7 22:23:59 2013(r253009) @@ -852,12 +852,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288. -# + +# From Andrew Paprocki (2013-07-02): +# Morocco announced that the year's Ramadan daylight-savings +# transitions would be 2013-07-07 and 2013-08-10; see: +# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 + +# From Paul Eggert (2013-07-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2013 through 2021 were determined by running +# transition dates for 2014 through 2021 were determined by running # the following program under GNU Emacs 24.3: # -# (let ((islamic-year 1434)) +# (let ((islamic-year 1435)) # (while ( islamic-year 1444) # (let ((a # (calendar-gregorian-from-absolute @@ -910,8 +916,8 @@ RuleMorocco 20122019- Apr lastSun 2: Rule Morocco 2012max - Sep lastSun 3:00 0 - Rule Morocco 2012only- Jul 20 3:00 0 - Rule Morocco 2012only- Aug 20 2:00 1:00S -Rule Morocco 2013only- Jul 9 3:00 0 - -Rule Morocco 2013only- Aug 8 2:00 1:00S +Rule Morocco 2013only- Jul 7 3:00 0 - +Rule Morocco 2013only- Aug 10 2:00 1:00S Rule Morocco 2014only- Jun 29 3:00 0 - Rule Morocco 2014only- Jul 29 2:00 1:00S Rule Morocco 2015only- Jun 18 3:00 0 - Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaSun Jul 7 22:18:08 2013(r253008) +++ head/contrib/tzdata/asiaSun Jul 7 22:23:59 2013(r253009) @@ -1212,39 +1212,21 @@ RuleZion2011only- Oct 2 2:000 S Rule Zion2012only- Mar Fri=26 2:001:00D Rule Zion2012only- Sep 23 2:000 S -# From Ephraim Silverberg (2012-10-18): -# Yesterday, the Interior Ministry Committee, after more than a year -# past, approved sending the proposed June 2011 changes to the Time -# Decree Law back to the Knesset for second and third (final) votes -# before the upcoming elections on Jan. 22, 2013. Hence, although the -# changes are not yet law, they are expected to be so before February 2013. -# -# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. -# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the -# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day -# later (i.e. at 02:00 the first Monday after October 2). -# [Rosh Hashana holidays are factored in until 2100.] - -# From Ephraim Silverberg (2012-11-05): -# The Knesset passed today (in second and final readings) the amendment to the -# Time Decree Law making the changes ... law. +# From Ephraim Silverberg (2013-06-27): +# On June 23, 2013, the Israeli government approved changes to the +# Time Decree Law. The next day, the changes passed the First Reading +# in the Knesset. The law is expected to pass the Second and Third +# (final) Readings by the beginning of September 2013. +# +# As of 2013, DST starts at 02:00 on the Friday before the last Sunday +# in March. DST ends at 02:00 on the last Sunday of October. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Zion2013max - Mar Fri=23 2:001:00D -Rule Zion
svn commit: r250198 - head/usr.bin/calendar/calendars
Author: edwin Date: Fri May 3 02:03:35 2013 New Revision: 250198 URL: http://svnweb.freebsd.org/changeset/base/250198 Log: Op 30 April 2013 trad koninging Beatrix af en werd kroonprins Willem Alexander de nieuwe koning. Koningsdag is op 27 April. On 30 April 2013 queen Beatrix resigned and crownprince Willem Alexander became the new king. King's day is on 27 April. MFC after:1 week Modified: head/usr.bin/calendar/calendars/calendar.dutch Modified: head/usr.bin/calendar/calendars/calendar.dutch == --- head/usr.bin/calendar/calendars/calendar.dutch Fri May 3 01:16:18 2013(r250197) +++ head/usr.bin/calendar/calendars/calendar.dutch Fri May 3 02:03:35 2013(r250198) @@ -13,7 +13,7 @@ Easter=Pasen jan/01 Nieuwjaar jan/06 Driekoningen apr/01 1 april -apr/30 Koninginnedag +apr/27 Koningsdag mei/01 Dag van de Arbeid mei/04 Dodenherdenking mei/05 Bevrijdingsdag @@ -60,13 +60,13 @@ sep/TueThirdPrinsjesdag * Het koningshuis */ jan/19 Prinses Margriet (1943) -jan/31 Koningin Beatrix (1938) +jan/31 Prinses Beatrix (1938) feb/17 Prins Willem III (1817 - 1890) feb/18 Prinses Christina (1947) apr/10 Prinses Ariane (2007) apr/19 Prins Hendrik (1876 - 1934) -apr/27 Kroonprins Willem Alexander (1967) -apr/30 Koningin Juliana (1909 - 2004) +apr/27 Koning Willem Alexander (1967) +apr/30 Prinses Juliana (1909 - 2004) apr/30 Mr. Pieter van Vollenhoven (1939) mei/17 Prinses Maxima (1971) jun/26 Prinses Alexia (2005) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r249692 - head/contrib/tzdata
Author: edwin Date: Sat Apr 20 11:42:10 2013 New Revision: 249692 URL: http://svnweb.freebsd.org/changeset/base/249692 Log: Merge of vendor of 249690, tzdata2013c - antarctica: AusAQ and ATAQ have been removed. - Antarctica/Macquarie has been moved to australasia file and AU. - Asia/Hebron, Palestine updated for 2013. - Paraguay stays with DST for the whole year. Modified: head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/antarctica == --- head/contrib/tzdata/antarctica Sat Apr 20 11:35:25 2013 (r249691) +++ head/contrib/tzdata/antarctica Sat Apr 20 11:42:10 2013 (r249692) @@ -53,34 +53,6 @@ Rule ChileAQ 2011only- Aug Sun=16 4:0 Rule ChileAQ 2012max - Apr Sun=23 3:00u 0 - Rule ChileAQ 2012max - Sep Sun=2 4:00u 1:00S -# These rules are stolen from the `australasia' file. -Rule AusAQ 1917only- Jan 1 0:011:00- -Rule AusAQ 1917only- Mar 25 2:000 - -Rule AusAQ 1942only- Jan 1 2:001:00- -Rule AusAQ 1942only- Mar 29 2:000 - -Rule AusAQ 1942only- Sep 27 2:001:00- -Rule AusAQ 19431944- Mar lastSun 2:000 - -Rule AusAQ 1943only- Oct 3 2:001:00- -Rule ATAQ1967only- Oct Sun=1 2:00s 1:00- -Rule ATAQ1968only- Mar lastSun 2:00s 0 - -Rule ATAQ19681985- Oct lastSun 2:00s 1:00- -Rule ATAQ19691971- Mar Sun=8 2:00s 0 - -Rule ATAQ1972only- Feb lastSun 2:00s 0 - -Rule ATAQ19731981- Mar Sun=1 2:00s 0 - -Rule ATAQ19821983- Mar lastSun 2:00s 0 - -Rule ATAQ19841986- Mar Sun=1 2:00s 0 - -Rule ATAQ1986only- Oct Sun=15 2:00s 1:00- -Rule ATAQ19871990- Mar Sun=15 2:00s 0 - -Rule ATAQ1987only- Oct Sun=22 2:00s 1:00- -Rule ATAQ19881990- Oct lastSun 2:00s 1:00- -Rule ATAQ19911999- Oct Sun=1 2:00s 1:00- -Rule ATAQ19912005- Mar lastSun 2:00s 0 - -Rule ATAQ2000only- Aug lastSun 2:00s 1:00- -Rule ATAQ2001max - Oct Sun=1 2:00s 1:00- -Rule ATAQ2006only- Apr Sun=1 2:00s 0 - -Rule ATAQ2007only- Mar lastSun 2:00s 0 - -Rule ATAQ2008max - Apr Sun=1 2:00s 0 - - # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 # Esperanza, San Martin Land, -6323-05659, since 1952-12-17 @@ -122,10 +94,7 @@ RuleATAQ2008max - Apr Sun=1 2:00s 0 # /a # From Steffen Thorsen (2010-03-10): -# We got these changes from the Australian Antarctic Division: -# - Macquarie Island will stay on UTC+11 for winter and therefore not -# switch back from daylight savings time when other parts of Australia do -# on 4 April. +# We got these changes from the Australian Antarctic Division: ... # # - Casey station reverted to its normal time of UTC+8 on 5 March 2010. # The change to UTC+11 is being considered as a regular summer thing but @@ -136,9 +105,6 @@ RuleATAQ2008max - Apr Sun=1 2:00s 0 # # - Mawson station stays on UTC+5. # -# In addition to the Rule changes for Casey/Davis, it means that Macquarie -# will no longer be like Hobart and will have to have its own Zone created. -# # Background: # a href=http://www.timeanddate.com/news/time/antartica-time-changes-2010.html; # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html @@ -165,12 +131,6 @@ Zone Antarctica/Mawson 0 - zzz 1954 Feb 6:00- MAWT2009 Oct 18 2:00 # Mawson Time 5:00- MAWT -Zone Antarctica/Macquarie 0- zzz 1911 - 10:00 - EST 1916 Oct 1 2:00 - 10:00 1:00EST 1917 Feb - 10:00 AusAQ EST 1967 - 10:00 ATAQEST 2010 Apr 4 3:00 - 11:00 - MIST# Macquarie Island Time # References: # a
svn commit: r248307 - head/contrib/tzdata
Author: edwin Date: Fri Mar 15 00:27:24 2013 New Revision: 248307 URL: http://svnweb.freebsd.org/changeset/base/248307 Log: MFV of 248305, tzdata2013b Lots of historical data added. Morocco: add DST rules for the coming years Cuba: Doing DST in 2013. Chili: Will do DST in 2013 as it seems. Modified: head/contrib/tzdata/africa head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Fri Mar 15 00:25:54 2013(r248306) +++ head/contrib/tzdata/africa Fri Mar 15 00:27:24 2013(r248307) @@ -6,7 +6,7 @@ # go ahead and edit the file (and please send any changes to # t...@iana.org for general use in the future). -# From Paul Eggert (2006-03-22): +# From Paul Eggert (2013-02-21): # # A good source for time zone historical data outside the U.S. is # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition), @@ -25,6 +25,10 @@ # Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which # I found in the UCLA library. # +# For data circa 1899, a common source is: +# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94 +# http://www.jstor.org/stable/1774359. +# # A reliable and entertaining source about time zones is # Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997). # @@ -116,8 +120,12 @@ Zone Africa/Porto-Novo 0:10:28 - LMT 191 1:00- WAT # Botswana +# From Paul Eggert (2013-02-21): +# Milne says they were regulated by the Cape Town Signal in 1899; +# assume they switched to 2:00 when Cape Town did. # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Gaborone 1:43:40 - LMT 1885 + 1:30- SAST1903 Mar 2:00- CAT 1943 Sep 19 2:00 2:001:00CAST1944 Mar 19 2:00 2:00- CAT @@ -189,6 +197,11 @@ Zone Africa/Djibouti 2:52:36 - LMT 1911 # Egypt +# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh +# observatory; round to nearest. Milne also says that the official time for +# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this +# did not apply to Cairo, Alexandria, or Port Said. + # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Egypt 1940only- Jul 15 0:001:00S Rule Egypt 1940only- Oct 1 0:000 - @@ -329,7 +342,7 @@ RuleEgypt 2010only- Sep 10 0:001:00 Rule Egypt 2010only- Sep lastThu 23:00s 0 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Africa/Cairo2:05:00 - LMT 1900 Oct +Zone Africa/Cairo2:05:09 - LMT 1900 Oct 2:00Egypt EE%sT # Equatorial Guinea @@ -833,6 +846,41 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes # August 20, 2012 from 2:00 am. +# From Paul Eggert (2013-03-06): +# Morocco's daylight-saving transitions due to Ramadan seem to be +# announced a bit in advance. On 2012-07-11 the Moroccan government +# announced that year's Ramadan daylight-saving transitions would be +# 2012-07-20 and 2012-08-20; see +# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288. +# +# To estimate what the Moroccan government will do in future years, +# transition dates for 2013 through 2021 were determined by running +# the following program under GNU Emacs 24.3: +# +# (let ((islamic-year 1434)) +# (while ( islamic-year 1444) +# (let ((a +# (calendar-gregorian-from-absolute +#(calendar-islamic-to-absolute (list 9 1 islamic-year +# (b +# (calendar-gregorian-from-absolute +#(calendar-islamic-to-absolute (list 10 1 islamic-year) +# (insert +# (format +#(concat Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 3:00\t0\t-\n +#Rule\tMorocco\t%d\tonly\t-\t%s\t %2d\t 2:00\t1:00\tS\n) +#(car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) +#(car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b) +# (setq islamic-year (+ 1 islamic-year +# +# with the results hand-edited for 2020-2022, when the normal spring-forward +# date falls during the estimated Ramadan. +# +# From 2023 through 2038 Ramadan is not predicted to overlap with +# daylight saving time. Starting in 2039 there will be overlap again, +# but 32-bit
svn commit: r242927 - head/contrib/tzdata
Author: edwin Date: Mon Nov 12 20:44:59 2012 New Revision: 242927 URL: http://svnweb.freebsd.org/changeset/base/242927 Log: Merge of vendor import of 242925, tzdata2012i Update to tzdata2012i: - Cuba is changing back to Standard Time on 4 November 2012. Modified: head/contrib/tzdata/asia head/contrib/tzdata/northamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaMon Nov 12 20:42:08 2012(r242926) +++ head/contrib/tzdata/asiaMon Nov 12 20:44:59 2012(r242927) @@ -1204,7 +1204,7 @@ Rule Zion2012only- Sep 23 2:000 S # past, approved sending the proposed June 2011 changes to the Time # Decree Law back to the Knesset for second and third (final) votes # before the upcoming elections on Jan. 22, 2013. Hence, although the -# changes are not yet law, they are expected to be so before Februray 2013. +# changes are not yet law, they are expected to be so before February 2013. # # As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. # DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the Modified: head/contrib/tzdata/northamerica == --- head/contrib/tzdata/northamericaMon Nov 12 20:42:08 2012 (r242926) +++ head/contrib/tzdata/northamericaMon Nov 12 20:44:59 2012 (r242927) @@ -2797,6 +2797,13 @@ Zone America/Costa_Rica -5:36:20 - LMT 1 # http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html # /a +# From Steffen Thorsen (2012-11-03): +# Radio Reloj and many other sources report that Cuba is changing back +# to standard time on 2012-11-04: +# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre +# From Paul Eggert (2012-11-03): +# For now, assume the future rule is first Sunday in November. + # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Cuba1928only- Jun 10 0:001:00D Rule Cuba1928only- Oct 10 0:000 S @@ -2834,7 +2841,7 @@ Rule Cuba20092010- Mar Sun=8 0:00s 1 Rule Cuba2011only- Mar Sun=15 0:00s 1:00D Rule Cuba2011only- Nov 13 0:00s 0 S Rule Cuba2012only- Apr 1 0:00s 1:00D -Rule Cuba2012max - Oct lastSun 0:00s 0 S +Rule Cuba2012max - Nov Sun=1 0:00s 0 S Rule Cuba2013max - Mar Sun=8 0:00s 1:00D # Zone NAMEGMTOFF RULES FORMAT [UNTIL] ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r242208 - head/contrib/tzdata
Author: edwin Date: Sun Oct 28 09:14:42 2012 New Revision: 242208 URL: http://svn.freebsd.org/changeset/base/242208 Log: Merge of vendor import of tzdata2012h - Bahia no longer has DST. - Tocantins has DST. - Israel has new DST rules next year. - Jordan stays on DST this winter. Modified: head/contrib/tzdata/asia head/contrib/tzdata/southamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaSun Oct 28 09:13:07 2012(r242207) +++ head/contrib/tzdata/asiaSun Oct 28 09:14:42 2012(r242208) @@ -1170,15 +1170,15 @@ RuleZion2004only- Sep 22 1:000 S # # ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps -# From Paul Eggert (2005-02-22): +# From Paul Eggert (2012-10-26): # I used Ephraim Silverberg's dst-israel.el program # ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el (2005-02-20) # along with Ed Reingold's cal-hebrew in GNU Emacs 21.4, -# to generate the transitions in this list. +# to generate the transitions from 2005 through 2012. # (I replaced lastFri with Fri=26 by hand.) -# The spring transitions below all correspond to the following Rule: +# The spring transitions all correspond to the following Rule: # -# Rule Zion2005max - Mar Fri=26 2:001:00D +# Rule Zion20052012- Mar Fri=26 2:001:00D # # but older zic implementations (e.g., Solaris 8) do not support # Fri=26 to mean April 1 in years like 2005, so for now we list the @@ -1195,39 +1195,36 @@ RuleZion2009only- Sep 27 2:000 S Rule Zion2010only- Sep 12 2:000 S Rule Zion2011only- Apr 1 2:001:00D Rule Zion2011only- Oct 2 2:000 S -Rule Zion20122015- Mar Fri=26 2:001:00D +Rule Zion2012only- Mar Fri=26 2:001:00D Rule Zion2012only- Sep 23 2:000 S -Rule Zion2013only- Sep 8 2:000 S -Rule Zion2014only- Sep 28 2:000 S -Rule Zion2015only- Sep 20 2:000 S -Rule Zion2016only- Apr 1 2:001:00D -Rule Zion2016only- Oct 9 2:000 S -Rule Zion20172021- Mar Fri=26 2:001:00D -Rule Zion2017only- Sep 24 2:000 S -Rule Zion2018only- Sep 16 2:000 S -Rule Zion2019only- Oct 6 2:000 S -Rule Zion2020only- Sep 27 2:000 S -Rule Zion2021only- Sep 12 2:000 S -Rule Zion2022only- Apr 1 2:001:00D -Rule Zion2022only- Oct 2 2:000 S -Rule Zion20232032- Mar Fri=26 2:001:00D -Rule Zion2023only- Sep 24 2:000 S -Rule Zion2024only- Oct 6 2:000 S -Rule Zion2025only- Sep 28 2:000 S -Rule Zion2026only- Sep 20 2:000 S -Rule Zion2027only- Oct 10 2:000 S -Rule Zion2028only- Sep 24 2:000 S -Rule Zion2029only- Sep 16 2:000 S -Rule Zion2030only- Oct 6 2:000 S -Rule Zion2031only- Sep 21 2:000 S -Rule Zion2032only- Sep 12 2:000 S -Rule Zion2033only- Apr 1 2:001:00D -Rule Zion2033only- Oct 2 2:000 S -Rule Zion20342037- Mar Fri=26 2:001:00D -Rule Zion2034only- Sep 17 2:000 S -Rule Zion2035only- Oct 7 2:000 S -Rule Zion2036only- Sep 28 2:000 S -Rule Zion2037only- Sep 13 2:000 S + +# From Ephraim Silverberg (2012-10-18): + +# Yesterday, the Interior Ministry Committee, after more than a year +# past, approved sending the proposed June 2011 changes to the Time +# Decree Law back to the Knesset for second and third (final) votes +# before the upcoming elections on Jan. 22, 2013. Hence, although the +# changes are not yet law, they are expected to be so before Februray 2013. +# +# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in
svn commit: r241869 - head/contrib/tzdata
Author: edwin Date: Mon Oct 22 10:20:11 2012 New Revision: 241869 URL: http://svn.freebsd.org/changeset/base/241869 Log: MFV of r241867 Merge of tzdata2012g into head: - Fix end of DST in Gaza and Hebron - Western Samoa: DST start at 30 Septembet 2012 and finished at 7 April 2013. Modified: head/contrib/tzdata/asia head/contrib/tzdata/australasia Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaMon Oct 22 10:18:41 2012(r241868) +++ head/contrib/tzdata/asiaMon Oct 22 10:20:11 2012(r241869) @@ -2293,6 +2293,8 @@ Rule Palestine2010only- Aug 11 0:000 # From Arthur David Olson (2011-09-20): # 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +# From Paul Eggert (2012-10-12): +# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -2303,7 +2305,7 @@ Zone Asia/Gaza 2:17:52 - LMT 1900 Oct 2:00 Palestine EE%sT 2011 Apr 2 12:01 2:001:00EEST2011 Aug 1 2:00- EET 2012 Mar 30 - 2:001:00EEST2012 Sep 28 + 2:001:00EEST2012 Sep 21 1:00 2:00- EET Zone Asia/Hebron 2:20:23 - LMT 1900 Oct @@ -2318,7 +2320,7 @@ Zone Asia/Hebron 2:20:23 - LMT 1900 Oct 2:00- EET 2011 Aug 30 2:001:00EEST2011 Sep 30 3:00 2:00- EET 2012 Mar 30 - 2:001:00EEST2012 Sep 28 3:00 + 2:001:00EEST2012 Sep 21 1:00 2:00- EET # Paracel Is Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Mon Oct 22 10:18:41 2012 (r241868) +++ head/contrib/tzdata/australasia Mon Oct 22 10:20:11 2012 (r241869) @@ -628,6 +628,23 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # Although Samoa has used Daylight Saving Time in the 2010-2011 and 2011-2012 # seasons, there is not yet any indication that this trend will continue on # a regular basis. For now, we have explicitly listed the transitions below. +# +# From Nicky (2012-09-10): +# Daylight Saving Time commences on Sunday 30th September 2012 and +# ends on Sunday 7th of April 2013. +# +# Please find link below for more information. +# http://www.mcil.gov.ws/mcil_publications.html +# +# That publication also includes dates for Summer of 2013/4 as well +# which give the impression of a pattern in selecting dates for the +# future, so for now, we will guess this will continue. + +# Western Samoa +# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S +Rule WS 2012max - Sep lastSun 3:001 D +Rule WS 2012max - Apr Sun=1 4:000 - +# Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT1950# Samoa Time @@ -635,8 +652,8 @@ Zone Pacific/Apia12:33:04 - LMT 1879 J -11:00 1:00WSDT2011 Apr 2 4:00 -11:00 - WST 2011 Sep 24 3:00 -11:00 1:00WSDT2011 Dec 30 -13:00 1:00WSDT2012 Apr 1 4:00 -13:00 - WST +13:00 1:00WSDT2012 Apr Sun=1 4:00 +13:00 WS WS%sT # Solomon Is # excludes Bougainville, for which see Papua New Guinea ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r240457 - head/contrib/tzdata
Author: edwin Date: Thu Sep 13 10:17:01 2012 New Revision: 240457 URL: http://svn.freebsd.org/changeset/base/240457 Log: MFV of 240454, tzdata2012f - Pacific/Fiji will go into DST from 21 October 2012 till 20 January 2013. - Fix offset for Pacific/Tokelau. - Gaza and West Bank had DST from 29 March to 28 September 2012. - Syria has DST from April till October - Morocco had DST from April to September 2012 except for 20 July to 20 August. - Cuba changed to DST from 1 April 2012 only. - Haiti has DST between 8 March and 1 November in 2012. Obtained from:ftp://ftp.iana.org/tz/releases/ Modified: head/contrib/tzdata/africa head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/backward head/contrib/tzdata/etcetera head/contrib/tzdata/europe head/contrib/tzdata/factory head/contrib/tzdata/leapseconds head/contrib/tzdata/northamerica head/contrib/tzdata/pacificnew head/contrib/tzdata/southamerica head/contrib/tzdata/systemv head/contrib/tzdata/yearistype.sh head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Thu Sep 13 10:12:45 2012(r240456) +++ head/contrib/tzdata/africa Thu Sep 13 10:17:01 2012(r240457) @@ -1,5 +1,4 @@ # pre -# @(#)africa 8.33 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -238,7 +237,7 @@ RuleEgypt 2006only- Sep 21 23:00s 0 - # I received a mail from an airline which says that the daylight # saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07. # From Jesper Norgaard Welen (2007-08-15): [The following agree:] -# http://www.nentjes.info/Bill/bill5.htm +# http://www.nentjes.info/Bill/bill5.htm # http://www.timeanddate.com/worldclock/city.html?n=53 # From Steffen Thorsen (2007-09-04): The official information...: # http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/02/0207001580.htm @@ -292,18 +291,18 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # in September. # From Steffen Thorsen (2009-08-11): -# We have been able to confirm the August change with the Egyptian Cabinet +# We have been able to confirm the August change with the Egyptian Cabinet # Information and Decision Support Center: # a href=http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html; # http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html # /a -# +# # The Middle East News Agency # a href=http://www.mena.org.eg/index.aspx; # http://www.mena.org.eg/index.aspx # /a # also reports Egypt starts winter time on August 21 -# today in article numbered 71, 11/08/2009 12:25 GMT. +# today in article numbered 71, 11/08/2009 12:25 GMT. # Only the title above is available without a subscription to their service, # and can be found by searching for winter in their search engine # (at least today). @@ -482,7 +481,7 @@ Zone Africa/Nouakchott -1:03:48 - LMT 19 # From Steffen Thorsen (2008-06-25): # Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial # basis -# It seems that Mauritius observed daylight saving time from 1982-10-10 to +# It seems that Mauritius observed daylight saving time from 1982-10-10 to # 1983-03-20 as well, but that was not successful # http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html @@ -506,12 +505,12 @@ Zone Africa/Nouakchott-1:03:48 - LMT 19 # than previously announced (2008-11-01 to 2009-03-31). The new start # date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time # given, but it is probably at either 2 or 3 wall clock time). -# -# A little strange though, since the article says that they moved the date -# to align itself with Europe and USA which also change time on that date, -# but that means they have not paid attention to what happened in -# USA/Canada last year (DST ends first Sunday in November). I also wonder -# why that they end on a Friday, instead of aligning with Europe which +# +# A little strange though, since the article says that they moved the date +# to align itself with Europe and USA which also change time on that date, +# but that means they have not paid attention to what happened in +# USA/Canada last year (DST ends first Sunday in November). I also wonder +# why that they end on a Friday, instead of aligning with Europe which # changes two days later. # From Alex Krivenyshev (2008-07-11): @@ -570,7 +569,7 @@ Zone Africa/Nouakchott -1:03:48 - LMT 19 # /a # From Arthur David Olson (2009-07-11): -# The mauritius-dst-will-not-repeat wrapup includes this: +# The mauritius-dst-will-not-repeat wrapup includes this: # The trial ended on March 29, 2009, when
svn commit: r233445 - head/contrib/tzdata
Author: edwin Date: Sun Mar 25 02:10:31 2012 New Revision: 233445 URL: http://svn.freebsd.org/changeset/base/233445 Log: MFV of 233442, tzdata2012a - Updates to various locations in Antarctica. - Armenia will abolish DST this year. - Not only Samoa has moved to UTC+14, also Fakaofo did. - There will be a leap second in 30 June 2012. - Historical updates of 1918 to Canada, Winn, Regina, Edm, Vanc, Creston. - Chili stays on DST until 28 April 2012 - The Falkland islands will stay on DST this year. Modified: head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/leapseconds head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/antarctica == --- head/contrib/tzdata/antarctica Sun Mar 25 02:07:47 2012 (r233444) +++ head/contrib/tzdata/antarctica Sun Mar 25 02:10:31 2012 (r233445) @@ -1,5 +1,5 @@ # pre -# @(#)antarctica 8.9 +# @(#)antarctica 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -42,8 +42,19 @@ Rule ChileAQ 1997only- Mar 30 3:00u 0 Rule ChileAQ 1998only- Mar Sun=9 3:00u 0 - Rule ChileAQ 1998only- Sep 27 4:00u 1:00S Rule ChileAQ 1999only- Apr 4 3:00u 0 - -Rule ChileAQ 1999max - Oct Sun=9 4:00u 1:00S -Rule ChileAQ 2000max - Mar Sun=9 3:00u 0 - +Rule ChileAQ 19992010- Oct Sun=9 4:00u 1:00S +Rule ChileAQ 20002007- Mar Sun=9 3:00u 0 - +# N.B.: the end of March 29 in Chile is March 30 in Universal time, +# which is used below in specifying the transition. +Rule ChileAQ 2008only- Mar 30 3:00u 0 - +Rule ChileAQ 2009only- Mar Sun=9 3:00u 0 - +Rule ChileAQ 2010only- Apr Sun=1 3:00u 0 - +Rule ChileAQ 2011only- May Sun=2 3:00u 0 - +Rule ChileAQ 2011only- Aug Sun=16 4:00u 1:00S +Rule ChileAQ 2012only- Apr Sun=23 3:00u 0 - +Rule ChileAQ 2012only- Sep Sun=2 4:00u 1:00S +Rule ChileAQ 2013max - Mar Sun=9 3:00u 0 - +Rule ChileAQ 2013max - Oct Sun=9 4:00u 1:00S # These rules are stolen from the `australasia' file. Rule AusAQ 1917only- Jan 1 0:011:00- @@ -142,12 +153,16 @@ Zone Antarctica/Casey 0 - zzz 1969 # Western (Aus) Standard Time 11:00 - CAST2010 Mar 5 2:00 # Casey Time + 8:00- WST 2011 Oct 28 2:00 + 11:00 - CAST2012 Feb 21 17:00u 8:00- WST Zone Antarctica/Davis 0 - zzz 1957 Jan 13 7:00- DAVT1964 Nov # Davis Time 0 - zzz 1969 Feb 7:00- DAVT2009 Oct 18 2:00 5:00- DAVT2010 Mar 10 20:00u + 7:00- DAVT2011 Oct 28 2:00 + 5:00- DAVT2012 Feb 21 20:00u 7:00- DAVT Zone Antarctica/Mawson 0 - zzz 1954 Feb 13 6:00- MAWT2009 Oct 18 2:00 Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaSun Mar 25 02:07:47 2012(r233444) +++ head/contrib/tzdata/asiaSun Mar 25 02:10:31 2012(r233445) @@ -1,4 +1,4 @@ -# @(#)asia 8.69 +# @(#)asia 8.70 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -77,10 +77,6 @@ Rule RussiaAsia 1993max - Mar lastSun Rule RussiaAsia19931995- Sep lastSun 2:00s 0 - Rule RussiaAsia1996max - Oct lastSun 2:00s 0 - -# From Arthur David Olson (2011-06-15): -# While Russia abandoned DST in 2011, Armenia may choose to -# follow Russia's old rules. - # Afghanistan # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Kabul 4:36:48 - LMT 1890 @@ -97,6 +93,21 @@ Zone Asia/Kabul 4:36:48 - LMT 1890 # in 1996, though it did use DST in 1995. IATA SSIM (1991/1998) reports that # Armenia
svn commit: r226976 - head/contrib/tzdata
Author: edwin Date: Tue Nov 1 02:01:55 2011 New Revision: 226976 URL: http://svn.freebsd.org/changeset/base/226976 Log: MFV of r226974, tzdata2011n - Fiji will end DST on 22 January 2012. - Moldova split into two timezones has been cancelled. - Cuba will end DST on 13 November 2011 Obtained from:ftp://ftp.iana.org/tz/releases/ Modified: head/contrib/tzdata/australasia head/contrib/tzdata/backward head/contrib/tzdata/europe head/contrib/tzdata/northamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Tue Nov 1 01:34:54 2011 (r226975) +++ head/contrib/tzdata/australasia Tue Nov 1 02:01:55 2011 (r226976) @@ -1,5 +1,5 @@ # pre -# @(#)australasia 8.28 +# @(#)australasia 8.29 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -308,6 +308,20 @@ Zone Indian/Cocos6:27:40 - LMT 1900 # advance at 2am to 3am on October 23, 2011 and one hour back at 3am to # 2am on February 26 next year. +# From Ken Rylander (2011-10-24) +# Another change to the Fiji DST end date. In the TZ database the end date for +# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22. +# +# a href=http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=5017:amendments-to-daylight-savingscatid=71:press-releasesItemid=155; +# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=5017:amendments-to-daylight-savingscatid=71:press-releasesItemid=155 +# /a +# states: +# +# The end of daylight saving scheduled initially for the 26th of February 2012 +# has been brought forward to the 22nd of January 2012. +# The commencement of daylight saving will remain unchanged and start +# on the 23rd of October, 2011. + # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Fiji19981999- Nov Sun=1 2:001:00S Rule Fiji19992000- Feb lastSun 3:000 - @@ -316,7 +330,7 @@ RuleFiji2010only- Mar lastSun 3:000 Rule Fiji2010only- Oct 24 2:001:00S Rule Fiji2011only- Mar Sun=1 3:000 - Rule Fiji2011only- Oct 23 2:001:00S -Rule Fiji2012only- Feb 26 3:000 - +Rule Fiji2012only- Jan 22 3:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji11:53:40 - LMT 1915 Oct 26 # Suva 12:00 FijiFJ%sT # Fiji Time Modified: head/contrib/tzdata/backward == --- head/contrib/tzdata/backwardTue Nov 1 01:34:54 2011 (r226975) +++ head/contrib/tzdata/backwardTue Nov 1 02:01:55 2011 (r226976) @@ -1,5 +1,5 @@ # pre -# @(#)backward 8.10 +# @(#)backward 8.11 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -67,6 +67,7 @@ Link America/Havana Cuba Link Africa/CairoEgypt Link Europe/Dublin Eire Link Europe/London Europe/Belfast +Link Europe/Chisinau Europe/Tiraspol Link Europe/London GB Link Europe/London GB-Eire Link Etc/GMT GMT+0 Modified: head/contrib/tzdata/europe == --- head/contrib/tzdata/europe Tue Nov 1 01:34:54 2011(r226975) +++ head/contrib/tzdata/europe Tue Nov 1 02:01:55 2011(r226976) @@ -1,5 +1,5 @@ # pre -# @(#)europe 8.39 +# @(#)europe 8.40 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1678,6 +1678,18 @@ Zone Europe/Malta0:58:04 - LMT 1893 Nov # a pre-1880 LMT offset of 1:58:32. # # (which agrees with the earlier entry that had been removed) +# +# From Alexander Krivenyshev (2011-10-26) +# NO need to divide Moldova into two timezones at this point. +# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own +# decision to abolish DST this winter. +# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)- +# Tiraspol will go back to winter time on October 30, 2011. +# News from Moldova (in russian): +# a href=http://ru.publika.md/link_317061.html; +# http://ru.publika.md/link_317061.html +# /a + # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Europe/Chisinau 1:55:20 - LMT 1880 @@ -1694,21 +1706,6 @@ Zone Europe/Chisinau 1:55:20 - LMT 1880 # See Romania commentary for the guessed 1997 transition to EU rules.
Re: svn commit: r226771 - head/contrib/tzdata
For about a 4 hour window (09:00 till 12:30 Sydney time), tzsetup(8) would complain about this missing patch in head, stable/[678]/. When I committed the port earlier on (misc/zoneinfo) I had spend some time to make sure it worked properly. No idea why I fell for it during the commit in the src/-tree later on. On 26/10/2011, at 12:56 , Edwin Groothuis wrote: Author: edwin Date: Wed Oct 26 01:56:22 2011 New Revision: 226771 URL: http://svn.freebsd.org/changeset/base/226771 Log: Fix breakage in tzsetup: MD +4700+02850 Europe/Chisinau most locations Modified: head/contrib/tzdata/zone.tab Modified: head/contrib/tzdata/zone.tab == --- head/contrib/tzdata/zone.tab Wed Oct 26 01:03:53 2011 (r226770) +++ head/contrib/tzdata/zone.tab Wed Oct 26 01:56:22 2011 (r226771) @@ -257,7 +257,7 @@ LV+5657+02406 Europe/Riga LY+3254+01311 Africa/Tripoli MA+3339-00735 Africa/Casablanca MC+4342+00723 Europe/Monaco -MD +4700+02850 Europe/Chisinau +MD +4700+02850 Europe/Chisinau most locations MD+4651+02938 Europe/Tiraspol Pridnestrovie ME+4226+01916 Europe/Podgorica MF+1804-06305 America/Marigot ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r226752 - head/contrib/tzdata
Author: edwin Date: Tue Oct 25 21:53:43 2011 New Revision: 226752 URL: http://svn.freebsd.org/changeset/base/226752 Log: MFV of r226750, tzdata2011m Europe: - Pridnestrovian Moldavian Republic (PMR, also known as Pridnestrovie) has abolished seasonal clock change (no transition to the Winter Time). - The recent change to the Ukranian time zone (Europe/Kiev) to introduce permanent daylight saving time (similar to Russia) was reverted. South America: - Bahia: The President signed a decree that includes Bahia in summer time. zone.tab: - Add Europe/Tiraspol Pridnestrovie Obtained from: ftp://ftp.iana.org/tz/releases/ Modified: head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/backward head/contrib/tzdata/europe head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaTue Oct 25 21:51:34 2011(r226751) +++ head/contrib/tzdata/asiaTue Oct 25 21:53:43 2011(r226752) @@ -1,4 +1,4 @@ -# @(#)asia 8.68 +# @(#)asia 8.69 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Tue Oct 25 21:51:34 2011 (r226751) +++ head/contrib/tzdata/australasia Tue Oct 25 21:53:43 2011 (r226752) @@ -1,5 +1,5 @@ # pre -# @(#)australasia 8.27 +# @(#)australasia 8.28 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. Modified: head/contrib/tzdata/backward == --- head/contrib/tzdata/backwardTue Oct 25 21:51:34 2011 (r226751) +++ head/contrib/tzdata/backwardTue Oct 25 21:53:43 2011 (r226752) @@ -1,5 +1,5 @@ # pre -# @(#)backward 8.9 +# @(#)backward 8.10 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -67,7 +67,6 @@ Link America/Havana Cuba Link Africa/CairoEgypt Link Europe/Dublin Eire Link Europe/London Europe/Belfast -Link Europe/Chisinau Europe/Tiraspol Link Europe/London GB Link Europe/London GB-Eire Link Etc/GMT GMT+0 Modified: head/contrib/tzdata/europe == --- head/contrib/tzdata/europe Tue Oct 25 21:51:34 2011(r226751) +++ head/contrib/tzdata/europe Tue Oct 25 21:53:43 2011(r226752) @@ -1,5 +1,5 @@ # pre -# @(#)europe 8.38 +# @(#)europe 8.39 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1655,6 +1655,29 @@ Zone Europe/Malta0:58:04 - LMT 1893 Nov # But [two people] separately reported via # Jesper Norgaard that as of 2001-01-24 Tiraspol was like Chisinau. # The Tiraspol entry has therefore been removed for now. +# +# From Alexander Krivenyshev (2011-10-17): +# Pridnestrovian Moldavian Republic (PMR, also known as +# Pridnestrovie) has abolished seasonal clock change (no transition +# to the Winter Time). +# +# News (in Russian): +# a href=http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html; +# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html +# /a +# +# a href=http://www.allmoldova.com/moldova-news/1249064116.html; +# http://www.allmoldova.com/moldova-news/1249064116.html +# /a +# +# The substance of this change (reinstatement of the Tiraspol entry) +# is from a patch from Petr Machata (2011-10-17) +# +# From Tim Parenti (2011-10-19) +# In addition, being situated at +4651+2938 would give Tiraspol +# a pre-1880 LMT offset of 1:58:32. +# +# (which agrees with the earlier entry that had been removed) # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Europe/Chisinau 1:55:20 - LMT 1880 @@ -1671,6 +1694,21 @@ Zone Europe/Chisinau 1:55:20 - LMT 1880 # See Romania commentary for the guessed 1997 transition to EU rules. 2:00EU EE%sT +Zone Europe/Tiraspol 1:58:32 - LMT 1880 + 1:55- CMT 1918 Feb 15 # Chisinau MT + 1:44:24 - BMT 1931 Jul 24 # Bucharest MT + 2:00Romania EE%sT 1940 Aug 15 + 2:001:00EEST1941 Jul 17 + 1:00C-Eur CE%sT 1944 Aug 24 + 3:00Russia MSK/MSD 1990 + 3:00- MSK
svn commit: r226771 - head/contrib/tzdata
Author: edwin Date: Wed Oct 26 01:56:22 2011 New Revision: 226771 URL: http://svn.freebsd.org/changeset/base/226771 Log: Fix breakage in tzsetup: MD +4700+02850 Europe/Chisinau most locations Modified: head/contrib/tzdata/zone.tab Modified: head/contrib/tzdata/zone.tab == --- head/contrib/tzdata/zone.tabWed Oct 26 01:03:53 2011 (r226770) +++ head/contrib/tzdata/zone.tabWed Oct 26 01:56:22 2011 (r226771) @@ -257,7 +257,7 @@ LV +5657+02406 Europe/Riga LY +3254+01311 Africa/Tripoli MA +3339-00735 Africa/Casablanca MC +4342+00723 Europe/Monaco -MD +4700+02850 Europe/Chisinau +MD +4700+02850 Europe/Chisinau most locations MD +4651+02938 Europe/Tiraspol Pridnestrovie ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r226283 - head/share/misc
Author: edwin Date: Wed Oct 12 07:00:50 2011 New Revision: 226283 URL: http://svn.freebsd.org/changeset/base/226283 Log: Updates from Newsletter VI-9 and VI-10: Newsletter VI-9 2011-06-12 Name changes for Fiji and Myanmar as well as other minor corrections Newsletter VI-10 2011-08-09 Code elements for South Sudan. Reviewed by: http://www.iso.org/iso/country_codes.html Modified: head/share/misc/iso3166 Modified: head/share/misc/iso3166 == --- head/share/misc/iso3166 Wed Oct 12 06:40:49 2011(r226282) +++ head/share/misc/iso3166 Wed Oct 12 07:00:50 2011(r226283) @@ -46,7 +46,7 @@ BJBEN 204 Benin BM BMU 060 Bermuda BT BTN 064 Bhutan BO BOL 068 Bolivia, Plurinational State of -BQ BES 535 Bonaire, Saint Eustatius and Saba +BQ BES 535 Bonaire, Sint Eustatius and Saba BA BIH 070 Bosnia and Herzegovina BW BWA 072 Botswana BV BVT 074 Bouvet Island @@ -224,11 +224,12 @@ SBSLB 090 Solomon Islands SO SOM 706 Somalia ZA ZAF 710 South Africa GS SGS 239 South Georgia and the South Sandwich Islands +SS SSD 728 South Sudan ES ESP 724 Spain LK LKA 144 Sri Lanka SH SHN 654 Saint Helena, Ascension and Tristan da Cunha PM SPM 666 Saint Pierre and Miquelon -SD SDN 736 Sudan +SD SDN 729 Sudan SR SUR 740 Suriname SJ SJM 744 Svalbard and Jan Mayen SZ SWZ 748 Swaziland @@ -547,3 +548,10 @@ ZW ZWE 716 Zimbabwe # BONAIRE, SAINT EUSTATIUS AND SABA (BQ), CURACAO (CW) and # SINT MAARTEN (DUTCH PART) (SX) added as new entries. # NETHERLANDS ANTILLES (AN) removed. +# +# Newsletter VI-9 2011-06-12 +# Name changes for Fiji and Myanmar as well as other minor corrections +# +# Newsletter VI-10 2011-08-09 +# Code elements for South Sudan. +# ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r226289 - head/contrib/tzdata
Author: edwin Date: Wed Oct 12 09:13:16 2011 New Revision: 226289 URL: http://svn.freebsd.org/changeset/base/226289 Log: MFV of tzdata2011l, r226279 Changes in 2011i: Africa - Added South Sudan: Africa/Juba Australasia: - Samoa will go forward 24 hours at 30 December 2011 to better match the day of the week with its neighbours. Europe: - Europe/Kaliningrad will have the timezone KALT. North America: - Updates to Metlakatla historical data - Newfoundland, Labrador and Resolute will do something which I can't figure out. iso3166tab; - Add SS for South Sudan. Changes in 2011j: - Samoa will go from 29 December 23:59:59 to 31 December 00:00:00. - Samoa DST will end on 1 April 2012 Changes in 2011k: - Gaza / West Bank goes back to standard time on 02 August 2011. - West Bank went bac kto DST on 30 August 2011. - Lots of changes in Minsk (GMT+3 without DST) and other Russian regions. A new timezone has been created for them, FET: Further-eastern European Time aka GMT+3. - Add Asian/Hebron to the zone.tab file. Changes in 2011l: - West Bank came out of DST on 30 September 2011. - Fiji will g oin DST on 23 October and out of it on 26 Februari - State Bahia might go back to DST in 16 October 2011 Due to legal problems, ado and Paul Eggert have to temporary suspend their work on the timezone database (http://thread.gmane.org/gmane.comp.time.tz/4133). Their work has been continued by volunteers on the tz community and the hosting of the data files is done by Robert Elz at ftp://munnari.oz.au/pub/. Obtained from:ftp://munnari.oz.au/pub, ftp://elsie.nci.nih.gov/pub/ Modified: head/contrib/tzdata/africa head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/europe head/contrib/tzdata/northamerica head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Wed Oct 12 08:39:57 2011(r226288) +++ head/contrib/tzdata/africa Wed Oct 12 09:13:16 2011(r226289) @@ -1,5 +1,5 @@ # pre -# @(#)africa 8.31 +# @(#)africa 8.33 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -58,7 +58,7 @@ # I invented the following abbreviations; corrections are welcome! # 2:00 WASTWest Africa Summer Time # 2:30 BEATBritish East Africa Time (no longer used) -# 2:44:45 BEAUT British East Africa Unified Time (no longer used) +# 2:45 BEAUT British East Africa Unified Time (no longer used) # 3:00 CASTCentral Africa Summer Time (no longer used) # 3:00 SASTSouth Africa Summer Time (no longer used) # 3:00 EAT East Africa Time @@ -396,7 +396,7 @@ ZoneAfrica/Bissau -1:02:20 - LMT 1911 M Zone Africa/Nairobi 2:27:16 - LMT 1928 Jul 3:00- EAT 1930 2:30- BEAT1940 - 2:44:45 - BEAUT 1960 + 2:45- BEAUT 1960 3:00- EAT # Lesotho @@ -957,6 +957,11 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 2:00Sudan CA%sT 2000 Jan 15 12:00 3:00- EAT +# South Sudan +Zone Africa/Juba 2:06:24 - LMT 1931 + 2:00Sudan CA%sT 2000 Jan 15 12:00 + 3:00- EAT + # Swaziland # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar @@ -966,7 +971,7 @@ ZoneAfrica/Mbabane 2:04:24 - LMT 1903 M # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Dar_es_Salaam 2:37:08 -LMT 1931 3:00- EAT 1948 - 2:44:45 - BEAUT 1961 + 2:45- BEAUT 1961 3:00- EAT # Togo @@ -1092,7 +1097,7 @@ Zone Africa/Tunis0:40:44 - LMT 1881 May Zone Africa/Kampala 2:09:40 - LMT 1928 Jul 3:00- EAT 1930 2:30- BEAT1948 - 2:44:45 - BEAUT 1957 + 2:45- BEAUT 1957 3:00- EAT # Zambia Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaWed Oct 12 08:39:57 2011(r226288) +++ head/contrib/tzdata/asiaWed
svn commit: r223928 - head/usr.bin/calendar
Author: edwin
Date: Mon Jul 11 08:24:36 2011
New Revision: 223928
URL: http://svn.freebsd.org/changeset/base/223928
Log:
Fix the interpreter for:
Jul/Sat+3 Every third saturday of July - Jul/Sat+3
which was able to be done via:
Jul/SatThird Every third saturday of July - Jul/SatThird
Add interpreters for:
SatFourth Every third saturday of each month - SatFourth
Sat+4 Every third saturday of each month - Sat+4
Sat Every saturday of each month - Sat
MFC after:2 weeks
Modified:
head/usr.bin/calendar/parsedata.c
Modified: head/usr.bin/calendar/parsedata.c
==
--- head/usr.bin/calendar/parsedata.c Mon Jul 11 08:23:59 2011
(r223927)
+++ head/usr.bin/calendar/parsedata.c Mon Jul 11 08:24:36 2011
(r223928)
@@ -548,6 +548,24 @@ parsedaymonth(char *date, int *yearp, in
continue;
}
+ /* Every so-manied dayofweek of every month of the year */
+ if (lflags == (F_DAYOFWEEK | F_MODIFIERINDEX | F_VARIABLE)) {
+ offset = indextooffset(modifierindex);
+
+ for (m = 0; m 12; m++) {
+ dow = first_dayofweek_of_month(year, m);
+ d = (idayofweek - dow + 8) % 7;
+ d += (offset - 1) * 7;
+ if (remember_ymd(year, m, d)) {
+ remember(remindex,
+ yearp, monthp, dayp, edp,
+ year, m, d, NULL);
+ continue;
+ }
+ }
+ continue;
+ }
+
/* A certain dayofweek of a month */
if (lflags ==
(F_MONTH | F_DAYOFWEEK | F_MODIFIERINDEX | F_VARIABLE)) {
@@ -918,6 +936,16 @@ indextooffset(char *s)
int i;
struct fixs *n;
+ if (s[0] == '+' || s[0] == '-') {
+ char ss[9];
+ for (i = -100; i 100; i++) {
+ sprintf(ss, %s%d, (i 0) ? + : , i);
+ if (strcmp(ss, s) == 0)
+ return (i);
+ }
+ return (0);
+ }
+
for (i = 0; i 6; i++) {
if (strcasecmp(s, sequences[i]) == 0) {
if (i == 5)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223931 - head/usr.bin/ncal
Author: edwin Date: Mon Jul 11 10:41:08 2011 New Revision: 223931 URL: http://svn.freebsd.org/changeset/base/223931 Log: ncal(1) highlights the current date (or a date provided via parameter) even if stdout is not a tty. If stdout is not a tty the data is normally processed by other tools and no control sequences are expected. PR: bin/158580 MFC after:1 week Modified: head/usr.bin/ncal/ncal.1 head/usr.bin/ncal/ncal.c Modified: head/usr.bin/ncal/ncal.1 == --- head/usr.bin/ncal/ncal.1Mon Jul 11 10:02:27 2011(r223930) +++ head/usr.bin/ncal/ncal.1Mon Jul 11 10:41:08 2011(r223931) @@ -171,6 +171,8 @@ that, two after that and the whole year. will warn about these combinations. .Pp A year starts on January 1. +.P +Highlighting of dates is disabled if stdout is not a tty. .Sh SEE ALSO .Xr calendar 3 , .Xr strftime 3 Modified: head/usr.bin/ncal/ncal.c == --- head/usr.bin/ncal/ncal.cMon Jul 11 10:02:27 2011(r223930) +++ head/usr.bin/ncal/ncal.cMon Jul 11 10:41:08 2011(r223931) @@ -822,7 +822,8 @@ mkmonthr(int y, int m, int jd_flag, stru dt.d = j - jan1 + 1; else sdater(j, dt); - if (j == highlightdate !flag_nohighlight) + if (j == highlightdate !flag_nohighlight + isatty(STDOUT_FILENO)) highlight(mlines-lines[i] + k, ds + dt.d * dw, dw, l); else ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223932 - head/usr.bin/ncal
Author: edwin Date: Mon Jul 11 10:42:36 2011 New Revision: 223932 URL: http://svn.freebsd.org/changeset/base/223932 Log: Fix typo in order of markup and text. Modified: head/usr.bin/ncal/ncal.1 Modified: head/usr.bin/ncal/ncal.1 == --- head/usr.bin/ncal/ncal.1Mon Jul 11 10:41:08 2011(r223931) +++ head/usr.bin/ncal/ncal.1Mon Jul 11 10:42:36 2011(r223932) @@ -171,7 +171,7 @@ that, two after that and the whole year. will warn about these combinations. .Pp A year starts on January 1. -.P +.Pp Highlighting of dates is disabled if stdout is not a tty. .Sh SEE ALSO .Xr calendar 3 , ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223939 - head/usr.bin/calendar
Author: edwin
Date: Mon Jul 11 22:01:39 2011
New Revision: 223939
URL: http://svn.freebsd.org/changeset/base/223939
Log:
Fix run-time breakage when encoutering invalid input-data.
PR: bin/157718
Modified:
head/usr.bin/calendar/parsedata.c
Modified: head/usr.bin/calendar/parsedata.c
==
--- head/usr.bin/calendar/parsedata.c Mon Jul 11 20:43:59 2011
(r223938)
+++ head/usr.bin/calendar/parsedata.c Mon Jul 11 22:01:39 2011
(r223939)
@@ -818,6 +818,8 @@ showflags(int flags)
static const char *
getmonthname(int i)
{
+ if (i = 0 || i 12)
+ return ();
if (nmonths[i - 1].len != 0 nmonths[i - 1].name != NULL)
return (nmonths[i - 1].name);
return (months[i - 1]);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r223629 - head/contrib/tzdata
Author: edwin Date: Tue Jun 28 10:24:01 2011 New Revision: 223629 URL: http://svn.freebsd.org/changeset/base/223629 Log: MFV of tzdata2011h, r223627 - Russia scraps DST in 2011 - Remove Netherlands Antilles, add Bonaire, Curacao, Sint Maarten Modified: head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/europe head/contrib/tzdata/southamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/antarctica == --- head/contrib/tzdata/antarctica Tue Jun 28 10:15:03 2011 (r223628) +++ head/contrib/tzdata/antarctica Tue Jun 28 10:24:01 2011 (r223629) @@ -1,5 +1,5 @@ # pre -# @(#)antarctica 8.8 +# @(#)antarctica 8.9 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -19,18 +19,6 @@ # I made up all time zone abbreviations mentioned here; corrections welcome! # FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited. -# These rules are stolen from the `europe' file. -# Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S -Rule RussAQ 19811984- Apr 1 0:00 1:00S -Rule RussAQ 19811983- Oct 1 0:00 0 - -Rule RussAQ 19841991- Sep lastSun 2:00s 0 - -Rule RussAQ 19851991- Mar lastSun 2:00s 1:00S -Rule RussAQ 1992only- Mar lastSat 23:00 1:00S -Rule RussAQ 1992only- Sep lastSat 23:00 0 - -Rule RussAQ 1993max - Mar lastSun 2:00s 1:00S -Rule RussAQ 19931995- Sep lastSun 2:00s 0 - -Rule RussAQ 1996max - Oct lastSun 2:00s 0 - - # These rules are stolen from the `southamerica' file. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule ArgAQ 19641966- Mar 1 0:000 - Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaTue Jun 28 10:15:03 2011(r223628) +++ head/contrib/tzdata/asiaTue Jun 28 10:24:01 2011(r223629) @@ -1,4 +1,4 @@ -# @(#)asia 8.64 +# @(#)asia 8.65 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -77,6 +77,10 @@ Rule RussiaAsia 1993max - Mar lastSun Rule RussiaAsia19931995- Sep lastSun 2:00s 0 - Rule RussiaAsia1996max - Oct lastSun 2:00s 0 - +# From Arthur David Olson (2011-06-15): +# While Russia abandoned DST in 2011, Armenia may choose to +# follow Russia's old rules. + # Afghanistan # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Kabul 4:36:48 - LMT 1890 Modified: head/contrib/tzdata/europe == --- head/contrib/tzdata/europe Tue Jun 28 10:15:03 2011(r223628) +++ head/contrib/tzdata/europe Tue Jun 28 10:24:01 2011(r223629) @@ -1,5 +1,5 @@ # pre -# @(#)europe 8.32 +# @(#)europe 8.33 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -565,6 +565,26 @@ Rule Russia 1993max - Mar lastSun 2:00 Rule Russia 19931995- Sep lastSun 2:00s 0 - Rule Russia 1996max - Oct lastSun 2:00s 0 - +# From Alexander Krivenyshev (2011-06-14): +# According to Kremlin press service, Russian President Dmitry Medvedev +# signed a federal law On calculation of time on June 9, 2011. +# According to the law Russia is abolishing daylight saving time. +# +# Medvedev signed a law On the Calculation of Time (in russian): +# a href=http://bmockbe.ru/events/?ID=7583; +# http://bmockbe.ru/events/?ID=7583 +# /a +# +# Medvedev signed a law on the calculation of the time (in russian): +# a href=http://www.regnum.ru/news/polit/1413906.html; +# http://www.regnum.ru/news/polit/1413906.html +# /a + +# From Arthur David Olson (2011-06-15): +# Take abolishing daylight saving time to mean that time is now considered +# to be standard. +# At least for now, keep the old Russia rules for the benefit of Belarus. + # These are for backward compatibility with older versions. # Zone NAMEGMTOFF RULES FORMAT [UNTIL] @@ -2013,7 +2033,8 @@ Zone Europe/Kaliningrad1:22:00 - LMT 1 1:00 C-Eur CE%sT 1945 2:00 Poland CE%sT 1946 3:00 Russia MSK/MSD 1991 Mar 31 2:00s -2:00 Russia EE%sT +2:00 Russia EE%sT 2011 Mar 27 2:00s +
svn commit: r223633 - head/share/misc
Author: edwin Date: Tue Jun 28 10:38:12 2011 New Revision: 223633 URL: http://svn.freebsd.org/changeset/base/223633 Log: Remove AN again now that tzdata2011h has been imported. Modified: head/share/misc/iso3166 Modified: head/share/misc/iso3166 == --- head/share/misc/iso3166 Tue Jun 28 10:30:30 2011(r223632) +++ head/share/misc/iso3166 Tue Jun 28 10:38:12 2011(r223633) @@ -176,7 +176,6 @@ NA NAM 516 Namibia NR NRU 520 Nauru NP NPL 524 Nepal NL NLD 528 Netherlands -AN ANT 530 Netherlands Antilles NC NCL 540 New Caledonia NZ NZL 554 New Zealand NI NIC 558 Nicaragua ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r222094 - head/share/misc
On 23/05/2011, at 6:00 PM, Ulrich Spörlein wrote: On Sun, 22.05.2011 at 20:16:47 +1000, Edwin Groothuis wrote: On 22/05/2011, at 7:29 PM, Ulrich Spörlein wrote: On Thu, 19.05.2011 at 13:09:39 +, Edwin Groothuis wrote: Author: edwin Date: Thu May 19 13:09:39 2011 New Revision: 222094 URL: http://svn.freebsd.org/changeset/base/222094 Log: Put AN back after finding out that tzsetup(1) will complain that it doesn't exist. It will be removed again once the tzdata distribution files have been updated with the replacements for AN. Wouldn't it be better to have tzsetup use iso3166.tab from the tzdata distribution, which is mostly guaranteed to be in sync with zone.tab? Which opens a different can of worms. Duplicate file, with semi-similar contents. Whenever there are changes in the distribution of the tzdata iso3166.tab equivalent file, I check if they are in the /usr/share/misc equivalent file. A warning to that file should be added that tzsetup uses it and that they always should check tzsetup functionality before commiting it. This seems way too brittle, as can be seen by random people going in and updating our iso3166 file. I'd rather take a tiny duplication of files than manual fixups needed to unbreak installing. AFAICS only tzsetup and sysinstall depend on /usr/share/misc/iso3166, That are only the tools in the base system that you know about. It has been part of the base system long enough that people think they can rely on it. Some of my tools do, for sure. Edwin___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r222094 - head/share/misc
On 22/05/2011, at 7:29 PM, Ulrich Spörlein wrote: On Thu, 19.05.2011 at 13:09:39 +, Edwin Groothuis wrote: Author: edwin Date: Thu May 19 13:09:39 2011 New Revision: 222094 URL: http://svn.freebsd.org/changeset/base/222094 Log: Put AN back after finding out that tzsetup(1) will complain that it doesn't exist. It will be removed again once the tzdata distribution files have been updated with the replacements for AN. Wouldn't it be better to have tzsetup use iso3166.tab from the tzdata distribution, which is mostly guaranteed to be in sync with zone.tab? Which opens a different can of worms. Duplicate file, with semi-similar contents. Whenever there are changes in the distribution of the tzdata iso3166.tab equivalent file, I check if they are in the /usr/share/misc equivalent file. A warning to that file should be added that tzsetup uses it and that they always should check tzsetup functionality before commiting it. Edwin___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r222094 - head/share/misc
Author: edwin Date: Thu May 19 13:09:39 2011 New Revision: 222094 URL: http://svn.freebsd.org/changeset/base/222094 Log: Put AN back after finding out that tzsetup(1) will complain that it doesn't exist. It will be removed again once the tzdata distribution files have been updated with the replacements for AN. Modified: head/share/misc/iso3166 Modified: head/share/misc/iso3166 == --- head/share/misc/iso3166 Thu May 19 11:41:12 2011(r222093) +++ head/share/misc/iso3166 Thu May 19 13:09:39 2011(r222094) @@ -176,6 +176,7 @@ NA NAM 516 Namibia NR NRU 520 Nauru NP NPL 524 Nepal NL NLD 528 Netherlands +AN ANT 530 Netherlands Antilles NC NCL 540 New Caledonia NZ NZL 554 New Zealand NI NIC 558 Nicaragua ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r221092 - head/contrib/tzdata
Author: edwin Date: Tue Apr 26 22:14:10 2011 New Revision: 221092 URL: http://svn.freebsd.org/changeset/base/221092 Log: MFV of tzdata2011g, 221089. - Egypt has cancelled the move to DST for now. Modified: head/contrib/tzdata/africa head/contrib/tzdata/europe head/contrib/tzdata/southamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Tue Apr 26 22:13:58 2011(r221091) +++ head/contrib/tzdata/africa Tue Apr 26 22:14:10 2011(r221092) @@ -1,5 +1,5 @@ # pre -# @(#)africa 8.30 +# @(#)africa 8.31 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -212,7 +212,21 @@ Rule Egypt 1989only- May 6 1:001:00 Rule Egypt 19901994- May 1 1:001:00S # 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 1995max - Apr lastFri 0:00s 1:00S + +# 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 19952010- Apr lastFri 0:00s 1:00S Rule Egypt 19952005- Sep lastThu 23:00s 0 - # From Steffen Thorsen (2006-09-19): # The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports: @@ -313,7 +327,7 @@ RuleEgypt 2008only- Aug lastThu 23:00 Rule Egypt 2009only- Aug 20 23:00s 0 - Rule Egypt 2010only- Aug 11 0:000 - Rule Egypt 2010only- Sep 10 0:001:00S -Rule Egypt 2010max - Sep lastThu 23:00s 0 - +Rule Egypt 2010only- Sep lastThu 23:00s 0 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Cairo2:05:00 - LMT 1900 Oct Modified: head/contrib/tzdata/europe == --- head/contrib/tzdata/europe Tue Apr 26 22:13:58 2011(r221091) +++ head/contrib/tzdata/europe Tue Apr 26 22:14:10 2011(r221092) @@ -1,5 +1,5 @@ # pre -# @(#)europe 8.31 +# @(#)europe 8.32 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -146,7 +146,7 @@ # 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, +# 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,7 +1786,7 @@ Zone Europe/Oslo 0:43:00 - LMT 1895 Jan # # 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: +# war years it's probably best just do...the following for now: Link Europe/Oslo Arctic/Longyearbyen # Poland Modified: head/contrib/tzdata/southamerica == --- head/contrib/tzdata/southamericaTue Apr 26 22:13:58 2011 (r221091) +++ head/contrib/tzdata/southamericaTue Apr 26 22:14:10 2011 (r221092) @@ -1,5 +1,5 @@ # pre -# @(#)southamerica 8.48 +# @(#)southamerica 8.49 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -745,7 +745,7 @@ ZoneAmerica/La_Paz -4:32:36 - LMT 1890 # # 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 +# 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. # ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r220549 - head/contrib/tzdata
Author: edwin Date: Mon Apr 11 21:57:59 2011 New Revision: 220549 URL: http://svn.freebsd.org/changeset/base/220549 Log: MFV of r220547, tzdata2011f: - During 2011 the Falkland Islands will remain on Summer time. Obtained from: ftp://elsie.nci.nih.gov/pub/ Modified: head/contrib/tzdata/southamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/southamerica == --- head/contrib/tzdata/southamericaMon Apr 11 21:55:09 2011 (r220548) +++ head/contrib/tzdata/southamericaMon Apr 11 21:57:59 2011 (r220549) @@ -1,5 +1,5 @@ # pre -# @(#)southamerica 8.47 +# @(#)southamerica 8.48 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -1343,6 +1343,24 @@ Zone Pacific/Galapagos -5:58:24 - LMT 19 # For now, we'll just record the time in Stanley, since we have no # better info. +# From Steffen Thorsen (2011-04-01): +# The Falkland Islands will not turn back clocks this winter, but stay on +# daylight saving time. +# +# One source: +# a href=http://www.falklandnews.com/public/story.cfm?get=5914source=3; +# http://www.falklandnews.com/public/story.cfm?get=5914source=3 +# /a +# +# We have gotten this confirmed by a clerk of the legislative assembly: +# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the +# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3 +# hours) on the first Sunday of September at 0200hrs. +# +# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands +# will not revert to local mean time, but clocks will remain on Summer +# time (UTC/GMT - 3 hours) throughout the whole of 2011. Any long term +# change to local time following the trial period will be notified. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Falk19371938- Sep lastSun 0:001:00S Rule Falk19381942- Mar Sun=19 0:000 - @@ -1354,7 +1372,8 @@ Rule Falk19841985- Apr lastSun 0:000 Rule Falk1984only- Sep 16 0:001:00S Rule Falk19852000- Sep Sun=9 0:001:00S Rule Falk19862000- Apr Sun=16 0:000 - -Rule Falk2001max - Apr Sun=15 2:000 - +Rule Falk20012010- Apr Sun=15 2:000 - +Rule Falk2012max - Apr Sun=15 2:000 - Rule Falk2001max - Sep Sun=1 2:001:00S # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Atlantic/Stanley -3:51:24 - LMT 1890 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r220448 - head/usr.bin/logger
Author: edwin
Date: Fri Apr 8 12:33:07 2011
New Revision: 220448
URL: http://svn.freebsd.org/changeset/base/220448
Log:
When specifying the -t option (send tag in front of message), this tag
should also be forwarded to the remote logging host, not only when the
logging is done locally.
PR: bin/154324
Submitted by: Callum Gibson callumgib...@optusnet.com.au
MFC after:1 week
Modified:
head/usr.bin/logger/logger.1
head/usr.bin/logger/logger.c
Modified: head/usr.bin/logger/logger.1
==
--- head/usr.bin/logger/logger.1Fri Apr 8 11:08:26 2011
(r220447)
+++ head/usr.bin/logger/logger.1Fri Apr 8 12:33:07 2011
(r220448)
@@ -102,7 +102,8 @@ facility.
The default is ``user.notice.''
.It Fl t Ar tag
Mark every line in the log with the specified
-.Ar tag .
+.Ar tag
+rather than the default of current login name.
.It Ar message
Write the message to log; if not specified, and the
.Fl f
Modified: head/usr.bin/logger/logger.c
==
--- head/usr.bin/logger/logger.cFri Apr 8 11:08:26 2011
(r220447)
+++ head/usr.bin/logger/logger.cFri Apr 8 12:33:07 2011
(r220448)
@@ -59,7 +59,8 @@ __FBSDID($FreeBSD$);
intdecode(char *, CODE *);
intpencode(char *);
-static voidlogmessage(int, const char *, const char *, const char *);
+static voidlogmessage(int, const char *, const char *, const char *,
+ const char *);
static voidusage(void);
struct socks {
@@ -137,8 +138,11 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
+ if (tag == NULL)
+ tag = getlogin();
/* setup for logging */
- openlog(tag ? tag : getlogin(), logflags, 0);
+ if (host == NULL)
+ openlog(tag, logflags, 0);
(void) fclose(stdout);
/* log input line if appropriate */
@@ -149,11 +153,11 @@ main(int argc, char *argv[])
for (p = buf, endp = buf + sizeof(buf) - 2; *argv;) {
len = strlen(*argv);
if (p + len endp p buf) {
- logmessage(pri, host, svcname, buf);
+ logmessage(pri, tag, host, svcname, buf);
p = buf;
}
if (len sizeof(buf) - 1)
- logmessage(pri, host, svcname, *argv++);
+ logmessage(pri, tag, host, svcname, *argv++);
else {
if (p != buf)
*p++ = ' ';
@@ -162,10 +166,10 @@ main(int argc, char *argv[])
}
}
if (p != buf)
- logmessage(pri, host, svcname, buf);
+ logmessage(pri, tag, host, svcname, buf);
} else
while (fgets(buf, sizeof(buf), stdin) != NULL)
- logmessage(pri, host, svcname, buf);
+ logmessage(pri, tag, host, svcname, buf);
exit(0);
}
@@ -173,7 +177,8 @@ main(int argc, char *argv[])
* Send the message to syslog, either on the local host, or on a remote host
*/
void
-logmessage(int pri, const char *host, const char *svcname, const char *buf)
+logmessage(int pri, const char *tag, const char *host, const char *svcname,
+ const char *buf)
{
static struct socks *socks;
static int nsock = 0;
@@ -217,7 +222,7 @@ logmessage(int pri, const char *host, co
errx(1, socket);
}
- if ((len = asprintf(line, %d%s, pri, buf)) == -1)
+ if ((len = asprintf(line, %d%s: %s, pri, tag, buf)) == -1)
errx(1, asprintf);
lsent = -1;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r220172 - head/usr.sbin/tzsetup
Author: edwin
Date: Wed Mar 30 21:33:23 2011
New Revision: 220172
URL: http://svn.freebsd.org/changeset/base/220172
Log:
Add a menu entry for UTC in the main menu.
PR: bin/156019
Submitted by: Daniel O'Conner
Reviewed by: Garrett Cooper gcoo...@freebsd.org
MFC after:1 week
Modified:
head/usr.sbin/tzsetup/tzsetup.c
Modified: head/usr.sbin/tzsetup/tzsetup.c
==
--- head/usr.sbin/tzsetup/tzsetup.c Wed Mar 30 21:22:25 2011
(r220171)
+++ head/usr.sbin/tzsetup/tzsetup.c Wed Mar 30 21:33:23 2011
(r220172)
@@ -66,10 +66,13 @@ static int usedialog = 1;
static char *chrootenv = NULL;
static voidusage(void);
+static int confirm_zone(const char *filename);
static int continent_country_menu(dialogMenuItem *);
+static int install_zoneinfo_file(const char *zoneinfo_file);
static int set_zone_multi(dialogMenuItem *);
static int set_zone_whole_country(dialogMenuItem *);
static int set_zone_menu(dialogMenuItem *);
+static int set_zone_utc(void);
struct continent {
dialogMenuItem *menu;
@@ -79,7 +82,7 @@ struct continent {
};
static struct continentafrica, america, antarctica, arctic, asia,
atlantic;
-static struct continentaustralia, europe, indian, pacific;
+static struct continentaustralia, europe, indian, pacific, utc;
static struct continent_names {
const char *name;
@@ -94,7 +97,8 @@ static struct continent_names {
{ Australia, australia },
{ Europe, europe },
{ Indian, indian },
- { Pacific,pacific }
+ { Pacific,pacific },
+ { UTC,utc }
};
static struct continent_items {
@@ -110,7 +114,8 @@ static struct continent_items {
{ 7, Australia },
{ 8, Europe },
{ 9, Indian Ocean },
- { 0, Pacific Ocean }
+ { 0, Pacific Ocean },
+ { a, UTC }
};
#defineNCONTINENTS \
@@ -128,6 +133,9 @@ continent_country_menu(dialogMenuItem *c
int menulen;
int rv;
+ if (strcmp(continent-title, UTC) == 0)
+ return set_zone_utc();
+
/* Short cut -- if there's only one country, don't post a menu. */
if (contp-nitems == 1)
return (contp-menu[0].fire(contp-menu[0]));
@@ -502,6 +510,15 @@ set_zone_menu(dialogMenuItem *dmi)
return (DITEM_LEAVE_MENU);
}
+int
+set_zone_utc(void)
+{
+ if (!confirm_zone(NULL))
+ return (DITEM_FAILURE | DITEM_RECREATE);
+
+ return (install_zoneinfo_file(NULL));
+}
+
static int
install_zoneinfo_file(const char *zoneinfo_file)
{
@@ -526,7 +543,8 @@ install_zoneinfo_file(const char *zonein
else
snprintf(prompt, sizeof(prompt),
Creating symbolic link %s to %s,
- path_localtime, zoneinfo_file);
+ path_localtime,
+ zoneinfo_file == NULL ? (UTC) : zoneinfo_file);
if (usedialog)
dialog_notify(prompt);
else
@@ -534,6 +552,22 @@ install_zoneinfo_file(const char *zonein
#endif
if (reallydoit) {
+ if (zoneinfo_file == NULL) {
+ if (unlink(path_localtime) 0 errno != ENOENT) {
+ snprintf(title, sizeof(title), Error);
+ snprintf(prompt, sizeof(prompt),
+Could not delete %s: %s, path_localtime,
+strerror(errno));
+ if (usedialog)
+ dialog_mesgbox(title, prompt, 8, 72);
+ else
+ fprintf(stderr, %s\n, prompt);
+
+ return (DITEM_FAILURE | DITEM_RECREATE);
+ }
+ return (DITEM_LEAVE_MENU);
+ }
+
if (copymode) {
fd1 = open(zoneinfo_file, O_RDONLY, 0);
if (fd1 0) {
@@ -656,7 +690,7 @@ confirm_zone(const char *filename)
struct tm *tm;
int rv;
- setenv(TZ, filename, 1);
+ setenv(TZ, filename == NULL ? : filename, 1);
tzset();
tm = localtime(t);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r219687 - head/contrib/tzdata
Author: edwin Date: Wed Mar 16 03:28:42 2011 New Revision: 219687 URL: http://svn.freebsd.org/changeset/base/219687 Log: MFV of r219685, tzdata2011d - Pacific/Apia will have DST on 2 April instead of 3 April in 2011. - Turkye will go to DST on 28 April instead of 27 April in 2011. - Cuba will go to DST on 20 April in 2011. Obtained from: ftp://elsie.nci.nih.gov/pub/ Modified: head/contrib/tzdata/australasia head/contrib/tzdata/etcetera head/contrib/tzdata/europe head/contrib/tzdata/northamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Wed Mar 16 03:23:46 2011 (r219686) +++ head/contrib/tzdata/australasia Wed Mar 16 03:28:42 2011 (r219687) @@ -1,5 +1,5 @@ # pre -# @(#)australasia 8.22 +# @(#)australasia 8.23 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -509,11 +509,31 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks # backwards from 1:00am to 12:00am +# From Raymond Hughes (2011-03-07) +# I believe this will be posted shortly on the website +# a href=http://www.mcil.gov.ws; +# www.mcil.gov.ws +# /a +# +# PUBLIC NOTICE ON DAYLIGHT SAVING TIME +# +# Pursuant to the Daylight Saving Act 2009 and Cabinets decision, +# businesses and the general public are hereby advised that daylight +# saving time is on the first Saturday of April 2011 (02/04/11). +# +# The public is therefore advised that when the standard time strikes +# the hour of four oclock (4.00am or 0400 Hours) on the 2nd April 2011, +# then all instruments used to measure standard time are to be +# adjusted/changed to three oclock (3:00am or 0300Hrs). +# +# Margaret Fruean ACTING CHIEF EXECUTIVE OFFICER MINISTRY OF COMMERCE, +# INDUSTRY AND LABOUR 28th February 2011 + Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT1950# Samoa Time -11:00 - WST 2010 Sep 26 - -11:00 1:00WSDT2011 Apr 3 1:00 + -11:00 1:00WSDT2011 Apr 2 4:00 -11:00 - WST # Solomon Is Modified: head/contrib/tzdata/etcetera == --- head/contrib/tzdata/etceteraWed Mar 16 03:23:46 2011 (r219686) +++ head/contrib/tzdata/etceteraWed Mar 16 03:28:42 2011 (r219687) @@ -1,5 +1,5 @@ # pre -# @(#)etcetera 8.2 +# @(#)etcetera 8.3 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -36,8 +36,7 @@ Link Etc/GMT Etc/GMT0 # (i.e. west of Greenwich) even though many people would expect it to # mean 4 hours ahead of UTC (i.e. east of Greenwich). # -# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation -# (which is not yet supported by the tz code) allows for +# In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for # TZ='GMT-4+4'; if you want time zone abbreviations conforming to # ISO 8601 you can use TZ='-0400+4'. Thus the commonly-expected # offset is kept within the angle bracket (and is used for display) Modified: head/contrib/tzdata/europe == --- head/contrib/tzdata/europe Wed Mar 16 03:23:46 2011(r219686) +++ head/contrib/tzdata/europe Wed Mar 16 03:28:42 2011(r219687) @@ -1,5 +1,5 @@ # pre -# @(#)europe 8.27 +# @(#)europe 8.28 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -2483,25 +2483,18 @@ ZoneEurope/Zurich 0:34:08 - LMT 1848 Se # (on a non-government server though) describing dates between 2002 and 2006: # http://www.alomaliye.com/bkk_2002_3769.htm -# From Sue Williams (2008-08-11): -# I spotted this news article about a potential change in Turkey. -# -# a href=http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1; -# http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1 +# From Gouml;kdeniz Karada#x011f; (2011-03-10): +# +# According to the articles linked below, Turkey will change into summer +# time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27. +# This change is due to a nationwide exam on 27th. +# +# a href=http://www.worldbulletin.net/?aType=haberArticleID=70872; +# http://www.worldbulletin.net/?aType=haberArticleID=70872 # /a - -# From Sue Williams (2008-08-20): -# This article says that around the end of March 2011, Turkey wants to -# adjust the clocks forward by 1/2 hour and stay that way permanently. -# The article indicates that this is a change
svn commit: r218122 - head/contrib/tzdata
Author: edwin Date: Mon Jan 31 09:22:49 2011 New Revision: 218122 URL: http://svn.freebsd.org/changeset/base/218122 Log: MFV of tzdata2011a, r218120 - Cleanup rules for Australia/South_Australia (nothing changed) - Add historical information for Honolulu. Modified: head/contrib/tzdata/australasia head/contrib/tzdata/northamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Mon Jan 31 09:18:32 2011 (r218121) +++ head/contrib/tzdata/australasia Mon Jan 31 09:22:49 2011 (r218122) @@ -1,5 +1,5 @@ # pre -# @(#)australasia 8.20 +# @(#)australasia 8.22 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -84,14 +84,13 @@ RuleAS 1986only- Oct 19 2:00s 1:00- Rule AS 19872007- Oct lastSun 2:00s 1:00- Rule AS 1972only- Feb 27 2:00s 0 - Rule AS 19731985- Mar Sun=1 2:00s 0 - -Rule AS 19861989- Mar Sun=15 2:00s 0 - -Rule AS 1990only- Mar Sun=18 2:00s 0 - -Rule AS 1991only- Mar Sun=1 2:00s 0 - -Rule AS 1992only- Mar Sun=18 2:00s 0 - -Rule AS 1993only- Mar Sun=1 2:00s 0 - -Rule AS 1994only- Mar Sun=18 2:00s 0 - +Rule AS 19861990- Mar Sun=15 2:00s 0 - +Rule AS 1991only- Mar 3 2:00s 0 - +Rule AS 1992only- Mar 22 2:00s 0 - +Rule AS 1993only- Mar 7 2:00s 0 - +Rule AS 1994only- Mar 20 2:00s 0 - Rule AS 19952005- Mar lastSun 2:00s 0 - -Rule AS 2006only- Apr Sun=1 2:00s 0 - +Rule AS 2006only- Apr 2 2:00s 0 - Rule AS 2007only- Mar lastSun 2:00s 0 - Rule AS 2008max - Apr Sun=1 2:00s 0 - Rule AS 2008max - Oct Sun=1 2:00s 1:00- Modified: head/contrib/tzdata/northamerica == --- head/contrib/tzdata/northamericaMon Jan 31 09:18:32 2011 (r218121) +++ head/contrib/tzdata/northamericaMon Jan 31 09:22:49 2011 (r218122) @@ -1,5 +1,5 @@ # pre -# @(#)northamerica 8.34 +# %W% # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -471,20 +471,50 @@ Zone America/Adak 12:13:21 - LMT 1867 O # three votes for and one against. # Hawaii -# -# From Arthur David Olson: -# And then there's Hawaii. -# DST was observed for one day in 1933; -# standard time was changed by half an hour in 1947; -# it's always standard as of 1986. -# -# From Paul Eggert: -# Shanks says the 1933 experiment lasted for three weeks. Go with Shanks. -# -Zone Pacific/Honolulu -10:31:26 - LMT 1900 Jan 1 12:00 - -10:30 - HST 1933 Apr 30 2:00 - -10:30 1:00HDT 1933 May 21 2:00 - -10:30 US H%sT1947 Jun 8 2:00 + +# From Arthur David Olson (2010-12-09): +# Hawaiian Time by Robert C. Schmitt and Doak C. Cox appears on pages 207-225 +# of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09, +# the article is available at +# a href=http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf; +# http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf +# /a +# and indicates that standard time was adopted effective noon, January +# 13, 1896 (page 218), that in 1933, the Legislature decreed daylight +# saving for the period between the last Sunday of each April and the +# last Sunday of each September, but less than a month later repealed the +# act, (page 220), that year-round daylight saving time was in effect +# from 1942-02-09 to 1945-09-30 (page 221, with no time of day given for +# when clocks changed) and that clocks were changed by 30 minutes +# effective the second Sunday of June, 1947 (page 219, with no time of +# day given for when clocks changed). A footnote for the 1933 changes +# cites Session Laws of Hawaii 1933, Act. 90 (approved 26 Apr. 1933) +# and Act 163 (approved 21 May 1933). + +# From Arthur David Olson (2011-01-19): +# The following is from Laws of the Territory of Hawaii Passed by the +# Seventeenth Legislature: Regular Session 1933, available (as of +# 2011-01-19) at American University's Pence Law Library. Page 85: Act +# 90...At 2 o'clock ante meridian of
svn commit: r214722 - head/contrib/tzdata
Author: edwin Date: Wed Nov 3 01:30:56 2010 New Revision: 214722 URL: http://svn.freebsd.org/changeset/base/214722 Log: MFV of tzdata2010o, r214716 - Fiji moves to DST three weeks earlier in 2010. Modified: head/contrib/tzdata/australasia Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Wed Nov 3 01:28:57 2010 (r214721) +++ head/contrib/tzdata/australasia Wed Nov 3 01:30:56 2010 (r214722) @@ -1,5 +1,5 @@ # pre -# @(#)australasia 8.18 +# @(#)australasia 8.20 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -284,13 +284,26 @@ Zone Indian/Cocos6:27:40 - LMT 1900 # http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html # /a +# From Alexander Krivenyshev (2010-10-24): +# According to Radio Fiji and Fiji Times online, Fiji will end DST 3 +# weeks earlier than expected - on March 6, 2011, not March 27, 2011... +# Here is confirmation from Government of the Republic of the Fiji Islands, +# Ministry of Information (fiji.gov.fj) web site: +# a href=http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=2608:daylight-savingscatid=71:press-releasesItemid=155; +# http://www.fiji.gov.fj/index.php?option=com_contentview=articleid=2608:daylight-savingscatid=71:press-releasesItemid=155 +# /a +# or +# a href=http://www.worldtimezone.com/dst_news/dst_news_fiji04.html; +# http://www.worldtimezone.com/dst_news/dst_news_fiji04.html +# /a + # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Fiji19981999- Nov Sun=1 2:001:00S Rule Fiji19992000- Feb lastSun 3:000 - Rule Fiji2009only- Nov 29 2:001:00S Rule Fiji2010only- Mar lastSun 3:000 - Rule Fiji2010only- Oct 24 2:001:00S -Rule Fiji2011only- Mar lastSun 3:000 - +Rule Fiji2011only- Mar Sun=1 3:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Pacific/Fiji11:53:40 - LMT 1915 Oct 26 # Suva 12:00 FijiFJ%sT # Fiji Time @@ -487,11 +500,21 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1 # http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf # /a +# From Raymond Hughes (2010-10-07): +# Please see +# a href=http://www.mcil.gov.ws; +# http://www.mcil.gov.ws +# /a, +# the Ministry of Commerce, Industry and Labour (sideframe) Last Sunday +# September 2010 (26/09/10) - adjust clocks forward from 12:00 midnight +# to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks +# backwards from 1:00am to 12:00am + Zone Pacific/Apia 12:33:04 - LMT 1879 Jul 5 -11:26:56 - LMT 1911 -11:30 - SAMT1950# Samoa Time -11:00 - WST 2010 Sep 26 - -11:00 1:00WSDT2011 Apr 3 + -11:00 1:00WSDT2011 Apr 3 1:00 -11:00 - WST # Solomon Is ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r214411 - in head/contrib/tzcode: stdtime zic
Author: edwin
Date: Wed Oct 27 07:14:46 2010
New Revision: 214411
URL: http://svn.freebsd.org/changeset/base/214411
Log:
Sync code with tzcode2010m
asctime.c:
* Set errno to EINVAL and return ??? ??? ?? ??:??:?? \n if
asctime_r is called with a NULL struct tm pointer. (Note that
asctime_r is called by ctime_r and asctime; asctime is called by
ctime.)
localtime.c:
* Set errno to EINVAL and return WRONG if time1 is called with a
NULL struct tm pointer; avoid dereference if a NULL struct tm
pointer is passed to timelocal, timegm, or timeoff. (Note that
time1 is called by mktime, timegm, and timeoff; mktime is called
by timelocal.)
* more core-avoidance work
* Change to set timezone and altzone based on time types with
greatest transition times (for the benefit of Asia/Seoul).
zic.8:
* Warning about case-sensitivity of names, but not of abbrevations
zic.c:
* Conditionally output extra types with most-recently-use offsets
last (for use by systems with pre-2011 versions of localtime.c,
helping to ensure that globals altzone and timezone get set
correctly).
The code has been running for nearly four weeks on my laptop running
FreeBSD 8.1 without a problem.
MFC after:1 month
Modified:
head/contrib/tzcode/stdtime/asctime.c
head/contrib/tzcode/stdtime/localtime.c
head/contrib/tzcode/zic/zic.8
head/contrib/tzcode/zic/zic.c
Modified: head/contrib/tzcode/stdtime/asctime.c
==
--- head/contrib/tzcode/stdtime/asctime.c Wed Oct 27 04:19:07 2010
(r214410)
+++ head/contrib/tzcode/stdtime/asctime.c Wed Oct 27 07:14:46 2010
(r214411)
@@ -12,7 +12,7 @@
#include sys/cdefs.h
#ifndef lint
#ifndef NOID
-static charelsieid[] __unused = @(#)asctime.c 8.2;
+static charelsieid[] __unused = @(#)asctime.c 8.5;
#endif /* !defined NOID */
#endif /* !defined lint */
__FBSDID($FreeBSD$);
@@ -95,6 +95,10 @@ char * buf;
charyear[INT_STRLEN_MAXIMUM(int) + 2];
charresult[MAX_ASCTIME_BUF_SIZE];
+ if (timeptr == NULL) {
+ errno = EINVAL;
+ return strcpy(buf, ??? ??? ?? ??:??:?? \n);
+ }
if (timeptr-tm_wday 0 || timeptr-tm_wday = DAYSPERWEEK)
wn = ???;
elsewn = wday_name[timeptr-tm_wday];
@@ -117,10 +121,9 @@ char * buf;
timeptr-tm_mday, timeptr-tm_hour,
timeptr-tm_min, timeptr-tm_sec,
year);
- if (strlen(result) STD_ASCTIME_BUF_SIZE || buf == buf_asctime) {
- (void) strcpy(buf, result);
- return buf;
- } else {
+ if (strlen(result) STD_ASCTIME_BUF_SIZE || buf == buf_asctime)
+ return strcpy(buf, result);
+ else {
#ifdef EOVERFLOW
errno = EOVERFLOW;
#else /* !defined EOVERFLOW */
Modified: head/contrib/tzcode/stdtime/localtime.c
==
--- head/contrib/tzcode/stdtime/localtime.c Wed Oct 27 04:19:07 2010
(r214410)
+++ head/contrib/tzcode/stdtime/localtime.c Wed Oct 27 07:14:46 2010
(r214411)
@@ -6,7 +6,7 @@
#include sys/cdefs.h
#ifndef lint
#ifndef NOID
-static charelsieid[] __unused = @(#)localtime.c 8.9;
+static charelsieid[] __unused = @(#)localtime.c 8.14;
#endif /* !defined NOID */
#endif /* !defined lint */
__FBSDID($FreeBSD$);
@@ -315,34 +315,26 @@ settzname(void)
return;
}
#endif /* defined ALL_STATE */
+ /*
+ ** And to get the latest zone names into tzname. . .
+ */
for (i = 0; i sp-typecnt; ++i) {
- const struct ttinfo * const ttisp = sp-ttis[i];
+ const struct ttinfo * const ttisp = sp-ttis[sp-types[i]];
tzname[ttisp-tt_isdst] =
sp-chars[ttisp-tt_abbrind];
#ifdef USG_COMPAT
if (ttisp-tt_isdst)
daylight = 1;
- if (i == 0 || !ttisp-tt_isdst)
+ if (!ttisp-tt_isdst)
timezone = -(ttisp-tt_gmtoff);
#endif /* defined USG_COMPAT */
#ifdef ALTZONE
- if (i == 0 || ttisp-tt_isdst)
+ if (ttisp-tt_isdst)
altzone = -(ttisp-tt_gmtoff);
#endif /* defined ALTZONE */
}
/*
- ** And to get the latest zone names into tzname. . .
- */
- for (i = 0; i sp-timecnt; ++i) {
- const struct ttinfo * const ttisp =
- sp-ttis[
- sp-types[i]];
-
- tzname[ttisp-tt_isdst] =
- sp-chars[ttisp-tt_abbrind];
- }
- /*
** Finally, scrub
svn commit: r214124 - head/usr.sbin/lpr/lpr
Author: edwin
Date: Thu Oct 21 06:52:14 2010
New Revision: 214124
URL: http://svn.freebsd.org/changeset/base/214124
Log:
Fix printing of files located on ZFS filesystem with an st_dev or
st_ino larger than 2**31.
From the PR:
Printing from a ZFS filesystem using 'lp' fails and returns an
email reporting Your printer job was not printed because it was
not linked to the original file.
In order to protect against files being switched when files
are printed using 'lp' or 'lpr -s', the st_dev and st_ino
values for the original file are saved by lpr and verified
by lpd before the file is printed. Unfortunately, lpr prints
both values using '%d' (although both fields are unsigned)
and lpd(8) assumes a string of decimal digits.
ZFS (at least) generates st_dev values greater than 2^31-1,
resulting in negative values being printed - which lpd cannot
parse, leading it to report that the file has been switched.
A similar problem would occur with large inode numbers.
How-To-Repeat:
Find a file with either st_dev or st_ino greater than 2^31-1
(stat(1) will report both numbers) and print it with 'lpq -s'.
This should generate an email reporting that the file could
not be printed because it was not linked to the original file
PR: bin/151567
Submitted by: Peter Jeremy peter.jer...@alcatel-lucent.com
MFC after:1 week
Modified:
head/usr.sbin/lpr/lpr/lpr.c
Modified: head/usr.sbin/lpr/lpr/lpr.c
==
--- head/usr.sbin/lpr/lpr/lpr.c Thu Oct 21 01:13:41 2010(r214123)
+++ head/usr.sbin/lpr/lpr/lpr.c Thu Oct 21 06:52:14 2010(r214124)
@@ -386,7 +386,7 @@ main(int argc, char *argv[])
continue; /* file unreasonable */
if (sflag (cp = linked(arg)) != NULL) {
- (void) snprintf(buf, sizeof(buf), %d %d, statb.st_dev,
+ (void) snprintf(buf, sizeof(buf), %u %u, statb.st_dev,
statb.st_ino);
card('S', buf);
if (format == 'p')
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r214002 - head/usr.bin/uudecode
Author: edwin
Date: Mon Oct 18 03:59:55 2010
New Revision: 214002
URL: http://svn.freebsd.org/changeset/base/214002
Log:
Stylify of uudecode(1)
Part of PR bin/124739.
PR: bin/124739
Submitted by: Mark Andrews ma...@isc.org
Modified:
head/usr.bin/uudecode/uudecode.c
Modified: head/usr.bin/uudecode/uudecode.c
==
--- head/usr.bin/uudecode/uudecode.cMon Oct 18 03:34:33 2010
(r214001)
+++ head/usr.bin/uudecode/uudecode.cMon Oct 18 03:59:55 2010
(r214002)
@@ -87,7 +87,7 @@ main(int argc, char *argv[])
base64 = 1;
while ((ch = getopt(argc, argv, cimo:prs)) != -1) {
- switch(ch) {
+ switch (ch) {
case 'c':
if (oflag || rflag)
usage();
@@ -125,10 +125,10 @@ main(int argc, char *argv[])
usage();
}
}
-argc -= optind;
-argv += optind;
+ argc -= optind;
+ argv += optind;
- if (*argv) {
+ if (*argv != NULL) {
rval = 0;
do {
infp = fopen(infile = *argv, r);
@@ -184,7 +184,7 @@ decode2(void)
void *handle;
struct passwd *pw;
struct stat st;
- char buf[MAXPATHLEN+1];
+ char buf[MAXPATHLEN + 1];
base64 = 0;
/* search for header line */
@@ -259,7 +259,7 @@ decode2(void)
if (pflag || strcmp(outfile, /dev/stdout) == 0)
outfp = stdout;
else {
- flags = O_WRONLY|O_CREAT|O_EXCL;
+ flags = O_WRONLY | O_CREAT | O_EXCL;
if (lstat(outfile, st) == 0) {
if (iflag) {
warnc(EEXIST, %s: %s, infile, outfile);
@@ -305,6 +305,7 @@ decode2(void)
static int
getline(char *buf, size_t size)
{
+
if (fgets(buf, size, infp) != NULL)
return (2);
if (rflag)
@@ -341,17 +342,19 @@ uu_decode(void)
/* for each input line */
for (;;) {
switch (getline(buf, sizeof(buf))) {
- case 0: return (0);
- case 1: return (1);
+ case 0:
+ return (0);
+ case 1:
+ return (1);
}
-#defineDEC(c) (((c) - ' ') 077) /* single character
decode */
-#define IS_DEC(c) ( (((c) - ' ') = 0) (((c) - ' ') = 077 + 1) )
+#defineDEC(c) (((c) - ' ') 077) /* single character
decode */
+#define IS_DEC(c) ( (((c) - ' ') = 0) (((c) - ' ') = 077 + 1) )
#define OUT_OF_RANGE do { \
warnx(%s: %s: character out of range: [%d-%d],\
infile, outfile, 1 + ' ', 077 + ' ' + 1); \
-return (1);\
+ return (1); \
} while (0)
/*
@@ -364,8 +367,8 @@ uu_decode(void)
for (++p; i 0; p += 4, i -= 3)
if (i = 3) {
if (!(IS_DEC(*p) IS_DEC(*(p + 1))
-IS_DEC(*(p + 2)) IS_DEC(*(p + 3
- OUT_OF_RANGE;
+ IS_DEC(*(p + 2)) IS_DEC(*(p + 3
+ OUT_OF_RANGE;
ch = DEC(p[0]) 2 | DEC(p[1]) 4;
putc(ch, outfp);
@@ -373,8 +376,7 @@ uu_decode(void)
putc(ch, outfp);
ch = DEC(p[2]) 6 | DEC(p[3]);
putc(ch, outfp);
- }
- else {
+ } else {
if (i = 1) {
if (!(IS_DEC(*p) IS_DEC(*(p + 1
OUT_OF_RANGE;
@@ -383,25 +385,28 @@ uu_decode(void)
}
if (i = 2) {
if (!(IS_DEC(*(p + 1))
- IS_DEC(*(p + 2
- OUT_OF_RANGE;
+ IS_DEC(*(p + 2
+ OUT_OF_RANGE;
ch = DEC(p[1]) 4 | DEC(p[2]) 2;
putc(ch, outfp);
}
if (i = 3) {
if (!(IS_DEC(*(p + 2))
- IS_DEC(*(p + 3
- OUT_OF_RANGE;
+
svn commit: r214010 - head/usr.bin/uudecode
Author: edwin
Date: Mon Oct 18 05:44:11 2010
New Revision: 214010
URL: http://svn.freebsd.org/changeset/base/214010
Log:
b64decode -r did not handle arbitary breaks in base64 encoded
data. White space should be accepted anywhere in a base64 encoded
stream, not just after every chunk (4 characters).
Test-scenario:
VmVsb2NpdHkgUmV3YXJkcw==
and
VmVsb2NpdHkgUmV3YXJkcw
==
should both produce Velocity Rewards
PR: bin/124739
Submitted by: Mark Andrews ma...@isc.org
MFC after:2 weeks
Modified:
head/usr.bin/uudecode/uudecode.c
Modified: head/usr.bin/uudecode/uudecode.c
==
--- head/usr.bin/uudecode/uudecode.cMon Oct 18 05:16:44 2010
(r214009)
+++ head/usr.bin/uudecode/uudecode.cMon Oct 18 05:44:11 2010
(r214010)
@@ -57,6 +57,7 @@ __FBSDID($FreeBSD$);
#include netinet/in.h
+#include ctype.h
#include err.h
#include errno.h
#include fcntl.h
@@ -413,15 +414,40 @@ uu_decode(void)
static int
base64_decode(void)
{
- int n;
- char inbuf[MAXPATHLEN + 1];
+ int n, count, count4;
+ char inbuf[MAXPATHLEN + 1], *p;
unsigned char outbuf[MAXPATHLEN * 4];
+ char leftover[MAXPATHLEN + 1];
+ leftover[0] = '\0';
for (;;) {
- switch (getline(inbuf, sizeof(inbuf))) {
- case 0: return (0);
- case 1: return (1);
+ strcpy(inbuf, leftover);
+ switch (getline(inbuf + strlen(inbuf),
+ sizeof(inbuf) - strlen(inbuf))) {
+ case 0:
+ return (0);
+ case 1:
+ return (1);
}
+
+ count = 0;
+ count4 = -1;
+ p = inbuf;
+ while (*p != '\0') {
+ /*
+* Base64 encoded strings have the following
+* characters in them: A-Z, a-z, 0-9 and +, / and =
+*/
+ if (isalnum(*p) || *p == '+' || *p == '/' || *p == '=')
+ count++;
+ if (count % 4 == 0)
+ count4 = p - inbuf;
+ p++;
+ }
+
+ strcpy(leftover, inbuf + count4 + 1);
+ inbuf[count4 + 1] = 0;
+
n = b64_pton(inbuf, outbuf, sizeof(outbuf));
if (n 0)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r213875 - in head/usr.bin/calendar: . calendars
Author: edwin Date: Thu Oct 14 21:53:25 2010 New Revision: 213875 URL: http://svn.freebsd.org/changeset/base/213875 Log: Update manual with regarding to the status of calendars/calendar.judaic. Modified: head/usr.bin/calendar/calendar.1 head/usr.bin/calendar/calendars/calendar.judaic Modified: head/usr.bin/calendar/calendar.1 == --- head/usr.bin/calendar/calendar.1Thu Oct 14 21:51:53 2010 (r213874) +++ head/usr.bin/calendar/calendar.1Thu Oct 14 21:53:25 2010 (r213875) @@ -257,8 +257,8 @@ Other holidays, including the not-well-k obscure. .It Pa calendar.judaic Jewish holidays. -This calendar should be updated yearly by the local system administrator -so that roving holidays are set correctly for the current year. +The entries for this calendar have been obtained from the port +deskutils/hebcal. .It Pa calendar.music Musical events, births, and deaths. Strongly oriented toward rock 'n' roll. Modified: head/usr.bin/calendar/calendars/calendar.judaic == --- head/usr.bin/calendar/calendars/calendar.judaic Thu Oct 14 21:51:53 2010(r213874) +++ head/usr.bin/calendar/calendars/calendar.judaic Thu Oct 14 21:53:25 2010(r213875) @@ -13,9 +13,8 @@ #define _calendar_judaic_ /* - * The calendar below has gotten from the port deskutils/hebcal for - * the year of 2010 and for the city of New York. - * This should be updated every year! + * The calendar below has been obtained from the port deskutils/hebcal + * for the year of 2010 to 2015 and for the city of New York. */ 2010/Jan/16* Rosh Chodesh Sh'vat ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r213312 - head/contrib/tzdata
Author: edwin Date: Thu Sep 30 22:00:21 2010 New Revision: 213312 URL: http://svn.freebsd.org/changeset/base/213312 Log: MFV of 213310, tzdata2010m - Fix historical data for Hongkong - Fix location description for Antarctica/Vostok Modified: head/contrib/tzdata/asia head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaThu Sep 30 21:57:09 2010(r213311) +++ head/contrib/tzdata/asiaThu Sep 30 22:00:21 2010(r213312) @@ -1,4 +1,4 @@ -# @(#)asia 8.61 +# @(#)asia 8.62 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -547,8 +547,8 @@ RuleHK 1953only- Nov 1 3:300 - Rule HK 19541964- Mar Sun=18 3:301:00S Rule HK 1954only- Oct 31 3:300 - Rule HK 19551964- Nov Sun=1 3:300 - -Rule HK 19651977- Apr Sun=16 3:301:00S -Rule HK 19651977- Oct Sun=16 3:300 - +Rule HK 19651976- Apr Sun=16 3:301:00S +Rule HK 19651976- Oct Sun=16 3:300 - Rule HK 1973only- Dec 30 3:301:00S Rule HK 1979only- May Sun=8 3:301:00S Rule HK 1979only- Oct Sun=16 3:300 - Modified: head/contrib/tzdata/zone.tab == --- head/contrib/tzdata/zone.tabThu Sep 30 21:57:09 2010 (r213311) +++ head/contrib/tzdata/zone.tabThu Sep 30 22:00:21 2010 (r213312) @@ -1,5 +1,5 @@ # pre -# @(#)zone.tab 8.37 +# @(#)zone.tab 8.38 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # @@ -41,7 +41,7 @@ AQ-6448-06406 Antarctica/Palmer Palmer AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay AQ -6835+07758 Antarctica/DavisDavis Station, Vestfold Hills AQ -6617+11031 Antarctica/CaseyCasey Station, Bailey Peninsula -AQ -7824+10654 Antarctica/Vostok Vostok Station, S Magnetic Pole +AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -690022+0393524 Antarctica/SyowaSyowa Station, E Ongul I AQ -5430+15857 Antarctica/MacquarieMacquarie Island Station, Macquarie Island ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r213032 - head/usr.bin/calendar/calendars
Author: edwin Date: Wed Sep 22 21:10:45 2010 New Revision: 213032 URL: http://svn.freebsd.org/changeset/base/213032 Log: Fix location of the Battle of the Plains of Abraham PR: 150504 Submitted by: Douglas Berry bit...@bitnix.ca MFC after:1 week Modified: head/usr.bin/calendar/calendars/calendar.history Modified: head/usr.bin/calendar/calendars/calendar.history == --- head/usr.bin/calendar/calendars/calendar.historyWed Sep 22 21:06:43 2010(r213031) +++ head/usr.bin/calendar/calendars/calendar.historyWed Sep 22 21:10:45 2010(r213032) @@ -303,7 +303,7 @@ 09/12 German paratroopers rescue Mussolini from captivity in Rome, 1943 09/12 Germany annexes Sudetenland, 1938 09/13 58� C (136.4� F) measured at el Azizia, Libya, 1922 -09/13 British defeat the French at Abraham near Quebec City, 1788 +09/13 British defeat the French at the Plains of Abraham near Quebec City, 1788 09/13 Building of Hadrian's Wall begun, 122 09/13 Chiang Kai-Shek becomes president of China, 1943 09/14 Benjamin Franklin is sent to France as an American minister, 1778 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r213033 - head/usr.bin/calendar/calendars
Author: edwin Date: Wed Sep 22 21:14:18 2010 New Revision: 213033 URL: http://svn.freebsd.org/changeset/base/213033 Log: And now the 2nd part of the patch: Also fix the year. PR: 150504 Submitted by: Douglas Berry bit...@bitnix.ca Modified: head/usr.bin/calendar/calendars/calendar.history Modified: head/usr.bin/calendar/calendars/calendar.history == --- head/usr.bin/calendar/calendars/calendar.historyWed Sep 22 21:10:45 2010(r213032) +++ head/usr.bin/calendar/calendars/calendar.historyWed Sep 22 21:14:18 2010(r213033) @@ -303,7 +303,7 @@ 09/12 German paratroopers rescue Mussolini from captivity in Rome, 1943 09/12 Germany annexes Sudetenland, 1938 09/13 58� C (136.4� F) measured at el Azizia, Libya, 1922 -09/13 British defeat the French at the Plains of Abraham near Quebec City, 1788 +09/13 British defeat the French at the Plains of Abraham, just outside the walls of Quebec City, 1759 09/13 Building of Hadrian's Wall begun, 122 09/13 Chiang Kai-Shek becomes president of China, 1943 09/14 Benjamin Franklin is sent to France as an American minister, 1778 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r211517 - head/usr.bin/calendar
Author: edwin
Date: Thu Aug 19 21:59:39 2010
New Revision: 211517
URL: http://svn.freebsd.org/changeset/base/211517
Log:
'\0' - 0
Fix silly mistake by being overly zeaolous[sp] of applying the style rules.
Modified:
head/usr.bin/calendar/locale.c
Modified: head/usr.bin/calendar/locale.c
==
--- head/usr.bin/calendar/locale.c Thu Aug 19 17:00:33 2010
(r211516)
+++ head/usr.bin/calendar/locale.c Thu Aug 19 21:59:39 2010
(r211517)
@@ -76,7 +76,7 @@ setnnames(void)
int i, l;
struct tm tm;
- memset(tm, '\0', sizeof(struct tm));
+ memset(tm, 0, sizeof(struct tm));
for (i = 0; i 7; i++) {
tm.tm_wday = i;
strftime(buf, sizeof(buf), %a, tm);
@@ -104,7 +104,7 @@ setnnames(void)
fndays[i].len = strlen(buf);
}
- memset(tm, '\0', sizeof(struct tm));
+ memset(tm, 0, sizeof(struct tm));
for (i = 0; i 12; i++) {
tm.tm_mon = i;
strftime(buf, sizeof(buf), %b, tm);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r211422 - head/contrib/tzdata
Author: edwin Date: Tue Aug 17 12:10:35 2010 New Revision: 211422 URL: http://svn.freebsd.org/changeset/base/211422 Log: MFV of r211420, tzdata2010l - Fix start times of DST for Egypt. - clocks were set back one hour at 2010-08-11 00:00:00 local time in Gaza and the West Bank. Obtained from: ftp://elsie.nci.nih.gov/pub/ Modified: head/contrib/tzdata/africa head/contrib/tzdata/asia Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Tue Aug 17 12:05:48 2010(r211421) +++ head/contrib/tzdata/africa Tue Aug 17 12:10:35 2010(r211422) @@ -1,5 +1,5 @@ # pre -# @(#)africa 8.27 +# @(#)africa 8.28 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -311,8 +311,8 @@ RuleEgypt 2007only- Sep Thu=1 23:00s Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - -Rule Egypt 2010only- Aug 10 23:00s 0 - -Rule Egypt 2010only- Sep 9 0:00s 1:00S +Rule Egypt 2010only- Aug 11 0:000 - +Rule Egypt 2010only- Sep 10 0:001:00S Rule Egypt 2010max - Sep lastThu 23:00s 0 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaTue Aug 17 12:05:48 2010(r211421) +++ head/contrib/tzdata/asiaTue Aug 17 12:10:35 2010(r211422) @@ -1,4 +1,4 @@ -# @(#)asia 8.60 +# @(#)asia 8.61 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -2178,6 +2178,18 @@ Zone Asia/Karachi4:28:12 - LMT 1907 # At 12:01am Friday, clocks in Israel and the West Bank will change to # 1:01am, while Gaza clocks will change at 12:01am Saturday morning. +# From Steffen Thorsen (2010-08-11): +# According to several sources, including +# a href=http://www.maannews.net/eng/ViewDetails.aspx?ID=306795; +# http://www.maannews.net/eng/ViewDetails.aspx?ID=306795 +# /a +# the clocks were set back one hour at 2010-08-11 00:00:00 local time in +# Gaza and the West Bank. +# Some more background info: +# a href=http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html; +# http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html +# /a + # The rules for Egypt are stolen from the `africa' file. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule EgyptAsia 1957only- May 10 0:001:00S @@ -2198,6 +2210,7 @@ Rule Palestine2008only- Aug lastFri 2 Rule Palestine 2009only- Mar lastFri 0:001:00S Rule Palestine 2010max - Mar lastSat 0:011:00S Rule Palestine 2009max - Sep Fri=1 2:000 - +Rule Palestine 2010only- Aug 11 0:000 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r210718 - head/contrib/tzdata
Author: edwin Date: Sun Aug 1 09:03:10 2010 New Revision: 210718 URL: http://svn.freebsd.org/changeset/base/210718 Log: MFV of r210716, tzdata2010k - Daylight Saving Time will not be used in Egypt during Ramadan. - Proper names for Pacific/Pohnpei and Pacific/Chuuk - Fix historical information for Finland for 1981 and 1982 - No leap-second for December 2010. - Fix historical information for Ontario (Canada) Modified: head/contrib/tzdata/africa head/contrib/tzdata/australasia head/contrib/tzdata/backward head/contrib/tzdata/europe head/contrib/tzdata/leapseconds head/contrib/tzdata/northamerica head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Sun Aug 1 08:57:30 2010(r210717) +++ head/contrib/tzdata/africa Sun Aug 1 09:03:10 2010(r210718) @@ -1,5 +1,5 @@ # pre -# @(#)africa 8.26 +# @(#)africa 8.27 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -294,8 +294,25 @@ Rule Egypt 2007only- Sep Thu=1 23:00s # and can be found by searching for winter in their search engine # (at least today). +# From Alexander Krivenyshev (2010-07-20): +# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has +# decided that Daylight Saving Time will not be used in Egypt during +# Ramadan. +# +# Arabic translation: +# Clocks to go back during Ramadan--and then forward again +# a href=http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again; +# http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again +# /a +# or +# a href=http://www.worldtimezone.com/dst_news/dst_news_egypt02.html; +# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html +# /a + Rule Egypt 2008only- Aug lastThu 23:00s 0 - Rule Egypt 2009only- Aug 20 23:00s 0 - +Rule Egypt 2010only- Aug 10 23:00s 0 - +Rule Egypt 2010only- Sep 9 0:00s 1:00S Rule Egypt 2010max - Sep lastThu 23:00s 0 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Modified: head/contrib/tzdata/australasia == --- head/contrib/tzdata/australasia Sun Aug 1 08:57:30 2010 (r210717) +++ head/contrib/tzdata/australasia Sun Aug 1 09:03:10 2010 (r210718) @@ -1,5 +1,5 @@ # pre -# @(#)australasia 8.17 +# @(#)australasia 8.18 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -346,10 +346,10 @@ Zone Pacific/Kwajalein11:09:20 - LMT 19 # Micronesia # Zone NAMEGMTOFF RULES FORMAT [UNTIL] -Zone Pacific/Truk 10:07:08 - LMT 1901 - 10:00 - TRUT# Truk Time -Zone Pacific/Ponape10:32:52 - LMT 1901# Kolonia - 11:00 - PONT# Ponape Time +Zone Pacific/Chuuk 10:07:08 - LMT 1901 + 10:00 - CHUT# Chuuk Time +Zone Pacific/Pohnpei 10:32:52 - LMT 1901# Kolonia + 11:00 - PONT# Pohnpei Time Zone Pacific/Kosrae10:51:56 - LMT 1901 11:00 - KOST1969 Oct# Kosrae Time 12:00 - KOST1999 Modified: head/contrib/tzdata/backward == --- head/contrib/tzdata/backwardSun Aug 1 08:57:30 2010 (r210717) +++ head/contrib/tzdata/backwardSun Aug 1 09:03:10 2010 (r210718) @@ -1,5 +1,5 @@ # pre -# @(#)backward 8.8 +# @(#)backward 8.9 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -90,7 +90,9 @@ Link Pacific/Chatham NZ-CHAT Link America/Denver Navajo Link Asia/Shanghai PRC Link Pacific/Pago_Pago Pacific/Samoa -Link Pacific/TrukPacific/Yap +Link Pacific/Chuuk Pacific/Yap +Link Pacific/Chuuk Pacific/Truk +Link Pacific/Pohnpei Pacific/Ponape Link Europe/Warsaw Poland Link Europe/Lisbon Portugal Link Asia/Taipei ROC Modified: head/contrib/tzdata/europe == --- head/contrib/tzdata/europe Sun Aug 1 08:57:30 2010(r210717) +++ head/contrib/tzdata/europe Sun Aug 1 09:03:10 2010(r210718) @@ -1,5 +1,5 @@ # pre -# @(#)europe 8.26 +# @(#)europe 8.27
svn commit: r208943 - head/usr.bin/calendar
Author: edwin
Date: Wed Jun 9 10:36:25 2010
New Revision: 208943
URL: http://svn.freebsd.org/changeset/base/208943
Log:
fix memset() calls.
Found with: Coverity Prevent(tm)
CID: 8531
Modified:
head/usr.bin/calendar/locale.c
Modified: head/usr.bin/calendar/locale.c
==
--- head/usr.bin/calendar/locale.c Wed Jun 9 10:14:43 2010
(r208942)
+++ head/usr.bin/calendar/locale.c Wed Jun 9 10:36:25 2010
(r208943)
@@ -76,7 +76,7 @@ setnnames(void)
int i, l;
struct tm tm;
- memset(tm, sizeof(struct tm), 0);
+ memset(tm, '\0', sizeof(struct tm));
for (i = 0; i 7; i++) {
tm.tm_wday = i;
strftime(buf, sizeof(buf), %a, tm);
@@ -104,7 +104,7 @@ setnnames(void)
fndays[i].len = strlen(buf);
}
- memset(tm, sizeof(struct tm), 0);
+ memset(tm, '\0', sizeof(struct tm));
for (i = 0; i 12; i++) {
tm.tm_mon = i;
strftime(buf, sizeof(buf), %b, tm);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208825 - head/usr.bin/calendar
Author: edwin Date: Sat Jun 5 11:06:56 2010 New Revision: 208825 URL: http://svn.freebsd.org/changeset/base/208825 Log: Properly check the return value of chdir, even if it is a this should not happen case. Found with: Coverity Prevent(tm) CID: 4932 Modified: head/usr.bin/calendar/io.c Modified: head/usr.bin/calendar/io.c == --- head/usr.bin/calendar/io.c Sat Jun 5 10:16:23 2010(r208824) +++ head/usr.bin/calendar/io.c Sat Jun 5 11:06:56 2010(r208825) @@ -226,7 +226,8 @@ opencal(void) char *home = getenv(HOME); if (home == NULL || *home == '\0') errx(1, cannot get home directory); - chdir(home); + if (chdir(home) != 0) + errx(1, cannot enter home directory); for (found = i = 0; i sizeof(calendarHomes) / sizeof(calendarHomes[0]); i++) if (chdir(calendarHomes[i]) == 0 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208828 - head/usr.bin/calendar
Author: edwin
Date: Sat Jun 5 11:41:46 2010
New Revision: 208828
URL: http://svn.freebsd.org/changeset/base/208828
Log:
Fix warnings about uninitialized variables.
It was mostly harmless since strftime() only used %a and %b anyway.
Found with: Coverity Prevent(tm)
CID: 7769
Modified:
head/usr.bin/calendar/locale.c
Modified: head/usr.bin/calendar/locale.c
==
--- head/usr.bin/calendar/locale.c Sat Jun 5 11:32:31 2010
(r208827)
+++ head/usr.bin/calendar/locale.c Sat Jun 5 11:41:46 2010
(r208828)
@@ -76,6 +76,7 @@ setnnames(void)
int i, l;
struct tm tm;
+ memset(tm, sizeof(struct tm), 0);
for (i = 0; i 7; i++) {
tm.tm_wday = i;
strftime(buf, sizeof(buf), %a, tm);
@@ -103,6 +104,7 @@ setnnames(void)
fndays[i].len = strlen(buf);
}
+ memset(tm, sizeof(struct tm), 0);
for (i = 0; i 12; i++) {
tm.tm_mon = i;
strftime(buf, sizeof(buf), %b, tm);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208829 - head/usr.bin/calendar
Author: edwin
Date: Sat Jun 5 12:31:08 2010
New Revision: 208829
URL: http://svn.freebsd.org/changeset/base/208829
Log:
Make clang happier by removing unused assignments.
Modified:
head/usr.bin/calendar/sunpos.c
Modified: head/usr.bin/calendar/sunpos.c
==
--- head/usr.bin/calendar/sunpos.c Sat Jun 5 11:41:46 2010
(r208828)
+++ head/usr.bin/calendar/sunpos.c Sat Jun 5 12:31:08 2010
(r208829)
@@ -226,26 +226,24 @@ fequinoxsolstice(int year, double UTCoff
* It happens when the returned value dec goes from
* [350 ... 360 - [0 ... 10]
*/
- found = 0;
- prevdec = 350;
for (d = 18; d 31; d++) {
-// printf(Comparing day %d to %d.\n, d, d+1);
+ /* printf(Comparing day %d to %d.\n, d, d+1); */
sunpos(year, 3, d, UTCoffset, 0, 0, 0, 0.0, 0.0, L, decleft);
sunpos(year, 3, d + 1, UTCoffset, 0, 0, 0, 0.0, 0.0,
L, decright);
-// printf(Found %g and %g.\n, decleft, decright);
+ /* printf(Found %g and %g.\n, decleft, decright); */
if (SIGN(decleft) == SIGN(decright))
continue;
dial = SECSPERDAY;
s = SECSPERDAY / 2;
while (s 0) {
-// printf(Obtaining %d (%02d:%02d)\n,
-// dial, SHOUR(dial), SMIN(dial));
+ /* printf(Obtaining %d (%02d:%02d)\n,
+ dial, SHOUR(dial), SMIN(dial)); */
sunpos(year, 3, d, UTCoffset,
SHOUR(dial), SMIN(dial), SSEC(dial),
0.0, 0.0, L, decmiddle);
-// printf(Found %g\n, decmiddle);
+ /* printf(Found %g\n, decmiddle); */
if (SIGN(decleft) == SIGN(decmiddle)) {
decleft = decmiddle;
dial += s;
@@ -253,7 +251,9 @@ fequinoxsolstice(int year, double UTCoff
decright = decmiddle;
dial -= s;
}
-// printf(New boundaries: %g - %g\n, decleft, decright);
+ /*
+printf(New boundaries: %g - %g\n, decleft, decright);
+ */
s /= 2;
}
@@ -265,26 +265,24 @@ fequinoxsolstice(int year, double UTCoff
* It happens when the returned value dec goes from
* [10 ... 0] - 360 ... 350]
*/
- found = 0;
- prevdec = 10;
for (d = 18; d 31; d++) {
-// printf(Comparing day %d to %d.\n, d, d+1);
+ /* printf(Comparing day %d to %d.\n, d, d+1); */
sunpos(year, 9, d, UTCoffset, 0, 0, 0, 0.0, 0.0, L, decleft);
sunpos(year, 9, d + 1, UTCoffset, 0, 0, 0, 0.0, 0.0,
L, decright);
-// printf(Found %g and %g.\n, decleft, decright);
+ /* printf(Found %g and %g.\n, decleft, decright); */
if (SIGN(decleft) == SIGN(decright))
continue;
dial = SECSPERDAY;
s = SECSPERDAY / 2;
while (s 0) {
-// printf(Obtaining %d (%02d:%02d)\n,
-// dial, SHOUR(dial), SMIN(dial));
+ /* printf(Obtaining %d (%02d:%02d)\n,
+ dial, SHOUR(dial), SMIN(dial)); */
sunpos(year, 9, d, UTCoffset,
SHOUR(dial), SMIN(dial), SSEC(dial),
0.0, 0.0, L, decmiddle);
-// printf(Found %g\n, decmiddle);
+ /* printf(Found %g\n, decmiddle); */
if (SIGN(decleft) == SIGN(decmiddle)) {
decleft = decmiddle;
dial += s;
@@ -292,7 +290,9 @@ fequinoxsolstice(int year, double UTCoff
decright = decmiddle;
dial -= s;
}
-// printf(New boundaries: %g - %g\n, decleft, decright);
+ /*
+ printf(New boundaries: %g - %g\n, decleft, decright);
+ */
s /= 2;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208830 - head/usr.sbin/tzsetup
Author: edwin
Date: Sat Jun 5 12:49:39 2010
New Revision: 208830
URL: http://svn.freebsd.org/changeset/base/208830
Log:
When there is a problem with writing, also bail out.
Found with the clang checker.
Modified:
head/usr.sbin/tzsetup/tzsetup.c
Modified: head/usr.sbin/tzsetup/tzsetup.c
==
--- head/usr.sbin/tzsetup/tzsetup.c Sat Jun 5 12:31:08 2010
(r208829)
+++ head/usr.sbin/tzsetup/tzsetup.c Sat Jun 5 12:49:39 2010
(r208830)
@@ -564,7 +564,8 @@ install_zoneinfo_file(const char *zonein
}
while ((len = read(fd1, buf, sizeof(buf))) 0)
- len = write(fd2, buf, len);
+ if ((len = write(fd2, buf, len)) 0)
+ break;
if (len == -1) {
snprintf(title, sizeof(title), Error);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r208831 - head/usr.sbin/tzsetup
Author: edwin Date: Sat Jun 5 12:53:44 2010 New Revision: 208831 URL: http://svn.freebsd.org/changeset/base/208831 Log: Add comment that this value is unused. It is obvious that it isn't used, but both clang and Coverity talk about it. Found with: Coverity Prevent(tm) CID: 8066 Modified: head/usr.sbin/tzsetup/tzsetup.c Modified: head/usr.sbin/tzsetup/tzsetup.c == --- head/usr.sbin/tzsetup/tzsetup.c Sat Jun 5 12:49:39 2010 (r208830) +++ head/usr.sbin/tzsetup/tzsetup.c Sat Jun 5 12:53:44 2010 (r208831) @@ -358,7 +358,7 @@ read_zones(void) if (strlen(tlc) != 2) errx(1, %s:%d: invalid country code `%s', path_zonetab, lineno, tlc); - coord = strsep(line, \t); + coord = strsep(line, \t); /* Unused */ file = strsep(line, \t); p = strchr(file, '/'); if (p == 0) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r207830 - head/lib/libc/stdtime
Author: edwin
Date: Sun May 9 22:01:35 2010
New Revision: 207830
URL: http://svn.freebsd.org/changeset/base/207830
Log:
strptime(3) confused July with June with the fr_FR locale.
When parsing the month juillet (abbr jul), %B recognized it as
juin (abbr jui) because the full name of the month names is
checked at the same time as the abbrevation.
The new behaviour checks the full names first before checking the
abbrevation names.
PR: kern/141939
Submitted by: Denis Chatelain de...@tikuts.com
MFC after:1 week
Modified:
head/lib/libc/stdtime/strptime.c
Modified: head/lib/libc/stdtime/strptime.c
==
--- head/lib/libc/stdtime/strptime.cSun May 9 21:34:05 2010
(r207829)
+++ head/lib/libc/stdtime/strptime.cSun May 9 22:01:35 2010
(r207830)
@@ -408,6 +408,14 @@ label:
if (strncasecmp(buf, tptr-month[i],
len) == 0)
break;
+ }
+ }
+ /*
+* Try the abbreviated month name if the full name
+* wasn't found and Oalternative was not requested.
+*/
+ if (i == asizeof(tptr-month) !Oalternative) {
+ for (i = 0; i asizeof(tptr-month); i++) {
len = strlen(tptr-mon[i]);
if (strncasecmp(buf, tptr-mon[i],
len) == 0)
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r207462 - head/sbin/tunefs
Author: edwin
Date: Sat May 1 09:05:06 2010
New Revision: 207462
URL: http://svn.freebsd.org/changeset/base/207462
Log:
Improve usage of tunefs:
Document -j switch in usage() to reflect recent SUJ work.
Submitted by: Alastair Hogge
MFC after: 1 week
Modified:
head/sbin/tunefs/tunefs.c
Modified: head/sbin/tunefs/tunefs.c
==
--- head/sbin/tunefs/tunefs.c Sat May 1 07:25:28 2010(r207461)
+++ head/sbin/tunefs/tunefs.c Sat May 1 09:05:06 2010(r207462)
@@ -1007,10 +1007,11 @@ out:
void
usage(void)
{
- fprintf(stderr, %s\n%s\n%s\n%s\n,
+ fprintf(stderr, %s\n%s\n%s\n%s\n%s\n,
usage: tunefs [-A] [-a enable | disable] [-e maxbpg] [-f avgfilesize],
- [-J enable | disable ] [-L volname] [-l enable | disable],
- [-m minfree] [-N enable | disable] [-n enable | disable],
+ [-J enable | disable] [-j enable | disable],
+ [-L volname] [-l enable | disable] [-m minfree],
+ [-N enable | disable] [-n enable | disable],
[-o space | time] [-p] [-s avgfpdir] special | filesystem);
exit(2);
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206868 - head/contrib/tzdata
Author: edwin Date: Mon Apr 19 20:59:39 2010 New Revision: 206868 URL: http://svn.freebsd.org/changeset/base/206868 Log: MFV of tzdata2010i, r206865 - Marocco does have DST this year between May and August. - Historical data for Taiwan - Argentina / San Luis does not do DST this year. Modified: head/contrib/tzdata/africa head/contrib/tzdata/asia head/contrib/tzdata/southamerica Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/africa == --- head/contrib/tzdata/africa Mon Apr 19 20:56:04 2010(r206867) +++ head/contrib/tzdata/africa Mon Apr 19 20:59:39 2010(r206868) @@ -1,5 +1,5 @@ # pre -# @(#)africa 8.23 +# @(#)africa 8.26 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -680,6 +680,21 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # http://www.worldtimezone.com/dst_news/dst_news_morocco03.html # /a +# From Steffen Thorsen (2010-04-13): +# Several news media in Morocco report that the Ministry of Modernization +# of Public Sectors has announced that Morocco will have DST from +# 2010-05-02 to 2010-08-08. +# +# Example: +# a href=http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html; +# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html +# /a +# (French) +# Our page: +# a href=http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html; +# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html +# /a + # RULE NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Morocco 1939only- Sep 12 0:00 1:00S @@ -701,6 +716,8 @@ RuleMorocco 2008only- Jun 1 0:00 1: Rule Morocco 2008only- Sep 1 0:00 0 - Rule Morocco 2009only- Jun 1 0:00 1:00S Rule Morocco 2009only- Aug 21 0:00 0 - +Rule Morocco 2010only- May 2 0:00 1:00S +Rule Morocco 2010only- Aug 8 0:00 0 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 0:00 Morocco WE%sT 1984 Mar 16 @@ -942,6 +959,24 @@ Zone Africa/Lome 0:04:52 - LMT 1893 # Therefore, the standard time will be kept unchanged the whole year long. # So foregoing DST seems to be an exception (albeit one that may be repeated in the future). +# From Alexander Krivenyshev (2010-03-27): +# According to some news reports Tunis confirmed not to use DST in 2010 +# +# (translation): +# The Tunisian government has decided to abandon DST, which was scheduled on +# Sunday... +# Tunisian authorities had suspended the DST for the first time last year also +# coincided with the month of Ramadan... +# +# (in Arabic) +# a href=http://www.moheet.com/show_news.aspx?nid=358861pg=1; +# http://www.moheet.com/show_news.aspx?nid=358861pg=1 +# a href=http://www.almadenahnews.com/newss/news.php?c=118id=38036; +# http://www.almadenahnews.com/newss/news.php?c=118id=38036 +# or +# a href=http://www.worldtimezone.com/dst_news/dst_news_tunis02.html; +# http://www.worldtimezone.com/dst_news/dst_news_tunis02.html + # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Tunisia 1939only- Apr 15 23:00s 1:00S Rule Tunisia 1939only- Nov 18 23:00s 0 - @@ -968,8 +1003,7 @@ Rule Tunisia 2005only- May 1 0:00s 1 Rule Tunisia 2005only- Sep 30 1:00s 0 - Rule Tunisia 20062008- Mar lastSun 2:00s 1:00S Rule Tunisia 20062008- Oct lastSun 2:00s 0 - -Rule Tunisia 2010max - Mar lastSun 2:00s 1:00S -Rule Tunisia 2010max - Oct lastSun 2:00s 0 - + # Shanks Pottenger give 0:09:20 for Paris Mean Time; go with Howse's # more precise 0:09:21. # Shanks Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11. Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaMon Apr 19 20:56:04 2010(r206867) +++ head/contrib/tzdata/asiaMon Apr 19 20:59:39 2010(r206868) @@ -1,4 +1,4 @@ -# @(#)asia 8.58 +# @(#)asia 8.60 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -566,6 +566,28 @@ Zone Asia/Hong_Kong 7:36:36 - LMT 1904 O # was still controlled by Japan. This is hard to believe, but we don't # have any other information. +# From smallufo (2010-04-03): +# According to Taiwan's CWB, +# a
svn commit: r206568 - head/usr.bin/calendar/calendars
Author: edwin Date: Tue Apr 13 20:50:59 2010 New Revision: 206568 URL: http://svn.freebsd.org/changeset/base/206568 Log: Allerheilingen - Allerheiligen Submitted by: Ronald Klop ronald at realworks dot nl Modified: head/usr.bin/calendar/calendars/calendar.dutch Modified: head/usr.bin/calendar/calendars/calendar.dutch == --- head/usr.bin/calendar/calendars/calendar.dutch Tue Apr 13 20:47:11 2010(r206567) +++ head/usr.bin/calendar/calendars/calendar.dutch Tue Apr 13 20:50:59 2010(r206568) @@ -18,7 +18,7 @@ mei/01Dag van de Arbeid mei/04 Dodenherdenking mei/05 Bevrijdingsdag okt/04 Dierendag -nov/01 Allerheilingen +nov/01 Allerheiligen nov/02 Allerzielen nov/11 Sint Maarten nov/11 Elfde-van-de-elfde ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206219 - head/contrib/tzdata
Author: edwin Date: Mon Apr 5 22:15:06 2010 New Revision: 206219 URL: http://svn.freebsd.org/changeset/base/206219 Log: MFV of tzdata2010h: From tzdata2010h: - Tunis will not go into DST this year. - Pakistan will not go into DST this year. From tzdata2010g: - Bangladesh cancels DST. - Palestine goes into DST one day later than expected. - Russian timezones update: Europe/Samara goes to Moscow time. Asia/Kamchatka goes to Moscow+8 time. Asia/Anadyr goes to Moscow+8 time. Modified: head/contrib/tzdata/asia head/contrib/tzdata/europe head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaMon Apr 5 22:10:24 2010(r206218) +++ head/contrib/tzdata/asiaMon Apr 5 22:15:06 2010(r206219) @@ -1,4 +1,4 @@ -# @(#)asia 8.56 +# @(#)asia 8.58 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -214,42 +214,20 @@ Zone Asia/Bahrain3:22:20 - LMT 1920 # # 2010 midnight. The decision came at a cabinet meeting at the Prime # Minister's Office last night... -# From Danvin Ruangchan (2009-12-24): -# ...the news mentions DST will be turned off again 7 months after March -# 31st on Oct 31, 2010. - -# From Arthur David Olson (2009-12-26): -# Indeed, The government will advance again the Banglasdesh Standard -# Time by one one hour on March 31 next year by enforcing the Daylight -# Saving Time (DST) for seven months. It will continue till October 31 -# until further notice. I take that last sentence as the -# establishment of a rule. - -# From Nobutomo Nakano (2010-02-19): -# We received a report from Bangladesh saying that the start/end of -# Bangladesh DST is incorrect. Currently we have only the Bengali version -# of the official mail from BTRC which describes the following: -# -# From 2010 each year when local standard time is about to reach -# March 31 at 10:59:00 PM clocks are turned forward 1 hour (11:59:00 PM) -# and when local daylight time is about to October 31 at 11:59:00 PM -# clocks are turned backward 1 hour (10:59:00 PM). -# -# So, DST will start/end 1 minute earlier. - -# From Arthur David Olson (2010-03-03): -# The file -# a href=http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf -# http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf +# From Alexander Krivenyshev (2010-03-22): +# According to Bangladesh newspaper The Daily Star, +# Cabinet cancels Daylight Saving Time +# a href=http://www.thedailystar.net/newDesign/latest_news.php?nid=22817; +# http://www.thedailystar.net/newDesign/latest_news.php?nid=22817 +# /a +# or +# a href=http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html; +# http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html # /a -# is in Bengali; it does contain two 31s as well as two 11.59s and a 10.59 -# which is consistent with the information provided by Nobutomo Nakano. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Dhaka 2009only- Jun 19 23:00 1:00S Rule Dhaka 2009only- Dec 31 23:59 0 - -Rule Dhaka 2010max - Mar 31 22:59 1:00S -Rule Dhaka 2010max - Oct 31 23:59 0 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Dhaka 6:01:40 - LMT 1890 @@ -2129,6 +2107,32 @@ Zone Asia/Karachi4:28:12 - LMT 1907 # http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html # /a +# From Alexander Krivenyshev (2010-03-19): +# According to Voice of Palestine DST will last for 191 days, from March +# 26, 2010 till the last Sunday before the tenth day of Tishri +# (October), each year (October 03, 2010?) +# +# a href=http://palvoice.org/forums/showthread.php?t=245697; +# http://palvoice.org/forums/showthread.php?t=245697 +# /a +# (in Arabic) +# or +# a href=http://www.worldtimezone.com/dst_news/dst_news_westbank03.html; +# http://www.worldtimezone.com/dst_news/dst_news_westbank03.html +# /a + +# From Steffen Thorsen (2010-03-24): +# ...Ma'an News Agency reports that Hamas cabinet has decided it will +# start one day later, at 12:01am. Not sure if they really mean 12:01am or +# noon though: +# +# a href=http://www.maannews.net/eng/ViewDetails.aspx?ID=271178; +# http://www.maannews.net/eng/ViewDetails.aspx?ID=271178 +# /a +# (Ma'an News Agency) +# At 12:01am Friday, clocks in Israel and the West Bank will change to +# 1:01am, while Gaza clocks will change at 12:01am Saturday morning. + # The rules for Egypt are stolen from the `africa' file. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule EgyptAsia 1957only- May 10 0:001:00S
svn commit: r205872 - head/usr.bin/calendar
Author: edwin Date: Tue Mar 30 06:42:01 2010 New Revision: 205872 URL: http://svn.freebsd.org/changeset/base/205872 Log: On request of joel@: - Remove the 3rd clause of the UC Berkeley copyrighted files. - For the files added copyrighted by me, move the All rights reserved to the next line. Modified: head/usr.bin/calendar/calendar.1 head/usr.bin/calendar/calendar.c head/usr.bin/calendar/calendar.h head/usr.bin/calendar/dates.c head/usr.bin/calendar/day.c head/usr.bin/calendar/events.c head/usr.bin/calendar/io.c head/usr.bin/calendar/locale.c head/usr.bin/calendar/parsedata.c head/usr.bin/calendar/pathnames.h head/usr.bin/calendar/pom.c head/usr.bin/calendar/sunpos.c Modified: head/usr.bin/calendar/calendar.1 == --- head/usr.bin/calendar/calendar.1Tue Mar 30 05:48:16 2010 (r205871) +++ head/usr.bin/calendar/calendar.1Tue Mar 30 06:42:01 2010 (r205872) @@ -9,10 +9,6 @@ .\ 2. Redistributions in binary form must reproduce the above copyright .\notice, this list of conditions and the following disclaimer in the .\documentation and/or other materials provided with the distribution. -.\ 3. All advertising materials mentioning features or use of this software -.\must display the following acknowledgement: -.\ This product includes software developed by the University of -.\ California, Berkeley and its contributors. .\ 4. Neither the name of the University nor the names of its contributors .\may be used to endorse or promote products derived from this software .\without specific prior written permission. Modified: head/usr.bin/calendar/calendar.c == --- head/usr.bin/calendar/calendar.cTue Mar 30 05:48:16 2010 (r205871) +++ head/usr.bin/calendar/calendar.cTue Mar 30 06:42:01 2010 (r205872) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors *may be used to endorse or promote products derived from this software *without specific prior written permission. Modified: head/usr.bin/calendar/calendar.h == --- head/usr.bin/calendar/calendar.hTue Mar 30 05:48:16 2010 (r205871) +++ head/usr.bin/calendar/calendar.hTue Mar 30 06:42:01 2010 (r205872) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors *may be used to endorse or promote products derived from this software *without specific prior written permission. Modified: head/usr.bin/calendar/dates.c == --- head/usr.bin/calendar/dates.c Tue Mar 30 05:48:16 2010 (r205871) +++ head/usr.bin/calendar/dates.c Tue Mar 30 06:42:01 2010 (r205872) @@ -1,5 +1,6 @@ /*- - * Copyright (c) 1992-2009 Edwin Groothuis. All rights reserved. + * Copyright (c) 1992-2009 Edwin Groothuis ed...@freebsd.org. + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: head/usr.bin/calendar/day.c == --- head/usr.bin/calendar/day.c Tue Mar 30 05:48:16 2010(r205871) +++ head/usr.bin/calendar/day.c Tue Mar 30 06:42:01 2010(r205872) @@ -10,10 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in the *documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - *must display the following acknowledgement: - * This product includes software developed by the University of - * California
svn commit: r205821 - head/usr.bin/calendar
file is newly added)
+++ head/usr.bin/calendar/dates.c Mon Mar 29 06:49:20 2010
(r205821)
@@ -0,0 +1,451 @@
+/*-
+ * Copyright (c) 1992-2009 Edwin Groothuis. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include sys/cdefs.h
+__FBSDID($FreeBSD$);
+
+#include stdio.h
+#include stdlib.h
+#include err.h
+#include time.h
+
+#include calendar.h
+
+struct cal_year {
+ int year; /* 19xx, 20xx, 21xx */
+ int easter; /* Julian day */
+ int paskha; /* Julian day */
+ int cny;/* Julian day */
+ int firstdayofweek; /* 0 .. 6 */
+ struct cal_month *months;
+ struct cal_year *nextyear;
+} cal_year;
+
+struct cal_month {
+ int month; /* 01 .. 12 */
+ int firstdayjulian; /* 000 .. 366 */
+ int firstdayofweek; /* 0 .. 6 */
+ struct cal_year *year; /* points back */
+ struct cal_day *days;
+ struct cal_month *nextmonth;
+} cal_month;
+
+struct cal_day {
+ int dayofmonth; /* 01 .. 31 */
+ int julianday; /* 000 .. 366 */
+ int dayofweek; /* 0 .. 6 */
+ struct cal_day *nextday;
+ struct cal_month *month;/* points back */
+ struct cal_year *year; /* points back */
+ struct event *events;
+} cal_day;
+
+int debug_remember = 0;
+struct cal_year*hyear = NULL;
+
+/* 1-based month, 0-based days, cumulative */
+int *cumdays;
+intcumdaytab[][14] = {
+ {0, -1, 30, 58, 89, 119, 150, 180, 211, 242, 272, 303, 333, 364},
+ {0, -1, 30, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365},
+};
+/* 1-based month, individual */
+int *mondays;
+intmondaytab[][14] = {
+ {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
+ {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 30},
+};
+
+static struct cal_day *find_day(int yy, int mm, int dd);
+
+static void
+createdate(int y, int m, int d)
+{
+ struct cal_year *py, *pyp;
+ struct cal_month *pm, *pmp;
+ struct cal_day *pd, *pdp;
+ int *cumday;
+
+ pyp = NULL;
+ py = hyear;
+ while (py != NULL) {
+ if (py-year == y + 1900)
+ break;
+ pyp = py;
+ py = py-nextyear;
+ }
+
+ if (py == NULL) {
+ struct tm td;
+ time_t t;
+ py = (struct cal_year *)calloc(1, sizeof(struct cal_year));
+ py-year = y + 1900;
+ py-easter = easter(y);
+ py-paskha = paskha(y);
+
+ td = tm0;
+ td.tm_year = y;
+ td.tm_mday = 1;
+ t = mktime(td);
+ localtime_r(t, td);
+ py-firstdayofweek = td.tm_wday;
+
+ if (pyp != NULL)
+ pyp-nextyear = py;
+ }
+ if (pyp == NULL) {
+ /* The very very very first one */
+ hyear = py;
+ }
+
+ pmp = NULL;
+ pm = py-months;
+ while (pm != NULL) {
+ if (pm-month == m)
+ break;
+ pmp = pm;
+ pm = pm-nextmonth;
+ }
+
+ if (pm == NULL) {
+ pm = (struct cal_month *)calloc(1, sizeof(struct cal_month));
+ pm-year = py;
+ pm-month = m;
+ cumday = cumdaytab[isleap(y)];
+ pm-firstdayjulian = cumday[m] + 2;
+ pm-firstdayofweek =
+ (py-firstdayofweek + pm-firstdayjulian -1) % 7;
+ if (pmp != NULL)
+ pmp-nextmonth = pm
svn commit: r205827 - head/usr.bin/calendar
Author: edwin
Date: Mon Mar 29 07:08:47 2010
New Revision: 205827
URL: http://svn.freebsd.org/changeset/base/205827
Log:
Bump WARNS to 7
Modified:
head/usr.bin/calendar/Makefile
Modified: head/usr.bin/calendar/Makefile
==
--- head/usr.bin/calendar/Makefile Mon Mar 29 06:59:08 2010
(r205826)
+++ head/usr.bin/calendar/Makefile Mon Mar 29 07:08:47 2010
(r205827)
@@ -11,7 +11,7 @@ DE_LINKS= de_DE.ISO8859-15
FR_LINKS= fr_FR.ISO8859-15
TEXTMODE?= 444
-WARNS?=3
+WARNS?=7
beforeinstall:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${TEXTMODE} \
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r205828 - head/usr.bin/calendar/calendars
Author: edwin Date: Mon Mar 29 07:09:27 2010 New Revision: 205828 URL: http://svn.freebsd.org/changeset/base/205828 Log: Use new syntax for the dutch calendar: Use local month names instead of english ones. Modified: head/usr.bin/calendar/calendars/calendar.dutch Modified: head/usr.bin/calendar/calendars/calendar.dutch == --- head/usr.bin/calendar/calendars/calendar.dutch Mon Mar 29 07:08:47 2010(r205827) +++ head/usr.bin/calendar/calendars/calendar.dutch Mon Mar 29 07:09:27 2010(r205828) @@ -10,25 +10,25 @@ Easter=Pasen /* * Feestdagen */ -01/01 Nieuwjaar -01/06 Driekoningen -04/01 Een April -04/30 Koninginendag -05/01 Dag van de Arbeid -05/04 Dodenherdenking -05/05 Bevrijdingsdag -10/04 Dierendag -11/01 Allerheilingen -11/02 Allerzielen -11/11 Sint Maarten -11/11 Elfde-van-de-elfde -12/05 Sinterklaas avond -12/15 Koninkrijksdag -12/24 Kerstavond -12/25 Eerste kerstdag -12/26 Tweede kerstdag -12/28 Feest der Onnozele Kinderen -12/31 Oudjaar +jan/01 Nieuwjaar +jan/06 Driekoningen +apr/01 1 april +apr/30 Koninginnedag +mei/01 Dag van de Arbeid +mei/04 Dodenherdenking +mei/05 Bevrijdingsdag +okt/04 Dierendag +nov/01 Allerheilingen +nov/02 Allerzielen +nov/11 Sint Maarten +nov/11 Elfde-van-de-elfde +dec/05 Sinterklaas avond +dec/15 Koninkrijksdag +dec/24 Kerstavond +dec/25 Eerste kerstdag +dec/26 Tweede kerstdag +dec/28 Feest der Onnozele Kinderen +dec/31 Oudjaar /* * Pasen gerelateerd @@ -38,12 +38,12 @@ Pasen-49Carnaval Pasen-48 Carnaval Pasen-47 Carnaval (Vastenavond) Pasen-46 Aswoensdag -Pasen-7Palmzondag -Pasen-3Witte Donderdag -Pasen-2Goede vrijdag -Pasen-1Stille zaterdag +Pasen-7Palmzondag +Pasen-3Witte Donderdag +Pasen-2Goede vrijdag +Pasen-1Stille zaterdag Pasen Eerste paasdag -Pasen+1Tweede paasdag +Pasen+1Tweede paasdag Pasen+39 Hemelvaartsdag Pasen+49 Eerste Pinksterdag Pasen+50 Tweede Pinksterdag @@ -52,28 +52,28 @@ Pasen+56Trinitatis /* * Misc */ -05/SunSecond Moederdag -06/SunThirdVaderdag -09/TueThirdPrinsjesdag +mei/SunSecond Moederdag +jun/SunThird Vaderdag +sep/TueThird Prinsjesdag /* * Het koningshuis */ -01/19 Prinses Margriet (1943) -01/31 Koningin Beatrix (1938) -02/17 Prins Willem III (1817 - 1890) -02/18 Prinses Christina (1947) -04/10 Prinses Ariane (2007) -04/19 Prins Hendrik (1876 - 1934) -04/27 Kroonprins Willem Alexander (1967) -04/30 Koningin Juliana (1909 - 2004) -04/30 Mr. Pieter van Vollenhoven (1939) -05/17 Prinses Maxima (1971) -06/26 Prinses Alexia (2005) -06/29 Prins Bernhard (1911 - 2004) -08/05 Prinses Irene (1939) -08/31 Prinses Wilhelmina (1880 - 1962) -09/06 Prins Claus (1925 - 2002) -09/25 Prins Johan Friso (1968) -10/11 Prins Constantijn (1969) -12/07 Prinses Catharina-Amalia (2003) +jan/19 Prinses Margriet (1943) +jan/31 Koningin Beatrix (1938) +feb/17 Prins Willem III (1817 - 1890) +feb/18 Prinses Christina (1947) +apr/10 Prinses Ariane (2007) +apr/19 Prins Hendrik (1876 - 1934) +apr/27 Kroonprins Willem Alexander (1967) +apr/30 Koningin Juliana (1909 - 2004) +apr/30 Mr. Pieter van Vollenhoven (1939) +mei/17 Prinses Maxima (1971) +jun/26 Prinses Alexia (2005) +jun/29 Prins Bernhard (1911 - 2004) +aug/05 Prinses Irene (1939) +aug/31 Prinses Wilhelmina (1880 - 1962) +sep/06 Prins Claus (1925 - 2002) +sep/25 Prins Johan Friso (1968) +okt/11 Prins Constantijn (1969) +dec/07 Prinses Catharina-Amalia (2003) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r205475 - head/contrib/tzdata
Author: edwin Date: Mon Mar 22 21:27:51 2010 New Revision: 205475 URL: http://svn.freebsd.org/changeset/base/205475 Log: MFV of tzdata2010f: The Australian Antartic Division: - Macquarie Island will stay on UTC+11 for winter and not switch back from DST. - Casey station reverted to its normal time of UTC+8 on 5 March 2010. - Davis station will revert to its normal time of UTC+7 at 10 March 2010 - Mawson station stays on UTC+5. Syria will start DST on Thursday 1 April 2010 at midnight. Correct Samao DST start date (26 Sep vs 24 Oct) Modified: head/contrib/tzdata/antarctica head/contrib/tzdata/asia head/contrib/tzdata/australasia head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/antarctica == --- head/contrib/tzdata/antarctica Mon Mar 22 21:26:12 2010 (r205474) +++ head/contrib/tzdata/antarctica Mon Mar 22 21:27:51 2010 (r205475) @@ -1,5 +1,5 @@ # pre -# @(#)antarctica 8.7 +# @(#)antarctica 8.8 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -57,6 +57,33 @@ Rule ChileAQ 1999only- Apr 4 3:00u 0 Rule ChileAQ 1999max - Oct Sun=9 4:00u 1:00S Rule ChileAQ 2000max - Mar Sun=9 3:00u 0 - +# These rules are stolen from the `australasia' file. +Rule AusAQ 1917only- Jan 1 0:011:00- +Rule AusAQ 1917only- Mar 25 2:000 - +Rule AusAQ 1942only- Jan 1 2:001:00- +Rule AusAQ 1942only- Mar 29 2:000 - +Rule AusAQ 1942only- Sep 27 2:001:00- +Rule AusAQ 19431944- Mar lastSun 2:000 - +Rule AusAQ 1943only- Oct 3 2:001:00- +Rule ATAQ1967only- Oct Sun=1 2:00s 1:00- +Rule ATAQ1968only- Mar lastSun 2:00s 0 - +Rule ATAQ19681985- Oct lastSun 2:00s 1:00- +Rule ATAQ19691971- Mar Sun=8 2:00s 0 - +Rule ATAQ1972only- Feb lastSun 2:00s 0 - +Rule ATAQ19731981- Mar Sun=1 2:00s 0 - +Rule ATAQ19821983- Mar lastSun 2:00s 0 - +Rule ATAQ19841986- Mar Sun=1 2:00s 0 - +Rule ATAQ1986only- Oct Sun=15 2:00s 1:00- +Rule ATAQ19871990- Mar Sun=15 2:00s 0 - +Rule ATAQ1987only- Oct Sun=22 2:00s 1:00- +Rule ATAQ19881990- Oct lastSun 2:00s 1:00- +Rule ATAQ19911999- Oct Sun=1 2:00s 1:00- +Rule ATAQ19912005- Mar lastSun 2:00s 0 - +Rule ATAQ2000only- Aug lastSun 2:00s 1:00- +Rule ATAQ2001max - Oct Sun=1 2:00s 1:00- +Rule ATAQ2006only- Apr Sun=1 2:00s 0 - +Rule ATAQ2007only- Mar lastSun 2:00s 0 - +Rule ATAQ2008max - Apr Sun=1 2:00s 0 - # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 @@ -98,20 +125,52 @@ Rule ChileAQ 2000max - Mar Sun=9 3:00u # http://www.timeanddate.com/news/time/antarctica-new-times.html # /a +# From Steffen Thorsen (2010-03-10): +# We got these changes from the Australian Antarctic Division: +# - Macquarie Island will stay on UTC+11 for winter and therefore not +# switch back from daylight savings time when other parts of Australia do +# on 4 April. +# +# - Casey station reverted to its normal time of UTC+8 on 5 March 2010. +# The change to UTC+11 is being considered as a regular summer thing but +# has not been decided yet. +# +# - Davis station will revert to its normal time of UTC+7 at 10 March 2010 +# 20:00 UTC. +# +# - Mawson station stays on UTC+5. +# +# In addition to the Rule changes for Casey/Davis, it means that Macquarie +# will no longer be like Hobart and will have to have its own Zone created. +# +# Background: +# a href=http://www.timeanddate.com/news/time/antartica-time-changes-2010.html; +# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html +# /a + # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Antarctica/Casey 0 - zzz 1969 8:00- WST 2009 Oct 18 2:00 # Western (Aus) Standard Time - 11:00 - CAST# Casey Time + 11:00 - CAST2010 Mar 5 2:00 +
svn commit: r205427 - in head: tools/regression/usr.bin/ncal usr.bin/ncal
Author: edwin
Date: Sun Mar 21 21:33:21 2010
New Revision: 205427
URL: http://svn.freebsd.org/changeset/base/205427
Log:
Replace -b with -C and -B (as proposed by Alexander).
Add -3, -A and -B to the usage.
Update regression test for the new parameters.
Modified:
head/tools/regression/usr.bin/ncal/regress.sh
head/usr.bin/ncal/ncal.1
head/usr.bin/ncal/ncal.c
Modified: head/tools/regression/usr.bin/ncal/regress.sh
==
--- head/tools/regression/usr.bin/ncal/regress.sh Sun Mar 21 21:25:35
2010(r205426)
+++ head/tools/regression/usr.bin/ncal/regress.sh Sun Mar 21 21:33:21
2010(r205427)
@@ -1,7 +1,8 @@
# $FreeBSD$
CAL_BIN=ncal
-CAL=${CAL_BIN}
+CAL=${CAL_BIN} -C
+NCAL=${CAL_BIN} -N
YEARS=2008 2009 2010 2011
ONEYEAR=2009
@@ -18,13 +19,13 @@ echo 1..16
for y in ${YEARS}; do
# Regular calendar, Month days, No-highlight
- REGRESSION_TEST(`r-y${y}-md-nhl', `$CAL -h ${y}')
+ REGRESSION_TEST(`r-y${y}-md-nhl', `$NCAL -h ${y}')
# Backwards calendar, Month days, No-highlight
- REGRESSION_TEST(`b-y${y}-md-nhl', `$CAL -bh ${y}')
+ REGRESSION_TEST(`b-y${y}-md-nhl', `$CAL -h ${y}')
# Regular calendar, Julian days, No-highlight
- REGRESSION_TEST(`r-y${y}-jd-nhl', `$CAL -jh ${y}')
+ REGRESSION_TEST(`r-y${y}-jd-nhl', `$NCAL -jh ${y}')
# Backwards calendar, Julian days, No-highlight
- REGRESSION_TEST(`b-y${y}-jd-nhl', `$CAL -jbh ${y}')
+ REGRESSION_TEST(`b-y${y}-jd-nhl', `$CAL -jh ${y}')
done
# 3 month calendars
@@ -33,13 +34,15 @@ echo 17 .. 29
for m in $(jot -w %02d 12); do
# Regular calendar, Month days, No-highlight
- REGRESSION_TEST(`r-3m${ONEYEAR}${m}-md-nhl', `$CAL -h3 ${m} ${ONEYEAR}')
+ REGRESSION_TEST(`r-3m${ONEYEAR}${m}-md-nhl',
+ `$NCAL -h3 ${m} ${ONEYEAR}')
# Backwards calendar, Month days, No-highlight
- REGRESSION_TEST(`b-3m${ONEYEAR}${m}-md-nhl', `$CAL -bh3 ${m}
${ONEYEAR}')
+ REGRESSION_TEST(`b-3m${ONEYEAR}${m}-md-nhl', `$CAL -h3 ${m} ${ONEYEAR}')
# Regular calendar, Julian days, No-highlight
- REGRESSION_TEST(`r-3m${ONEYEAR}${m}-jd-nhl', `$CAL -jh3 ${m}
${ONEYEAR}')
+ REGRESSION_TEST(`r-3m${ONEYEAR}${m}-jd-nhl',
+ `$NCAL -jh3 ${m} ${ONEYEAR}')
# Backwards calendar, Julian days, No-highlight
- REGRESSION_TEST(`b-3m${ONEYEAR}${m}-jd-nhl', `$CAL -jbh3 ${m}
${ONEYEAR}')
+ REGRESSION_TEST(`b-3m${ONEYEAR}${m}-jd-nhl', `$CAL -jh3 ${m}
${ONEYEAR}')
done
#
@@ -47,33 +50,33 @@ done
#
# These should fail
-REGRESSION_TEST(`f-3y-nhl', `$CAL -3 -y 21')
-REGRESSION_TEST(`f-3A-nhl', `$CAL -3 -A 3 21')
-REGRESSION_TEST(`f-3B-nhl', `$CAL -3 -B 3 21')
-REGRESSION_TEST(`f-3gy-nhl', `$CAL -3 2008 21')
-REGRESSION_TEST(`f-3AB-nhl', `$CAL -3 -A 3 -B 3 21')
-REGRESSION_TEST(`f-mgm-nhl', `$CAL -m 3 2 2008 21')
-REGRESSION_TEST(`f-ym-nhl', `$CAL -y -m 2 21')
-REGRESSION_TEST(`f-ygm-nhl', `$CAL -y 2 2008 21')
-REGRESSION_TEST(`f-yA-nhl', `$CAL -y -A 3 21')
-REGRESSION_TEST(`f-yB-nhl', `$CAL -y -B 3 21')
-REGRESSION_TEST(`f-yAB-nhl', `$CAL -y -A 3 -B 3 21')
+REGRESSION_TEST(`f-3y-nhl', `$NCAL -3 -y 21')
+REGRESSION_TEST(`f-3A-nhl', `$NCAL -3 -A 3 21')
+REGRESSION_TEST(`f-3B-nhl', `$NCAL -3 -B 3 21')
+REGRESSION_TEST(`f-3gy-nhl', `$NCAL -3 2008 21')
+REGRESSION_TEST(`f-3AB-nhl', `$NCAL -3 -A 3 -B 3 21')
+REGRESSION_TEST(`f-mgm-nhl', `$NCAL -m 3 2 2008 21')
+REGRESSION_TEST(`f-ym-nhl', `$NCAL -y -m 2 21')
+REGRESSION_TEST(`f-ygm-nhl', `$NCAL -y 2 2008 21')
+REGRESSION_TEST(`f-yA-nhl', `$NCAL -y -A 3 21')
+REGRESSION_TEST(`f-yB-nhl', `$NCAL -y -B 3 21')
+REGRESSION_TEST(`f-yAB-nhl', `$NCAL -y -A 3 -B 3 21')
# These should be successful
-REGRESSION_TEST(`s-b-3-nhl',`$CAL -b -d 2008.03 -3')
-REGRESSION_TEST(`s-b-A-nhl',`$CAL -b -d 2008.03 -A 1')
-REGRESSION_TEST(`s-b-B-nhl',`$CAL -b -d 2008.03 -B 1')
-REGRESSION_TEST(`s-b-AB-nhl', `$CAL -b -d 2008.03 -A 1 -B 1')
-REGRESSION_TEST(`s-b-m-nhl',`$CAL -b -d 2008.03 -m 1')
-REGRESSION_TEST(`s-b-mgy-nhl', `$CAL -b -d 2008.03 -m 1 2007')
-REGRESSION_TEST(`s-b-gmgy-nhl', `$CAL -b -d 2008.03 1 2007')
-REGRESSION_TEST(`s-r-3-nhl',`$CAL -d 2008.03 -3')
-REGRESSION_TEST(`s-r-A-nhl',`$CAL -d 2008.03 -A 1')
-REGRESSION_TEST(`s-r-B-nhl',`$CAL -d 2008.03 -B 1')
-REGRESSION_TEST(`s-r-AB-nhl', `$CAL -d 2008.03 -A 1 -B 1')
-REGRESSION_TEST(`s-r-m-nhl',`$CAL -d 2008.03 -m 1')
-REGRESSION_TEST(`s-r-mgy-nhl', `$CAL -d 2008.03 -m 1 2007')
-REGRESSION_TEST(`s-r-gmgy-nhl', `$CAL -d 2008.03 1 2007')
+REGRESSION_TEST(`s-b-3-nhl',`$CAL -d 2008.03 -3')
+REGRESSION_TEST(`s-b-A-nhl',`$CAL -d 2008.03 -A 1')
+REGRESSION_TEST(`s-b-B-nhl',`$CAL -d 2008.03 -B 1')
+REGRESSION_TEST(`s-b-AB-nhl', `$CAL -d 2008.03 -A 1 -B 1')
+REGRESSION_TEST(`s-b-m-nhl',`$CAL -d 2008.03 -m 1')
+REGRESSION_TEST(`s-b-mgy-nhl', `$CAL -d 2008.03 -m 1 2007')
svn commit: r205071 - head/usr.bin/ncal
Author: edwin Date: Fri Mar 12 06:57:53 2010 New Revision: 205071 URL: http://svn.freebsd.org/changeset/base/205071 Log: - With the introduction of -A, -B and -3, not all combinations of arguments makes sense anymore. For example, what would a combination of -3 (show three months) and -y (show the whole year) do? We will abort on these cases. - Move the debug option -d to -H (from highlight), while -d is now used for setting the day of today so that -y and friends can be tested. Modified: head/usr.bin/ncal/ncal.1 head/usr.bin/ncal/ncal.c Modified: head/usr.bin/ncal/ncal.1 == --- head/usr.bin/ncal/ncal.1Fri Mar 12 06:56:51 2010(r205070) +++ head/usr.bin/ncal/ncal.1Fri Mar 12 06:57:53 2010(r205071) @@ -117,12 +117,6 @@ Britain and her colonies switched to the Print the number of the week below each week column. .It Fl y Display a calendar for the specified year. -.It Fl b -Switch to backwards compatibility mode (for debugging). -.It Fl d Ar -mm-dd -Use -.Ar -mm-dd -as the current date (for debugging of highlighting). .It Fl 3 Display the previous, current and next month surrounding today. .It Fl A Ar number @@ -133,6 +127,16 @@ of months after the current month. Display the .Ar number of months before the current month. +.It Fl b +Switch to backwards compatibility mode (for debugging). +.It Fl d Ar -mm +Use +.Ar -mm +as the current date (for debugging of date selection). +.It Fl H Ar -mm-dd +Use +.Ar -mm-dd +as the current date (for debugging of highlighting). .El .Pp A single parameter specifies the year (1\(en) to be displayed; @@ -148,6 +152,14 @@ year default to those of the current sys will display a calendar for the month of August in the current year). .Pp +Not all options can be used together. For example +.Dq Li -3 -A 2 -B 3 -y -m 7 +would mean: +show me the three months around the seventh month, three before +that, two after that and the whole year. +.Nm ncal +will warn about these combinations. +.Pp A year starts on January 1. .Sh SEE ALSO .Xr calendar 3 , Modified: head/usr.bin/ncal/ncal.c == --- head/usr.bin/ncal/ncal.cFri Mar 12 06:56:51 2010(r205070) +++ head/usr.bin/ncal/ncal.cFri Mar 12 06:57:53 2010(r205071) @@ -163,25 +163,25 @@ int flag_nohighlight; /* user doesn't wa int flag_weeks;/* user wants number of week */ int nswitch; /* user defined switch date */ intnswitchb; /* switch date for backward compatibility */ -inttoday; +inthighlightdate; char *center(char *s, char *t, int w); wchar_t *wcenter(wchar_t *s, wchar_t *t, int w); +intfirstday(int y, int m); +void highlight(char *dst, char *src, int len, int *extraletters); void mkmonthr(int year, int month, int jd_flag, struct monthlines * monthl); void mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl); void mkweekdays(struct weekdays * wds); +void monthranger(int year, int m, int jd_flag, int before, int after); +void monthrangeb(int year, int m, int jd_flag, int before, int after); intparsemonth(const char *s, int *m, int *y); void printcc(void); void printeaster(int year, int julian, int orthodox); -intfirstday(int y, int m); date *sdater(int ndays, struct date * d); date *sdateb(int ndays, struct date * d); intsndaysr(struct date * d); intsndaysb(struct date * d); static voidusage(void); -void monthranger(int year, int jd_flag, int m, int before, int after); -void monthrangeb(int year, int jd_flag, int m, int before, int after); -void highlight(char *dst, char *src, int len, int *extraletters); int main(int argc, char *argv[]) @@ -194,15 +194,21 @@ main(int argc, char *argv[]) int m = 0; /* month */ int y = 0; /* year */ int flag_backward = 0; /* user called cal--backward compat. */ - int flag_hole_year = 0; /* user wants the whole year */ + int flag_wholeyear = 0; /* user wants the whole year */ int flag_julian_cal = 0;/* user wants Julian Calendar */ - int flag_julian_day = 0;/* user wants the Julian day -* numbers */ - int flag_orthodox = 0; /* use wants Orthodox easter */ - int flag_easter = 0;/* use wants easter date */ + int flag_julian_day = 0;/* user wants the Julian day numbers */ + int flag_orthodox = 0; /* user wants Orthodox easter */ + int flag_easter = 0;/* user wants easter date */ + int flag_3months = 0; /* user wants 3 month display (-3) */ + int flag_after = 0; /* user wants to see months after */
svn commit: r204849 - head/usr.bin/ncal
Author: edwin
Date: Sun Mar 7 21:54:28 2010
New Revision: 204849
URL: http://svn.freebsd.org/changeset/base/204849
Log:
- document the -3, -A and -B properly in Synopsis.
- add highlight of current date for non-terminals.
- fix -J option.
- code cleanup.
MFC after:2 weeks
Modified:
head/usr.bin/ncal/ncal.1
head/usr.bin/ncal/ncal.c
Modified: head/usr.bin/ncal/ncal.1
==
--- head/usr.bin/ncal/ncal.1Sun Mar 7 21:50:40 2010(r204848)
+++ head/usr.bin/ncal/ncal.1Sun Mar 7 21:54:28 2010(r204849)
@@ -33,24 +33,32 @@
.Nd displays a calendar and the date of Easter
.Sh SYNOPSIS
.Nm
-.Op Fl hjy
+.Op Fl 3hjy
+.Op Fl A Ar number
+.Op Fl B Ar number
.Oo
.Op Ar month
.Ar year
.Oc
.Nm
-.Op Fl hj
+.Op Fl 3hj
+.Op Fl A Ar number
+.Op Fl B Ar number
.Fl m Ar month
.Op Ar year
.Nm ncal
-.Op Fl hjJpwy
+.Op Fl 3hjJpwy
+.Op Fl A Ar number
+.Op Fl B Ar number
.Op Fl s Ar country_code
.Oo
.Op Ar month
.Ar year
.Oc
.Nm ncal
-.Op Fl hJeo
+.Op Fl 3hJeo
+.Op Fl A Ar number
+.Op Fl B Ar number
.Op Ar year
.Sh DESCRIPTION
The
Modified: head/usr.bin/ncal/ncal.c
==
--- head/usr.bin/ncal/ncal.cSun Mar 7 21:50:40 2010(r204848)
+++ head/usr.bin/ncal/ncal.cSun Mar 7 21:54:28 2010(r204849)
@@ -159,10 +159,10 @@ char jdaystr[] =1 2 3 4
350 351 352 353 354 355 356 357 358 359
360 361 362 363 364 365 366;
+intflag_nohighlight; /* user doesn't want a highlighted today */
int flag_weeks;/* user wants number of week */
int nswitch; /* user defined switch date */
intnswitchb; /* switch date for backward compatibility */
-const char *term_so, *term_se;
inttoday;
char *center(char *s, char *t, int w);
@@ -181,6 +181,7 @@ int sndaysb(struct date * d);
static voidusage(void);
void monthranger(int year, int jd_flag, int m, int before, int after);
void monthrangeb(int year, int jd_flag, int m, int before, int after);
+void highlight(char *dst, char *src, int len, int *extraletters);
int
main(int argc, char *argv[])
@@ -204,15 +205,9 @@ main(int argc, char *argv[])
char*flag_highlightdate = NULL;
int before, after;
const char*locale; /* locale to get country code */
- char tbuf[1024], cbuf[512], *b;
- /* On how to highlight on this terminal */
- term_se = term_so = NULL;
- if (isatty(STDOUT_FILENO) tgetent(tbuf, NULL) == 1) {
- b = cbuf;
- term_so = tgetstr(so, b);
- term_se = tgetstr(se, b);
- }
+ flag_nohighlight = 0;
+ flag_weeks = 0;
/*
* Use locale to determine the country code,
@@ -283,7 +278,7 @@ main(int argc, char *argv[])
flag_highlightdate = optarg;
break;
case 'h':
- term_so = term_se = NULL;
+ flag_nohighlight = 1;
break;
case 'e':
if (flag_backward)
@@ -369,6 +364,12 @@ main(int argc, char *argv[])
usage();
}
+ if (flag_hole_year) {
+ m = 1;
+ before = 0;
+ after = 11;
+ }
+
if (flag_month != NULL) {
if (parsemonth(flag_month, m, y)) {
errx(EX_USAGE,
@@ -717,33 +718,17 @@ mkmonthr(int y, int m, int jd_flag, stru
for (i = 0; i != 7; i++) {
l = 0;
for (j = firstm + i, k = 0; j last; j += 7, k += dw) {
- if (j == today
- (term_so != NULL term_se != NULL)) {
- l = strlen(term_so);
- if (jd_flag)
- dt.d = j - jan1 + 1;
- else
- sdateb(j, dt);
- /* separator */
- mlines-lines[i][k] = ' ';
- /* the actual text */
- memcpy(mlines-lines[i] + k + l,
- ds + dt.d * dw, dw);
- /* highlight on */
- memcpy(mlines-lines[i] + k + 1, term_so, l);
- /* highlight off */
- memcpy(mlines-lines[i] + k + l + dw, term_se,
- strlen(term_se));
- l = strlen(term_se) + strlen(term_so);
- continue;
- }
if (j = first) {
if (jd_flag)
Re: svn commit: r204849 - head/usr.bin/ncal
On Mon, Mar 08, 2010 at 12:16:04AM +0100, Alexander Best wrote: could you have another look at the -J option? it seems highlighting still Aha, only -J in month only view is still not working. Will take care of it later. Also add a bunch of regression tests to it, because of all of this. isn't enabled in combination with it. also i'm wondering what the purpose of the -b switch is. running `cal` and `ncal -b` seems to be doing the very same thing (setting flag_backward = 1). You can't run cal until you have installed it, while being able to run ncal -b and coming into cal mode is kind of nice. Edwin -- Edwin Groothuis Website: http://www.mavetju.org/ ed...@mavetju.org Weblog: http://www.mavetju.org/weblog/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r204706 - head/usr.bin/ncal
Author: edwin
Date: Thu Mar 4 12:18:24 2010
New Revision: 204706
URL: http://svn.freebsd.org/changeset/base/204706
Log:
Remove no-op of WARNS?=
Submitted by: Ulrich Sp??rlein u...@spoerlein.net
Modified:
head/usr.bin/ncal/Makefile
Modified: head/usr.bin/ncal/Makefile
==
--- head/usr.bin/ncal/Makefile Thu Mar 4 11:09:49 2010(r204705)
+++ head/usr.bin/ncal/Makefile Thu Mar 4 12:18:24 2010(r204706)
@@ -4,7 +4,6 @@ PROG= ncal
DPADD= ${LIBCALENDAR} ${LIBTERMCAP}
LDADD= -lcalendar -ltermcap
-WARNS?=6
LINKS= ${BINDIR}/ncal ${BINDIR}/cal
MLINKS=ncal.1 cal.1
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r204697 - head/usr.bin/ncal
On Thu, Mar 04, 2010 at 03:31:17PM +0300, Ruslan Ermilov wrote: Edwin, On Thu, Mar 04, 2010 at 07:04:27AM +, Edwin Groothuis wrote: Author: edwin Date: Thu Mar 4 07:04:27 2010 New Revision: 204697 URL: http://svn.freebsd.org/changeset/base/204697 Log: - Implement -3 option (show previous, this and next month) option. - Add -A option (months after this month). - Add -B option (months before this month). - Fix highlighting of today in year overview. - Fix aligning of foreign characters. MFC after:2 weeks - This breaks cal -y. I see, thanks. - All of the above options are missing from usage(). So many options, so many places, so many eyeballs :-) - Options -b and -d are missing from the manpage's SYNOPSIS. - for debug the highlighting can be spelled better. I will fix this all before the end of the weekend. Edwin -- Edwin Groothuis Website: http://www.mavetju.org/ ed...@mavetju.org Weblog: http://www.mavetju.org/weblog/ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r204332 - in head: contrib/tzcode/zic usr.sbin/zic usr.sbin/zic/zdump usr.sbin/zic/zic
Author: edwin
Date: Thu Feb 25 21:10:27 2010
New Revision: 204332
URL: http://svn.freebsd.org/changeset/base/204332
Log:
From contrib/tzcode:
The Makefiles are leftovers from the copies and should live in usr.sbin/zic/*
From usr.sbin/zic:
The sources are from a vendor contributed source, therefore should
live in contrib/tzcode/zic.
Deleted:
head/contrib/tzcode/zic/Makefile
head/contrib/tzcode/zic/Makefile.inc
head/usr.sbin/zic/Theory
head/usr.sbin/zic/ialloc.c
head/usr.sbin/zic/private.h
head/usr.sbin/zic/scheck.c
head/usr.sbin/zic/zdump.8
head/usr.sbin/zic/zdump.c
head/usr.sbin/zic/zic.8
head/usr.sbin/zic/zic.c
Modified:
head/usr.sbin/zic/zdump/Makefile
head/usr.sbin/zic/zic/Makefile
Modified: head/usr.sbin/zic/zdump/Makefile
==
--- head/usr.sbin/zic/zdump/MakefileThu Feb 25 20:54:54 2010
(r204331)
+++ head/usr.sbin/zic/zdump/MakefileThu Feb 25 21:10:27 2010
(r204332)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR}/../../../contrib/tzcode/zic
PROG= zdump
MAN= zdump.8
Modified: head/usr.sbin/zic/zic/Makefile
==
--- head/usr.sbin/zic/zic/Makefile Thu Feb 25 20:54:54 2010
(r204331)
+++ head/usr.sbin/zic/zic/Makefile Thu Feb 25 21:10:27 2010
(r204332)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${.CURDIR}/..
+.PATH: ${.CURDIR}/../../../contrib/tzcode/zic
PROG= zic
MAN= zic.8
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r204336 - head/contrib/tzcode/stdtime
Author: edwin Date: Thu Feb 25 21:29:40 2010 New Revision: 204336 URL: http://svn.freebsd.org/changeset/base/204336 Log: Remove non-contributed code. Deleted: head/contrib/tzcode/stdtime/Makefile.inc head/contrib/tzcode/stdtime/Symbol.map head/contrib/tzcode/stdtime/strftime.3 head/contrib/tzcode/stdtime/strftime.c head/contrib/tzcode/stdtime/strptime.3 head/contrib/tzcode/stdtime/strptime.c head/contrib/tzcode/stdtime/time32.c head/contrib/tzcode/stdtime/timelocal.c head/contrib/tzcode/stdtime/timelocal.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r204347 - in head: lib/libc/gen lib/libc/stdtime usr.sbin/zic/zdump usr.sbin/zic/zic
Author: edwin
Date: Fri Feb 26 06:44:00 2010
New Revision: 204347
URL: http://svn.freebsd.org/changeset/base/204347
Log:
Split the contributed code from libc/stdtime from lib/libc/stdtime
to contrib/tzcode/stdtime.
Deleted:
head/lib/libc/stdtime/asctime.c
head/lib/libc/stdtime/ctime.3
head/lib/libc/stdtime/difftime.c
head/lib/libc/stdtime/localtime.c
head/lib/libc/stdtime/private.h
head/lib/libc/stdtime/time2posix.3
head/lib/libc/stdtime/tzfile.5
head/lib/libc/stdtime/tzfile.h
Modified:
head/lib/libc/gen/sysconf.c
head/lib/libc/stdtime/Makefile.inc
head/usr.sbin/zic/zdump/Makefile
head/usr.sbin/zic/zic/Makefile
Modified: head/lib/libc/gen/sysconf.c
==
--- head/lib/libc/gen/sysconf.c Fri Feb 26 06:35:24 2010(r204346)
+++ head/lib/libc/gen/sysconf.c Fri Feb 26 06:44:00 2010(r204347)
@@ -50,7 +50,7 @@ __FBSDID($FreeBSD$);
#include unistd.h
#include ../stdlib/atexit.h
-#include ../stdtime/tzfile.h
+#include tzfile.h/* from ../../../contrib/tzcode/stdtime */
#define_PATH_ZONEINFO TZDIR /* from tzfile.h */
Modified: head/lib/libc/stdtime/Makefile.inc
==
--- head/lib/libc/stdtime/Makefile.inc Fri Feb 26 06:35:24 2010
(r204346)
+++ head/lib/libc/stdtime/Makefile.inc Fri Feb 26 06:44:00 2010
(r204347)
@@ -1,13 +1,16 @@
# Makefile.inc,v 1.2 1994/09/13 21:26:01 wollman Exp
# $FreeBSD$
-.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale
+.PATH: ${.CURDIR}/stdtime ${.CURDIR}/../locale \
+ ${.CURDIR}/../../contrib/tzcode/stdtime
SRCS+= asctime.c difftime.c localtime.c strftime.c strptime.c timelocal.c \
time32.c
SYM_MAPS+= ${.CURDIR}/stdtime/Symbol.map
+CFLAGS+= -I${.CURDIR}/../../contrib/tzcode/stdtime -I${.CURDIR}/stdtime
+
MAN+= ctime.3 strftime.3 strptime.3 time2posix.3
MAN+= tzfile.5
Modified: head/usr.sbin/zic/zdump/Makefile
==
--- head/usr.sbin/zic/zdump/MakefileFri Feb 26 06:35:24 2010
(r204346)
+++ head/usr.sbin/zic/zdump/MakefileFri Feb 26 06:44:00 2010
(r204347)
@@ -8,7 +8,7 @@ SRCS= zdump.c ialloc.c scheck.c
CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\/usr/share/zoneinfo\ -Demkdir=mkdir
-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
WARNS?=2
Modified: head/usr.sbin/zic/zic/Makefile
==
--- head/usr.sbin/zic/zic/Makefile Fri Feb 26 06:35:24 2010
(r204346)
+++ head/usr.sbin/zic/zic/Makefile Fri Feb 26 06:44:00 2010
(r204347)
@@ -9,7 +9,7 @@ SRCS= zic.c ialloc.c scheck.c
CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS
CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\/usr/share/zoneinfo\ -Demkdir=mkdir
CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H
-CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime
+CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../contrib/tzcode/stdtime
WARNS?=2
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r204298 - head/contrib/tzdata
Author: edwin Date: Thu Feb 25 06:31:05 2010 New Revision: 204298 URL: http://svn.freebsd.org/changeset/base/204298 Log: Copy share/zoneinfo to contrib/zoneinfo for the proper split of contributed data and FreeBSD specific data. Added: - copied from r204297, head/share/zoneinfo/ Directory Properties: head/contrib/tzdata/ (props changed) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r204300 - head/share/zoneinfo
Author: edwin
Date: Thu Feb 25 06:44:16 2010
New Revision: 204300
URL: http://svn.freebsd.org/changeset/base/204300
Log:
Officially speaking, the zoneinfo data files are contributed data.
Therefore treat them as such.
Deleted:
head/share/zoneinfo/africa
head/share/zoneinfo/antarctica
head/share/zoneinfo/asia
head/share/zoneinfo/australasia
head/share/zoneinfo/backward
head/share/zoneinfo/etcetera
head/share/zoneinfo/europe
head/share/zoneinfo/factory
head/share/zoneinfo/leapseconds
head/share/zoneinfo/northamerica
head/share/zoneinfo/pacificnew
head/share/zoneinfo/southamerica
head/share/zoneinfo/systemv
head/share/zoneinfo/yearistype.sh
head/share/zoneinfo/zone.tab
Modified:
head/share/zoneinfo/Makefile
Modified: head/share/zoneinfo/Makefile
==
--- head/share/zoneinfo/MakefileThu Feb 25 06:35:21 2010
(r204299)
+++ head/share/zoneinfo/MakefileThu Feb 25 06:44:16 2010
(r204300)
@@ -29,6 +29,8 @@
#
CLEANFILES+= yearistype
+CONTRIBDIR=${.CURDIR}/../../contrib/tzdata/
+.PATH: ${CONTRIBDIR}
.if defined(LEAPSECONDS)
LEAPFILE= -L leapseconds
@@ -44,6 +46,8 @@ POSIXRULES= America/New_York
TZFILES+= backward systemv
.endif
+TZFILES:= ${TZFILES:S/^/${CONTRIBDIR}/}
+
all: yearistype
beforeinstall:
@@ -52,7 +56,7 @@ beforeinstall:
-u ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${LEAPFILE} -y ${.OBJDIR}/yearistype ${TZFILES}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
- ${.CURDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
+ ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
afterinstall:
#
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r204302 - head/contrib/tzcode/zic
Author: edwin Date: Thu Feb 25 06:53:46 2010 New Revision: 204302 URL: http://svn.freebsd.org/changeset/base/204302 Log: Copy usr.sbin/zic to contrib/tzcode/zic for the proper split of contributed code and FreeBSD specific code. Added: - copied from r204301, head/usr.sbin/zic/ Directory Properties: head/contrib/tzcode/zic/ (props changed) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r204061 - head
Author: edwin Date: Thu Feb 18 21:14:29 2010 New Revision: 204061 URL: http://svn.freebsd.org/changeset/base/204061 Log: Add heads-up requests for parts of the tree I look after and which are partly maintained by a third party: - share/zoneinfo - usr.sbin/zic - lib/libc/stdtime Modified: head/MAINTAINERS Modified: head/MAINTAINERS == --- head/MAINTAINERSThu Feb 18 20:20:34 2010(r204060) +++ head/MAINTAINERSThu Feb 18 21:14:29 2010(r204061) @@ -125,6 +125,12 @@ gnu/usr.bin/send-prbugmaster Pre-commit ncursesrafan Heads-up appreciated, try not to break it. *env(3)secteam Due to the problematic security history of this code, please have patches reviewed by secteam. +share/zoneinfo edwin Heads-up appreciated, since our data is coming + from a third party source. +usr.sbin/zic edwin Heads-up appreciated, since this code is + maintained by a third party source. +lib/libc/stdtime edwin Heads-up appreciated, since parts of this code + is maintained by a third party source. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
