diff --git a/0002-tests-fix-zstd-long-option-test-for-32-bit-architect.patch b/0002-tests-fix-zstd-long-option-test-for-32-bit-architect.patch new file mode 100644 index 0000000..997e18f --- /dev/null +++ b/0002-tests-fix-zstd-long-option-test-for-32-bit-architect.patch @@ -0,0 +1,32 @@ +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 +--- + 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 3cdbd812..c9731f1b 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 +-- +2.41.0 + diff --git a/libarchive.spec b/libarchive.spec index b4f48c9..9d11f03 100644 --- a/libarchive.spec +++ b/libarchive.spec @@ -1,7 +1,7 @@ %bcond_without check Name: libarchive -Version: 3.7.1 +Version: 3.7.2 Release: 1%{?dist} Summary: A library for handling streaming archive formats @@ -38,6 +38,10 @@ BuildRequires: make # support explicitly. Patch0001: 0001-Drop-rmd160-from-OpenSSL.patch +# Upstream patch: https://github.com/libarchive/libarchive/commit/3bd918d92f8c34ba12de9c6604d96f9e262a59fc +# Fixes the broken 32-bit builds (i686 arch) due to "Allocation error : not enough memory" +Patch0002: 0002-tests-fix-zstd-long-option-test-for-32-bit-architect.patch + %description Libarchive is a programming library that can create and read several different streaming archive formats, including most popular tar variants, several cpio @@ -235,6 +239,9 @@ run_testsuite %changelog +* Tue Sep 12 2023 Lukas Javorsky - 3.7.2-1 +- Rebase to version 3.7.2 + * Mon Jul 31 2023 Lukas Javorsky - 3.7.1-1 - Rebase to version 3.7.1 diff --git a/sources b/sources index 98879d2..30382a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarchive-3.7.1.tar.gz) = ccd36fc5e24e5feaad15b08496c4f6373f1bbb6ba657af5dc633b9d1454c98aba9a59ccffc48b41afc1219119d46c15d4db09c5855950422946e4dc058f17b88 +SHA512 (libarchive-3.7.2.tar.gz) = 1af253203df3014d1fbf3e99ebdc7aa2a3f036c7c2606d0f0550c49973b0fff99ee7262f4a6e20090c0806c40e964731334360daa3b718bde40108183eacc8a1