commit: 203a8c1075d6b0bbeff5f099f75dcc1e491a810f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Jan 6 07:27:19 2026 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Jan 6 08:03:43 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=203a8c10
app-arch/libarchive: Bump to 3.8.5 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-arch/libarchive/Manifest | 2 + app-arch/libarchive/libarchive-3.8.5.ebuild | 174 ++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index dbca9d72c358..37fb28140786 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -2,3 +2,5 @@ DIST libarchive-3.8.3.tar.xz 5990552 BLAKE2B 5be5f0e98f7582e2a34a43dd9217644defb DIST libarchive-3.8.3.tar.xz.asc 833 BLAKE2B 583c3b6b7626dc3de8a2e23cce23ed34fcdcd2f854bab61d0ecdae41414ff021733ceedabb006b7f128462f12065af0e66f4215fe060dd1f720de11bccfa71c9 SHA512 239e6ebaaffefee1d12f185e4e033e333feb81d5a5b985d9bfc33f883f6cbb7e7d65d480286cfaa4313e6139252eb7f3a7a1e095c251477c3a49196312c6d9a7 DIST libarchive-3.8.4.tar.xz 6065584 BLAKE2B c6cadc1dc97f79a379fa1f2fae4d791fade4513796066de8bfa32e40f8b5dc1efb4c46a9f0aefb62510c5ab428599f9cbda508e89b67cd932e160ee5377ee0e6 SHA512 088f3726de7f8e2f4b2ac6cc9c01338328493de19f5b0645157114ef3b7a0fa5213cb6d64123736cae83354a2137bba9e2187bb4208cb7848e2566c65b100489 DIST libarchive-3.8.4.tar.xz.asc 833 BLAKE2B 2b4edd5f9d5d5ca9c0f7276b9891f95621def922ceea043520460fc731e588d1acf8cfc41aa8a4df8a10285ca196411a17b886ef64722de985c7012af8adc024 SHA512 1ec7e73a5b0c02d236567f77812003276af9a499e774d2d6d322ed823a5a98f662a4dc6053eb471dcaa1317b2980937910a528f9c83d23c115a310175a23ad61 +DIST libarchive-3.8.5.tar.xz 6009124 BLAKE2B d0fa6a49209a06240240cf578f95138eb72eebdc7179d034fdd9efc2e49820e34e9da41aa46cd11be2c2d46c380c8cc7e830d41271a6f3a7d9c39df138098cab SHA512 b050ca8488143503bdec38ffcab7a5010af61f1b93c1207a3fa006d72d643b84aa8c1ab267e890eb39966ccaedd6e18db8fe5b02f2789bbd1b318a3c4cf138f3 +DIST libarchive-3.8.5.tar.xz.asc 833 BLAKE2B bf3d85fad2f6e681c94ec341753dffc8ca658ffdc55641278dc28aa863209c3d6d42e32d0d33de9326314b6daa5486a758b6cce82f445b9f6568ccac4fc7b457 SHA512 80b155e86d9f93efd3f2e65655c1fe66fb0b9b937888fd5b24e65b26418f01ee6fbd66c649079b8591c15ae593980ece3de49778bb1215eaecd9af0f2823fb71 diff --git a/app-arch/libarchive/libarchive-3.8.5.ebuild b/app-arch/libarchive/libarchive-3.8.5.ebuild new file mode 100644 index 000000000000..929bef7e461f --- /dev/null +++ b/app-arch/libarchive/libarchive-3.8.5.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +inherit libtool multilib-minimal toolchain-funcs verify-sig + +DESCRIPTION="Multi-format archive and compression library" +HOMEPAGE=" + https://www.libarchive.org/ + https://github.com/libarchive/libarchive/ +" +SRC_URI=" + https://www.libarchive.de/downloads/${P}.tar.xz + verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc ) +" + +LICENSE="BSD BSD-2 BSD-4 public-domain" +SLOT="0/13" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +IUSE=" + acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle + static-libs test xattr +zstd +" +RESTRICT="!test? ( test )" + +RDEPEND=" + virtual/zlib:=[${MULTILIB_USEDEP}] + acl? ( virtual/acl:=[${MULTILIB_USEDEP}] ) + blake2? ( app-crypt/libb2:=[${MULTILIB_USEDEP}] ) + bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] ) + expat? ( dev-libs/expat:=[${MULTILIB_USEDEP}] ) + !expat? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) + iconv? ( virtual/libiconv:=[${MULTILIB_USEDEP}] ) + dev-libs/openssl:=[${MULTILIB_USEDEP}] + lz4? ( >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.2.5-r1:=[${MULTILIB_USEDEP}] ) + lzo? ( >=dev-libs/lzo-2:=[${MULTILIB_USEDEP}] ) + nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + kernel_linux? ( + virtual/os-headers + e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] ) + ) + test? ( + app-arch/lrzip + app-arch/lz4 + app-arch/lzip + app-arch/lzop + app-arch/xz-utils + app-arch/zstd + lzma? ( app-arch/xz-utils[extra-filters(+)] ) + ) +" +BDEPEND=" + virtual/pkgconfig + verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20251118 ) + elibc_musl? ( sys-libs/queue-standalone ) +" + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc + +# false positives (checks for libc-defined hash functions) +QA_CONFIG_IMPL_DECL_SKIP=( + SHA256_Init SHA256_Update SHA256_Final + SHA384_Init SHA384_Update SHA384_Final + SHA512_Init SHA512_Update SHA512_Final +) + +PATCHES=( + # https://github.com/libarchive/libarchive/issues/2069 + # (we can simply update the command since we don't support old lrzip) + "${FILESDIR}/${PN}-3.7.2-lrzip.patch" +) + +src_prepare() { + default + + # Needed for flags to be respected w/ LTO + elibtoolize +} + +multilib_src_configure() { + export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 + + local myconf=( + $(use_enable acl) + $(use_enable static-libs static) + $(use_enable xattr) + $(use_with blake2 libb2) + $(use_with bzip2 bz2lib) + $(use_with expat) + $(use_with !expat xml2) + $(use_with iconv) + $(use_with lz4) + $(use_with lzma) + $(use_with lzo lzo2) + $(use_with nettle) + --with-zlib + $(use_with zstd) + + # Windows-specific + --without-cng + ) + if multilib_is_native_abi ; then + myconf+=( + --enable-bsdcat="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdcpio="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdtar="$(tc-is-static-only && echo static || echo shared)" + --enable-bsdunzip="$(tc-is-static-only && echo static || echo shared)" + ) + else + myconf+=( + --disable-bsdcat + --disable-bsdcpio + --disable-bsdtar + --disable-bsdunzip + ) + fi + + ECONF_SOURCE="${S}" econf "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi ; then + emake + else + emake libarchive.la + fi +} + +src_test() { + mkdir -p "${T}"/bin || die + # tests fail when lbzip2[symlink] is used in place of ref bunzip2 + ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die + # workaround lrzip broken on 32-bit arches with >= 10 threads + # https://bugs.gentoo.org/927766 + cat > "${T}"/bin/lrzip <<-EOF || die + #!/bin/sh + exec "$(type -P lrzip)" -p1 "\${@}" + EOF + chmod +x "${T}/bin/lrzip" || die + local -x PATH=${T}/bin:${PATH} + multilib-minimal_src_test +} + +multilib_src_test() { + # sandbox is breaking long symlink behavior + local -x SANDBOX_ON=0 + local -x LD_PRELOAD= + # some locales trigger different output that breaks tests + local -x LC_ALL=C.UTF-8 + emake check +} + +multilib_src_install() { + if multilib_is_native_abi ; then + emake DESTDIR="${D}" install + else + local install_targets=( + install-includeHEADERS + install-libLTLIBRARIES + install-pkgconfigDATA + ) + emake DESTDIR="${D}" "${install_targets[@]}" + fi + + # Libs.private: should be used from libarchive.pc instead + find "${ED}" -type f -name "*.la" -delete || die + # https://github.com/libarchive/libarchive/issues/1766 + sed -e '/Requires\.private/s:iconv::' \ + -i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die +}
