diff options
author | Mike Gilbert <floppym@gentoo.org> | 2021-04-25 14:12:40 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2021-04-25 14:13:25 -0400 |
commit | 569ba84b15b51f0a0ee9bdff795a7455e67b4404 (patch) | |
tree | dd45d5fc30eca3690fac1b5050bfdf2af6f2cc5b | |
parent | dev-python/djangorestframework: remove myself from maintainers (diff) | |
download | gentoo-569ba84b15b51f0a0ee9bdff795a7455e67b4404.tar.gz gentoo-569ba84b15b51f0a0ee9bdff795a7455e67b4404.tar.bz2 gentoo-569ba84b15b51f0a0ee9bdff795a7455e67b4404.zip |
sys-apps/file: drop 5.39-r4
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r-- | sys-apps/file/Manifest | 1 | ||||
-rw-r--r-- | sys-apps/file/file-5.39-r4.ebuild | 146 | ||||
-rw-r--r-- | sys-apps/file/files/file-5.39-add-missing-termios.patch | 30 | ||||
-rw-r--r-- | sys-apps/file/files/file-5.39-allow-futex-seccomp.patch | 18 | ||||
-rw-r--r-- | sys-apps/file/files/file-5.39-seccomp-musl.patch | 37 |
5 files changed, 0 insertions, 232 deletions
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index 128c4b0fb4fd..87042e9a8329 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -1,2 +1 @@ -DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild deleted file mode 100644 index 9a001b6a0730..000000000000 --- a/sys-apps/file/file-5.39-r4.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -DISTUTILS_OPTIONAL=1 - -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 - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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 lzma python seccomp static-libs zlib" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -DEPEND=" - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - python? ( - ${PYTHON_DEPS} - dev-python/setuptools[${PYTHON_USEDEP}] - ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}/file-5.39-add-missing-termios.patch" #728416 - "${FILESDIR}/file-5.39-seccomp-musl.patch" - "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978 - "${FILESDIR}/file-5.39-allow-futex-seccomp.patch" #771096 -) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - eautoreconf - fi - - elibtoolize - - # don't let python README kill main README #60043 - mv python/README.md python/README.python.md || die - sed 's@README.md@README.python.md@' -i python/setup.py || die #662090 -} - -multilib_src_configure() { - local myeconfargs=( - --enable-fsect-man5 - $(use_enable bzip2 bzlib) - $(use_enable lzma xzlib) - $(use_enable seccomp libseccomp) - $(use_enable static-libs static) - $(use_enable zlib) - ) - econf "${myeconfargs[@]}" -} - -build_src_configure() { - local myeconfargs=( - --disable-shared - --disable-libseccomp - --disable-bzlib - --disable-xzlib - --disable-zlib - ) - tc-env_build econf "${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 #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 - cd src || die - emake magic.h #586444 - emake libmagic.la - fi -} - -src_compile() { - if need_build_file; then - emake -C "${WORKDIR}"/build/src magic.h #586444 - 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.39-add-missing-termios.patch b/sys-apps/file/files/file-5.39-add-missing-termios.patch deleted file mode 100644 index 0614f52dd275..000000000000 --- a/sys-apps/file/files/file-5.39-add-missing-termios.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 471e2c6c61ecd30ba6e304ae0444d364cfd44254 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -Date: Thu, 18 Jun 2020 16:25:12 +0000 -Subject: [PATCH] PR/168: gyakovlev: Include <termios.h> - ---- - src/seccomp.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/seccomp.c b/src/seccomp.c -index e667adfe4..68c56485d 100644 ---- a/src/seccomp.c -+++ b/src/seccomp.c -@@ -27,7 +27,7 @@ - #include "file.h" - - #ifndef lint --FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $") -+FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $") - #endif /* lint */ - - #if HAVE_LIBSECCOMP -@@ -35,6 +35,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $") - #include <sys/prctl.h> /* prctl */ - #include <sys/ioctl.h> - #include <sys/socket.h> -+#include <termios.h> - #include <fcntl.h> - #include <stdlib.h> - #include <errno.h> diff --git a/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch b/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch deleted file mode 100644 index 8d9e3d1eb660..000000000000 --- a/sys-apps/file/files/file-5.39-allow-futex-seccomp.patch +++ /dev/null @@ -1,18 +0,0 @@ -In some situations, futex() is called even when lzma -support is not compiled in. Let's enable it unconditionally -for now. - -https://bugs.gentoo.org/771096 -https://bugs.astron.com/view.php?id=241 ---- a/src/seccomp.c -+++ b/src/seccomp.c -@@ -175,9 +175,7 @@ enable_sandbox_full(void) - ALLOW_RULE(fcntl64); - ALLOW_RULE(fstat); - ALLOW_RULE(fstat64); --#ifdef XZLIBSUPPORT - ALLOW_RULE(futex); --#endif - ALLOW_RULE(getdents); - #ifdef __NR_getdents64 - ALLOW_RULE(getdents64); diff --git a/sys-apps/file/files/file-5.39-seccomp-musl.patch b/sys-apps/file/files/file-5.39-seccomp-musl.patch deleted file mode 100644 index 72836de67e58..000000000000 --- a/sys-apps/file/files/file-5.39-seccomp-musl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 93c91e2ba8042d499fee168e27cbd526438454c6 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -Date: Sat, 5 Sep 2020 17:20:32 +0000 -Subject: [PATCH] PR/194: puchuu: Handle muslc syscalls - ---- - src/seccomp.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/seccomp.c b/src/seccomp.c -index 68c56485d..db9364ae4 100644 ---- a/src/seccomp.c -+++ b/src/seccomp.c -@@ -27,7 +27,7 @@ - #include "file.h" - - #ifndef lint --FILE_RCSID("@(#)$File: seccomp.c,v 1.16 2020/06/18 16:25:12 christos Exp $") -+FILE_RCSID("@(#)$File: seccomp.c,v 1.17 2020/09/05 17:20:32 christos Exp $") - #endif /* lint */ - - #if HAVE_LIBSECCOMP -@@ -220,12 +220,14 @@ enable_sandbox_full(void) - ALLOW_RULE(rt_sigreturn); - ALLOW_RULE(select); - ALLOW_RULE(stat); -+ ALLOW_RULE(statx); - ALLOW_RULE(stat64); - ALLOW_RULE(sysinfo); - ALLOW_RULE(umask); // Used in file_pipe2file() - ALLOW_RULE(getpid); // Used by glibc in file_pipe2file() - ALLOW_RULE(unlink); - ALLOW_RULE(write); -+ ALLOW_RULE(writev); - - - #if 0 |