From 8aa70a684a17a628e335f09ac55aa0b1874ed647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sat, 23 Dec 2023 21:21:27 +0700 Subject: [PATCH] tzutils: update to 2023d. --- .../tzutils/patches/only-check-relevant.patch | 12 ++++++------ srcpkgs/tzutils/patches/reexec-with-bash.patch | 16 +++++++++------- srcpkgs/tzutils/template | 6 +++--- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/srcpkgs/tzutils/patches/only-check-relevant.patch b/srcpkgs/tzutils/patches/only-check-relevant.patch index d7bf3372783..d411f699d87 100644 --- a/srcpkgs/tzutils/patches/only-check-relevant.patch +++ b/srcpkgs/tzutils/patches/only-check-relevant.patch @@ -1,11 +1,11 @@ --- a/Makefile +++ b/Makefile -@@ -768,7 +768,7 @@ tzselect: tzselect.ksh version - - check: check_character_set check_white_space check_links \ - check_name_lengths check_slashed_abbrs check_sorted \ +@@ -827,7 +827,7 @@ check: check_back check_mild + check_mild: check_character_set check_white_space check_links \ + check_name_lengths check_now \ + check_slashed_abbrs check_sorted \ - check_tables check_web check_ziguard check_zishrink check_tzs + check_tables check_ziguard check_zishrink check_tzs - check_character_set: $(ENCHILADA) - test ! '$(UTF8_LOCALE)' || \ + # True if UTF8_LOCALE does not work; + # otherwise, false but with LC_ALL set to $(UTF8_LOCALE). diff --git a/srcpkgs/tzutils/patches/reexec-with-bash.patch b/srcpkgs/tzutils/patches/reexec-with-bash.patch index 756146177b5..9ff272388b3 100644 --- a/srcpkgs/tzutils/patches/reexec-with-bash.patch +++ b/srcpkgs/tzutils/patches/reexec-with-bash.patch @@ -1,15 +1,17 @@ Avoid dependencies to bash, in order to reduce the bootstrap chain, However, this utility works better with bash because of select builtin -Index: tzutils-2021b/tzselect.ksh -=================================================================== ---- tzutils-2021b.orig/tzselect.ksh -+++ tzutils-2021b/tzselect.ksh -@@ -2,6 +2,10 @@ +--- a/tzselect.ksh ++++ b/tzselect.ksh +@@ -2,6 +2,14 @@ # Ask the user about the time zone, and output the resulting TZ value to stdout. # Interact with the user via stderr and stdin. -+if [ -z "$BASH_VERSION" ] && [ -x /bin/bash ]; then -+ exec /bin/bash "$0" "$@" ++if [ -z "$BASH_VERSION$KSH_VERSION" ]; then ++ if [ -x /bin/ksh ]; then ++ exec /bin/ksh "$0" "$@" ++ elif [ -x /bin/bash ]; then ++ exec /bin/bash "$0" "$@" ++ fi +fi + PKGVERSION='(tzcode) ' diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template index 3b9ad102497..8fa5e3a36e9 100644 --- a/srcpkgs/tzutils/template +++ b/srcpkgs/tzutils/template @@ -1,14 +1,14 @@ # Template file for 'tzutils' pkgname=tzutils -version=2023c -revision=2 +version=2023d +revision=1 bootstrap=yes short_desc="Time zone and daylight-saving time utilities" maintainer="Đoàn Trần Công Danh " license="Public Domain" homepage="https://www.iana.org/time-zones" distfiles="https://www.iana.org/time-zones/repository/releases/tzdb-${version}.tar.lz" -checksum=08fd090f1a16d522ae4e9247445056f4155002239e5be760b31ba0376d2e632c +checksum=696849b454176ea8f52dd7e9001999d01f5bb594344190a0c4084aeaf7f86bd8 if [ "$CROSS_BUILD" ]; then hostmakedepends="tzutils"