bsdtar 3.6.1 (#21)

- synced deps for win and linux - with zstd
hemnstill · Apr 28, 2022 · a430479 · a430479
1 parent 50733c7
commit a430479
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/bsdtar.yml b/.github/workflows/bsdtar.yml
@@ -48,7 +48,7 @@ jobs:
     uses: ./.github/workflows/release.yml
     with:
       workflow: ${{ github.workflow }}
-      tool_version: '3.6.0-zstd'
+      tool_version: '3.6.1'
       prepare_body: |
         bsdtar -Oxf ./build-musl/build-musl.tar.gz build-musl.md >> body.md
         bsdtar -Oxf ./build-mingw/build-mingw.tar.gz build-mingw.md >> body.md

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Standalone (static) tools:
 | releases                                                                                                                                                                                                                                                                                                                                                                                                                                          | project                                                                                                                                                   |
 |---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|
-| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/bsdtar-3.6.0-zstd/total?label=⭳%20bsdtar-3.6.0-zstd)](https://github.com/hemnstill/StandaloneTools/releases/tag/bsdtar-3.6.0-zstd)                                                                                                                                                                                                                  | [![GitHub Repo stars](https://img.shields.io/github/stars/libarchive/libarchive?style=social&label=libarchive)](https://github.com/libarchive/libarchive) |
+| [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/bsdtar-3.6.1/total?label=⭳%20bsdtar-3.6.1)](https://github.com/hemnstill/StandaloneTools/releases/tag/bsdtar-3.6.1)                                                                                                                                                                                                                                 | [![GitHub Repo stars](https://img.shields.io/github/stars/libarchive/libarchive?style=social&label=libarchive)](https://github.com/libarchive/libarchive) |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/pcre2grep-10.39/total?label=⭳%20pcre2grep-10.39)](https://github.com/hemnstill/StandaloneTools/releases/tag/pcre2grep-10.39)                                                                                                                                                                                                                        | [![GitHub Repo stars](https://img.shields.io/github/stars/PhilipHazel/pcre2?style=social&label=PCRE2)](https://github.com/PhilipHazel/pcre2)              |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/openssl-3.0.1/total?label=⭳%20openssl-3.0.1)](https://github.com/hemnstill/StandaloneTools/releases/tag/openssl-3.0.1) <br/>[![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/openssl-1_1_1m/total?label=⭳%20openssl-1_1_1m)](https://github.com/hemnstill/StandaloneTools/releases/tag/openssl-1_1_1m) | [![GitHub Repo stars](https://img.shields.io/github/stars/openssl/openssl?style=social&label=OpenSSL)](https://github.com/openssl/openssl)                |
 | [![GitHub release (by tag)](https://img.shields.io/github/downloads/hemnstill/StandaloneTools/far2l-2.4.0-beta/total?label=⭳%20far2l-2.4.0-beta)](https://github.com/hemnstill/StandaloneTools/releases/tag/far2l-2.4.0-beta)                                                                                                                                                                                                                     | [![GitHub Repo stars](https://img.shields.io/github/stars/elfmz/far2l?style=social&label=far2l)](https://github.com/elfmz/far2l)                          |

diff --git a/bsdtar/build_mingw.sh b/bsdtar/build_mingw.sh
@@ -3,7 +3,7 @@ dp0="$(realpath "$(dirname "$0")")"
 set -e
 
 tool_name="bsdtar.exe"
-tool_version="3.6.0"
+tool_version="3.6.1"
 echo "::set-output name=tool_name::$tool_name"
 echo "::set-output name=tool_version::$tool_version"
 

diff --git a/bsdtar/build_musl.sh b/bsdtar/build_musl.sh
@@ -5,12 +5,17 @@ set -e
 echo "::group::install deps"
 
 apk update
-apk add --no-cache alpine-sdk zlib-dev zlib-static xz-dev zstd-dev zstd-static
+apk add --no-cache alpine-sdk zlib-dev zlib-static xz-dev
+
+wget https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/zstd-libs-1.5.2-r1.apk
+wget https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/zstd-dev-1.5.2-r1.apk
+wget https://dl-cdn.alpinelinux.org/alpine/edge/main/x86_64/zstd-static-1.5.2-r1.apk
+apk add --allow-untrusted zstd-libs-1.5.2-r1.apk zstd-dev-1.5.2-r1.apk zstd-static-1.5.2-r1.apk
 
 echo "::endgroup::"
 
 tool_name="bsdtar"
-tool_version="3.6.0"
+tool_version="3.6.1"
 echo "::set-output name=tool_name::$tool_name"
 echo "::set-output name=tool_version::$tool_version"
 

diff --git a/bsdtar/release/ci.cmd b/bsdtar/release/ci.cmd
@@ -1,7 +1,7 @@
 @ECHO OFF
-SET ZLIB_VERSION=1.2.11
+SET ZLIB_VERSION=1.2.12
 SET XZ_VERSION=5.2.5
-SET ZSTD_VERSION=1.5.0
+SET ZSTD_VERSION=1.5.2
 IF NOT "%BE%"=="mingw-gcc" (
   IF NOT "%BE%"=="msvc" (
     ECHO Environment variable BE must be mingw-gcc or msvc