[PR PATCH] common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[PR PATCH] common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages tar-zst
https://github.com/void-linux/void-packages/pull/42573

common/hooks/do-extract/00-distfiles.sh: support .tar.zst
bsdtar is built with support for it, so this shouldn't cause issues

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

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



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tar-zst-42573.patch --]
[-- Type: text/x-diff, Size: 1227 bytes --]

From 7a634086f431e0f20a752a0b7c546e7f5881afd4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 3 Mar 2023 14:25:01 -0500
Subject: [PATCH] common/hooks/do-extract/00-distfiles.sh: support .tar.zst

bsdtar is built with support for it, so this shouldn't cause issues
---
 common/hooks/do-extract/00-distfiles.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index 14503de3ed76..cec16d1dead0 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -56,6 +56,8 @@ hook() {
 		*.tbz)        cursufx="tbz";;
 		*.tar.gz)     cursufx="tgz";;
 		*.tgz)        cursufx="tgz";;
+		*.tar.zst)    cursufx="tzst";;
+		*.tzst)       cursufx="tzst";;
 		*.gz)         cursufx="gz";;
 		*.xz)         cursufx="xz";;
 		*.bz2)        cursufx="bz2";;
@@ -74,7 +76,7 @@ hook() {
 		esac
 
 		case ${cursufx} in
-		tar|txz|tbz|tlz|tgz|crate)
+		tar|txz|tbz|tlz|tgz|tzst|crate)
 			$TAR_CMD -x --no-same-permissions --no-same-owner -f $srcdir/$curfile -C "$extractdir"
 			if [ $? -ne 0 ]; then
 				msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"

Re: common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42573#issuecomment-1454029102

Comment:
I don't think supporting plain `foo.zst` is possible without adding `zstd` to the chroot

Re: common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/42573#issuecomment-1455007553

Comment:
> I don't think supporting plain `foo.zst` is possible without adding `zstd` to the chroot

That is fine, we used to support `*.zip` file like that (template needs to add `unzip` themselves).

Re: [PR PATCH] [Updated] common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages tar-zst
https://github.com/void-linux/void-packages/pull/42573

common/hooks/do-extract/00-distfiles.sh: support .tar.zst
bsdtar is built with support for it, so this shouldn't cause issues

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

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



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tar-zst-42573.patch --]
[-- Type: text/x-diff, Size: 1912 bytes --]

From bb39c493411b954f7e884334478496448da8cd77 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 3 Mar 2023 14:25:01 -0500
Subject: [PATCH] common/hooks/do-extract/00-distfiles.sh: support .tar.zst and
 .zst

.tar.zst: bsdtar is built with support for it, so this shouldn't cause issues
.zst: zstd isn't in base-chroot, so it will need to be specified explicitly
---
 common/hooks/do-extract/00-distfiles.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index 14503de3ed76..34b89531c96b 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -56,9 +56,12 @@ hook() {
 		*.tbz)        cursufx="tbz";;
 		*.tar.gz)     cursufx="tgz";;
 		*.tgz)        cursufx="tgz";;
+		*.tar.zst)    cursufx="tzst";;
+		*.tzst)       cursufx="tzst";;
 		*.gz)         cursufx="gz";;
 		*.xz)         cursufx="xz";;
 		*.bz2)        cursufx="bz2";;
+		*.zst)        cursufx="zst";;
 		*.tar)        cursufx="tar";;
 		*.zip)        cursufx="zip";;
 		*.rpm)        cursufx="rpm";;
@@ -74,13 +77,13 @@ hook() {
 		esac
 
 		case ${cursufx} in
-		tar|txz|tbz|tlz|tgz|crate)
+		tar|txz|tbz|tlz|tgz|tzst|crate)
 			$TAR_CMD -x --no-same-permissions --no-same-owner -f $srcdir/$curfile -C "$extractdir"
 			if [ $? -ne 0 ]; then
 				msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
 			fi
 			;;
-		gz|bz2|xz)
+		gz|bz2|xz|zst)
 			cp -f $srcdir/$curfile "$extractdir"
 			cd "$extractdir"
 			case ${cursufx} in
@@ -90,9 +93,16 @@ hook() {
 			bz2)
 				bunzip2 -f $curfile
 				;;
-			*)
+			xz)
 				unxz -f $curfile
 				;;
+			zst)
+				if command -v unzstd &>/dev/null; then
+					unzstd $curfile
+				else
+					msg_error "$pkgver: cannot find unzstd bin for extraction.\n"
+				fi
+				;;
 			esac
 			;;
 		zip)

Re: common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/42573#issuecomment-1455017678

Comment:
good point

Re: [PR PATCH] [Updated] common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages tar-zst
https://github.com/void-linux/void-packages/pull/42573

common/hooks/do-extract/00-distfiles.sh: support .tar.zst
bsdtar is built with support for it, so this shouldn't cause issues

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

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



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tar-zst-42573.patch --]
[-- Type: text/x-diff, Size: 1912 bytes --]

From b47a347ae20823c0aeafd9f16d9f7b774d506722 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 3 Mar 2023 14:25:01 -0500
Subject: [PATCH] common/hooks/do-extract/00-distfiles.sh: support .tar.zst and
 .zst

