diff --git a/0001-Drop-rmd160-from-OpenSSL.patch b/0001-Drop-rmd160-from-OpenSSL.patch new file mode 100644 index 0000000000000000000000000000000000000000..f152f68f15dcec148f9df5b7cc002d4c15c23a34 --- /dev/null +++ b/0001-Drop-rmd160-from-OpenSSL.patch @@ -0,0 +1,24 @@ +From 375bbe7d20284f205ebb73652ef61ae6fceac344 Mon Sep 17 00:00:00 2001 +From: Lukas Javorsky +Date: Tue, 18 Jul 2023 10:29:22 +0000 +Subject: [PATCH] Drop rmd160 from OpenSSL + +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7f5dbdf..179fb2d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1300,7 +1300,6 @@ if test "x$with_openssl" != "xno"; then + LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libcrypto" + AC_CHECK_LIB(crypto,OPENSSL_config) + CRYPTO_CHECK(MD5, OPENSSL, md5) +- CRYPTO_CHECK(RMD160, OPENSSL, rmd160) + CRYPTO_CHECK(SHA1, OPENSSL, sha1) + CRYPTO_CHECK(SHA256, OPENSSL, sha256) + CRYPTO_CHECK(SHA384, OPENSSL, sha384) +-- +2.41.0 + 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 0000000000000000000000000000000000000000..997e18fe09597b6c6380ae8e238687519c5ecc2a --- /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-3.7.1.tar.gz b/libarchive-3.7.2.tar.gz similarity index 49% rename from libarchive-3.7.1.tar.gz rename to libarchive-3.7.2.tar.gz index 922b6c729d391c010ffa6228134c164886bac0f1..1293bda3e94bc96d7f9eed01c94b2136477b402a 100644 Binary files a/libarchive-3.7.1.tar.gz and b/libarchive-3.7.2.tar.gz differ diff --git a/libarchive.spec b/libarchive.spec index 9a8c88f6c81611bdfe8e21bbf4814527e800990e..15e6fac4b2c0cdcfbd47c942f9ebe5aa030226dd 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 Summary: Multi-format archive and compression library License: BSD @@ -9,9 +9,24 @@ URL: https://www.libarchive.org/ Source0: https://libarchive.org/downloads/%{name}-%{version}.tar.gz BuildRequires: gcc bison sharutils zlib-devel bzip2-devel xz-devel -BuildRequires: lzo-devel e2fsprogs-devel libacl-devel libattr-devel +BuildRequires: e2fsprogs-devel libacl-devel libattr-devel BuildRequires: openssl-devel libxml2-devel lz4-devel automake libzstd-devel BuildRequires: autoconf libtool make +# According to libarchive maintainer, linking against liblzo violates +# LZO license. +# See https://github.com/libarchive/libarchive/releases/tag/v3.3.0 +#BuildRequires: lzo-devel + +# When configured against OpenSSL 1.1, the RIPEMD-160 support was not detected, +# so it was not compiled in previously. With OpenSSL 3.0, it's now detected as +# being available, but it only actually works when the legacy provider is +# loaded, which breaks the RIPEMD-160 test. This patch disables the RIPEMD-160 +# 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 %{name} is an open-source BSD-licensed C programming library that @@ -198,6 +213,10 @@ run_testsuite %{_mandir}/*/bsdunzip* %changelog +* Fri Apr 12 2024 zhangxingrong - 3.7.2-1 +- Upgrade to 3.7.2 +- Sync upstream patches + * Thu Aug 3 2023 dillon chen - 3.7.1-1 - Upgrade to 3.7.1 - Add new bsdunzip subpackage