From 69af7a70ebd858568e4fc9aa8404f1a4e25d4fe0 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Mon, 28 Dec 2020 09:10:05 -0600
Subject: [PATCH] libarchive: update to 3.5.1.

Closes: #27500 [via git-merge-pr]
---
 srcpkgs/libarchive/template | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 48b1c29802..5c9e316c60 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
-version=3.4.3
-revision=2
+version=3.5.1
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -16,13 +16,24 @@ short_desc="Library to read/write several different streaming archive formats"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://www.libarchive.org/"
-distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz"
-checksum=ee1e749213c108cb60d53147f18c31a73d6717d7e3d2481c157e1b34c881ea39
+distfiles="https://github.com/libarchive/libarchive/releases/download/${version}/libarchive-${version}.tar.gz"
+checksum=9015d109ec00bb9ae1a384b172bf2fc1dff41e2c66e5a9eeddf933af9db37f5a
 
-# Package build options
 build_options="acl expat lzo lz4 ssl zstd"
 build_options_default="acl ssl lz4 zstd"
 
+do_check() {
+	case "$XBPS_TARGET_LIBC" in
+		*musl)
+			make check ||
+				msg_warn "Tests can fail due to encoding conversions\n"
+			;;
+		*)
+			make check
+			;;
+	esac
+}
+
 post_install() {
 	vlicense COPYING
 }
@@ -43,8 +54,8 @@ libarchive-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
-		vmove usr/lib/*.a
-		vmove usr/lib/*.so
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		vmove usr/share
 	}