Resolves: #2149397

Rebase to tzdata-2022g
- The northern edge of the Mexican state of Chihuahua will
  change time zone to agree with nearby US locations on
  2022-11-30.
- Added a new Zone America/Ciudad_Juarez that splits from
  America/Ojinaga.

.gitignore

@@ -184,3 +184,23 @@ noarch/
 /tzdata2020f.tar.gz
 /tzcode2021a.tar.gz
 /tzdata2021a.tar.gz
+/tzdata2021b.tar.gz
+/tzcode2021b.tar.gz
+/tzcode2021c.tar.gz
+/tzdata2021c.tar.gz
+/tzdata2021e.tar.gz
+/tzcode2021e.tar.gz
+/tzdata2022a.tar.gz
+/tzcode2022a.tar.gz
+/tzcode2022b.tar.gz
+/tzdata2022b.tar.gz
+/tzcode2022c.tar.gz
+/tzdata2022c.tar.gz
+/tzcode2022d.tar.gz
+/tzdata2022d.tar.gz
+/tzcode2022e.tar.gz
+/tzdata2022e.tar.gz
+/tzcode2022f.tar.gz
+/tzdata2022f.tar.gz
+/tzcode2022g.tar.gz
+/tzdata2022g.tar.gz

0001-Fix-Jan-Mayen-typo.patch

@@ -0,0 +1,29 @@
+From 2a7c7c5873ff0eb725e8eafad04f6af6ada66dc6 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sat, 25 Sep 2021 08:32:39 -0700
+Subject: [PROPOSED] Fix Jan Mayen typo
+
+Fix typo in 2021-09-24 revert of most of the 2021-05-19
+alike-since-1970 patch.  Problem reported by Chris Walton in:
+https://mm.icann.org/pipermail/tz/2021-September/030772.html
+* backward (Atlantic/Jan_Mayen): Link from Europe/Oslo,
+not Europe/Berlin.
+---
+ backward | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/backward b/backward
+index 7c288e3..5412c46 100644
+--- a/backward
++++ b/backward
+@@ -116,7 +116,7 @@ Link	Asia/Makassar		Asia/Ujung_Pandang
+ Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
+ Link	Asia/Bangkok		Asia/Vientiane
+ Link	Atlantic/Faroe		Atlantic/Faeroe
+-Link	Europe/Berlin		Atlantic/Jan_Mayen
++Link	Europe/Oslo		Atlantic/Jan_Mayen
+ Link	Africa/Abidjan		Atlantic/St_Helena
+ Link	Australia/Sydney	Australia/ACT
+ Link	Australia/Sydney	Australia/Canberra
+-- 
+2.30.2

0001-Work-around-awk-bug-1.patch

