From 551e418db0fd74a98694e834e2246effd83b0d82 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Mon, 20 Nov 2023 13:14:05 +0000 Subject: system/libarchive: bump { 3.6.2 --> 3.7.2 }. fixes #1120. --- system/libarchive/APKBUILD | 17 +++----- system/libarchive/fix-test-32-bit-zstd.patch | 29 +++++++++++++ ...tools-Fix-static-linking-when-openssl-is-.patch | 49 ---------------------- 3 files changed, 35 insertions(+), 60 deletions(-) create mode 100644 system/libarchive/fix-test-32-bit-zstd.patch delete mode 100644 system/libarchive/revert-autotools-Fix-static-linking-when-openssl-is-.patch (limited to 'system/libarchive') diff --git a/system/libarchive/APKBUILD b/system/libarchive/APKBUILD index 18fae33b9..9fcca3319 100644 --- a/system/libarchive/APKBUILD +++ b/system/libarchive/APKBUILD @@ -1,20 +1,20 @@ # Contributor: Sergey Lukin # Maintainer: A. Wilcox pkgname=libarchive -pkgver=3.6.2 -pkgrel=1 +pkgver=3.7.2 +pkgrel=0 pkgdesc="Multi-format archive and compression library" url="https://www.libarchive.org/" arch="all" license="BSD-2-Clause AND BSD-3-Clause AND Public-Domain" depends="" makedepends="zlib-dev bzip2-dev xz-dev lz4-dev acl-dev openssl-dev expat-dev - attr-dev zstd-dev autoconf automake libtool" + attr-dev zstd-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools" source="https://github.com/libarchive/libarchive/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz disable-locale-tests.patch disable-unaligned-access-arm32-xxhash.patch - revert-autotools-Fix-static-linking-when-openssl-is-.patch + fix-test-32-bit-zstd.patch " # secfixes: @@ -27,11 +27,6 @@ source="https://github.com/libarchive/libarchive/releases/download/v$pkgver/$pkg # 3.3.2-r1: # - CVE-2017-14166 -prepare() { - default_prepare - autoreconf -i -} - build () { ./configure \ --build=$CBUILD \ @@ -66,7 +61,7 @@ tools() { ln -s bsdcpio "$subpkgdir"/usr/bin/cpio } -sha512sums="24e476465054a29a2d48adf3c197a171b5361fa5038729a1f14d578c6701424de4e5dd6a2b20a6b697969ab43bdd8afc1585f8de0465c266f455d7eaa19e5048 libarchive-3.6.2.tar.gz +sha512sums="1af253203df3014d1fbf3e99ebdc7aa2a3f036c7c2606d0f0550c49973b0fff99ee7262f4a6e20090c0806c40e964731334360daa3b718bde40108183eacc8a1 libarchive-3.7.2.tar.gz 27cf2aaa3e70e3a2a9944fac0c96c411e669c7e1a48daad1423bff68eef0f49153e5ef9d22dc9591a65353119d7fe203a28258ab82278aeb86b46fe691bcfb6a disable-locale-tests.patch 56a2b13b6cd7b127c04ac50ebf49994ec91ff2467d5d0f32b8428bd4df82b167459d4630dee5d1b5119f70b04ea6fe4411d44b768e0f313fa302c9e5fe51b7cd disable-unaligned-access-arm32-xxhash.patch -1b69d47d900d658622de7a621056f8abeacaf6ad4871a2d326fc925d76f7fe8ae15b16d16979fb8c62e429e231e13a97a89e8d064b3ed2b53b1399722207e1ab revert-autotools-Fix-static-linking-when-openssl-is-.patch" +f0a8e3881e742395afc74e418eceab419280152f0884fd6b9dc971d90e117de1cd0a7578c08f14f694c75b904f12fa71fb0102dde0d67a095f6369b3413f7348 fix-test-32-bit-zstd.patch" diff --git a/system/libarchive/fix-test-32-bit-zstd.patch b/system/libarchive/fix-test-32-bit-zstd.patch new file mode 100644 index 000000000..5f43c2626 --- /dev/null +++ b/system/libarchive/fix-test-32-bit-zstd.patch @@ -0,0 +1,29 @@ +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 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/system/libarchive/revert-autotools-Fix-static-linking-when-openssl-is-.patch b/system/libarchive/revert-autotools-Fix-static-linking-when-openssl-is-.patch deleted file mode 100644 index 24acd4080..000000000 --- a/system/libarchive/revert-autotools-Fix-static-linking-when-openssl-is-.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 57b52cb8b54ec57d72ed0ccacacc1f6506749d17 Mon Sep 17 00:00:00 2001 -From: Zach van Rijn -Date: Tue, 11 Apr 2023 17:14:18 -0500 -Subject: [PATCH] Revert "autotools: Fix static linking when openssl is enabled - in windows" - -This reverts commit a83f3d327aefe8d628230f326621b014d82f55b4. - -diff --git a/build/pkgconfig/libarchive.pc.in b/build/pkgconfig/libarchive.pc.in -index 1f51e77f..4b631e63 100644 ---- a/build/pkgconfig/libarchive.pc.in -+++ b/build/pkgconfig/libarchive.pc.in -@@ -10,4 +10,3 @@ Cflags: -I${includedir} - Cflags.private: -DLIBARCHIVE_STATIC - Libs: -L${libdir} -larchive - Libs.private: @LIBS@ --Requires.private: @LIBSREQUIRED@ -diff --git a/configure.ac b/configure.ac -index 349e7580..d60f66fb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -378,7 +378,6 @@ if test "x$with_iconv" != "xno"; then - AC_CHECK_HEADERS([localcharset.h]) - am_save_LIBS="$LIBS" - LIBS="${LIBS} ${LIBICONV}" -- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }iconv" - AC_CHECK_FUNCS([locale_charset]) - LIBS="${am_save_LIBS}" - if test "x$ac_cv_func_locale_charset" != "xyes"; then -@@ -1210,7 +1209,6 @@ fi - if test "x$with_openssl" != "xno"; then - AC_CHECK_HEADERS([openssl/evp.h]) - saved_LIBS=$LIBS -- LIBSREQUIRED="$LIBSREQUIRED${LIBSREQUIRED:+ }libssl libcrypto" - AC_CHECK_LIB(crypto,OPENSSL_config) - CRYPTO_CHECK(MD5, OPENSSL, md5) - CRYPTO_CHECK(RMD160, OPENSSL, rmd160) -@@ -1221,8 +1219,6 @@ if test "x$with_openssl" != "xno"; then - AC_CHECK_FUNCS([PKCS5_PBKDF2_HMAC_SHA1]) - fi - --AC_SUBST(LIBSREQUIRED) -- - # Probe libmd AFTER OpenSSL/libcrypto. - # The two are incompatible and OpenSSL is more complete. - AC_CHECK_HEADERS([md5.h ripemd.h sha.h sha256.h sha512.h]) --- -2.25.1 - -- cgit v1.2.3-60-g2f50