[PR PATCH] tzdata: fix update on system with leftover timezone

[PR PATCH] tzdata: fix update on system with leftover timezone

[sgn]

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

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

https://github.com/sgn/void-packages fix-tzdata-leftover
https://github.com/void-linux/void-packages/pull/38390

tzdata: fix update on system with leftover timezone
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/38390.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-tzdata-leftover-38390.patch --]
[-- Type: text/x-diff, Size: 1399 bytes --]

From 3be256d49e43af7e5d81d448992d3963925d3c29 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: Sun, 31 Jul 2022 19:12:48 +0700
Subject: [PATCH] tzdata: fix update on system with leftover timezone

---
 srcpkgs/tzutils/template       |  2 +-
 srcpkgs/tzutils/tzdata.INSTALL | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/tzutils/tzdata.INSTALL

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 2bfcccb4f4d5..69763ca6814f 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,7 +1,7 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2022a
-revision=2
+revision=3
 bootstrap=yes
 wrksrc="tzdb-${version}"
 short_desc="Time zone and daylight-saving time utilities"
diff --git a/srcpkgs/tzutils/tzdata.INSTALL b/srcpkgs/tzutils/tzdata.INSTALL
new file mode 100644
index 000000000000..5b91eff82942
--- /dev/null
+++ b/srcpkgs/tzutils/tzdata.INSTALL
@@ -0,0 +1,11 @@
+case "${ACTION}" in
+pre)
+	# Due to some reasons, some old timezone was kept
+	# The latest one would be Canada/East-Saskatchewan in 2017c
+	# Don't force remove on everyone since it will spit error on update
+	if [ -f usr/share/zoneinfo/posix/Canada/East-Saskatchewan ]; then
+		rm -rf usr/share/zoneinfo/posix
+		rm -rf usr/share/zoneinfo/right
+	fi
+	;;
+esac

Re: [PR PATCH] [Updated] tzdata: fix update on system with leftover timezone

[sgn]

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages fix-tzdata-leftover
https://github.com/void-linux/void-packages/pull/38390

tzdata: fix update on system with leftover timezone
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/38390.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-tzdata-leftover-38390.patch --]
[-- Type: text/x-diff, Size: 1399 bytes --]

From 9e1d790fc1d3a3067283ec4199b5d65702843863 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: Sun, 31 Jul 2022 19:12:48 +0700
Subject: [PATCH] tzdata: fix update on system with leftover timezone

---
 srcpkgs/tzutils/template       |  2 +-
 srcpkgs/tzutils/tzdata.INSTALL | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/tzutils/tzdata.INSTALL

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 2bfcccb4f4d5..69763ca6814f 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,7 +1,7 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2022a
-revision=2
+revision=3
 bootstrap=yes
 wrksrc="tzdb-${version}"
 short_desc="Time zone and daylight-saving time utilities"
diff --git a/srcpkgs/tzutils/tzdata.INSTALL b/srcpkgs/tzutils/tzdata.INSTALL
new file mode 100755
index 000000000000..5b91eff82942
--- /dev/null
+++ b/srcpkgs/tzutils/tzdata.INSTALL
@@ -0,0 +1,11 @@
+case "${ACTION}" in
+pre)
+	# Due to some reasons, some old timezone was kept
+	# The latest one would be Canada/East-Saskatchewan in 2017c
+	# Don't force remove on everyone since it will spit error on update
+	if [ -f usr/share/zoneinfo/posix/Canada/East-Saskatchewan ]; then
+		rm -rf usr/share/zoneinfo/posix
+		rm -rf usr/share/zoneinfo/right
+	fi
+	;;
+esac

Re: [PR PATCH] [Merged]: tzdata: fix update on system with leftover timezone

[sgn]

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

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

tzdata: fix update on system with leftover timezone
https://github.com/void-linux/void-packages/pull/38390

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->