diff --git a/extra/tzdata/build b/extra/tzdata/build index 7585a791..0685a003 100755 --- a/extra/tzdata/build +++ b/extra/tzdata/build @@ -1,7 +1,5 @@ #!/bin/sh -e -patch -p1 < awk.patch - make make DESTDIR="$1" ZICDIR=/usr/bin install diff --git a/extra/tzdata/checksums b/extra/tzdata/checksums index f95cb7ba..437dd0c8 100644 --- a/extra/tzdata/checksums +++ b/extra/tzdata/checksums @@ -1,2 +1 @@ -5da3fd3eb51d51d2aa4c599db8a1dd8dff453d79f4881131e35d40707ae1f838 -5fb0497a5a004d182f33a5e49e6a6f10a1c2db29c208363c7eefde8fc009b383 +067f0f4bee8e509b3eca502c5bd7c8f98073ab49b6c05654a157cbffd07aa3a4 diff --git a/extra/tzdata/patches/awk.patch b/extra/tzdata/patches/awk.patch deleted file mode 100644 index dcf7ab4e..00000000 --- a/extra/tzdata/patches/awk.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/ziguard.awk b/ziguard.awk -index 0728baa..9b3f2f8 100644 ---- a/ziguard.awk -+++ b/ziguard.awk -@@ -165,7 +165,7 @@ DATAFORM != "main" { - sub(/[-+][^\t ]+CHANGE-TO-/, "") - } else { - if (/^[^#]*%z/) { -- stdoff_column = 2 * /^Zone/ + 1 -+ stdoff_column = 2 * int(/^Zone/) + 1 - rules_column = stdoff_column + 1 - stdoff = get_minutes($stdoff_column) - rules = $rules_column -@@ -222,7 +222,7 @@ DATAFORM != "main" { - stdoff_subst[1] = rounded_stdoff - } - } else if (stdoff_subst[0]) { -- stdoff_column = 2 * /^Zone/ + 1 -+ stdoff_column = 2 * int(/^Zone/) + 1 - stdoff_column_val = $stdoff_column - if (stdoff_column_val == stdoff_subst[0]) { - sub(stdoff_subst[0], stdoff_subst[1]) diff --git a/extra/tzdata/sources b/extra/tzdata/sources index 990f92d2..ef6466ba 100644 --- a/extra/tzdata/sources +++ b/extra/tzdata/sources @@ -1,2 +1 @@ https://github.com/eggert/tz/archive/VERSION.tar.gz -patches/awk.patch diff --git a/extra/tzdata/version b/extra/tzdata/version index 96588fd9..aecd44d4 100644 --- a/extra/tzdata/version +++ b/extra/tzdata/version @@ -1 +1 @@ -2022b 1 +2022c 1