Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Add tzdata to base-chroot
@ 2021-06-09 11:24 sgn
  2021-06-09 11:31 ` [PR PATCH] [Updated] " sgn
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: sgn @ 2021-06-09 11:24 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages add-tzdata-to-base-chroot
https://github.com/void-linux/void-packages/pull/31377

Add tzdata to base-chroot
@void-linux/pkg-committers 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-add-tzdata-to-base-chroot-31377.patch --]
[-- Type: text/x-diff, Size: 4157 bytes --]

From 759edb53fee16a10d8068eca87f3ec132a447df5 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: Wed, 9 Jun 2021 09:42:37 +0700
Subject: [PATCH 1/3] tzutils: fix version, setbootstrap

---
 srcpkgs/tzutils/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 3bd79fb85cbb..6dc565b2c96a 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,16 +1,18 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2021a
-revision=1
+revision=3
+bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+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
 
 do_build() {
+	echo "$version" >version
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
@@ -21,8 +23,5 @@ do_install() {
 	vman zic.8
 	vman zdump.8
 	vman tzselect.8
-}
-
-post_install() {
 	vlicense LICENSE
 }

From 19d51135e74ff8812579b4eef381f1c7fde7d53a 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: Wed, 9 Jun 2021 09:43:08 +0700
Subject: [PATCH 2/3] tzdata: set bootstrap=yes

---
 srcpkgs/tzdata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 25f79d0a1926..618ad6c9e10a 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -2,7 +2,7 @@
 pkgname=tzdata
 version=2021a
 revision=1
-wrksrc=tzdata
+bootstrap=yes
 create_wrksrc=yes
 hostmakedepends="tzutils"
 short_desc="Time zone and daylight-saving time data"

From 9a8ced479a0ad99f2ea5e1c3930cbcdb900ddfe8 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: Wed, 9 Jun 2021 09:44:48 +0700
Subject: [PATCH 3/3] base-chroot: add tzdata

Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.
---
 common/xbps-src/shutils/chroot.sh | 10 +---------
 srcpkgs/base-chroot/template      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index c7ada3151618..53e3d4a4c70f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -109,15 +109,7 @@ chroot_prepare() {
     # Some software expects /etc/localtime to be a symbolic link it can read to
     # determine the name of the time zone, so set up the expected link
     # structure.
-    if [ -f /usr/share/zoneinfo/UTC ]; then
-        tzfile=/usr/share/zoneinfo/UTC
-        mkdir -p $XBPS_MASTERDIR/usr/share/zoneinfo
-        cp /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/usr/share/zoneinfo/UTC
-        ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
-    else
-        # Should never happen.
-        msg_warn "No local timezone configuration file created.\n"
-    fi
+    ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
 
     for f in dev sys tmp proc host boot; do
         [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 5003e3c37247..599183f8c54b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -19,7 +19,7 @@ depends+="
  patch sed findutils diffutils make gzip coreutils
  file bsdtar xbps mpfr ncurses libreadline8
  chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-util-linux chroot-git tzdata"
 
 if [ "$CHROOT_READY" ]; then
 	depends+=" ccache"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
@ 2021-06-09 11:31 ` sgn
  2021-06-09 17:35 ` the-maldridge
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-09 11:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages add-tzdata-to-base-chroot
https://github.com/void-linux/void-packages/pull/31377

Add tzdata to base-chroot
@void-linux/pkg-committers 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-add-tzdata-to-base-chroot-31377.patch --]
[-- Type: text/x-diff, Size: 4157 bytes --]

From 2526d0530ee88ef103340139401ed140e015a600 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: Wed, 9 Jun 2021 18:31:25 +0700
Subject: [PATCH 1/3] tzutils: fix version, setbootstrap

---
 srcpkgs/tzutils/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 3bd79fb85cbb..6dc565b2c96a 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,16 +1,18 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2021a
-revision=1
+revision=3
+bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+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
 
 do_build() {
+	echo "$version" >version
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
@@ -21,8 +23,5 @@ do_install() {
 	vman zic.8
 	vman zdump.8
 	vman tzselect.8
-}
-
-post_install() {
 	vlicense LICENSE
 }

From 263dc2d8958a245eff7a572297acd0e13db610a1 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: Wed, 9 Jun 2021 18:31:27 +0700
Subject: [PATCH 2/3] tzdata: set bootstrap=yes

---
 srcpkgs/tzdata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 25f79d0a1926..618ad6c9e10a 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -2,7 +2,7 @@
 pkgname=tzdata
 version=2021a
 revision=1
-wrksrc=tzdata
+bootstrap=yes
 create_wrksrc=yes
 hostmakedepends="tzutils"
 short_desc="Time zone and daylight-saving time data"

From 330f2dbeb19fd2f05ddd2fefbeaa38a2e3fd9923 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: Wed, 9 Jun 2021 18:31:28 +0700
Subject: [PATCH 3/3] base-chroot: add tzdata

Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.
---
 common/xbps-src/shutils/chroot.sh | 10 +---------
 srcpkgs/base-chroot/template      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index c7ada3151618..53e3d4a4c70f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -109,15 +109,7 @@ chroot_prepare() {
     # Some software expects /etc/localtime to be a symbolic link it can read to
     # determine the name of the time zone, so set up the expected link
     # structure.
-    if [ -f /usr/share/zoneinfo/UTC ]; then
-        tzfile=/usr/share/zoneinfo/UTC
-        mkdir -p $XBPS_MASTERDIR/usr/share/zoneinfo
-        cp /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/usr/share/zoneinfo/UTC
-        ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
-    else
-        # Should never happen.
-        msg_warn "No local timezone configuration file created.\n"
-    fi
+    ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
 
     for f in dev sys tmp proc host boot; do
         [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 5003e3c37247..599183f8c54b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -19,7 +19,7 @@ depends+="
  patch sed findutils diffutils make gzip coreutils
  file bsdtar xbps mpfr ncurses libreadline8
  chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-util-linux chroot-git tzdata"
 
 if [ "$CHROOT_READY" ]; then
 	depends+=" ccache"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
  2021-06-09 11:31 ` [PR PATCH] [Updated] " sgn
@ 2021-06-09 17:35 ` the-maldridge
  2021-06-09 18:54 ` [PR REVIEW] " ericonr
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: the-maldridge @ 2021-06-09 17:35 UTC (permalink / raw)
  To: ml

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

New comment by the-maldridge on void-packages repository

https://github.com/void-linux/void-packages/pull/31377#issuecomment-857896666

Comment:
context?

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
  2021-06-09 11:31 ` [PR PATCH] [Updated] " sgn
  2021-06-09 17:35 ` the-maldridge
@ 2021-06-09 18:54 ` ericonr
  2021-06-09 18:54 ` ericonr
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-06-09 18:54 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31377#discussion_r648588731

Comment:
2?

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
                   ` (2 preceding siblings ...)
  2021-06-09 18:54 ` [PR REVIEW] " ericonr
@ 2021-06-09 18:54 ` ericonr
  2021-06-10  0:35 ` sgn
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-06-09 18:54 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31377#discussion_r648590872

Comment:
Removing `wrksrc` seems wrong to me...

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
                   ` (3 preceding siblings ...)
  2021-06-09 18:54 ` ericonr
@ 2021-06-10  0:35 ` sgn
  2021-06-10  0:37 ` [PR PATCH] [Updated] " sgn
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-10  0:35 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/31377#issuecomment-858192657

Comment:
> context?


Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
                   ` (4 preceding siblings ...)
  2021-06-10  0:35 ` sgn
@ 2021-06-10  0:37 ` sgn
  2021-06-10  0:38 ` [PR REVIEW] " sgn
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-10  0:37 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages add-tzdata-to-base-chroot
https://github.com/void-linux/void-packages/pull/31377

Add tzdata to base-chroot
@void-linux/pkg-committers 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-add-tzdata-to-base-chroot-31377.patch --]
[-- Type: text/x-diff, Size: 4875 bytes --]

From 07b2887dabbfdbcb626a02ea645fc33b65eccddb 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: Wed, 9 Jun 2021 18:31:25 +0700
Subject: [PATCH 1/4] tzutils: fix version, setbootstrap

---
 srcpkgs/tzutils/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 3bd79fb85cbb..6dc565b2c96a 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,16 +1,18 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2021a
