summaryrefslogtreecommitdiff
path: root/sys-apps/file
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-12-28 07:37:55 +0000
committerV3n3RiX <venerix@koprulu.sector>2023-12-28 07:37:55 +0000
commitd46d1d3a5897cade51811b3848c7bf27969da625 (patch)
tree0dabb04db53e3fe66abe43df0a3cdff5d3b664db /sys-apps/file
parente67d5b4ba05349b3bf4229d0cf7d069809c4420e (diff)
gentoo auto-resync : 28:12:2023 - 07:37:55
Diffstat (limited to 'sys-apps/file')
-rw-r--r--sys-apps/file/Manifest8
-rw-r--r--sys-apps/file/file-5.44-r3.ebuild178
-rw-r--r--sys-apps/file/file-5.45.ebuild175
-rw-r--r--sys-apps/file/files/file-5.43-portage-sandbox.patch28
-rw-r--r--sys-apps/file/files/file-5.44-decompress-empty.patch126
-rw-r--r--sys-apps/file/files/file-5.44-limits-solaris.patch19
-rw-r--r--sys-apps/file/files/file-5.44-seccomp-utimes.patch18
7 files changed, 0 insertions, 552 deletions
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index f45d89f9b403..4fa086dd6243 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,18 +1,10 @@
-AUX file-5.43-portage-sandbox.patch 640 BLAKE2B d0442694866d6d0dfa203f686309de3f79a9f3047cbb20b8ea2d9042293c437cbd6b04f02a6c779df9b6331a7c9cee4fc460b2e4ed0c29563fce981f33d69ec3 SHA512 10a8d059a62d3d4f58a255c8204f9f72660babb16e76d9de9946cb1c91130e56c9733f1fcf30396c40bc9906055a123b47ea55d38a54f3473e8b2c69a2f91ef3
AUX file-5.43-seccomp-fstatat64-musl.patch 565 BLAKE2B 31c42ae9857958e70dc459afc6c2cf1a297c0d29048908e54bd9ea5e15b85608a6fa76795d89716d3c5293a131e986fb83398f4a6eb560a72d794a448387fe2c SHA512 d53ed79b84a7b499c92b5d57ef4b482750a96dbeca904d480b44017e757fee8f404703485513d9da823c7aace7c1b51c64be4402afd6aca0ff9e4ece6ccfcb53
-AUX file-5.44-decompress-empty.patch 4065 BLAKE2B 4eea6b2cee04861a595d543e01940bd0fbfabf91a33d30ad40de1e84a3d49b456587839ebebde5aaea1a45e0ce9d7ef4aed4462062476e9bb9ebd536f84afe91 SHA512 852da270c653a2663fa7baa1a805dbd272190364d9fbe2c4ac599ee659b7f1ebbcfa27cbec46476b9055f95ff2decd67caaa4fcac3a19c24c385519ef95429eb
-AUX file-5.44-limits-solaris.patch 443 BLAKE2B d7481f0669b48d6c1a94e50706b6523636adba4e789d8f5a43fe231d26cbe89b8faded72470059cce7064d011eb5587ae4d5ef34c83c0463f04dd322d09aa5a4 SHA512 d96e84db2e87ca616d2d0eea58e188847f5bd98fcb843d1b875786e3f23faf515d199b2ccf5d4cc22834153a889439b7754091f80d5588f7cbd343d218a442c4
-AUX file-5.44-seccomp-utimes.patch 587 BLAKE2B c1d2a8861034e9de0d4b1d0440935bd1ce25b789de0ac7f573378a1ef5d409f4c879deb0fd8dc89c48674d5af795cf8b99f7da870c9e5d54cec7a2d400b803f5 SHA512 e41b80f2e858ecc3e100b128d41c2d2e948a334f87523ae5d0c3b50916c678f37d6f26948d0b51a1bbdea9b0ab2683a3955004df2736d1240dcf80ee14390d9f
AUX file-5.45-32-bit-time_t-deux.patch 929 BLAKE2B 3798fe20be6deb8df058c51d916760233c08fa405cfc880de0b325d0878a70045b2164a6cd660a28b19e154da83140fd49cf19d96cc2f9867657c6e53dddeb17 SHA512 31c158dd610913da5fb6d51951ffc474b9ca25c34701c74c058b9edffd4a061d92ea72dbe0bd459b3cfc2a143ddbc2a1b88a8f93319974b5543155b74808508d
AUX file-5.45-32-bit-time_t.patch 1164 BLAKE2B a2840cb4a14c8e0bd35e4bf054b336a52b6f26d3d041f87deb3a3a02be31d0fa60e731b964bedc3a22a2e52f5fa8e4b5e7b017247d838c32f2c09d2985397eae SHA512 0059736fec00a33d41005891524553c4b89b2c3d78f5b30c58737be0d7b8e3d26b17591fe52cb570b21d0b39203614055221f726e1914c053dcf5dcc8ad02da1
AUX file-5.45-seccomp-sandbox.patch 1354 BLAKE2B 5b84be7d9a8ac3a99a6414895afab07fb3a135b646890c960bf02b6276cfc0bacb8b1cf1f2cabb34017ce3e7389b8bf023779b15b8b8d2e89c4da2734fa6b9ac SHA512 cb3973a5165641acd32dc5101f8e07f93e5a05b0b90cb1f03502dda6ba54e5f59c74efec45b430000c61996436c0b973b68553351400aabbec4355d9ebd091fc
AUX file-5.45-weak-magic-shell.patch 1166 BLAKE2B 715d220e472a6ea1c6374f8b0f789699f0cb4292c25768808d23503104e660ad07946e5e6466cc391eb7ffd87fbca1966e13da39440046576183f56b8c013bc9 SHA512 532bbd9d643badb50977b3ff168a77dbd282f9e83f11716d1f863bcf2ef29402a2e6d488a79e175d24a36bdcad68f9ef940478bc658bad0bc2ddcdc34f26148d
-DIST file-5.44.tar.gz 1186437 BLAKE2B a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42 SHA512 26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
-DIST file-5.44.tar.gz.asc 195 BLAKE2B a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1 SHA512 1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
DIST file-5.45.tar.gz 1246503 BLAKE2B 30fc77c091e6624f2e9a950f4c6fe69ea6aa46d4a8ad9f20d49320a3675617c5bfbc9ff1ebba5eeb2cf4435c38d71b47b8beeb5146c9f55fe3bac11fe65e89bd SHA512 12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a
DIST file-5.45.tar.gz.asc 163 BLAKE2B 1405080c63412e9c66bfe06086ecee28b276b77cc2ddacb20cfd370c539a0d983812fd29dcf7a33bad69d6490cd439ef8d1219bfaf3928fb835a38da85013af3 SHA512 56bf131b2f35e896788be19b4d8cd1c7ec942c794fb584d5e589375d22fbccebdd04c03e779fafc0c10840586dc41e64251b3de1767ae9ab95f5d3300f9af254
-EBUILD file-5.44-r3.ebuild 4127 BLAKE2B a06c332b88d9c7518e8b14b68235c3bc250b413bd7d5d273b3d9e34055932b631ba59f0d27085c7d73938e47e2371b8bd0c9c801e405bc7dfddf9ccaaa5156dd SHA512 cd8ef433ee20d95ece66743dc3702637ee6641eebd7236b9a520064b5622a4e6a58c7cb0bbb4c93d516c75566be3d8b00cdba21db815c8f2e61bc072ba33d351
EBUILD file-5.45-r3.ebuild 4154 BLAKE2B 8029a67867a813b16eb13accbbaafe02cf3234ba010e1071b5e3f00cde262f76f1ee6e4d857f10ec4467d926d8bc7e3ae2d1cee39a57537ca9121280dac54275 SHA512 b2e1e21b7a9d8819b85b1711a84034fc767e5e17a0f16c626b3e43338c1200bcda3017b9ecf3077a84db50a82eacf9aac997b8e2c1ded9461c42b45124642c9c
-EBUILD file-5.45.ebuild 3953 BLAKE2B 6565334797f00121ee6294cf716b42c23e805ef9110411d13512cde90552927b5c5abc4faa04d07d8fa3f990df767afd3868ede534669bf8d8bfeea96f8ff5bc SHA512 cf45832067032f75389cbadffc2f53f668517de1764c3a88b0364733a1b9cb30b3a6421012f4ca2d3a7b2cf3953f0ec288bca6b62ada2df4ecce622bbf22edb7
EBUILD file-9999.ebuild 3953 BLAKE2B 6565334797f00121ee6294cf716b42c23e805ef9110411d13512cde90552927b5c5abc4faa04d07d8fa3f990df767afd3868ede534669bf8d8bfeea96f8ff5bc SHA512 cf45832067032f75389cbadffc2f53f668517de1764c3a88b0364733a1b9cb30b3a6421012f4ca2d3a7b2cf3953f0ec288bca6b62ada2df4ecce622bbf22edb7
MISC metadata.xml 439 BLAKE2B d937d412b733516f49ca24a5de5238688ba56c06872cec060608139cb551f78e165e05990bcf6ea5bb1e98d27eb2650f5a972a4cded85eb67dbe9218d5d705b8 SHA512 20ff0c1b94dae95c3b277cfcc10da2b6ff31582cfe8f4e2ae60a74ec45db2a854eef40950f354465a45563ee6333f327566565e40cb16249d191bde585c5b1f2
diff --git a/sys-apps/file/file-5.44-r3.ebuild b/sys-apps/file/file-5.44-r3.ebuild
deleted file mode 100644
index b707b4b3b516..000000000000
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git"
- inherit autotools git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/file.asc
- inherit verify-sig
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
-
- 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"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzip? ( app-arch/lzlib )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-"
-BDEPEND+="
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )
-"
-
-# https://bugs.gentoo.org/898676
-QA_CONFIG_IMPL_DECL_SKIP=( makedev )
-
-PATCHES=(
- "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
- "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
- "${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream
- "${FILESDIR}/file-5.44-seccomp-utimes.patch" # upstream
- "${FILESDIR}/file-5.44-decompress-empty.patch" # upstream
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999 ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-
- # Don't let python README kill main README, bug ##60043
- mv python/README.md python/README.python.md || die
-
- # bug #662090
- sed -i 's@README.md@README.python.md@' python/setup.py || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(multilib_native_use_enable lzip lzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- $(use_enable zstd zstdlib)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
- --disable-shared
- --disable-libseccomp
- --disable-bzlib
- --disable-xzlib
- --disable-zlib
- )
-
- econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
- # When cross-compiling, we need to build up our own file
- # because people often don't keep matching host/target
- # file versions, bug #362941
- tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
- local ECONF_SOURCE="${S}"
-
- if need_build_file ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- build_src_configure
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- # bug #586444
- emake -C src magic.h
- emake -C src libmagic.la
- fi
-}
-
-src_compile() {
- if need_build_file ; then
- # bug #586444
- emake -C "${WORKDIR}"/build/src magic.h
- emake -C "${WORKDIR}"/build/src file
- local -x PATH="${WORKDIR}/build/src:${PATH}"
- fi
-
- multilib-minimal_src_compile
-
- if use python ; then
- cd python || die
- distutils-r1_src_compile
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- default
- else
- emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog MAINT # README
-
- # Required for `file -C`
- insinto /usr/share/misc/magic
- doins -r magic/Magdir/*
-
- if use python ; then
- cd python || die
- distutils-r1_src_install
- fi
-
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.45.ebuild b/sys-apps/file/file-5.45.ebuild
deleted file mode 100644
index 1f2cf6f8d1ac..000000000000
--- a/sys-apps/file/file-5.45.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git"
- inherit autotools git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/file.asc
- inherit verify-sig
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
-
- 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"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzip? ( app-arch/lzlib )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-"
-BDEPEND+="
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )
-"
-
-# https://bugs.gentoo.org/898676
-QA_CONFIG_IMPL_DECL_SKIP=( makedev )
-
-PATCHES=(
- "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet
- "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == 9999 ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-
- # Don't let python README kill main README, bug #60043
- mv python/README.md python/README.python.md || die
-
- # bug #662090
- sed -i 's@README.md@README.python.md@' python/setup.py || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(multilib_native_use_enable lzip lzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- $(use_enable zstd zstdlib)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
- --disable-shared
- --disable-libseccomp
- --disable-bzlib
- --disable-xzlib
- --disable-zlib
- )
-
- econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
- # When cross-compiling, we need to build up our own file
- # because people often don't keep matching host/target
- # file versions, bug #362941
- tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
- local ECONF_SOURCE="${S}"
-
- if need_build_file ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- build_src_configure
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- # bug #586444
- emake -C src magic.h
- emake -C src libmagic.la
- fi
-}
-
-src_compile() {
- if need_build_file ; then
- # bug #586444
- emake -C "${WORKDIR}"/build/src magic.h
- emake -C "${WORKDIR}"/build/src file
- local -x PATH="${WORKDIR}/build/src:${PATH}"
- fi
-
- multilib-minimal_src_compile
-
- if use python ; then
- cd python || die
- distutils-r1_src_compile
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- default
- else
- emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog MAINT # README
-
- # Required for `file -C`
- insinto /usr/share/misc/magic
- doins -r magic/Magdir/*
-
- if use python ; then
- cd python || die
- distutils-r1_src_install
- fi
-
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/files/file-5.43-portage-sandbox.patch b/sys-apps/file/files/file-5.43-portage-sandbox.patch
deleted file mode 100644
index f9e715cc366f..000000000000
--- a/sys-apps/file/files/file-5.43-portage-sandbox.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Allow syscalls for Gentoo's portage sandbox
-
-- Add getcwd (bug #728978)
-- Add faccessat2 (bug #889046)
-
-Bug: https://bugs.gentoo.org/728978
-Bug: https://bugs.gentoo.org/889046
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -174,6 +174,9 @@ enable_sandbox_full(void)
- ALLOW_RULE(exit_group);
- #ifdef __NR_faccessat
- ALLOW_RULE(faccessat);
-+#endif
-+#ifdef __NR_faccessat2
-+ ALLOW_RULE(faccessat2);
- #endif
- ALLOW_RULE(fcntl);
- ALLOW_RULE(fcntl64);
-@@ -237,6 +240,8 @@ enable_sandbox_full(void)
- ALLOW_RULE(write);
- ALLOW_RULE(writev);
-
-+ // needed by Gentoo's portage sandbox
-+ ALLOW_RULE(getcwd);
-
- #if 0
- // needed by valgrind
diff --git a/sys-apps/file/files/file-5.44-decompress-empty.patch b/sys-apps/file/files/file-5.44-decompress-empty.patch
deleted file mode 100644
index 21dcfa4c94c5..000000000000
--- a/sys-apps/file/files/file-5.44-decompress-empty.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-https://bugs.astron.com/view.php?id=415
-https://github.com/file/file/commit/1dd21dd360472d7b830825df8e40a06cdc1cbbcf
-
-From 1dd21dd360472d7b830825df8e40a06cdc1cbbcf Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sun, 8 Jan 2023 18:09:16 +0000
-Subject: [PATCH] fix decompression always returning empty.
-
---- a/src/compress.c
-+++ b/src/compress.c
-@@ -609,6 +609,7 @@ uncompresszlib(const unsigned char *old, unsigned char **newch,
- int rc;
- z_stream z;
-
-+ DPRINTF("builtin zlib decompression\n");
- z.next_in = CCAST(Bytef *, old);
- z.avail_in = CAST(uint32_t, *n);
- z.next_out = *newch;
-@@ -650,6 +651,7 @@ uncompressbzlib(const unsigned char *old, unsigned char **newch,
- int rc;
- bz_stream bz;
-
-+ DPRINTF("builtin bzlib decompression\n");
- memset(&bz, 0, sizeof(bz));
- rc = BZ2_bzDecompressInit(&bz, 0, 0);
- if (rc != BZ_OK)
-@@ -690,6 +692,7 @@ uncompressxzlib(const unsigned char *old, unsigned char **newch,
- int rc;
- lzma_stream xz;
-
-+ DPRINTF("builtin xzlib decompression\n");
- memset(&xz, 0, sizeof(xz));
- rc = lzma_auto_decoder(&xz, UINT64_MAX, 0);
- if (rc != LZMA_OK)
-@@ -729,6 +732,7 @@ uncompresszstd(const unsigned char *old, unsigned char **newch,
- ZSTD_inBuffer in;
- ZSTD_outBuffer out;
-
-+ DPRINTF("builtin zstd decompression\n");
- if ((zstd = ZSTD_createDStream()) == NULL) {
- return makeerror(newch, n, "No ZSTD decompression stream, %s",
- strerror(errno));
-@@ -777,6 +781,7 @@ uncompresslzlib(const unsigned char *old, unsigned char **newch,
-
- bufp = *newch;
-
-+ DPRINTF("builtin lzlib decompression\n");
- dec = LZ_decompress_open();
- if (!dec) {
- return makeerror(newch, n, "unable to allocate LZ_Decoder");
-@@ -833,11 +838,13 @@ makeerror(unsigned char **buf, size_t *len, const char *fmt, ...)
- va_list ap;
- int rv;
-
-+ DPRINTF("Makeerror %s\n", fmt);
- free(*buf);
- va_start(ap, fmt);
- rv = vasprintf(&msg, fmt, ap);
- va_end(ap);
- if (rv < 0) {
-+ DPRINTF("Makeerror failed");
- *buf = NULL;
- *len = 0;
- return NODATA;
-@@ -1048,7 +1055,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- pid_t pid;
- pid_t writepid = -1;
- size_t i;
-- ssize_t r;
-+ ssize_t r, re;
- char *const *args;
- #ifdef HAVE_POSIX_SPAWNP
- posix_spawn_file_actions_t fa;
-@@ -1103,6 +1110,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
-
- handledesc(&fa, fd, fdp);
-
-+ DPRINTF("Executing %s\n", compr[method].argv[0]);
- status = posix_spawnp(&pid, compr[method].argv[0], &fa, NULL,
- args, NULL);
-
-@@ -1128,6 +1136,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- * do not modify fdp[i][j].
- */
- handledesc(NULL, fd, fdp);
-+ DPRINTF("Executing %s\n", compr[method].argv[0]);
-
- (void)execvp(compr[method].argv[0], args);
- dprintf(STDERR_FILENO, "exec `%s' failed, %s",
-@@ -1146,6 +1155,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- if (writepid == (pid_t)-1) {
- rv = makeerror(newch, n, "Write to child failed, %s",
- strerror(errno));
-+ DPRINTF("Write to child failed\n");
- goto err;
- }
- closefd(fdp[STDIN_FILENO], 1);
-@@ -1153,6 +1163,7 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
-
- rv = OKDATA;
- r = sread(fdp[STDOUT_FILENO][0], *newch, bytes_max, 0);
-+ DPRINTF("read got %zd\n", r);
- if (r < 0) {
- rv = ERRDATA;
- DPRINTF("Read stdout failed %d (%s)\n", fdp[STDOUT_FILENO][0],
-@@ -1165,15 +1176,17 @@ uncompressbuf(int fd, size_t bytes_max, size_t method, int nofork,
- * errors, otherwise we risk the child blocking and never
- * exiting.
- */
-+ DPRINTF("Closing stdout for bytes_max\n");
- closefd(fdp[STDOUT_FILENO], 0);
- goto ok;
- }
-- if ((r = sread(fdp[STDERR_FILENO][0], *newch, bytes_max, 0)) > 0) {
-+ if ((re = sread(fdp[STDERR_FILENO][0], *newch, bytes_max, 0)) > 0) {
-+ DPRINTF("Got stuff from stderr %s\n", *newch);
- rv = ERRDATA;
- r = filter_error(*newch, r);
- goto ok;
- }
-- if (r == 0)
-+ if (re == 0)
- goto ok;
- rv = makeerror(newch, n, "Read stderr failed, %s",
- strerror(errno));
-
diff --git a/sys-apps/file/files/file-5.44-limits-solaris.patch b/sys-apps/file/files/file-5.44-limits-solaris.patch
deleted file mode 100644
index 7a04535577b4..000000000000
--- a/sys-apps/file/files/file-5.44-limits-solaris.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-softmagic: include limits.h for UINT_MAX usage
-
-Platforms like Solaris need this to compile.
-
-Bug: https://bugs.astron.com/view.php?id=413
-Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -42,6 +42,7 @@
- #include <ctype.h>
- #include <stdlib.h>
- #include <time.h>
-+#include <limits.h>
- #include "der.h"
-
- file_private int match(struct magic_set *, struct magic *, file_regex_t **, size_t,
-
-
diff --git a/sys-apps/file/files/file-5.44-seccomp-utimes.patch b/sys-apps/file/files/file-5.44-seccomp-utimes.patch
deleted file mode 100644
index 49f1c2e4b739..000000000000
--- a/sys-apps/file/files/file-5.44-seccomp-utimes.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-https://github.com/file/file/commit/1590a653b520123d47070a47436abfba42d4c943
-
-From 1590a653b520123d47070a47436abfba42d4c943 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 26 Dec 2022 18:57:29 +0000
-Subject: [PATCH] PR/408: SpraxDev: Add utimes to the allow list for -p
-
---- a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -233,6 +233,7 @@ enable_sandbox_full(void)
- ALLOW_RULE(umask); // Used in file_pipe2file()
- ALLOW_RULE(getpid); // Used by glibc in file_pipe2file()
- ALLOW_RULE(unlink);
-+ ALLOW_RULE(utimes);
- ALLOW_RULE(write);
- ALLOW_RULE(writev);
-
-