From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Tue, 03 Jan 2023 12:08:56 +0100
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1pCfA9-000MDW-2l
	for lore@lore.pengutronix.de; Tue, 03 Jan 2023 12:08:56 +0100
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1pCfA6-000337-Lr; Tue, 03 Jan 2023 12:08:54 +0100
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1pCf9V-0002Ml-0U; Tue, 03 Jan 2023 12:08:17 +0100
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pCf9U-003YA5-Br; Tue, 03 Jan 2023 12:08:16 +0100
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1pCf9T-009LGu-PR; Tue, 03 Jan 2023 12:08:15 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Tue,  3 Jan 2023 12:08:15 +0100
Message-Id: <20230103110815.2226662-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20221212194519.1589655-2-christian.melki@t2data.com>
References: <20221212194519.1589655-2-christian.melki@t2data.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] libarchive: Version bump. 3.61 -> 3.62 plus
 config changes.
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Christian Melki <christian.melki@t2data.com>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
X-SA-Exim-Connect-IP: 127.0.0.1
X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de
X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as 3b79f344d7473c841d026635e1555a34bbd8b7c4.

Michael

[sent from post-receive hook]

On Tue, 03 Jan 2023 12:08:15 +0100, Christian Melki <christian.melki@t2data.com> 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 <christian.melki@t2data.com>
> Message-Id: <20221212194519.1589655-2-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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
>