.tar.zst: bsdtar is built with support for it, so this shouldn't cause issues
.zst: zstd isn't in base-chroot, so it will need to be specified explicitly
---
 common/hooks/do-extract/00-distfiles.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index eba3ba04bbaf..e002a4bfd478 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -56,9 +56,12 @@ hook() {
 		*.tbz)        cursufx="tbz";;
 		*.tar.gz)     cursufx="tgz";;
 		*.tgz)        cursufx="tgz";;
+		*.tar.zst)    cursufx="tzst";;
+		*.tzst)       cursufx="tzst";;
 		*.gz)         cursufx="gz";;
 		*.xz)         cursufx="xz";;
 		*.bz2)        cursufx="bz2";;
+		*.zst)        cursufx="zst";;
 		*.tar)        cursufx="tar";;
 		*.zip)        cursufx="zip";;
 		*.rpm)        cursufx="rpm";;
@@ -74,13 +77,13 @@ hook() {
 		esac
 
 		case ${cursufx} in
-		tar|txz|tbz|tlz|tgz|crate)
+		tar|txz|tbz|tlz|tgz|tzst|crate)
 			$TAR_CMD -x --no-same-permissions --no-same-owner -f $srcdir/$curfile -C "$extractdir"
 			if [ $? -ne 0 ]; then
 				msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
 			fi
 			;;
-		gz|bz2|xz)
+		gz|bz2|xz|zst)
 			cp -f $srcdir/$curfile "$extractdir"
 			cd "$extractdir"
 			case ${cursufx} in
@@ -90,9 +93,16 @@ hook() {
 			bz2)
 				bunzip2 -f $curfile
 				;;
-			*)
+			xz)
 				unxz -f $curfile
 				;;
+			zst)
+				if command -v unzstd &>/dev/null; then
+					unzstd $curfile
+				else
+					msg_error "$pkgver: cannot find unzstd bin for extraction.\n"
+				fi
+				;;
 			esac
 			;;
 		zip)

Re: [PR REVIEW] common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/42573#discussion_r1127209430

Comment:
```suggestion
				unzstd $curfile
```

`unxz` also not available in chroot. When it's not available, the extraction will fail with `unzstd: file not found`.

Re: [PR PATCH] [Updated] common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages tar-zst
https://github.com/void-linux/void-packages/pull/42573

common/hooks/do-extract/00-distfiles.sh: support .tar.zst
bsdtar is built with support for it, so this shouldn't cause issues

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

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



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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tar-zst-42573.patch --]
[-- Type: text/x-diff, Size: 1776 bytes --]

From 61f292fef46930f2da543e910a911db58f084578 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 3 Mar 2023 14:25:01 -0500
Subject: [PATCH] common/hooks/do-extract/00-distfiles.sh: support .tar.zst and
 .zst

.tar.zst: bsdtar is built with support for it, so this shouldn't cause issues
.zst: zstd isn't in base-chroot, so it will need to be specified explicitly
---
 common/hooks/do-extract/00-distfiles.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/hooks/do-extract/00-distfiles.sh b/common/hooks/do-extract/00-distfiles.sh
index eba3ba04bbaf..07e987a6862b 100644
--- a/common/hooks/do-extract/00-distfiles.sh
+++ b/common/hooks/do-extract/00-distfiles.sh
@@ -56,9 +56,12 @@ hook() {
 		*.tbz)        cursufx="tbz";;
 		*.tar.gz)     cursufx="tgz";;
 		*.tgz)        cursufx="tgz";;
+		*.tar.zst)    cursufx="tzst";;
+		*.tzst)       cursufx="tzst";;
 		*.gz)         cursufx="gz";;
 		*.xz)         cursufx="xz";;
 		*.bz2)        cursufx="bz2";;
+		*.zst)        cursufx="zst";;
 		*.tar)        cursufx="tar";;
 		*.zip)        cursufx="zip";;
 		*.rpm)        cursufx="rpm";;
@@ -74,13 +77,13 @@ hook() {
 		esac
 
 		case ${cursufx} in
-		tar|txz|tbz|tlz|tgz|crate)
+		tar|txz|tbz|tlz|tgz|tzst|crate)
 			$TAR_CMD -x --no-same-permissions --no-same-owner -f $srcdir/$curfile -C "$extractdir"
 			if [ $? -ne 0 ]; then
 				msg_error "$pkgver: extracting $curfile into $XBPS_BUILDDIR.\n"
 			fi
 			;;
-		gz|bz2|xz)
+		gz|bz2|xz|zst)
 			cp -f $srcdir/$curfile "$extractdir"
 			cd "$extractdir"
 			case ${cursufx} in
@@ -90,9 +93,12 @@ hook() {
 			bz2)
 				bunzip2 -f $curfile
 				;;
-			*)
+			xz)
 				unxz -f $curfile
 				;;
+			zst)
+				unzstd $curfile
+				;;
 			esac
 			;;
 		zip)

Re: [PR PATCH] [Merged]: common/hooks/do-extract/00-distfiles.sh: support .tar.zst

[classabbyamp]

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

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

common/hooks/do-extract/00-distfiles.sh: support .tar.zst
https://github.com/void-linux/void-packages/pull/42573

Description:
bsdtar is built with support for it, so this shouldn't cause issues

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

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