From 46df93d564bb81c25f3ca43a0ee69d0983768383 Mon Sep 17 00:00:00 2001 From: skmpz Date: Wed, 15 May 2024 13:01:35 +0300 Subject: [PATCH] libarchive: update to 3.7.4, adopt --- .../patches/fix-error-reporting.patch | 27 ---------------- .../patches/fix-tests-on-32bit.patch | 31 ------------------- srcpkgs/libarchive/template | 10 +++--- 3 files changed, 5 insertions(+), 63 deletions(-) delete mode 100644 srcpkgs/libarchive/patches/fix-error-reporting.patch delete mode 100644 srcpkgs/libarchive/patches/fix-tests-on-32bit.patch diff --git a/srcpkgs/libarchive/patches/fix-error-reporting.patch b/srcpkgs/libarchive/patches/fix-error-reporting.patch deleted file mode 100644 index 57d2c8e32e27a3..00000000000000 --- a/srcpkgs/libarchive/patches/fix-error-reporting.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6110e9c82d8ba830c3440f36b990483ceaaea52c Mon Sep 17 00:00:00 2001 -From: Ed Maste -Date: Fri, 29 Mar 2024 18:02:06 -0400 -Subject: [PATCH] tar: make error reporting more robust and use correct errno - (#2101) - -As discussed in #1609. ---- - tar/read.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tar/read.c b/tar/read.c -index af3d3f423daff024791465bb9976a9b9a74b91ad..a7f14a07bb35602256b732cf3de96892e4280523 100644 ---- a/tar/read.c -+++ b/tar/read.c -@@ -371,8 +371,9 @@ read_archive(struct bsdtar *bsdtar, char mode, struct archive *writer) - if (r != ARCHIVE_OK) { - if (!bsdtar->verbose) - safe_fprintf(stderr, "%s", archive_entry_pathname(entry)); -- fprintf(stderr, ": %s: ", archive_error_string(a)); -- fprintf(stderr, "%s", strerror(errno)); -+ safe_fprintf(stderr, ": %s: %s", -+ archive_error_string(a), -+ strerror(archive_errno(a))); - if (!bsdtar->verbose) - fprintf(stderr, "\n"); - bsdtar->return_value = 1; diff --git a/srcpkgs/libarchive/patches/fix-tests-on-32bit.patch b/srcpkgs/libarchive/patches/fix-tests-on-32bit.patch deleted file mode 100644 index d624316c11cab9..00000000000000 --- a/srcpkgs/libarchive/patches/fix-tests-on-32bit.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3bd918d92f8c34ba12de9c6604d96f9e262a59fc Mon Sep 17 00:00:00 2001 -From: Martin Matuska -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 0df543645d4e76..fffa9d0b2fba13 100644 --- a/srcpkgs/libarchive/template +++ b/srcpkgs/libarchive/template @@ -1,7 +1,7 @@ # Template file for 'libarchive' pkgname=libarchive -version=3.7.2 -revision=3 +version=3.7.4 +revision=1 bootstrap=yes build_style=gnu-configure configure_args="$(vopt_enable acl) $(vopt_enable acl xattr) @@ -13,12 +13,12 @@ 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="Orphaned " +maintainer="skmpz " license="BSD-2-Clause" -homepage="http://www.libarchive.org/" +homepage="https://www.libarchive.org/" changelog="https://github.com/libarchive/libarchive/releases" distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.xz" -checksum=04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb +checksum=f887755c434a736a609cbd28d87ddbfbe9d6a3bb5b703c22c02f6af80a802735 build_options="acl expat lzo lz4 ssl zstd" build_options_default="acl ssl lz4 zstd"