From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- sys-apps/firejail/Manifest | 9 +-- sys-apps/firejail/firejail-0.9.64-r1.ebuild | 98 ----------------------------- sys-apps/firejail/firejail-0.9.64.4.ebuild | 6 +- sys-apps/firejail/firejail-0.9.64.ebuild | 88 -------------------------- sys-apps/firejail/firejail-9999.ebuild | 4 +- sys-apps/firejail/metadata.xml | 1 - 6 files changed, 10 insertions(+), 196 deletions(-) delete mode 100644 sys-apps/firejail/firejail-0.9.64-r1.ebuild delete mode 100644 sys-apps/firejail/firejail-0.9.64.ebuild (limited to 'sys-apps/firejail') diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest index 1e2706454632..5d4012139f70 100644 --- a/sys-apps/firejail/Manifest +++ b/sys-apps/firejail/Manifest @@ -1,7 +1,4 @@ DIST firejail-0.9.64.4.tar.xz 431116 BLAKE2B 1e64af1459cdbd6e753299796b2521efdc1fe364a66b8f0f40df1adabec32d0673cb9805a2ab385b96b64aca16e038e615ab1e4dc4df1dbcaa0b5b24f54c89d0 SHA512 580a074cb40e7559f6d532418b5e05e042c30306e8507d32ac3c71a51dec6648035ad810d253da02caaa4adc41f773dfdab55528618f5ca30ff30d4e7bbd12c9 -DIST firejail-0.9.64.tar.xz 419464 BLAKE2B 9425910bd78739dc628a05247877f3e96065f9eab6be1fa87a70932ff04a53817e03cd67a81b35b0e5a69b5598fc5be9d6191f9c5c2bf511bc76c1edaf0eb22d SHA512 89bab9aee944ebde6221a96f0f028380f607cd49046cad5348d5974efcc92c50a172edf5e50c56606091d2060d1d8f0c50a41f05f63327672a3c3cb48eb93699 -EBUILD firejail-0.9.64-r1.ebuild 2489 BLAKE2B 8a576a4e3780707c4a5e03bf8473b476b2ee77ee0e78fb2e6481f980e7405ec06383bb0a40da5e403f668c58a63c62e4aa765c9815b18fc7333f89a989b46555 SHA512 9b75ecd447887970506476ca44d885e42e3ae560d2d3c97c2be404cc38d0752bcda5e67fd573c70308d9eb4938a48afe99ac46e8699d2b70a89d3df401f3c1e7 -EBUILD firejail-0.9.64.4.ebuild 2450 BLAKE2B bd289c8bb56e64a79c9e62dc6f6909bae9b4b334a0b9e2e39e0ba27a24972a07098ba1e1b8eb7e607ac55f87415fe5622d6497bdb28e70897917e20cb5bf599a SHA512 8a903f8406cc307a377b5371114a400697e562e54096bfa595b496df2f92003188cf0684db2fea2731b0ebe9915160e301333c308987470cbf8a41afcfdaa03a -EBUILD firejail-0.9.64.ebuild 2280 BLAKE2B 5f9661f30d885d551a078698e98c6686fc47ca6cbc973089b105a1bfed2b2510ee7ae2fe81c0a3cb0fd56880084b562fb5e5e54d3e846eaf7887726869455945 SHA512 8304043f6d419f82e7f810e98e9e77bcb77d790d2b3486f03da6196b4fc594e90324e8c19601061fdb28561667c02b48aa72c0dc02166f2c1488945344fd6569 -EBUILD firejail-9999.ebuild 2244 BLAKE2B e25c9688ffc059dfc0b69b2306e1ea7068a5344c10aee94c371cc3177f550cebf371f559b344a1c94ceff33ebf8375673c5bbd4e9bde5d277f85fc7dd1f9c178 SHA512 4e44059e59123a5e87d4a7d2425a5f7ce753e89afd368eac9ab602142dc08ebd798e9c0498bfe38a471ba5e36ae5b077ce7a36d8186800ebc1d2b69cbe02150d -MISC metadata.xml 1832 BLAKE2B aec785bbd3674d6ec089390d65c064b6ce1f56c9ae459f39808a393dd478b9225821dbaad8892f22f367d5c163f40b664b29afcd130aa6463a87fe6c46ef592f SHA512 c1f8ee756c4bd7e79cfa81b4c5ac92a3377ab58a5d8df6f5535d9906d3fcb55d9f34664f2206c950b3b8ba560e3ed7e4d18b7f5637463ac8cb1934a90b2b68d4 +EBUILD firejail-0.9.64.4.ebuild 2514 BLAKE2B 5169243203fa8e77926aaccce08a9ad82277f8e9d272c99a87e885ab4a6bc251ec30b2c2e9f754ba35744f2933d0845a636ca15132c529a97f304a1be1828963 SHA512 da06a3199f3714b07bb99831d59e796b940d600334b9d8df8d4f2c887cdbd9205a9933e028353b41ae58afa3ecedd3f39c65c11ed01d2b344b4adb9cbc321082 +EBUILD firejail-9999.ebuild 2304 BLAKE2B 88ce4ea8d871af749c4f19ede13aa7d35b9037451b3e782b1a9558bf2a00274470b99d8e3d315f4a91af7084aabd5133562827e347852364ef0e0bbf07932f9e SHA512 c3c3c7d8e953630bb9f0765506780512e324ca8cf467a7a23568e2de3544c223bbe5e027b6fac32bb3be2716e64beb5084ca8959bd235b7638114e9e15be8814 +MISC metadata.xml 1783 BLAKE2B 747901d18b87b2ad96fed6307a7eb63594b817378e25b84eb178055c1eae50e8c5213091d42d5a8917136276d43e4020c39ee7c892e8a00dff7e75e6b6b79928 SHA512 be513de56d8eaa38373c66eecf4d5bbf53bc7b0ab04c2a2fad73c58c271db6fb4a53c79568e82a39c99697d5f9c58b63222e7f3f0986ab74b43e66a9734d6e90 diff --git a/sys-apps/firejail/firejail-0.9.64-r1.ebuild b/sys-apps/firejail/firejail-0.9.64-r1.ebuild deleted file mode 100644 index cc11d2089e38..000000000000 --- a/sys-apps/firejail/firejail-0.9.64-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit toolchain-funcs python-single-r1 linux-info - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" - 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" - EGIT_BRANCH="master" -fi - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist" -RESTRICT="!test? ( test )" - -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 )" - -REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - 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 - - sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die - - # 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 - - if use contrib; then - python_fix_shebang -f contrib/*.py - fi - - # some tests were missing from this release's tarball - if use test; then - sed -i -r -e 's/^(test:.*) test-private-lib (.*)/\1 \2/; s/^(test:.*) test-fnetfilter (.*)/\1 \2/' Makefile.in || die - fi -} - -src_configure() { - econf \ - --disable-firetunnel \ - $(use_enable apparmor) \ - $(use_enable chroot) \ - $(use_enable dbusproxy) \ - $(use_enable file-transfer) \ - $(use_enable globalcfg) \ - $(use_enable network) \ - $(use_enable overlayfs) \ - $(use_enable private-home) \ - $(use_enable suid) \ - $(use_enable userns) \ - $(use_enable whitelist) \ - $(use_enable X x11) -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - default - - 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 -} diff --git a/sys-apps/firejail/firejail-0.9.64.4.ebuild b/sys-apps/firejail/firejail-0.9.64.4.ebuild index 1542ba12484b..77f8fb130dd8 100644 --- a/sys-apps/firejail/firejail-0.9.64.4.ebuild +++ b/sys-apps/firejail/firejail-0.9.64.4.ebuild @@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..9} ) inherit toolchain-funcs python-single-r1 linux-info if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~x86" SRC_URI="https://github.com/netblue30/${PN}/releases/download/${PV}/${P}.tar.xz" else inherit git-r3 @@ -22,7 +22,9 @@ 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" -RESTRICT="!test? ( test )" +# Needs a lot of work to function within sandbox/portage +# bug #769731 +RESTRICT="test" RDEPEND="!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) diff --git a/sys-apps/firejail/firejail-0.9.64.ebuild b/sys-apps/firejail/firejail-0.9.64.ebuild deleted file mode 100644 index cb33c0d313b7..000000000000 --- a/sys-apps/firejail/firejail-0.9.64.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit toolchain-funcs python-single-r1 - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~x86" - 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" - EGIT_BRANCH="master" -fi - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="X apparmor +chroot contrib +dbusproxy +file-transfer +globalcfg +network +overlayfs +private-home +suid test +userns +whitelist" -RESTRICT="!test? ( test )" - -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 )" - -REQUIRED_USE="contrib? ( ${PYTHON_REQUIRED_USE} )" - -src_prepare() { - default - - find -type f -name Makefile.in -exec sed -i -r -e '/^\tinstall .*COPYING /d; /CFLAGS/s: (-O2|-ggdb) : :g' {} + || die - - sed -i -r -e '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die - - # 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 - - if use contrib; then - python_fix_shebang -f contrib/*.py - fi - - # some tests were missing from this release's tarball - if use test; then - sed -i -r -e 's/^(test:.*) test-private-lib (.*)/\1 \2/; s/^(test:.*) test-fnetfilter (.*)/\1 \2/' Makefile.in || die - fi -} - -src_configure() { - econf \ - --disable-firetunnel \ - $(use_enable apparmor) \ - $(use_enable chroot) \ - $(use_enable dbusproxy) \ - $(use_enable file-transfer) \ - $(use_enable globalcfg) \ - $(use_enable network) \ - $(use_enable overlayfs) \ - $(use_enable private-home) \ - $(use_enable suid) \ - $(use_enable userns) \ - $(use_enable whitelist) \ - $(use_enable X x11) -} - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - default - - if use contrib; then - python_scriptinto /usr/$(get_libdir)/firejail - python_doscript contrib/*.py - insinto /usr/$(get_libdir)/firejail - dobin contrib/*.sh - fi -} diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild index 7c0a516bf0c5..bcd7e7b29268 100644 --- a/sys-apps/firejail/firejail-9999.ebuild +++ b/sys-apps/firejail/firejail-9999.ebuild @@ -22,7 +22,9 @@ 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" -RESTRICT="!test? ( test )" +# Needs a lot of work to function within sandbox/portage +# bug #769731 +RESTRICT="test" RDEPEND="!sys-apps/firejail-lts apparmor? ( sys-libs/libapparmor ) diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml index a41213b778f7..b007062e7a91 100644 --- a/sys-apps/firejail/metadata.xml +++ b/sys-apps/firejail/metadata.xml @@ -29,7 +29,6 @@ Enable file transfers between sandboxes and the host system Enable global config file Enable networking features - Enable overlayfs Enable private home feature Enable attaching a new user namespace to a sandbox (--noroot option) Enable whitelist -- cgit v1.2.3