mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
libarchive: update to 3.7.2, adopt.
This commit is contained in:
parent
a929553fbe
commit
1b99065f75
3 changed files with 48 additions and 13 deletions
1
srcpkgs/bsdunzip
Symbolic link
1
srcpkgs/bsdunzip
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
libarchive
|
31
srcpkgs/libarchive/patches/fix-tests-on-32bit.patch
Normal file
31
srcpkgs/libarchive/patches/fix-tests-on-32bit.patch
Normal file
|
@ -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
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'libarchive'
|
# Template file for 'libarchive'
|
||||||
pkgname=libarchive
|
pkgname=libarchive
|
||||||
version=3.6.2
|
version=3.7.2
|
||||||
revision=3
|
revision=1
|
||||||
bootstrap=yes
|
bootstrap=yes
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="$(vopt_enable acl) $(vopt_enable acl xattr)
|
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 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)"
|
$(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"
|
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"
|
license="BSD-2-Clause"
|
||||||
homepage="http://www.libarchive.org/"
|
homepage="http://www.libarchive.org/"
|
||||||
changelog="https://raw.githubusercontent.com/wiki/libarchive/libarchive/ReleaseNotes.md"
|
changelog="https://github.com/libarchive/libarchive/releases"
|
||||||
distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.gz"
|
distfiles="https://github.com/libarchive/libarchive/releases/download/v${version}/libarchive-${version}.tar.xz"
|
||||||
checksum=ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3
|
checksum=04357661e6717b6941682cde02ad741ae4819c67a260593dfb2431861b251acb
|
||||||
|
|
||||||
build_options="acl expat lzo lz4 ssl zstd"
|
build_options="acl expat lzo lz4 ssl zstd"
|
||||||
build_options_default="acl ssl lz4 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() {
|
pre_configure() {
|
||||||
export LIBS=-pthread
|
export LIBS=-pthread
|
||||||
}
|
}
|
||||||
|
@ -35,11 +30,11 @@ pre_configure() {
|
||||||
do_check() {
|
do_check() {
|
||||||
case "$XBPS_TARGET_LIBC" in
|
case "$XBPS_TARGET_LIBC" in
|
||||||
*musl)
|
*musl)
|
||||||
make check ||
|
make check ${makejobs} ||
|
||||||
msg_warn "Tests can fail due to encoding conversions\n"
|
msg_warn "Tests can fail due to encoding conversions\n"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
make check
|
make check ${makejobs}
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
@ -59,6 +54,14 @@ bsdtar_package() {
|
||||||
mv ${PKGDESTDIR}/usr/share/man/man5/{mtree.5,libarchive-mtree.5}
|
mv ${PKGDESTDIR}/usr/share/man/man5/{mtree.5,libarchive-mtree.5}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bsdunzip_package() {
|
||||||
|
reverts="20160115_1 20160115_2"
|
||||||
|
build_style="meta"
|
||||||
|
short_desc="BSD utilities using libarchive (transitional dummy package)"
|
||||||
|
depends="bsdtar>=${version}_${revision}"
|
||||||
|
}
|
||||||
|
|
||||||
libarchive-devel_package() {
|
libarchive-devel_package() {
|
||||||
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
|
||||||
short_desc+=" - development files"
|
short_desc+=" - development files"
|
||||||
|
|
Loading…
Add table
Reference in a new issue