Thanks, applied as 3b79f344d7473c841d026635e1555a34bbd8b7c4. Michael
[sent from post-receive hook] On Tue, 03 Jan 2023 12:08:15 +0100, Christian Melki <[email protected]> wrote: > 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/libarchive.in b/rules/libarchive.in > index a631a6eef56b..b80c2147b866 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 e75034d74fea..1d505e71f4c1 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 >
