Update data to 2021b (modified)

This is really 2021a+ — there is a great deal of controversy upstream
about the inclusion of a number of patches that merge pre-existing zones
into zones with which they differ before 1970.

These changes may be disruptive to test suites and a large number of
people asked the maintainer to make a release containing only the
changes to Samoa and Jordan's DST (which are time-sensitive) and to
continue the debate about the other changes without the added time
pressure. The maintainer cut a release with fewer of the proposed
changes, but still many changes. As a result, there has been some split
in the ecosystem about which binaries to actually deploy — some people
are packaging 2021a + Samoa & Jordan while others are packaging 2021b
as-is.

We will attempt a compromise by releasing 2021a + cherry-picked changes
as 2021.2 and 2021b as 2021.2.post0.

Author: pganssle

NEWS.md

@@ -1,3 +1,20 @@
+# Version 2021.2
+Upstream version 2021b released 2021-09-24T23:23:00+00:00
+
+## Briefly:
+
+This is an intermediate release that cherry-picks only the changes to Jordan and
+Samoa's DST. It will not match upstream 2021b, which includes many other
+changes.
+
+## Changes to future timestamps
+
+Jordan now starts DST on February's last Thursday. (Thanks to Steffen Thorsen.)
+
+Samoa no longer observes DST.  (Thanks to Geoffrey D. Bennett.)
+
+---
+
 # Version 2021.1
 Upstream version 2021a released 2021-01-24T18:54:57+00:00
 

VERSION

@@ -1 +1 @@
-2021.1
+2021.2

news.d/2021b.md

@@ -0,0 +1,14 @@
+# Version 2021.2
+Upstream version 2021b released 2021-09-24T23:23:00+00:00
+
+## Briefly:
+
+This is an intermediate release that cherry-picks only the changes to Jordan and
+Samoa's DST. It will not match upstream 2021b, which includes many other
+changes.
+
+## Changes to future timestamps
+
+Jordan now starts DST on February's last Thursday. (Thanks to Steffen Thorsen.)
+
+Samoa no longer observes DST.  (Thanks to Geoffrey D. Bennett.)

src/tzdata/__init__.py

@@ -1,6 +1,6 @@
 # IANA versions like 2020a are not valid PEP 440 identifiers; the recommended
 # way to translate the version is to use YYYY.n where `n` is a 0-based index.
-__version__ = "2021.1"
+__version__ = "2021.2"
 
 # This exposes the original IANA version number.
-IANA_VERSION = "2021a"
+IANA_VERSION = "2021b"

src/tzdata/zoneinfo/Asia/Amman

@@ -72,11 +72,11 @@ Leap	2016	Dec	31	23:59:60	+	S
 # Any additional leap seconds will come after this.
 # This Expires line is commented out for now,
 # so that pre-2020a zic implementations do not reject this file.
-#Expires 2021	Dec	28	00:00:00
+#Expires 2022	Jun	28	00:00:00
 
 # POSIX timestamps for the data in this file:
 #updated 1467936000 (2016-07-08 00:00:00 UTC)
-#expires 1640649600 (2021-12-28 00:00:00 UTC)
+#expires 1656374400 (2022-06-28 00:00:00 UTC)
 
-#	Updated through IERS Bulletin C61
-#	File expires on:  28 December 2021
+#	Updated through IERS Bulletin C62
+#	File expires on:  28 June 2022

src/tzdata/zoneinfo/Pacific/Apia

@@ -1,4 +1,4 @@
-# version 2021a
+# version 2021b
 # This zic input file is in the public domain.
 R d 1916 o - Jun 14 23s 1 S
 R d 1916 1919 - O Su>=1 23s 0 -
@@ -916,8 +916,9 @@ R J 2004 o - O 15 0s 0 -
 R J 2005 o - S lastF 0s 0 -
 R J 2006 2011 - O lastF 0s 0 -
 R J 2013 o - D 20 0 0 -
-R J 2014 ma - Mar lastTh 24 1 S
+R J 2014 2021 - Mar lastTh 24 1 S
 R J 2014 ma - O lastF 0s 0 -
+R J 2022 ma - F lastTh 24 1 S
 Z Asia/Amman 2:23:44 - LMT 1931
 2 J EE%sT
 Z Asia/Almaty 5:7:48 - LMT 1924 May 2
@@ -1596,8 +1597,8 @@ L Pacific/Pago_Pago Pacific/Midway
 R WS 2010 o - S lastSu 0 1 -
 R WS 2011 o - Ap Sa>=1 4 0 -
 R WS 2011 o - S lastSa 3 1 -
-R WS 2012 ma - Ap Su>=1 4 0 -
-R WS 2012 ma - S lastSu 3 1 -
+R WS 2012 2021 - Ap Su>=1 4 0 -
+R WS 2012 2020 - S lastSu 3 1 -
 Z Pacific/Apia 12:33:4 - LMT 1892 Jul 5
 -11:26:56 - LMT 1911
 -11:30 - -1130 1950