[PR PATCH] tzutils & tzdata update to 2021b

[PR PATCH] tzutils & tzdata update to 2021b

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1600 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages tzutils-tzdata-update
https://github.com/void-linux/void-packages/pull/33188

tzutils & tzdata update to 2021b
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/33188.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tzutils-tzdata-update-33188.patch --]
[-- Type: text/x-diff, Size: 4505 bytes --]

From 939f4353072ca8405309fe9320b5021b7fcbbcd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 30 Sep 2021 16:28:54 +0700
Subject: [PATCH 1/2] tzutils: update to 2021b.

---
 .../tzutils/patches/only-check-relevant.patch   | 16 ++++++++++++++++
 srcpkgs/tzutils/patches/reexec-with-bash.patch  | 17 +++++++++++++++++
 srcpkgs/tzutils/template                        | 13 +++++++++----
 3 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/tzutils/patches/only-check-relevant.patch
 create mode 100644 srcpkgs/tzutils/patches/reexec-with-bash.patch

diff --git a/srcpkgs/tzutils/patches/only-check-relevant.patch b/srcpkgs/tzutils/patches/only-check-relevant.patch
new file mode 100644
index 000000000000..c16a47ff5745
--- /dev/null
+++ b/srcpkgs/tzutils/patches/only-check-relevant.patch
@@ -0,0 +1,16 @@
+Index: tzutils-2021b/Makefile
+===================================================================
+--- tzutils-2021b.orig/Makefile
++++ tzutils-2021b/Makefile
+@@ -751,9 +751,8 @@ tzselect:	tzselect.ksh version
+ 		chmod +x $@.out
+ 		mv $@.out $@
+ 
+-check:		check_character_set check_white_space check_links \
+-		  check_name_lengths check_sorted \
+-		  check_tables check_web check_zishrink check_tzs
++check:		check_links check_name_lengths check_sorted \
++		  check_tables check_zishrink check_tzs
+ 
+ check_character_set: $(ENCHILADA)
+ 	test ! '$(UTF8_LOCALE)' || \
diff --git a/srcpkgs/tzutils/patches/reexec-with-bash.patch b/srcpkgs/tzutils/patches/reexec-with-bash.patch
new file mode 100644
index 000000000000..756146177b56
--- /dev/null
+++ b/srcpkgs/tzutils/patches/reexec-with-bash.patch
@@ -0,0 +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 @@
+ # 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" "$@"
++fi
++
+ PKGVERSION='(tzcode) '
+ TZVERSION=see_Makefile
+ REPORT_BUGS_TO=tz@iana.org
diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 252a714929c6..5d9dafdae258 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,7 +1,7 @@
 # Template file for 'tzutils'
 pkgname=tzutils
-version=2021a
-revision=2
+version=2021b
+revision=1
 bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
@@ -9,11 +9,16 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="Public Domain, BSD-3-Clause"
 homepage="https://www.iana.org/time-zones"
 distfiles="https://github.com/eggert/tz/archive/${version}.tar.gz"
-checksum=bd7ecd99cbb0a2f15bb7e38be2cbc04dced89922fce4ac0ffcd1ca844ba9362f
+checksum=97996d405c651d981288720f03b16e7ba9173c941728015de0cf681245bb7600
 
 do_build() {
 	echo "$version" >version
-	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+	make TZDIR=/usr/share/zoneinfo KSHELL=/bin/sh \
+		CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
+}
+
+do_check() {
+	make check
 }
 
 do_install() {

From 90a2ad88a013bf886876168920b0808fb5736cdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 30 Sep 2021 16:28:58 +0700
Subject: [PATCH 2/2] tzdata: update to 2021b.

---
 srcpkgs/tzdata/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 618ad6c9e10a..a0b210a20040 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -1,6 +1,6 @@
 # Template file for 'tzdata'
 pkgname=tzdata
-version=2021a
+version=2021b
 revision=1
 bootstrap=yes
 create_wrksrc=yes
@@ -10,7 +10,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="Public Domain"
 homepage="http://www.iana.org/time-zones"
 distfiles="http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz"
-checksum=39e7d2ba08c68cbaefc8de3227aab0dec2521be8042cf56855f7dc3a9fb14e08
+checksum=53d9e6dbdb59dffe2b7bff59d140148181386c06e175fa69eaeb4cc83bc3deb7
 
 do_install() {
 	local timezones="africa antarctica asia australasia europe northamerica \

Re: [PR PATCH] [Merged]: tzutils & tzdata update to 2021b

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]

There's a merged pull request on the void-packages repository

tzutils & tzdata update to 2021b
https://github.com/void-linux/void-packages/pull/33188

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->