From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Nov 2022 10:23:04 +0000 (+0000)
Subject: libarchive: Update to 3.6.1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22f5333f5b2a78429eb865d3744449ffb15dbbbd;p=ipfire-3.x.git

libarchive: Update to 3.6.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/libarchive/libarchive.nm b/libarchive/libarchive.nm
index 6df62064e..993154f83 100644
--- a/libarchive/libarchive.nm
+++ b/libarchive/libarchive.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = libarchive
-version    = 3.2.2
+version    = 3.6.1
 release    = 1
 
 groups     = System/Libraries
@@ -20,7 +20,7 @@ description
 	archives.
 end
 
-source_dl  = http://www.libarchive.org/downloads/
+source_dl  = https://www.libarchive.org/downloads/
 
 build
 	requires
@@ -35,6 +35,7 @@ build
 		openssl-devel
 		xz-devel
 		zlib-devel
+		zstd-devel
 	end
 
 	configure_options += \
@@ -48,11 +49,11 @@ build
 		--with-lzo2 \
 		--with-nettle \
 		--with-zlib \
+		--with-zstd \
 		--without-lzmadec
 
 	test
-		# Fails immediately with SEGV
-		make check || :
+		LD_LIBRARY_PATH=$(pwd)/src/.libs make check || :
 	end
 
 	install_cmds