contrib/tzdata: correct DST in Jordan and Samoa

Direct commit to stable/11.

The recent tzdata 2021b release includes several controversial changes
under active debate on the tz mailing list. Pending consensus, and
hopefully a 2021c release reflecting it, only merge the DST changes for
Jordan and Samoa. This corrects present and future timestamps in those
regions.

Git Hash: 21e88c53735de2ba1036d87156e5dda0b4f12991
Git Author: philip@FreeBSD.org

MFC: contrib/tzdata: import tzdata 2020e

Changes: https://github.com/eggert/tz/blob/2020e/NEWS

(cherry picked from commit dc505d53dcc15636aea9df8c03298f8c32147fa9)

Git Hash: 57d2cb51419cbd7a92214cc57c2145340946efc7
Git Author: philip@FreeBSD.org

MFC r366779: Import tzdata 2020c

MFC r366529: Import tzdata 2020b

MFC r352238: Import tzdata 2019c

MFC r349592: Import tzdata 2019b

MFC r342613: Import tzdata 2018h
MFC r342644: Import tzdata 2018i

MFC r339503: Import tzdata 2018f

MFC r333247: Import tzdata 2018e

North Korea switches back to +09 on 2018-05-05.

This version more correctly models time stamps in time zones with
negative DST such as Europe/Dublin (from 1971 on), Europe/Prague
(1946/7), and Africa/Windhoek (1994/2017). This does not affect the
UT offsets, only time zone abbreviations and the tm_isdst flag.

Approved by: re (kib)

MFC r331481: Import tzdata 2018d

MFC r328055: Import tzdata 2018a
MFC r328318: Import tzdata 2018c

MFC r325059: import tzdata 2017c

MFC r316060:

Import tzdata 2017b

MFC r308270:
MFV r308265: Update tzdata to 2016i.

Sponsored by: The FreeBSD Foundation

MFC r307783:

Import tzdata 2016h

MFC r306853

Import tzdata 2016g

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

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.

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.)

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.

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.

MFV of r270725, tzdata2014f

- Russia time zone changes.
- New zones: Asia/Chita and Asia/Srednekolymsk.
- Lots of changes wrt. time zone abbreviations and historical data.
- New zone tab data format.

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.

Undo commit r267455, which was done in the wrong directory.

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/

MFV for 263899, tzdata2014b

- Update antartica.
- Comments about historical data for Hawaii.
- Update details for Crimea on 30 March
- Move location data Simferopol.

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.

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.

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.]

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.

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.

Merge of vendor import of 242999, tzdata2012j

- Libya went to Standard Time on 10 November 2012

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.

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/

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.

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/

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/

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/

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/

MFV of tzdata2011a, r218120

- Cleanup rules for Australia/South_Australia (nothing changed)
- Add historical information for Honolulu.

MFV of tzdata2010o, r214716

- Fiji moves to DST three weeks earlier in 2010.

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)

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)

MFV of tzdata2010e:

- Adjust beginning / end of DST in Bangladesh (minimal impact)
- Fiji ends DST one month earlier to last Sunday of March
- Samoa changes
- Chile extends DST until 3 April this year.

Copy share/zoneinfo to contrib/zoneinfo for the proper split of
contributed data and FreeBSD specific data.

MFV of tzdata2009s, r199334

- Fix (harmless) typo in the definitions of Antarctica/David
- Fiji will go into DST from 29 November 2009 to 25 April 2010.

MFC after: 3 days

MFV of tzdata2009o:

- Somoa has not moved to DST this year (comment only)
- Bangladesh stays on DST for now.
- Pakistan went back to standard time in 1 October 2009

MFC after: 1 week

MFV of r196998.

Import of tzdata2008m

Samoa will go in DST on 4 October 2009 till 28 March 2010
Palestine will go back from DST on 4 September 2009

MFV of r196350

Import of tzdata2009l

- Egypt will go to Wintertime on 21 August 2009
- Heads up for a possible DST in Samoa

MFV of tzdata2009h:

- Fix coordinates of Africa/Gaborone, Pacific/Noumea, Pacific/Tongatapu,
Europe/Vatican

- Fix URLs (=3D -> = etc)

- Jordan doesn't go at last Friday of March 00:00 but no last
Thursday of March 24:00

- Specifically state license for the data: public domain

MFC after: 1 week

MFV of tzdata2008d

- Mauritius will have a DST experiment between 2008-11-01 and 2009-03-31.
- Add/Fix historical data for C-Eur, the SovietZone, Germany,
Bahamas, San Luis.
- Add information about West Para (America/Santarem)
- America/Eirunepe and America/Rio_Branco go to UTC-4

Approved by: bde (mentor, implicit), des
MFC after: 1 week

MFV of tzdata2008c

- Africa/Morocco will have DST in 2008.
- Asia/Choibalsan should be GMT+08:00.
- Asia/Pakistan will have DST in 2008.

Also set all the svn:eol-style properties to native.

Approved by: bde (mentor, implicit), des
MFC after: 1 week

Set magic fbsd:nokeywords property that allows files to bypass
keyword expansion. (file-specific replacement for CVSROOT/exclude)

MFV: tzdata2007g

PR: conf/115706
Submitted by: edwin@
Approved by: re (bmah@)
Obtained from: ftp://elsie.nci.nih.gov/pub/
MFC after: 1 week

MFV: tzdata2007f

PR: conf/109418
Requested by: edwin@
Obtained from: Arthur David Olson, ftp://elsie.nci.nih.gov/pub/tzdata2007f.tar.gz
MFC after: 1 week

MFV.

Merge from vendor branch.

Updates to historic rules only for: part of Alaska, Algeria, Bulgaria,
Colombia, Easter Island, Italy, Malta, Mexico, Mongolia, Montserrat,
Puerto Rico, Poland, Russia, South Korea, Spain, part of North Dakota,
United Kingdom, Uruguay, Uzbekistan

Updates to current and future rules for: Guatemala, Haiti, Honduras,
part of Indiana, Iran, Nicaragua, Palestinian Territories, Sri Lanka,
Tunisia,

Updates to future rules only for: Canada, Thule AFB in Greenland

Merge tzdata2005r from vendor branch. Only significant change is to
update those Canadian provinces which have announced that they will
follow the new US DST rules.

Merge tzdata2005q from vendor branch. Data changes for the following
locales: Azerbaijan, Brazil, Cuba, Gaza, Georgia, Jordan, Kirgizstan,
Nicaragua, Uruguay.

Merge tzdata2005l update from vendor branch.

MT6: after release
MT5: immediately

MFV: tzdata2003d

Merge from vendor branch:
- No more DST in Pakistan
- Update some historical information
- New zone for Rothera station in the Antarctic.

PR: misc/51495

Merge from vendor tzdata2002d.

PR: 44004
MFC after: 3 days

Merge from vendor branch.

Except for a comment in zone.tab (about the location of the ISO 3166 table),
we are now using the vendor files verbatim.

Merge tzdata2001d update from vendor branch.

PR: conf/31851
Obtained from: Arthur David Olson and the timezone database maintainers
MFC after: 1 week

Fixed typos: dependant -> dependent

Merge tzdata2001b from vendor branch.

Merge from vendor branch.

Merge from vendor branch. Also move FreeBSD Ids away from vendor Id
to make future merges easier.

Merge from vendor branch.

PR: 17431
Obtained from: ftp://elsie.nci.nih.gov/pub/tzdata2000d.tar.gz

Add $FreeBSD$

Correct the date on which DST begins in Victoria and New South Wales
in the year 2000: as the result of some local function in Sydney, DST
will begin on Sunday, 27 August instead of Sunday, 29 Cotober.

