mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Christian Melki <christian.melki@t2data.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH 2/2] libarchive: Version bump. 3.61 -> 3.62 plus config changes.
Date: Mon, 12 Dec 2022 20:45:19 +0100	[thread overview]
Message-ID: <20221212194519.1589655-2-christian.melki@t2data.com> (raw)
In-Reply-To: <20221212194519.1589655-1-christian.melki@t2data.com>

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.melki@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	other threads:[~2022-12-12 19:46 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-12 19:45 [ptxdist] [PATCH 1/2] host-libarchive: Disable zstd Christian Melki
2022-12-12 19:45 ` Christian Melki [this message]
2023-01-03 11:08   ` [ptxdist] [APPLIED] libarchive: Version bump. 3.61 -> 3.62 plus config changes Michael Olbrich
2023-01-03 11:08 ` [ptxdist] [APPLIED] host-libarchive: Disable zstd Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221212194519.1589655-2-christian.melki@t2data.com \
    --to=christian.melki@t2data.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox