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

[mhmdanas <mhmdanas@users.noreply.github.com>]

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

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

https://github.com/mhmdanas/void-packages libarchive-3.7.2
https://github.com/void-linux/void-packages/pull/46671

libarchive: update to 3.7.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

Fixes various security issues.

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 733515cb89c2041f5afe26753944b42af0ee4d1e Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Thu, 2 Nov 2023 22:22:30 +0000
Subject: [PATCH 1/2] bsdunzip: remove package.

Hasn't been updated in 6 years.
---
 srcpkgs/bsdunzip/patches/add-license.patch | 38 ----------------------
 srcpkgs/bsdunzip/template                  | 20 ------------
 2 files changed, 58 deletions(-)
 delete mode 100644 srcpkgs/bsdunzip/patches/add-license.patch
 delete mode 100644 srcpkgs/bsdunzip/template

diff --git a/srcpkgs/bsdunzip/patches/add-license.patch b/srcpkgs/bsdunzip/patches/add-license.patch
deleted file mode 100644
index e50e55da9c9e2..0000000000000
--- a/srcpkgs/bsdunzip/patches/add-license.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e8ce52e84c17944c8ee38786d2c401006f4962c7 Mon Sep 17 00:00:00 2001
-From: Kylie McClain <somasis@exherbo.org>
-Date: Sun, 10 Jul 2016 22:32:16 -0400
-Subject: [PATCH] Add LICENSE (closes #1)
-
----
- LICENSE | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
- create mode 100644 LICENSE
-
---- /dev/null
-+++ b/LICENSE
-@@ -0,0 +1,24 @@
-+This license file only applies to the Makefile and README.md within the root
-+of this repository. I claim no copyright on `/usr.bin/unzip`, or any files
-+within it. The changes are likely too small to warrant a copyright claim.
-+
-+All files in `/usr.bin/unzip` are under a two-clause BSD license as of last
-+sync from upstream.
-+
-+`Makefile` and `README.md` are licensed under the ISC license, which is
-+reproduced here:
-+
-+Copyright (c) 2015-2016 Kylie McClain <somasis@exherbo.org>
-+
-+Permission to use, copy, modify, and/or distribute this software for any
-+purpose with or without fee is hereby granted, provided that the above
-+copyright notice and this permission notice appear in all copies.
-+
-+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+
-
diff --git a/srcpkgs/bsdunzip/template b/srcpkgs/bsdunzip/template
deleted file mode 100644
index e6ac1e4a369f3..0000000000000
--- a/srcpkgs/bsdunzip/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'bsdunzip'
-pkgname=bsdunzip
-version=20160115
-revision=2
-build_style=gnu-makefile
-makedepends="libarchive-devel"
-short_desc="Libarchive(3)-utilizing unzip implementation from FreeBSD"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-2-Clause, ISC"
-homepage="https://github.com/somasis/bsdunzip"
-distfiles="https://github.com/somasis/bsdunzip/archive/${version}.tar.gz"
-checksum=06c52c77fa518732665aa2daa73f364cd2470a5d47a83c9c79f86f207cf3ecc1
-
-if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
-	makedepends+=" musl-legacy-compat"
-fi
-
-post_install() {
-	vlicense LICENSE
-}

From 757d5dd8352e1d27376adbe978b76d5e4ac19430 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Sat, 14 Oct 2023 00:20:11 +0100
Subject: [PATCH 2/2] libarchive: update to 3.7.2, adopt.

---
 srcpkgs/bsdunzip                              |  1 +
 .../patches/fix-tests-on-32bit.patch          | 31 +++++++++++++++++++
 srcpkgs/libarchive/template                   | 29 +++++++++--------
 3 files changed, 48 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/bsdunzip
 create mode 100644 srcpkgs/libarchive/patches/fix-tests-on-32bit.patch

diff --git a/srcpkgs/bsdunzip b/srcpkgs/bsdunzip
new file mode 120000
index 0000000000000..6e93d9cc1c027
--- /dev/null
+++ b/srcpkgs/bsdunzip
@@ -0,0 +1 @@
+libarchive
\ No newline at end of file
diff --git a/srcpkgs/libarchive/patches/fix-tests-on-32bit.patch b/srcpkgs/libarchive/patches/fix-tests-on-32bit.patch
new file mode 100644
index 0000000000000..d624316c11cab
--- /dev/null
+++ b/srcpkgs/libarchive/patches/fix-tests-on-32bit.patch
@@ -0,0 +1,31 @@
+From 3bd918d92f8c34ba12de9c6604d96f9e262a59fc Mon Sep 17 00:00:00 2001
+From: Martin Matuska <martin@matuska.de>
+Date: Tue, 12 Sep 2023 08:54:47 +0200
+Subject: [PATCH] tests: fix zstd long option test for 32-bit architectures
+
+Fixes #1968
+---
+Upstream commit: https://github.com/libarchive/libarchive/commit/3bd918d92f8c34ba12de9c6604d96f9e262a59fc
+
+ libarchive/test/test_write_filter_zstd.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/test/test_write_filter_zstd.c b/libarchive/test/test_write_filter_zstd.c
+index 3cdbd812a..c9731f1b6 100644
+--- a/libarchive/test/test_write_filter_zstd.c
++++ b/libarchive/test/test_write_filter_zstd.c
+@@ -161,8 +161,12 @@ DEFINE_TEST(test_write_filter_zstd)
+ 	    archive_write_set_filter_option(a, NULL, "max-frame-size", "1048576"));
+ #endif
+ #if ZSTD_VERSION_NUMBER >= MINVER_LONG
+-	assertEqualIntA(a, ARCHIVE_OK,
+-	    archive_write_set_filter_option(a, NULL, "long", "27"));
++	if ((int)(sizeof(size_t) == 4))
++		assertEqualIntA(a, ARCHIVE_OK,
++		    archive_write_set_filter_option(a, NULL, "long", "26"));
++	else
++		assertEqualIntA(a, ARCHIVE_OK,
++		    archive_write_set_filter_option(a, NULL, "long", "27"));
+ 	assertEqualIntA(a, ARCHIVE_FAILED,
+ 	    archive_write_set_filter_option(a, NULL, "long", "-1")); /* negative */
+ #endif
diff --git a/srcpkgs/libarchive/template b/srcpkgs/libarchive/template
index f4885ebc033c5..acc7659de1d62 100644
--- a/srcpkgs/libarchive/template
+++ b/srcpkgs/libarchive/template
@@ -1,7 +1,7 @@
 # Template file for 'libarchive'
 pkgname=libarchive
-version=3.6.2
-revision=3
+version=3.7.2
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
@@ -13,21 +13,16 @@ makedepends="zlib-devel bzip2-devel liblzma-devel
  $(vopt_if acl acl-devel) $(vopt_if expat expat-devel) $(vopt_if zstd libzstd-devel)
  $(vopt_if lzo lzo-devel) $(vopt_if lz4 liblz4-devel) $(vopt_if ssl openssl-devel)"
 short_desc="Library to read/write several different streaming archive formats"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="triallax <triallax@tutanota.com>"
 license="BSD-2-Clause"
 homepage="http://www.libarchive.org/"
-changelog="https://raw.githubusercontent.com/wiki/libarchive/libarchive/ReleaseNotes.md"
-distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz"
-checksum=ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3
+changelog="https://github.com/libarchive/libarchive/releases"
+distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.xz"
+checksum=04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb
 
 build_options="acl expat lzo lz4 ssl zstd"
 build_options_default="acl ssl lz4 zstd"
 
-post_extract() {
-	# remove iconv from libarchive.pc requirements.
-	vsed -e '/LIBSREQUIRED.*iconv/d' -i configure
-}
-
 pre_configure() {
 	export LIBS=-pthread
 }
@@ -35,11 +30,11 @@ pre_configure() {
 do_check() {
 	case "$XBPS_TARGET_LIBC" in
 		*musl)
-			make check ||
+			make check ${makejobs} ||
 				msg_warn "Tests can fail due to encoding conversions\n"
 			;;
 		*)
-			make check
+			make check ${makejobs}
 			;;
 	esac
 }
@@ -59,6 +54,14 @@ bsdtar_package() {
 		mv ${PKGDESTDIR}/usr/share/man/man5/{mtree.5,libarchive-mtree.5}
 	}
 }
+
+bsdunzip_package() {
+	reverts="20160115_2"
+	build_style="meta"
+	short_desc="BSD utilities using libarchive (transitional dummy package)"
+	depends="bsdtar-${version}_${revision}"
+}
+
 libarchive-devel_package() {
 	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"