[PR PATCH] libarchive: update to 3.5.1.

[PR PATCH] libarchive: update to 3.5.1.

[ndowens]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

There is a new pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages libarchive
https://github.com/void-linux/void-packages/pull/27500

libarchive: update to 3.5.1.


A patch file from https://github.com/void-linux/void-packages/pull/27500.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libarchive-27500.patch --]
[-- Type: text/x-diff, Size: 1662 bytes --]

From 0eae007280e6650094918e134440997d3a301a9c 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.

---
 srcpkgs/libarchive/template | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 48b1c29802b..b04508b91c9 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,10 +16,9 @@ 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"
 
@@ -43,8 +42,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
 	}

Re: libarchive: update to 3.5.1.

[ndowens]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/27500#issuecomment-751763850

Comment:
Installing x86_64-musl in virtualbox to see if I can figure out issue with check on x86_64-musl 

Re: libarchive: update to 3.5.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27500#issuecomment-751770886

Comment:
A Musl masterdir should be enough to make it work.

Re: libarchive: update to 3.5.1.

[ndowens]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/27500#issuecomment-751771298

Comment:
> A Musl masterdir should be enough to make it work.

Tried but ran into issue, user issue, but looking at the test, it seems to deal with UTF8 and some locales

Re: [PR PATCH] [Updated] libarchive: update to 3.5.1.

[ndowens]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages libarchive
https://github.com/void-linux/void-packages/pull/27500

libarchive: update to 3.5.1.


A patch file from https://github.com/void-linux/void-packages/pull/27500.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libarchive-27500.patch --]
[-- Type: text/x-diff, Size: 1881 bytes --]

From 6662e84a291f5428fdb860946151cdf7c8e9ff41 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.

---
 srcpkgs/libarchive/template | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 48b1c29802b..e8056382e6e 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,20 @@ 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"
 
+pre_check() {
+	case "$XBPS_TARGET_LIBC" in
+		# encoding test fails only on musl
+		musl) vsed -i '/encoding/d' libarchive/test/CMakeLists.txt ;;
+		*) ;;
+	esac
+}
+
 post_install() {
 	vlicense COPYING
 }
@@ -43,8 +50,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
 	}

Re: [PR PATCH] [Updated] libarchive: update to 3.5.1.

[ndowens]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages libarchive
https://github.com/void-linux/void-packages/pull/27500

libarchive: update to 3.5.1.


A patch file from https://github.com/void-linux/void-packages/pull/27500.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libarchive-27500.patch --]
[-- Type: text/x-diff, Size: 1881 bytes --]

From 57d8a3c0d77a1fa8b0fd33a367a929a8fca9b083 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.

---
 srcpkgs/libarchive/template | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 48b1c29802b..7bdf02e057c 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,20 @@ 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"
 
+pre_build() {
+	case "$XBPS_TARGET_LIBC" in
+		# encoding test fails only on musl
+		musl) vsed -i '/encoding/d' libarchive/test/CMakeLists.txt ;;
+		*) ;;
+	esac
+}
+
 post_install() {
 	vlicense COPYING
 }
@@ -43,8 +50,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
 	}

Re: [PR PATCH] [Updated] libarchive: update to 3.5.1.

[ndowens]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages libarchive
https://github.com/void-linux/void-packages/pull/27500

libarchive: update to 3.5.1.


A patch file from https://github.com/void-linux/void-packages/pull/27500.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libarchive-27500.patch --]
[-- Type: text/x-diff, Size: 1882 bytes --]

From 817bf251fafcb20e958106bed724988c04ef102e 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.

---
 srcpkgs/libarchive/template | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 48b1c29802b..3045940e9e7 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,20 @@ 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"
 
+pre_build() {
+	case "$XBPS_TARGET_LIBC" in
+		# encoding test fails only on musl
+		*musl) vsed -i '/encoding/d' libarchive/test/CMakeLists.txt ;;
+		*) ;;
+	esac
+}
+
 post_install() {
 	vlicense COPYING
 }
@@ -43,8 +50,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
 	}

Re: [PR PATCH] [Updated] libarchive: update to 3.5.1.

[ndowens]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages libarchive
https://github.com/void-linux/void-packages/pull/27500

libarchive: update to 3.5.1.


A patch file from https://github.com/void-linux/void-packages/pull/27500.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libarchive-27500.patch --]
[-- Type: text/x-diff, Size: 1849 bytes --]

From 6bf8947b9ee9168f6823792bc7682c331fd17bc9 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.

---
 srcpkgs/libarchive/template | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index 48b1c29802b..f4d84c872fa 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,19 @@ 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) : ;; # Checks fail because of UTF-8 encoding checks
+		*) make check ;;
+	esac
+}
+
 post_install() {
 	vlicense COPYING
 }
@@ -43,8 +49,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
 	}

Re: [PR PATCH] [Closed]: libarchive: update to 3.5.1.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 162 bytes --]

There's a closed pull request on the void-packages repository

libarchive: update to 3.5.1.
https://github.com/void-linux/void-packages/pull/27500

Description: