diff options
| author |   Sam James <sam@gentoo.org> | 2023-01-13 03:46:34 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2023-01-13 03:46:34 +0000 |
| commit | 91bff8e1a6489728a3951a052ff7bd3daa1903b3 (patch) | |
| tree | 57d2aeaa71ec8a83da887812fb3a8c9d9de14f9d /sys-apps | |
| parent | sys-apps/file: drop 5.44-r1 (diff) | |
| download | gentoo-91bff8e1a6489728a3951a052ff7bd3daa1903b3.tar.gz gentoo-91bff8e1a6489728a3951a052ff7bd3daa1903b3.tar.bz2 gentoo-91bff8e1a6489728a3951a052ff7bd3daa1903b3.zip | |
sys-apps/file: depend on newer libseccomp for faccessat2()
This ensures correct upgrade ordering and also mitigates issues
w/ partial upgrades - newer libseccomp is needed for faccessat2
to be defined properly.
Bug: https://bugs.gentoo.org/889046
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/file/file-5.43-r3.ebuild (renamed from sys-apps/file/file-5.43-r2.ebuild) | 14 | ||||
| -rw-r--r-- | sys-apps/file/file-5.44-r3.ebuild (renamed from sys-apps/file/file-5.44-r2.ebuild) | 10 | ||||
| -rw-r--r-- | sys-apps/file/file-9999.ebuild | 12 |
3 files changed, 24 insertions, 12 deletions
diff --git a/sys-apps/file/file-5.43-r2.ebuild b/sys-apps/file/file-5.43-r3.ebuild index 610753073aa6..040db6fb3eb5 100644 --- a/sys-apps/file/file-5.43-r2.ebuild +++ b/sys-apps/file/file-5.43-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,15 +38,19 @@ DEPEND=" ${PYTHON_DEPS} dev-python/setuptools[${PYTHON_USEDEP}] ) - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND} + seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${DEPEND} python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" +" BDEPEND+=" python? ( ${PYTHON_DEPS} ${DISTUTILS_DEPS} - )" + ) +" PATCHES=( "${FILESDIR}/file-5.43-portage-sandbox.patch" #713710 #728978 diff --git a/sys-apps/file/file-5.44-r2.ebuild b/sys-apps/file/file-5.44-r3.ebuild index b20035b2e73c..cdeb8bd0cfe1 100644 --- a/sys-apps/file/file-5.44-r2.ebuild +++ b/sys-apps/file/file-5.44-r3.ebuild @@ -39,17 +39,21 @@ DEPEND=" ${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} +RDEPEND=" + ${DEPEND} python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" + seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] ) +" BDEPEND+=" python? ( ${PYTHON_DEPS} ${DISTUTILS_DEPS} - )" + ) +" PATCHES=( "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild index c83ce4f71f81..0c13d481dc8d 100644 --- a/sys-apps/file/file-9999.ebuild +++ b/sys-apps/file/file-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -39,17 +39,21 @@ DEPEND=" ${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} +RDEPEND=" + ${DEPEND} python? ( !dev-python/python-magic ) - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" + seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] ) +" BDEPEND+=" python? ( ${PYTHON_DEPS} ${DISTUTILS_DEPS} - )" + ) +" PATCHES=( "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not upstream yet |