Minor bugfixes.
https://github.com/libarchive/libarchive/releases/tag/v3.6.2

* Wire up zstd in case anyone needs it.
* Same for openssl. In case anyone needs it.

Signed-off-by: Christian Melki <christian.me...@t2data.com>
---
 rules/libarchive.in   | 10 ++++++++++
 rules/libarchive.make |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/rules/libarchive.in b/rules/libarchive.in
index a631a6eef..b80c2147b 100644
--- a/rules/libarchive.in
+++ b/rules/libarchive.in
@@ -4,15 +4,21 @@ menuconfig LIBARCHIVE
        tristate
        select GCCLIBS_GCC_S
        select ZLIB
+       select OPENSSL          if LIBARCHIVE_OPENSSL
        select BZIP2            if LIBARCHIVE_BZIP2
        select BZIP2_LIBBZ2     if LIBARCHIVE_BZIP2
        select XZ               if LIBARCHIVE_LZMA
+       select ZSTD             if LIBARCHIVE_ZSTD
        prompt "libarchive                    "
        help
          Multi-format archive and compression library.
 
 if LIBARCHIVE
 
+config LIBARCHIVE_OPENSSL
+       bool
+       prompt "openssl support"
+
 config LIBARCHIVE_BZIP2
        bool
        prompt "bzip2 support"
@@ -21,6 +27,10 @@ config LIBARCHIVE_LZMA
        bool
        prompt "xz support"
 
+config LIBARCHIVE_ZSTD
+       bool
+       prompt "zstd support"
+
 config LIBARCHIVE_BSDTAR
        bool
        prompt "install bsdtar"
diff --git a/rules/libarchive.make b/rules/libarchive.make
index e75034d74..1d505e71f 100644
--- a/rules/libarchive.make
+++ b/rules/libarchive.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive
 #
 # Paths and names
 #
-LIBARCHIVE_VERSION     := 3.6.1
-LIBARCHIVE_MD5         := 802a56ef9eaa0b8776296ba78a6d0c2c
+LIBARCHIVE_VERSION     := 3.6.2
+LIBARCHIVE_MD5         := b5b8efa8cba29396816d0dd5f61f3de3
 LIBARCHIVE             := libarchive-$(LIBARCHIVE_VERSION)
 LIBARCHIVE_SUFFIX      := tar.gz
 LIBARCHIVE_URL         := 
https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
@@ -54,13 +54,13 @@ LIBARCHIVE_CONF_OPT := \
        --without-libb2 \
        --without-iconv \
        --without-lz4 \
-       --without-zstd \
+       --$(call ptx/wwo, PTXCONF_LIBARCHIVE_ZSTD)-zstd \
        --$(call ptx/wwo, PTXCONF_LIBARCHIVE_LZMA)-lzma \
        --without-lzo2 \
        --without-cng \
        --without-mbedtls \
        --without-nettle \
-       --without-openssl \
+       --$(call ptx/wwo, PTXCONF_LIBARCHIVE_OPENSSL)-openssl \
        --without-xml2 \
        --without-expat
 
-- 
2.34.1


Reply via email to