@@ -0,0 +1,153 @@
+From e8171130f9b80ae3c75dfa5e96c47d5dbc0f4aae Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Wed, 10 Aug 2022 18:58:08 -0700
+Subject: [PROPOSED] Work around macOS awk bug
+
+* ziguard.awk: Replace every regular expression /ERE/ in ordinary
+contexts with ($0 ~ /ERE/), to work around a bug in macOS 13.0 awk.
+Problem reported by Deborah Goldsmith in:
+https://mm.icann.org/pipermail/tz/2022-August/031783.html
+---
+ NEWS        |  8 ++++++++
+ ziguard.awk | 37 ++++++++++++++++++++-----------------
+ 2 files changed, 28 insertions(+), 17 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 6a0d5c50..7291030a 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,5 +1,13 @@
+ News for the tz database
+ 
++Unreleased, experimental changes
++
++  Changes to code
++
++    Work around a bug in macOS 'awk' that broke commands like 'make
++    traditional_tarballs'.  (Problem reported by Deborah Goldsmith.)
++
++
+ Release 2022b - 2022-08-10 15:38:32 -0700
+ 
+   Briefly:
+diff --git a/ziguard.awk b/ziguard.awk
+index 0728baa5..0556cc4a 100644
+--- a/ziguard.awk
++++ b/ziguard.awk
+@@ -91,12 +91,13 @@ $1 == "#PACKRATLIST" && $2 == PACKRATLIST {
+ /^Zone/ { zone = $2 }
+ 
+ DATAFORM != "main" {
+-  in_comment = /^#/
++  in_comment = $0 ~ /^#/
+   uncomment = comment_out = 0
+ 
+   # If this line should differ due to Czechoslovakia using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  if (zone == "Europe/Prague" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) {
++  if (zone == "Europe/Prague" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \
++      && $0 ~ /1947 Feb 23/) {
+     if (($(in_comment + 2) != "-") == (DATAFORM != "rearguard")) {
+       uncomment = in_comment
+     } else {
+@@ -106,9 +107,9 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Ireland using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  Rule_Eire = /^#?Rule[\t ]+Eire[\t ]/
++  Rule_Eire = $0 ~ /^#?Rule[\t ]+Eire[\t ]/
+   Zone_Dublin_post_1968 \
+-    = (zone == "Europe/Dublin" && /^#?[\t ]+[01]:00[\t ]/ \
++    = (zone == "Europe/Dublin" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \
+        && (!$(in_comment + 4) || 1968 < $(in_comment + 4)))
+   if (Rule_Eire || Zone_Dublin_post_1968) {
+     if ((Rule_Eire \
+@@ -122,9 +123,9 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Namibia using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/
++  Rule_Namibia = $0 ~ /^#?Rule[\t ]+Namibia[\t ]/
+   Zone_using_Namibia_rule \
+-    = (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \
++    = (zone == "Africa/Windhoek" && $0 ~ /^#?[\t ]+[12]:00[\t ]/ \
+        && ($(in_comment + 2) == "Namibia" \
+ 	   || ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \
+ 	       && ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \
+@@ -142,8 +143,8 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Portugal benefiting from %z if supported,
+   # uncomment the desired version and comment out the undesired one.
+-  if (/^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) {
+-    if (/%z/ == (DATAFORM == "vanguard")) {
++  if ($0 ~ /^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) {
++    if (($0 ~ /%z/) == (DATAFORM == "vanguard")) {
+       uncomment = in_comment
+     } else {
+       comment_out = !in_comment
+@@ -164,8 +165,8 @@ DATAFORM != "main" {
+     sub(/-00CHANGE-TO-%z/, "-00")
+     sub(/[-+][^\t ]+CHANGE-TO-/, "")
+   } else {
+-    if (/^[^#]*%z/) {
+-      stdoff_column = 2 * /^Zone/ + 1
++    if ($0 ~ /^[^#]*%z/) {
++      stdoff_column = 2 * ($0 ~ /^Zone/) + 1
+       rules_column = stdoff_column + 1
+       stdoff = get_minutes($stdoff_column)
+       rules = $rules_column
+@@ -184,9 +185,9 @@ DATAFORM != "main" {
+ 	    dstoff = 20
+ 	  } else if (((rules == "Cook" || rules == "LH") && NF == 3) \
+ 		     || (rules == "Uruguay" \
+-			 && /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) {
++			 && $0 ~ /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) {
+ 	    dstoff = 30
+-	  } else if (rules == "Uruguay" && /[\t ]1974 Mar 10$/) {
++	  } else if (rules == "Uruguay" && $0 ~ /[\t ]1974 Mar 10$/) {
+ 	    dstoff = 90
+ 	  } else {
+ 	    dstoff = 60
+@@ -222,7 +223,7 @@ DATAFORM != "main" {
+       stdoff_subst[1] = rounded_stdoff
+     }
+   } else if (stdoff_subst[0]) {
+-    stdoff_column = 2 * /^Zone/ + 1
++    stdoff_column = 2 * ($0 ~ /^Zone/) + 1
+     stdoff_column_val = $stdoff_column
+     if (stdoff_column_val == stdoff_subst[0]) {
+       sub(stdoff_subst[0], stdoff_subst[1])
+@@ -233,7 +234,7 @@ DATAFORM != "main" {
+ 
+   # In rearguard form, change the Japan rule line with "Sat>=8 25:00"
+   # to "Sun>=9 1:00", to cater to zic before 2007 and to older Java.
+-  if (/^Rule/ && $2 == "Japan") {
++  if ($0 ~ /^Rule/ && $2 == "Japan") {
+     if (DATAFORM == "rearguard") {
+       if ($7 == "Sat>=8" && $8 == "25:00") {
+ 	sub(/Sat>=8/, "Sun>=9")
+@@ -250,7 +251,7 @@ DATAFORM != "main" {
+   # In rearguard form, change the Morocco lines with negative SAVE values
+   # to use positive SAVE values.
+   if ($2 == "Morocco") {
+-    if (/^Rule/) {
++    if ($0 ~ /^Rule/) {
+       if ($4 ~ /^201[78]$/ && $6 == "Oct") {
+ 	if (DATAFORM == "rearguard") {
+ 	  sub(/\t2018\t/, "\t2017\t")
+@@ -290,8 +291,10 @@ DATAFORM != "main" {
+ /^Zone/ {
+   packrat_ignored = FILENAME == PACKRATDATA && PACKRATLIST && !packratlist[$2];
+ }
+-packrat_ignored && !/^Rule/ {
+-  sub(/^/, "#")
++{
++  if (packrat_ignored && $0 !~ /^Rule/) {
++    sub(/^/, "#")
++  }
+ }
+ 
+ # If a Link line is followed by a Link or Zone line for the same data, comment
+-- 
+2.34.1
+

sources

@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2021a.tar.gz) = bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
+SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a
-SHA512 (tzdata2021a.tar.gz) = 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
+SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65

tests/tzdata-checker/runtest.sh

@@ -73,12 +73,13 @@ rlJournalStart
 
   rlPhaseStartSetup "Test zdump"
     for zone in `cat zones.int`; do
-      rlRun "./zdump -v -c 1970,$hiyear $zone >ref"
+      if rlIsRHEL "<8"; then # glibc's zdump is out of sync for '-v option'
-      if uname -r | egrep -o -q '\.el5'; then  # glibc's zdump is out of sync for RHEL5
+        rlRun "./zdump -v -c 1970,$hiyear $zone >ref"
         rlRun "./zdump -v -c 1970,$hiyear /usr/share/zoneinfo/$zone >cur"
         sed -i 's|^/usr/share/zoneinfo/||' cur
       else
-        rlRun "zdump -v -c 1970,$hiyear $zone >cur"
+        rlRun "./zdump -V -c 1970,$hiyear $zone >ref"
+        rlRun "zdump -V -c 1970,$hiyear $zone >cur"
       fi
 
       # normalize zdump outputs

tzdata.spec

@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021a
+Version: 2022g
-%define tzdata_version 2021a
+%define tzdata_version 2022g
-%define tzcode_version 2021a
+%define tzcode_version 2022g
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
 Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
@@ -151,6 +151,82 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Dec 02 2022 Patsy Griffin <patsy@redhat.com> - 2022g-1
+- Rebase to tzdata-2022g
+  - The northern edge of the Mexican state of Chihuahua will
+    change time zone to agree with nearby US locations on
+    2022-11-30.
+  - Added a new Zone America/Ciudad_Juarez that splits from
+    America/Ojinaga.
+
+* Mon Oct 31 2022 Patsy Griffin <patsy@redhat.com> - 2022f-1
+- Rebase to tzdata-2022f
+  - Mexico will stop observing DST except near the US border.
+  - Chihuahua moved to -06 year round starting on 2022-10-30.
+  - Fiji no longer observes DST.
+
+* Fri Oct 14 2022 Patsy Griffin <patsy@redhat.com> - 2022e-1
+- Rebase to tzdata-2022e
+  - Jordan and Syria cancelled the DST transition planned
+    for 2022-10-28, remaining at +03 permanently.
+
+* Sun Sep 25 2022 Patsy Griffin <patsy@redhat.com> - 2022d-1
+- Rebase to tzdata-2022d
+  - Palestine DST transition will be on October 29, 2022,
+    not October 28, 2022.
+  - Europe/Uzhgorod and Europe/Zaporozhye are moved to 'backzone'.
+
+* Mon Aug 22 2022 Patsy Griffin <patsy@redhat.com> - 2022c-1
+- Rebase to tzdata-2022c - supersedes tzdata-2022b
+  - Add a work-around for an awk bug in FreeBSD, macOS, etc.
+  - Improve tzselect with respect to intercontinental Zones.
+
+* Sun Aug 14 2022 Patsy Griffin <patsy@redhat.com> - 2022b-1
+- Rebase to tzdata-2022b
+  - Chile transitions to DST on 2022-09-11, not 2022-09-04
+  - 'make install' now defaults LOCALTIME to Factory rather than GMT
+  - More zones that are the same since 1970 have been moved to backzone.
+  - Include patch for awk workaround.
+
+* Tue Apr 12 2022 Patsy Griffin <patsy@redhat.com> - 2022a-2
+- Rebuild with updates for tests/tzdata-checker/runtest.sh.
+
+* Wed Mar 23 2022 Patsy Griffin <patsy@redhat.com> - 2022a-1
+- Rebase to tzdata-2022a
+  - Palestine springs forward on 2022-03-27, not 2022-03-26.
+  - zdump -v now outputs better failure information.
+  - bug fixes for code that reads corrupted TZif data.
+
+* Tue Oct 26 2021 Patsy Griffin <patsy@redhat.com> - 2021e-1
+- Rebase to tzdata-2021e - supersedes tzdata-2021d
+  - Pacific/Fiji suspended DST for the 2021/2022 season.
+  - 'zic -r' now marks unspecified timestamps with "-00".
+  - Palestine will fall back 2021-10-29 at 01:00, rather
+    than the predicted 2021-10-30.
+
+* Thu Oct 07 2021 Patsy Griffin <patsy@redhat.com> - 2021c-1
+- Rebase to tzdata-2021c
+  - Revert most 2021b changes to the 'backward' file.
+  - Fix 'zic -b fat' bug in pre-1970 32-bit data reported in tzdata-2021b.
+  - Fix two Link line typos from tzdata-2021b.
+  - Distribute the new SECURITY file.
+
+* Sat Sep 25 2021 Patsy Griffin <patsy@redhat.com> - 2021b-1
+- Rebase to tzdata-2021b
+  - Jordan now starts DST on February's last Thursday.
+  - Samoa no longer observes DST.
+  - Merge more location-based Zones whose timestamps agree since 1970.
+  - Move some backward-compatibility links to 'backward'.
+  - Rename Pacific/Enderbury to Pacific/Kanton.
+  - Correct many pre-1993 transitions in Malawi, Portugal, etc.
+  - zic now creates each output file or link atomically.
+  - zic -L no longer omits the POSIX TZ string in its output.
+  - zic fixes for truncation and leap second table expiration.
+  - zic now follows POSIX for TZ strings using all-year DST.
+  - Fix some localtime crashes and bugs in obscure cases.
+  - zdump -v now outputs more-useful boundary cases.
+  - tzfile.5 better matches a draft successor to RFC 8536.
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild