summaryrefslogtreecommitdiff
path: root/app-arch/libarchive
diff options
context:
space:
mode:
Diffstat (limited to 'app-arch/libarchive')
-rw-r--r--app-arch/libarchive/Manifest6
-rw-r--r--app-arch/libarchive/files/libarchive-3.7.4-INT_MAX.patch26
-rw-r--r--app-arch/libarchive/libarchive-3.7.3.ebuild176
-rw-r--r--app-arch/libarchive/libarchive-3.7.4.ebuild4
4 files changed, 31 insertions, 181 deletions
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 3e720ea2eaef..635bf21bc9dc 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,8 +1,6 @@
AUX libarchive-3.7.2-lrzip.patch 1095 BLAKE2B 011c61282f5ad91436e8155458695c5f0b9144e21ae856ba319927e6431d9730257d6e7f7ebcc916ad784e24b2f4ff2af75955aa0493ea3705fa8826f632f163 SHA512 71e3aefe7d3e5faa6cd47e350e52135d594184d957cf3e2d592e3770971ff3fed8886b7fe6c897c94efa15b3b9e9d15be05686178d201b422d4503e3878b704d
-DIST libarchive-3.7.3.tar.xz 5428992 BLAKE2B c53672c8cdbe8f406f00bf4fc6b36e4dffcd23a33909dbec6ef06b86dceefc6062840eff629ba3bd19c36121720e16a8ba10dfa1a35ebed186cc92eb144f55d0 SHA512 984e7c61010b9555bafe54d5f52ff2d089e28afe5cea3a14615e2aca8539075293789d18f17f8915882ec328bcbdca7b3d1536d6dc19620ca226e8b6d802ef63
-DIST libarchive-3.7.3.tar.xz.asc 659 BLAKE2B bfe18e36ef2e96ad46ab2cd1236701b4b80f41ebb840681c1baf7eac72f38444cc0619645fac17d3acdda6553b294483d87f0a92d9575138d117934e838d85d2 SHA512 9f340b41fc9db34f1c4e0823d559b666196d3031249e05981cfb43a401aa8a85710f14ba1cc784ab3ca367439e4c485668dffe7020f38f50b3ed35810df504a1
+AUX libarchive-3.7.4-INT_MAX.patch 649 BLAKE2B 2b64a02ba2f0697bf33f5d92a9128d041a3109debce7baefc48ca94dbbf2ae4d57ad2a15592e4ebb86aaf06043c8ae7cd6bad7b4ca4335c77c6ce2601c00245e SHA512 9b505466296c61ad94c45abf3e76bc239ee1674ce2e89978d956d88ce04f4c0e91e881c049c143e7f6dbbe856112626c443a5960f7febbd7af20237d3077a452
DIST libarchive-3.7.4.tar.xz 5417660 BLAKE2B 128f72235da61e112201046c0cfe62a8c580cf73b426c4cfe270ae913356f6ad430ba33a663dcd617b082c7baf45ada8d1c9928c45fea16fd57e8020693a60bc SHA512 84bc346ba15861ab10aa54a3d687de955178e4efbe12bf3a49a467181e7f819673949f131f4c8338de8ed6e319a8565af376e5a540380bda08e60dffbc7c8686
DIST libarchive-3.7.4.tar.xz.asc 659 BLAKE2B 77e705194f6e9a9f97da0ac43c9b3157e1a8a490d26da34079e4ef3f2bcf98d6f6e95567e110287fab0ec26d3fc27e5bbeff7569c9ca138de2caf47af737c6d0 SHA512 82caa18a78661ea717ce93cdcb0806eed48450c20fb4d45cb4c33001f2d4d0fb5a791552acbb24ad8c41772e1d0b66c76c9cb86946bc862109721a0c986f5331
-EBUILD libarchive-3.7.3.ebuild 4673 BLAKE2B 49df980076bd86ba4b0557898de5565129c0139f59dde1aea1aa3e2a7f812cc92bc4f3c0fe616fbf76a9554af221d4d233433b889924a209691973a5624131ff SHA512 b859d3afcdbd1549b84f13ee55967af6080a3786fcee49fd4d508c01319276d5de796eb0aaecbd60ff53d69e773d7f8f90555a925ed87146a9758862176eaa5a
-EBUILD libarchive-3.7.4.ebuild 4681 BLAKE2B 2f51cad43757b2d46ee696df975af96229068dba08d4dc9d3b78b32a63539c3325750e053c9e2653a3289b8d8c88d285b9e4d42e76b8cdb4f06f4d0f550e7992 SHA512 e0c4bb471487523c507c571058c46ac0cda49b3022c24b2d369d590d0d2c7c5a9726fce0d6bf45e93f76d94f32e9997faabd2fd11e8a76d0eb351ffe44148220
+EBUILD libarchive-3.7.4.ebuild 4806 BLAKE2B 13fa7d55f946115767d940c1862268fb9c814ec284932dea26dd6854b144cd72f36666b9bde3409243eb68815d2a31f1bcf8b2d380d9f6459f95e53da2b436c8 SHA512 ceb3aa5dd02044b9baaffc0c73f668a17efc3f6459caff2862e11cc641b2e760c0a7b6122350344dfd770ef9f2a9eaa2e5bc34628b5f4aa41c4c02747a15e553
MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/files/libarchive-3.7.4-INT_MAX.patch b/app-arch/libarchive/files/libarchive-3.7.4-INT_MAX.patch
new file mode 100644
index 000000000000..150216b3344d
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.7.4-INT_MAX.patch
@@ -0,0 +1,26 @@
+From 6ff1cd1e487ddf545337b88da3f1f5ca69a2f958 Mon Sep 17 00:00:00 2001
+From: Tim Kientzle <kientzle@acm.org>
+Date: Mon, 6 May 2024 20:46:26 -0700
+Subject: [PATCH] Define INT_MAX via `#include <limits.h>` (#2170)
+
+#2110 added usages of INT_MAX here without adding the necessary header.
+
+Resolves #2162
+---
+ tar/bsdtar.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tar/bsdtar.c b/tar/bsdtar.c
+index 42baab286..f0e71afd1 100644
+--- a/tar/bsdtar.c
++++ b/tar/bsdtar.c
+@@ -43,6 +43,9 @@
+ #ifdef HAVE_LANGINFO_H
+ #include <langinfo.h>
+ #endif
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#endif
+ #ifdef HAVE_LOCALE_H
+ #include <locale.h>
+ #endif
diff --git a/app-arch/libarchive/libarchive-3.7.3.ebuild b/app-arch/libarchive/libarchive-3.7.3.ebuild
deleted file mode 100644
index 7c609d3a3f58..000000000000
--- a/app-arch/libarchive/libarchive-3.7.3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2024 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-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="
- sys-libs/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}] )
- kernel_linux? (
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
- )
- dev-libs/openssl:0=[${MULTILIB_USEDEP}]
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
- nettle? ( dev-libs/nettle:0=[${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="
- verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
- 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
-}
diff --git a/app-arch/libarchive/libarchive-3.7.4.ebuild b/app-arch/libarchive/libarchive-3.7.4.ebuild
index 4e1429fdc70c..695219f457cd 100644
--- a/app-arch/libarchive/libarchive-3.7.4.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="BSD BSD-2 BSD-4 public-domain"
SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="
acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
static-libs test xattr +zstd
@@ -74,6 +74,8 @@ 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"
+ # https://github.com/libarchive/libarchive/commit/6ff1cd1e487ddf545337b88da3f1f5ca69a2f958
+ "${FILESDIR}/${PN}-3.7.4-INT_MAX.patch"
)
src_prepare() {