Update zoneinfo-utils to 2023c (#702)

* Update zoneinfo-utils to 2023c

.github/workflows/pr-labels.yml

@@ -5,7 +5,7 @@ on:
 jobs:
     check-labels:
         name: Check that PRs against the stable branch are labelled correctly
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Check labels
               run: |

.github/workflows/pr.yml

@@ -4,7 +4,7 @@ on:
 jobs:
     lint:
         name: Check that it conforms to the style guide
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
@@ -16,15 +16,15 @@ jobs:
               run: make lint
     pr:
         name: Check that it builds without error
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         needs: lint
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3
             - name: Setup Toltec dependencies
               uses: ./.github/actions/setup
             - name: Build packages
-              run: make repo-new FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}'
+              run: FLAGS='--remote-repo https://toltec-dev.org/${{ github.base_ref }}' make repo-new
             - name: Save the build output
               uses: actions/upload-artifact@v3
               with:

.github/workflows/stable.yml

@@ -6,7 +6,7 @@ on:
 jobs:
     stable:
         name: Build and publish the stable channel
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3

.github/workflows/testing.yml

@@ -6,7 +6,7 @@ on:
 jobs:
     testing:
         name: Build and publish the testing channel
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         steps:
             - name: Checkout the Git repository
               uses: actions/checkout@v3

Makefile

@@ -6,6 +6,10 @@ RECIPES=$(shell ls package/)
 RECIPES_PUSH=$(foreach app, $(RECIPES), $(app)-push)
 RECIPES_CLEAN=$(foreach app, $(RECIPES), $(app)-clean)
 
+ifeq ($(RUNNER_DEBUG), 1)
+FLAGS+= --verbose
+endif
+
 define USAGE
 Building packages:
 

package/zoneinfo-utils/package

@@ -7,23 +7,24 @@
 pkgnames=(zoneinfo-utils)
 pkgdesc="Utilities for interacting with zoneinfo files"
 url=https://www.iana.org/time-zones
-_tzver=2021a
-pkgver="$_tzver"-2
-timestamp=2020-05-04T06:16Z
+_tzver=2023c
+pkgver="$_tzver"-1
+timestamp=2023-03-28T00:00Z
 section=utils
 maintainer="Eeems <[email protected]>"
 license="custom: public domain"
 installdepends=(zoneinfo-core)
 makedepends=(build:gawk)
+flags=(nostrip)
 
-image=base:v2.1
+image=base:v3.0
 source=(
     "https://www.iana.org/time-zones/repository/releases/tzcode${_tzver}.tar.gz"
     "https://www.iana.org/time-zones/repository/releases/tzdata${_tzver}.tar.gz"
 )
 sha256sums=(
-    eb46bfa124b5b6bd13d61a609bfde8351bd192894708d33aa06e5c1e255802d0
-    39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08
+    46d17f2bb19ad73290f03a203006152e0fa0d7b11e5b71467c4a823811b214e7
+    3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c
 )
 
 prepare() {
@@ -35,17 +36,20 @@ build() {
     pushd .x86 > /dev/null
 
     shopt -s extglob
-    cp -r ../* .
-    make VERSION="$_tzver"
+    ln -s ../* .
+    make VERSION="$_tzver" zic
+    mv zic ../zic.x86
 
     popd > /dev/null
-
+    rm -r .x86
     make VERSION="$_tzver" CC=arm-linux-gnueabihf-cc
+    "${CROSS_COMPILE}strip" --strip-all zic zdump
 }
 
 package() {
     pushd "${srcdir}" > /dev/null
-    local zic=.x86/zic
+
+    local zic=./zic.x86
     # install tzcode stuff
     make DESTDIR="${pkgdir}" zic="$zic" install
     # install license