-revision=1
+revision=3
+bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+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
 
 do_build() {
+	echo "$version" >version
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
@@ -21,8 +23,5 @@ do_install() {
 	vman zic.8
 	vman zdump.8
 	vman tzselect.8
-}
-
-post_install() {
 	vlicense LICENSE
 }

From 317e06442174cb7deea0a9c532e5dac477a79298 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: Wed, 9 Jun 2021 18:31:27 +0700
Subject: [PATCH 2/4] tzdata: set bootstrap=yes

---
 srcpkgs/tzdata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 25f79d0a1926..618ad6c9e10a 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -2,7 +2,7 @@
 pkgname=tzdata
 version=2021a
 revision=1
-wrksrc=tzdata
+bootstrap=yes
 create_wrksrc=yes
 hostmakedepends="tzutils"
 short_desc="Time zone and daylight-saving time data"

From d2a216f4b2f87b74fecc3c70267db335951f01a2 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: Wed, 9 Jun 2021 18:31:28 +0700
Subject: [PATCH 3/4] base-chroot: add tzdata

Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.
---
 common/xbps-src/shutils/chroot.sh | 10 +---------
 srcpkgs/base-chroot/template      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index c7ada3151618..53e3d4a4c70f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -109,15 +109,7 @@ chroot_prepare() {
     # Some software expects /etc/localtime to be a symbolic link it can read to
     # determine the name of the time zone, so set up the expected link
     # structure.
-    if [ -f /usr/share/zoneinfo/UTC ]; then
-        tzfile=/usr/share/zoneinfo/UTC
-        mkdir -p $XBPS_MASTERDIR/usr/share/zoneinfo
-        cp /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/usr/share/zoneinfo/UTC
-        ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
-    else
-        # Should never happen.
-        msg_warn "No local timezone configuration file created.\n"
-    fi
+    ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
 
     for f in dev sys tmp proc host boot; do
         [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 5003e3c37247..599183f8c54b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -19,7 +19,7 @@ depends+="
  patch sed findutils diffutils make gzip coreutils
  file bsdtar xbps mpfr ncurses libreadline8
  chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-util-linux chroot-git tzdata"
 
 if [ "$CHROOT_READY" ]; then
 	depends+=" ccache"

From 35c7bde21d52096d0fe1eb0be89c1fddcbef7799 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, 10 Jun 2021 07:37:08 +0700
Subject: [PATCH 4/4] fixup! tzutils: fix version, setbootstrap

---
 srcpkgs/tzutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 6dc565b2c96a..252a714929c6 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,7 +1,7 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2021a
-revision=3
+revision=2
 bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR REVIEW] Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
                   ` (5 preceding siblings ...)
  2021-06-10  0:37 ` [PR PATCH] [Updated] " sgn
@ 2021-06-10  0:38 ` sgn
  2021-06-10  0:38 ` sgn
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-10  0:38 UTC (permalink / raw)
  To: ml

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/31377#discussion_r648771497

Comment:
It's `create_wrksrc=yes`, so remove `wrksrc=` is fine.

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
                   ` (6 preceding siblings ...)
  2021-06-10  0:38 ` [PR REVIEW] " sgn
@ 2021-06-10  0:38 ` sgn
  2021-06-10  0:52 ` [PR PATCH] [Updated] " sgn
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-10  0:38 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/31377#issuecomment-858193622

Comment:
> Do you think we should also remove `tzdata` from `checkdepends`?

Should be done, too. But not necessary.


^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
                   ` (7 preceding siblings ...)
  2021-06-10  0:38 ` sgn
@ 2021-06-10  0:52 ` sgn
  2021-06-10 10:14 ` sgn
  2021-06-15 18:18 ` sgn
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-10  0:52 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages add-tzdata-to-base-chroot
https://github.com/void-linux/void-packages/pull/31377

Add tzdata to base-chroot
@void-linux/pkg-committers 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-add-tzdata-to-base-chroot-31377.patch --]
[-- Type: text/x-diff, Size: 17326 bytes --]

From 07b2887dabbfdbcb626a02ea645fc33b65eccddb 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: Wed, 9 Jun 2021 18:31:25 +0700
Subject: [PATCH 1/5] tzutils: fix version, setbootstrap

---
 srcpkgs/tzutils/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 3bd79fb85cbb..6dc565b2c96a 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,16 +1,18 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2021a
-revision=1
+revision=3
+bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+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
 
 do_build() {
+	echo "$version" >version
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
@@ -21,8 +23,5 @@ do_install() {
 	vman zic.8
 	vman zdump.8
 	vman tzselect.8
-}
-
-post_install() {
 	vlicense LICENSE
 }

From 317e06442174cb7deea0a9c532e5dac477a79298 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: Wed, 9 Jun 2021 18:31:27 +0700
Subject: [PATCH 2/5] tzdata: set bootstrap=yes

---
 srcpkgs/tzdata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 25f79d0a1926..618ad6c9e10a 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -2,7 +2,7 @@
 pkgname=tzdata
 version=2021a
 revision=1
-wrksrc=tzdata
+bootstrap=yes
 create_wrksrc=yes
 hostmakedepends="tzutils"
 short_desc="Time zone and daylight-saving time data"

From d2a216f4b2f87b74fecc3c70267db335951f01a2 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: Wed, 9 Jun 2021 18:31:28 +0700
Subject: [PATCH 3/5] base-chroot: add tzdata

Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.
---
 common/xbps-src/shutils/chroot.sh | 10 +---------
 srcpkgs/base-chroot/template      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index c7ada3151618..53e3d4a4c70f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -109,15 +109,7 @@ chroot_prepare() {
     # Some software expects /etc/localtime to be a symbolic link it can read to
     # determine the name of the time zone, so set up the expected link
     # structure.
-    if [ -f /usr/share/zoneinfo/UTC ]; then
-        tzfile=/usr/share/zoneinfo/UTC
-        mkdir -p $XBPS_MASTERDIR/usr/share/zoneinfo
-        cp /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/usr/share/zoneinfo/UTC
-        ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
-    else
-        # Should never happen.
-        msg_warn "No local timezone configuration file created.\n"
-    fi
+    ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
 
     for f in dev sys tmp proc host boot; do
         [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 5003e3c37247..599183f8c54b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -19,7 +19,7 @@ depends+="
  patch sed findutils diffutils make gzip coreutils
  file bsdtar xbps mpfr ncurses libreadline8
  chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-util-linux chroot-git tzdata"
 
 if [ "$CHROOT_READY" ]; then
 	depends+=" ccache"

From 35c7bde21d52096d0fe1eb0be89c1fddcbef7799 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, 10 Jun 2021 07:37:08 +0700
Subject: [PATCH 4/5] fixup! tzutils: fix version, setbootstrap

---
 srcpkgs/tzutils/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 6dc565b2c96a..252a714929c6 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,7 +1,7 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2021a
-revision=3
+revision=2
 bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"

From 9be6f9f1b2b12f00d4ee2a01c2ed3bb547198529 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, 10 Jun 2021 07:51:26 +0700
Subject: [PATCH 5/5] srcpkgs: mass remove tzdata from {hostmake,check}depends

---
 srcpkgs/ModemManager/template                 | 2 +-
 srcpkgs/R/template                            | 2 +-
 srcpkgs/git/template                          | 2 +-
 srcpkgs/glib/template                         | 2 +-
 srcpkgs/gnome-panel/template                  | 2 +-
 srcpkgs/ldc/template                          | 2 +-
 srcpkgs/libical/template                      | 1 -
 srcpkgs/libmateweather/template               | 2 +-
 srcpkgs/miller/template                       | 1 -
 srcpkgs/mu/template                           | 1 -
 srcpkgs/nmh/template                          | 2 +-
 srcpkgs/perl-POSIX-strftime-Compiler/template | 1 -
 srcpkgs/postgresql/template                   | 1 -
 srcpkgs/postgresql13/template                 | 1 -
 srcpkgs/python-pytz/template                  | 2 +-
 srcpkgs/python3-pyside2/template              | 2 +-
 srcpkgs/python3/template                      | 2 +-
 srcpkgs/ruby/template                         | 1 -
 srcpkgs/strongswan/template                   | 1 -
 19 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/ModemManager/template b/srcpkgs/ModemManager/template
index 30b5dc01c066..61e6c73306eb 100644
--- a/srcpkgs/ModemManager/template
+++ b/srcpkgs/ModemManager/template
@@ -13,7 +13,7 @@ makedepends="libglib-devel libgudev-devel polkit-devel libqmi-devel
  libmbim-devel libxslt-devel ppp $(vopt_if gir vala-devel)
  python3-gobject-devel python3-dbus-devel"
 depends="hicolor-icon-theme ppp"
-checkdepends="dbus tzdata"
+checkdepends="dbus"
 short_desc="Mobile broadband modem management service"
 maintainer="Frank Steinborn <steinex@nognu.de>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 762a6e90e33b..b63d32dbefca 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -16,7 +16,7 @@ makedepends="libgomp-devel readline-devel libXmu-devel libXt-devel
  texlive texlive-fontsextra texinfo
  $(vopt_if openblas openblas-devel 'blas-devel lapack-devel')"
 depends="xdg-utils less which"
-checkdepends="tzdata tar"
+checkdepends="tar"
 short_desc="System for statistical computation and graphics"
 maintainer="Florian Wagner <florian@wagner-flo.net>"
 license="GPL-2.0-or-later"
diff --git a/srcpkgs/git/template b/srcpkgs/git/template
index 571fc6dc6df8..9ddd445769f3 100644
--- a/srcpkgs/git/template
+++ b/srcpkgs/git/template
@@ -7,7 +7,7 @@ makedepends="libglib-devel libcurl-devel libsecret-devel pcre2-devel tk-devel"
 # Required by https://
 depends="ca-certificates perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
 checkdepends="tar cvs cvsps2 perl-DBD-SQLite subversion subversion-perl
- perl-Term-ReadKey tzdata"
+ perl-Term-ReadKey"
 short_desc="Git Tree History Storage Tool"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only"
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 855a55856b31..84fb4e8abca8 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -9,7 +9,7 @@ configure_args="-Dfam=false -Dman=true -Dselinux=disabled
  $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
 hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
 makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
-checkdepends="desktop-file-utils shared-mime-info tzdata dbus python3-pytest"
+checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
 short_desc="GNU library of C routines"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later"
diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template
index 315d4fc1f468..d932447524a2 100644
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@@ -4,7 +4,7 @@ version=3.40.0
 revision=1
 build_style=gnu-configure
 configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo"
-hostmakedepends="gettext-devel glib-devel itstool pkg-config tzdata gettext"
+hostmakedepends="gettext-devel glib-devel itstool pkg-config gettext"
 makedepends="cairo-devel dconf-devel elogind-devel evolution-data-server-devel
  gdm-devel gnome-desktop-devel gnome-menus-devel gtk+3-devel libglib-devel
  libgweather-devel libwnck-devel libXrandr-devel libX11-devel pango-devel
diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template
index 396494330584..24144b3cc63f 100644
--- a/srcpkgs/ldc/template
+++ b/srcpkgs/ldc/template
@@ -15,7 +15,7 @@ hostmakedepends="dmd llvm12 perl pkg-config"
 makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel
  llvm-libunwind-devel"
 depends="ldc-runtime llvm-libunwind-devel"
-checkdepends="python3 tzdata"
+checkdepends="python3"
 short_desc="Portable D programming language compiler based on LLVM"
 maintainer="Auri <me@aurieh.me>"
 license="BSD-3-Clause, BSL-1.0"
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 2d97ec032b62..be9221ae750a 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -8,7 +8,6 @@ configure_args="-DICAL_BUILD_DOCS=false
  $(vopt_if gir '-DGOBJECT_INTROSPECTION=true -DICAL_GLIB_VAPI=true')"
 hostmakedepends="gettext libglib-devel libxml2-devel perl pkg-config $(vopt_if gir vala)"
 makedepends="libglib-devel libxml2-devel $(vopt_if gir vala-devel)"
-checkdepends="tzdata"
 short_desc="Reference implementation of the iCalendar data type and format"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-only, MPL-2.0"
diff --git a/srcpkgs/libmateweather/template b/srcpkgs/libmateweather/template
index ee05294d610d..b7180e39aff1 100644
--- a/srcpkgs/libmateweather/template
+++ b/srcpkgs/libmateweather/template
@@ -5,7 +5,7 @@ revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-python
  --enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo"
-hostmakedepends="pkg-config intltool itstool glib-devel tzdata"
+hostmakedepends="pkg-config intltool itstool glib-devel"
 makedepends="gtk+3-devel libsoup-devel"
 depends="dconf"
 short_desc="Provides access to weather information from the Internet for MATE"
diff --git a/srcpkgs/miller/template b/srcpkgs/miller/template
index 03cf36ca6095..5dcaa49fe196 100644
--- a/srcpkgs/miller/template
+++ b/srcpkgs/miller/template
@@ -4,7 +4,6 @@ version=5.10.2
 revision=1
 build_style=gnu-configure
 hostmakedepends="asciidoc automake flex libtool"
-checkdepends="tzdata"
 short_desc="Tool like sed/awk/cut/join/sort for name-indexed data such as CSV"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="BSD-2-Clause"
diff --git a/srcpkgs/mu/template b/srcpkgs/mu/template
index 9a6f1e8badaf..b47ba5d58b8b 100644
--- a/srcpkgs/mu/template
+++ b/srcpkgs/mu/template
@@ -5,7 +5,6 @@ revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config texinfo glib-devel"
 makedepends="xapian-core-devel gmime3-devel libuuid-devel"
-checkdepends="tzdata"
 short_desc="Emacs-based tool for dealing with e-mail stored in the Maildir-format"
 maintainer="Benjamin Slade <slade@jnanam.net>"
 license="GPL-3.0-or-later"
diff --git a/srcpkgs/nmh/template b/srcpkgs/nmh/template
index 0c234f74d824..aaf3267adc5d 100644
--- a/srcpkgs/nmh/template
+++ b/srcpkgs/nmh/template
@@ -5,7 +5,7 @@ revision=6
 build_style=gnu-configure
 configure_args="--with-cyrus-sasl --with-tls"
 makedepends="db-devel libcurl-devel openssl-devel libsasl-devel ncurses-devel"
-checkdepends="groff lynx tzdata tar"
+checkdepends="groff lynx tar"
 conf_files="/etc/nmh/*"
 short_desc="Message Handling System (New RAND Mail Handler)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/perl-POSIX-strftime-Compiler/template b/srcpkgs/perl-POSIX-strftime-Compiler/template
index 514b64a98149..96dd5d3c8d8d 100644
--- a/srcpkgs/perl-POSIX-strftime-Compiler/template
+++ b/srcpkgs/perl-POSIX-strftime-Compiler/template
@@ -7,7 +7,6 @@ build_style=perl-ModuleBuild
 hostmakedepends="perl perl-Module-Build-Tiny"
 makedepends="perl"
 depends="perl"
-checkdepends="tzdata"
 short_desc="GNU C library compatible strftime for loggers and servers"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Artistic-1.0-Perl, GPL-1.0-or-later"
diff --git a/srcpkgs/postgresql/template b/srcpkgs/postgresql/template
index 3167e0657fed..3aca74f7228d 100644
--- a/srcpkgs/postgresql/template
+++ b/srcpkgs/postgresql/template
@@ -12,7 +12,6 @@ configure_args="--with-openssl --with-python
 hostmakedepends="docbook2x flex gettext openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python-devel readline-devel tcl-devel"
-checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"
 license="PostgreSQL"
diff --git a/srcpkgs/postgresql13/template b/srcpkgs/postgresql13/template
index be54f0bafe4c..562fd64f56c3 100644
--- a/srcpkgs/postgresql13/template
+++ b/srcpkgs/postgresql13/template
@@ -15,7 +15,6 @@ configure_args="--with-openssl --with-python
 hostmakedepends="docbook2x gettext flex openjade"
 makedepends="libfl-devel openssl-devel libuuid-devel libxslt-devel pam-devel perl
  python3-devel readline-devel tcl-devel"
-checkdepends="tzdata"
 short_desc="Sophisticated open-source Object-Relational DBMS"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
 license="PostgreSQL"
diff --git a/srcpkgs/python-pytz/template b/srcpkgs/python-pytz/template
index 570d028d5696..d508d195b878 100644
--- a/srcpkgs/python-pytz/template
+++ b/srcpkgs/python-pytz/template
@@ -6,7 +6,7 @@ wrksrc="pytz-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python tzdata"
-checkdepends="python-pytest python3-pytest tzdata"
+checkdepends="python-pytest python3-pytest"
 short_desc="Python2 timezone library"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="MIT"
diff --git a/srcpkgs/python3-pyside2/template b/srcpkgs/python3-pyside2/template
index 6040ef39243c..db5ac6ef97c8 100644
--- a/srcpkgs/python3-pyside2/template
+++ b/srcpkgs/python3-pyside2/template
@@ -18,7 +18,7 @@ makedepends="python3-devel libshiboken2-devel qt5-devel
  qt5-serialport-devel
  $(vopt_if webengine 'qt5-webengine-devel')"
 depends="python3-shiboken2"
-checkdepends="python3-distro tzdata pulseaudio qt5-quickcontrols"
+checkdepends="python3-distro pulseaudio qt5-quickcontrols"
 short_desc="Python3 bindings for the Qt5 toolkit"
 maintainer="yopito <pierre.bourgin@free.fr>"
 license="LGPL-3.0-or-later"
diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template
index 40c6cc1ef8e5..0485ec5d1677 100644
--- a/srcpkgs/python3/template
+++ b/srcpkgs/python3/template
@@ -11,7 +11,7 @@ hostmakedepends="pkgconf"
 makedepends="libffi-devel readline-devel gdbm-devel openssl-devel
  expat-devel sqlite-devel bzip2-devel zlib-devel liblzma-devel"
 depends="ca-certificates"
-checkdepends="$depends iana-etc tzdata"
+checkdepends="$depends iana-etc"
 short_desc="Python programming language (${version%.*} series)"
 maintainer="Andrew J. Hesford <ajh@sideband.org>"
 license="Python-2.0"
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 29c1c2eac3c3..d7524fba3519 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -11,7 +11,6 @@ make_build_args="all capi"
 hostmakedepends="pkg-config bison groff"
 makedepends="zlib-devel readline-devel libffi-devel openssl-devel
  gdbm-devel libyaml-devel pango-devel"
-checkdepends="tzdata"
 short_desc="Ruby programming language"
 homepage="http://www.ruby-lang.org/en/"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
diff --git a/srcpkgs/strongswan/template b/srcpkgs/strongswan/template
index 4b50f795e769..0b291e75edd0 100644
--- a/srcpkgs/strongswan/template
+++ b/srcpkgs/strongswan/template
@@ -12,7 +12,6 @@ hostmakedepends="pkg-config flex bison python"
 makedepends="gmp-devel libsoup-devel libldns-devel unbound-devel libcurl-devel
  NetworkManager-devel openssl-devel"
 depends="iproute2 sqlite"
-checkdepends="tzdata"
 conf_files="/etc/*.conf /etc/strongswan.d/*.conf /etc/strongswan.d/charon/*.conf /etc/ipsec.secrets"
 short_desc="IPsec-based VPN solution, supporting IKEv1/IKEv2 and MOBIKE"
 maintainer="Toyam Cox <Vaelatern@voidlinux.org>"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: [PR PATCH] [Updated] Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
                   ` (8 preceding siblings ...)
  2021-06-10  0:52 ` [PR PATCH] [Updated] " sgn
@ 2021-06-10 10:14 ` sgn
  2021-06-15 18:18 ` sgn
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-10 10:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages add-tzdata-to-base-chroot
https://github.com/void-linux/void-packages/pull/31377

Add tzdata to base-chroot
@void-linux/pkg-committers 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-add-tzdata-to-base-chroot-31377.patch --]
[-- Type: text/x-diff, Size: 4157 bytes --]

From eae48e9d4dc532ca28f71045d241cc54278fc5c8 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: Wed, 9 Jun 2021 18:31:25 +0700
Subject: [PATCH 1/3] tzutils: fix version, setbootstrap

---
 srcpkgs/tzutils/template | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/tzutils/template b/srcpkgs/tzutils/template
index 3bd79fb85cbb..252a714929c6 100644
--- a/srcpkgs/tzutils/template
+++ b/srcpkgs/tzutils/template
@@ -1,16 +1,18 @@
 # Template file for 'tzutils'
 pkgname=tzutils
 version=2021a
-revision=1
+revision=2
+bootstrap=yes
 wrksrc="tz-${version}"
 short_desc="Time zone and daylight-saving time utilities"
-maintainer="Anthony Iliopoulos <ailiop@altatus.com>"
+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
 
 do_build() {
+	echo "$version" >version
 	make TZDIR=/usr/share/zoneinfo CC=$CC CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
 }
 
@@ -21,8 +23,5 @@ do_install() {
 	vman zic.8
 	vman zdump.8
 	vman tzselect.8
-}
-
-post_install() {
 	vlicense LICENSE
 }

From 15f569da771de2fc459b8fc14416e874a626d92f 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: Wed, 9 Jun 2021 18:31:27 +0700
Subject: [PATCH 2/3] tzdata: set bootstrap=yes

---
 srcpkgs/tzdata/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tzdata/template b/srcpkgs/tzdata/template
index 25f79d0a1926..618ad6c9e10a 100644
--- a/srcpkgs/tzdata/template
+++ b/srcpkgs/tzdata/template
@@ -2,7 +2,7 @@
 pkgname=tzdata
 version=2021a
 revision=1
-wrksrc=tzdata
+bootstrap=yes
 create_wrksrc=yes
 hostmakedepends="tzutils"
 short_desc="Time zone and daylight-saving time data"

From 78b24fc62068f67aafce9976555afe3630998b43 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: Wed, 9 Jun 2021 18:31:28 +0700
Subject: [PATCH 3/3] base-chroot: add tzdata

Some packages require tzdata to testing, however, adding `tzdata` to
those checkdepends will break masterdir, since `tzdata` provides
`/usr/share/zoneinfo/UTC`, hence, it will be removed upon cleanup.

Let's add `tzdata` into `base-chroot` and remove the shenanigan in
`chroot.sh`.
---
 common/xbps-src/shutils/chroot.sh | 10 +---------
 srcpkgs/base-chroot/template      |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index c7ada3151618..53e3d4a4c70f 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -109,15 +109,7 @@ chroot_prepare() {
     # Some software expects /etc/localtime to be a symbolic link it can read to
     # determine the name of the time zone, so set up the expected link
     # structure.
-    if [ -f /usr/share/zoneinfo/UTC ]; then
-        tzfile=/usr/share/zoneinfo/UTC
-        mkdir -p $XBPS_MASTERDIR/usr/share/zoneinfo
-        cp /usr/share/zoneinfo/UTC $XBPS_MASTERDIR/usr/share/zoneinfo/UTC
-        ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
-    else
-        # Should never happen.
-        msg_warn "No local timezone configuration file created.\n"
-    fi
+    ln -sf ../usr/share/zoneinfo/UTC $XBPS_MASTERDIR/etc/localtime
 
     for f in dev sys tmp proc host boot; do
         [ ! -d $XBPS_MASTERDIR/$f ] && mkdir -p $XBPS_MASTERDIR/$f
diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index 5003e3c37247..599183f8c54b 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -19,7 +19,7 @@ depends+="
  patch sed findutils diffutils make gzip coreutils
  file bsdtar xbps mpfr ncurses libreadline8
  chroot-bash chroot-grep chroot-gawk chroot-distcc
- chroot-util-linux chroot-git"
+ chroot-util-linux chroot-git tzdata"
 
 if [ "$CHROOT_READY" ]; then
 	depends+=" ccache"

^ permalink raw reply	[flat|nested] 12+ messages in thread

* Re: Add tzdata to base-chroot
  2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
                   ` (9 preceding siblings ...)
  2021-06-10 10:14 ` sgn
@ 2021-06-15 18:18 ` sgn
  10 siblings, 0 replies; 12+ messages in thread
From: sgn @ 2021-06-15 18:18 UTC (permalink / raw)
  To: ml

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/31377#issuecomment-861729550

Comment:
I guess no-one against this proposal, merging tomorrow.

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2021-06-15 18:18 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-09 11:24 [PR PATCH] Add tzdata to base-chroot sgn
2021-06-09 11:31 ` [PR PATCH] [Updated] " sgn
2021-06-09 17:35 ` the-maldridge
2021-06-09 18:54 ` [PR REVIEW] " ericonr
2021-06-09 18:54 ` ericonr
2021-06-10  0:35 ` sgn
2021-06-10  0:37 ` [PR PATCH] [Updated] " sgn
2021-06-10  0:38 ` [PR REVIEW] " sgn
2021-06-10  0:38 ` sgn
2021-06-10  0:52 ` [PR PATCH] [Updated] " sgn
2021-06-10 10:14 ` sgn
2021-06-15 18:18 ` sgn

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git