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 A2BF813835A for ; Fri, 20 Nov 2020 10:42:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9876BE0827; Fri, 20 Nov 2020 10:42:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6EAEDE0827 for ; Fri, 20 Nov 2020 10:42:07 +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 4A18C340F46 for ; Fri, 20 Nov 2020 10:42:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AC650451 for ; Fri, 20 Nov 2020 10:42:04 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1605868380.738a16256a49052f35c041aa3f1bf1cc944da355.juippis@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: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 738a16256a49052f35c041aa3f1bf1cc944da355 X-VCS-Branch: master Date: Fri, 20 Nov 2020 10:42:04 +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: 916e2f51-3c48-49e4-b784-56ec4b7a6d33 X-Archives-Hash: b650600bc3ffae74d93ad8ab8eb5fa0a commit: 738a16256a49052f35c041aa3f1bf1cc944da355 Author: Hank Leininger korelogic com> AuthorDate: Sat Nov 14 07:26:38 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Nov 20 10:33:00 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=738a1625 sys-apps/firejail: bring live ebuild in line with current The live ebuild lags behind various fixes; sync it. Signed-off-by: Hank Leininger korelogic.com> Closes: https://bugs.gentoo.org/751466 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Closes: https://github.com/gentoo/gentoo/pull/18258 Signed-off-by: Joonas Niilola gentoo.org> sys-apps/firejail/firejail-9999.ebuild | 65 +++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild index 8dfef857188..5858a542c31 100644 --- a/sys-apps/firejail/firejail-9999.ebuild +++ b/sys-apps/firejail/firejail-9999.ebuild @@ -3,9 +3,13 @@ EAPI=7 +PYTHON_COMPAT=( python3_{6..9} ) + +inherit toolchain-funcs python-single-r1 linux-info + if [[ ${PV} != 9999 ]]; then KEYWORDS="~amd64 ~x86" - SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz" else inherit git-r3 EGIT_REPO_URI="https://github.com/netblue30/firejail.git" @@ -17,32 +21,37 @@ HOMEPAGE="https://firejail.wordpress.com/" LICENSE="GPL-2" SLOT="0" -IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11" +IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist" +RESTRICT="!test? ( test )" -DEPEND="!sys-apps/firejail-lts +RDEPEND="!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) + contrib? ( ${PYTHON_DEPS} ) + dbusproxy? ( sys-apps/xdg-dbus-proxy )" + +DEPEND="${RDEPEND} + sys-libs/libseccomp test? ( dev-tcltk/expect )" -RDEPEND="apparmor? ( sys-libs/libapparmor )" +REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )" -# TODO: enable tests -RESTRICT="test" +pkg_setup() { + python-single-r1_pkg_setup +} src_prepare() { default - find ./contrib -type f -name '*.py' | xargs sed --in-place 's-#!/usr/bin/python3-#!/usr/bin/env python3-g' || die - - find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \ - --expression='/^\tinstall .*COPYING /d' \ - --expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die + find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die - sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die + sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die # remove compression of man pages - sed --in-place '/gzip -9n $$man; \\/d' Makefile.in || die - sed --in-place '/rm -f $$man.gz; \\/d' Makefile.in || die - sed --in-place --regexp-extended 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die + 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 + + if use contrib; then + python_fix_shebang -f contrib/*.py + fi } src_configure() { @@ -50,27 +59,35 @@ src_configure() { --disable-firetunnel \ $(use_enable apparmor) \ $(use_enable chroot) \ - $(use_enable contrib contrib-install) \ + $(use_enable dbusproxy) \ $(use_enable file-transfer) \ $(use_enable globalcfg) \ $(use_enable network) \ $(use_enable overlayfs) \ $(use_enable private-home) \ - $(use_enable seccomp) \ $(use_enable suid) \ $(use_enable userns) \ $(use_enable whitelist) \ - $(use_enable x11) + $(use_enable X x11) +} + +src_compile() { + emake CC="$(tc-getCC)" } src_install() { default - if use vim-syntax; then - insinto /usr/share/vim/vimfiles/ftdetect - doins contrib/vim/ftdetect/firejail.vim - - insinto /usr/share/vim/vimfiles/syntax - doins contrib/vim/syntax/firejail.vim + if use contrib; then + python_scriptinto /usr/$(get_libdir)/firejail + python_doscript contrib/*.py + insinto /usr/$(get_libdir)/firejail + dobin contrib/*.sh fi } + +pkg_postinst() { + CONFIG_CHECK="~SQUASHFS" + local ERROR_SQUASHFS="CONFIG_SQUASHFS: required for firejail --appimage mode" + check_extra_config +}