From 7a7daa06a06110abc743b5ebd9da85620a5679b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 1 Aug 2023 22:48:35 +0100 Subject: gentoo auto-resync : 01:08:2023 - 22:48:35 --- sys-apps/file/Manifest | 4 + sys-apps/file/file-5.45-r1.ebuild | 180 +++++++++++++++++++++ .../file/files/file-5.45-32-bit-time_t-deux.patch | 29 ++++ sys-apps/file/files/file-5.45-32-bit-time_t.patch | 34 ++++ .../file/files/file-5.45-weak-magic-shell.patch | 43 +++++ 5 files changed, 290 insertions(+) create mode 100644 sys-apps/file/file-5.45-r1.ebuild create mode 100644 sys-apps/file/files/file-5.45-32-bit-time_t-deux.patch create mode 100644 sys-apps/file/files/file-5.45-32-bit-time_t.patch create mode 100644 sys-apps/file/files/file-5.45-weak-magic-shell.patch (limited to 'sys-apps/file') diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index d73a1ce26c64..78f2309f2a70 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -3,11 +3,15 @@ AUX file-5.43-seccomp-fstatat64-musl.patch 565 BLAKE2B 31c42ae9857958e70dc459afc 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-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 4137 BLAKE2B 4226f9be97736eb6540ccada16b16c50b949516af7546dec4d4999bb77bf03f70c84307b44d9e9be27d890a2e64676acb17c26f25f65da1408475192a7eb09bc SHA512 0aadc7dc621d374f6f0fdd796cd27357330d15814b2c833e1db4ebd188b3b14c185a29769b5ebf81265ab8793fc05a56d53625d17906a29f1dc54dcd90b6c791 +EBUILD file-5.45-r1.ebuild 4180 BLAKE2B 8f2159d2031d8204db88bd7c3dca7c9db2c5f81a551f62d360b2516e236bfca445d7ef39ef34741e0cb875a17ab9940a5a577d8be8b8d9a294a74b2bc9a4bb21 SHA512 6f6e048cabb3282a35936430173289362f01c358d3b7921b48ff6673cf0b6b81c298d4607cc597e205a85d0ec339c406a6b88971422e548d4683a9ace4b04ecf EBUILD file-5.45.ebuild 3963 BLAKE2B 422373b76dc8423cbb0397914a3c9504d7167168e49264fa02a6878e5ee7230806f14933eb716ddc7cc82a82220318a2bf029535add9da22a6e52afe3a7f074e SHA512 b9ebc61cf356d624117618ea3b16477797120d204bba2ebc9f3309b489838b9c2750673431b05c0bb07968ec9cbe8ed7567b519daa697a237728e0e9b30213ea EBUILD file-9999.ebuild 3963 BLAKE2B 422373b76dc8423cbb0397914a3c9504d7167168e49264fa02a6878e5ee7230806f14933eb716ddc7cc82a82220318a2bf029535add9da22a6e52afe3a7f074e SHA512 b9ebc61cf356d624117618ea3b16477797120d204bba2ebc9f3309b489838b9c2750673431b05c0bb07968ec9cbe8ed7567b519daa697a237728e0e9b30213ea MISC metadata.xml 565 BLAKE2B 737512e354fedb4483608b04c594a486c0d8a0f70d23d306c59c78dedb0c8116f80ff558926444b9d9b9ef15805b3826163523b5644c88f01a330be1b8c9a76f SHA512 f240bf9e064c6e6f5b63e3265dfe3adf5b1d2c2b5b2456b79ea7451580150271ccb4097d33967de57ba767fecbdbea51fb62ccb683fcc5e1cca101be660ffd19 diff --git a/sys-apps/file/file-5.45-r1.ebuild b/sys-apps/file/file-5.45-r1.ebuild new file mode 100644 index 000000000000..dfa655148963 --- /dev/null +++ b/sys-apps/file/file-5.45-r1.ebuild @@ -0,0 +1,180 @@ +# 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 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="${BROOT}"/usr/share/openpgp-keys/file.asc + inherit autotools 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}/${P}-32-bit-time_t.patch" + "${FILESDIR}/${P}-32-bit-time_t-deux.patch" + "${FILESDIR}/${P}-weak-magic-shell.patch" #908401 +) + +src_prepare() { + default + + #if [[ ${PV} == 9999 ]] ; then + # eautoreconf + #else + # elibtoolize + #fi + # Just for file-5.45-32-bit-time_t-deux.patch, drop in 5.46 + eautoreconf + + # 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.45-32-bit-time_t-deux.patch b/sys-apps/file/files/file-5.45-32-bit-time_t-deux.patch new file mode 100644 index 000000000000..8c1e0934145c --- /dev/null +++ b/sys-apps/file/files/file-5.45-32-bit-time_t-deux.patch @@ -0,0 +1,29 @@ +https://github.com/file/file/commit/8dc5513908381a14981b16a85d59ba054bf4df52 + +From 8dc5513908381a14981b16a85d59ba054bf4df52 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Mon, 31 Jul 2023 15:56:12 +0000 +Subject: [PATCH] Check if we support _TIME_BITS. (Werner Fink) + +--- a/configure.ac ++++ b/configure.ac +@@ -152,6 +152,18 @@ AC_TYPE_UINT64_T + AC_TYPE_INT64_T + AC_TYPE_INTPTR_T + AC_TYPE_UINTPTR_T ++m4_ifdef([AC_SYS_YEAR2038], [AC_SYS_YEAR2038], [ ++# GNU libc only allows setting _TIME_BITS when FILE_OFFSET_BITS is also set. ++# GNU libc defines __TIMESIZE on systems where _TIME_BITS can be set. ++AS_IF([test X"$ac_cv_sys_file_offset_bits" = X"64"], [ ++ AC_CHECK_DECL(__TIMESIZE, [ ++ AC_DEFINE([_TIME_BITS], [64], [Number of bits in a timestamp, on hosts where this is settable.]) ++ ], [], [ ++AC_INCLUDES_DEFAULT ++#include ++ ]) ++ ]) ++]) + AC_FUNC_MMAP + AC_FUNC_FORK + AC_FUNC_MBRTOWC + diff --git a/sys-apps/file/files/file-5.45-32-bit-time_t.patch b/sys-apps/file/files/file-5.45-32-bit-time_t.patch new file mode 100644 index 000000000000..c86a46207e60 --- /dev/null +++ b/sys-apps/file/files/file-5.45-32-bit-time_t.patch @@ -0,0 +1,34 @@ +https://mailman.astron.com/pipermail/file/2023-July/001206.html +https://github.com/file/file/commit/218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 + +From 218fdf813fd5ccecbb8887a1b62509cd1c6dd3a1 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Fri, 28 Jul 2023 14:38:25 +0000 +Subject: [PATCH] deal with 32 bit time_t + +--- a/src/file.h ++++ b/src/file.h +@@ -27,7 +27,7 @@ + */ + /* + * file.h - definitions for file(1) program +- * @(#)$File: file.h,v 1.247 2023/07/27 19:40:22 christos Exp $ ++ * @(#)$File: file.h,v 1.248 2023/07/28 14:38:25 christos Exp $ + */ + + #ifndef __file_h__ +@@ -159,9 +159,11 @@ + /* + * Dec 31, 23:59:59 9999 + * we need to make sure that we don't exceed 9999 because some libc +- * implementations like muslc crash otherwise ++ * implementations like muslc crash otherwise. If you are unlucky ++ * to be running on a system with a 32 bit time_t, then it is even less. + */ +-#define MAX_CTIME CAST(time_t, 0x3afff487cfULL) ++#define MAX_CTIME \ ++ CAST(time_t, sizeof(time_t) > 4 ? 0x3afff487cfULL : 0x7fffffffULL) + + #define FILE_BADSIZE CAST(size_t, ~0ul) + #define MAXDESC 64 /* max len of text description/MIME type */ + diff --git a/sys-apps/file/files/file-5.45-weak-magic-shell.patch b/sys-apps/file/files/file-5.45-weak-magic-shell.patch new file mode 100644 index 000000000000..cdcab736b64e --- /dev/null +++ b/sys-apps/file/files/file-5.45-weak-magic-shell.patch @@ -0,0 +1,43 @@ +https://bugs.gentoo.org/908401 +https://bugs.astron.com/view.php?id=457 +https://github.com/file/file/commit/1fc9175166fc5c5117838a1dcfb309b7c595eb56 + +From 1fc9175166fc5c5117838a1dcfb309b7c595eb56 Mon Sep 17 00:00:00 2001 +From: Christos Zoulas +Date: Sun, 30 Jul 2023 16:31:47 +0000 +Subject: [PATCH] Comment out weak magic + +--- a/magic/Magdir/printer ++++ b/magic/Magdir/printer +@@ -1,6 +1,6 @@ + + #------------------------------------------------------------------------------ +-# $File: printer,v 1.34 2023/06/16 19:27:12 christos Exp $ ++# $File: printer,v 1.35 2023/07/30 16:31:47 christos Exp $ + # printer: file(1) magic for printer-formatted files + # + +@@ -230,8 +230,9 @@ + 0 string PS4 + >0 use hpgl + # la.hp +-0 string BP +->0 use hpgl ++# Too weak ++#0 string BP ++#>0 use hpgl + # miter.hp + # Plot Absolute x,y{,x,y{...}}; x and y in range between -32767 and 32768 like: PA4000,3000; + 0 string PA +@@ -241,8 +242,9 @@ + #>2 regex \^([-]{0,1}[0-9]{1,5}) COORDINATE=%s + >>0 use hpgl + # pw.hpg number of pens x +-0 string NP +->0 use hpgl ++# Too weak ++#0 string NP ++#>0 use hpgl + # win_1.hp + #0 string \003INCA WHAT_IS_THAT + #>0 use hpgl -- cgit v1.2.3