From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1AD2C158010 for ; Fri, 13 Jan 2023 03:50:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D1D2E0948; Fri, 13 Jan 2023 03:50:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30029E092C for ; Fri, 13 Jan 2023 03:50:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17103340AA7 for ; Fri, 13 Jan 2023 03:50:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 443EE828 for ; Fri, 13 Jan 2023 03:50:10 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1673581594.91bff8e1a6489728a3951a052ff7bd3daa1903b3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/file/file-5.43-r2.ebuild sys-apps/file/file-5.43-r3.ebuild sys-apps/file/file-5.44-r2.ebuild sys-apps/file/file-5.44-r3.ebuild sys-apps/file/file-9999.ebuild X-VCS-Directories: sys-apps/file/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 91bff8e1a6489728a3951a052ff7bd3daa1903b3 X-VCS-Branch: master Date: Fri, 13 Jan 2023 03:50:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 49b1a7d9-c581-496c-853e-2e61de08121d X-Archives-Hash: 77816363b30dc85257cfd525dd71f811 commit: 91bff8e1a6489728a3951a052ff7bd3daa1903b3 Author: Sam James gentoo org> AuthorDate: Fri Jan 13 03:46:34 2023 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jan 13 03:46:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bff8e1 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 gentoo.org> sys-apps/file/{file-5.43-r2.ebuild => file-5.43-r3.ebuild} | 14 +++++++++----- sys-apps/file/{file-5.44-r2.ebuild => file-5.44-r3.ebuild} | 10 +++++++--- 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 similarity index 95% rename from sys-apps/file/file-5.43-r2.ebuild rename to 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 similarity index 96% rename from sys-apps/file/file-5.44-r2.ebuild rename to 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