This change had already been made, but the date was incorrectly
specified as (Saturday) 26 August.

Submitted by: Howard Lowndes <lannet@lannet.com.au>

Merge from vendor branch. Includes functional updates for:

Egypt, Cyprus, Israel, Japan, Australia, Fiji, Brazil,
Mexico, Nicaragua

PR: 8632

Obtained from: ftp://elsie.nci.nih.gov/pub/tzdata1999b

Merge the 1999a revision of the timezone data files. There are a number
of important changes to European and South and Central American countries
which should be back-ported to 3.x.

Obtained from: ftp://elsie.nci.nih.gov/pub/tzdata1999a.tar.gz

Merge changes from vendor branch.

Merge from vendor branch.

Merge changes from vendor branch.

Update to the latest version from the vendor branch. These files are
now identical with the distributed versions, which may cause some
abbreviations to change for people in obscure zones. (The abbreviations
can be changed again if need be.) It also changes the abbreviation
of Central European Time to `CET' from its previous value of `MET'
(a curious German-English hybrid). Finally, we have finally rid
ourselves of those nasty ZONE-DESCR comments, which were a maintenance
nightmare, in favor of the new zone.tab file. We are not using the
distribution's iso3166.tab file because we have our own list.

Obtained from: Arthur David Olson; ftp://elsie.nci.nih.gov

Merged the latest timezone data file release.

Changed zones: Algeria, Egypt, Ghana, Libya, Morocco, Sierra Leone,
South Africa, Sudan, Tunisia, Armenia, Myanmar, China, Taiwan, Hong
Kong, Macao, Cyprus, Georgia, Iran, Israel, Jordan, Kazakhstan,
Kirgizstan, Lebanon, Mongolia, the Phillippines, Syria, Tajikistan,
Turkmenistan, Uzbekistan, Australia, Kiribati, New Caledonia, New
Zealand, Vanuatu, the United Kingdom, Ireland, the Czech Republic,
Finland, France, Greece, Hungary, Iceland, Italy, Luxembourg, the
Netherlands, Norway, Portugal, Romania, Spain, Switzerland, Turkey,
Canada, Mexico, the Bahamas, Barbados, Belize, Costa Rica, Cuba, the
Dominican Republic, El Salvador, Guatemala, Haiti, Nicaragua,
Brazil, the Falkland Islands, Paraguay

Deleted zones: Asia/Tomsk (superseded by Asia/Krasnoyarsk)

Added zones: Asia/Aktau (area formerly part of Asia/Alma-Ata);
Asia/Krasnoyarsk (supersedes Asia/Tomsk); America/Glace_Bay (area
formerly part of America/Halifax); America/Thunder_Bay,
America/Nipigon, America/Rainy_River (areas formerly covered by
America/Montreal); America/Swift_Current (area formerly part of
America/Regina); America/Dawson_Creek (area formerly part of
America/Vancouver); America/Pangnirtung, America/Iqaluit,
America/Rankin_Inlet, America/Yellowknife, America/Inuvik,
America/Dawson (areas formerly part of America/Whitehorse)

Update timezone files to 96c from vendor branch.
Australia/Canberra is dead (use Australia/Sydney).
Asia/Tel_Aviv has been renamed Asia/Jerusalem.

I forgot the reason why I didn't have a period in the `Rep of Palau' the
last time, and mistakenly added it in, thus causing a syntax error in
tzsetup. Fixed.

Merge timzeone data changes from vendor branch. Most significant change
is 1996 EC harmonization. Also, the following timezones have been renamed:
Asia/Frunze -> Asia/Bishkek
Pacific/Cocos -> Indian/Cocos
Pacific/Belau -> Pacific/Palau
America/Navajo -> America/Shiprock
and one new timezone has been added:
Australia/Canberra

Add more comments for tzsetup and fix some old ones.

Added parseable comments describing the zone each entry represents.

Initial revision