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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 757D6139345 for ; Fri, 16 Jul 2021 00:37:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A5F48E0A65; Fri, 16 Jul 2021 00:37:02 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B551E0A4F for ; Fri, 16 Jul 2021 00:37:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B76DB34072E for ; Fri, 16 Jul 2021 00:37:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CBA27D1 for ; Fri, 16 Jul 2021 00:36:59 +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: <1626395809.3fda124c2efc1ad639af1b8911aa4d35b179b9df.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/firejail/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/firejail/firejail-9999.ebuild X-VCS-Directories: sys-apps/firejail/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3fda124c2efc1ad639af1b8911aa4d35b179b9df X-VCS-Branch: master Date: Fri, 16 Jul 2021 00:36:59 +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: 8fad1105-9845-4a2f-9041-fdde26beced7 X-Archives-Hash: 5cbced77094307bc4f5dde7d5e17ee31 commit: 3fda124c2efc1ad639af1b8911aa4d35b179b9df Author: Sam James gentoo org> AuthorDate: Fri Jul 16 00:36:11 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jul 16 00:36:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fda124c sys-apps/firejail: sync live ebuild Signed-off-by: Sam James gentoo.org> sys-apps/firejail/firejail-9999.ebuild | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild index bcd7e7b2926..198f90b336a 100644 --- a/sys-apps/firejail/firejail-9999.ebuild +++ b/sys-apps/firejail/firejail-9999.ebuild @@ -3,13 +3,13 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8,9} ) inherit toolchain-funcs python-single-r1 linux-info if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~x86" SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" else inherit git-r3 EGIT_REPO_URI="https://github.com/netblue30/firejail.git" @@ -21,7 +21,7 @@ HOMEPAGE="https://firejail.wordpress.com/" LICENSE="GPL-2" SLOT="0" -IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist" +IUSE="apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +private-home +suid test +userns +whitelist X" # Needs a lot of work to function within sandbox/portage # bug #769731 RESTRICT="test" @@ -38,16 +38,25 @@ DEPEND="${RDEPEND} REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )" pkg_setup() { - python-single-r1_pkg_setup + CONFIG_CHECK="~SQUASHFS" + local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode" + check_extra_config + use contrib && python-single-r1_pkg_setup } src_prepare() { default - find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die + find -type f -name Makefile.in -exec sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' {} + || die sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die + # fix up hardcoded paths to templates and docs + local files=$(grep -E -l -r '/usr/share/doc/firejail([^-]|$)' ./RELNOTES ./src/man/ ./etc/profile*/ ./test/ || die) + for file in ${files[@]} ; do + sed -i -r -e "s:/usr/share/doc/firejail([^-]|\$):/usr/share/doc/${PF}\1:" "$file" || die + done + # remove compression of man pages sed -i -r -e '/rm -f \$\$man.gz; \\/d; /gzip -9n \$\$man; \\/d; s|\*\.([[:digit:]])\) install -m 0644 \$\$man\.gz|\*\.\1\) install -m 0644 \$\$man|g' Makefile.in || die @@ -79,6 +88,8 @@ src_compile() { src_install() { default + rm "${ED}"/usr/share/doc/${PF}/COPYING || die + if use contrib; then python_scriptinto /usr/$(get_libdir)/firejail python_doscript contrib/*.py @@ -86,9 +97,3 @@ src_install() { dobin contrib/*.sh fi } - -pkg_postinst() { - CONFIG_CHECK="~SQUASHFS" - local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode" - check_extra_config -}