From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-apps/firejail/Manifest | 5 +- sys-apps/firejail/firejail-0.9.60-r1.ebuild | 65 ----------------------- sys-apps/firejail/firejail-0.9.62-r1.ebuild | 80 +++++++++++++++++++++++++++++ sys-apps/firejail/firejail-0.9.62.ebuild | 2 +- 4 files changed, 83 insertions(+), 69 deletions(-) delete mode 100644 sys-apps/firejail/firejail-0.9.60-r1.ebuild create mode 100644 sys-apps/firejail/firejail-0.9.62-r1.ebuild (limited to 'sys-apps/firejail') diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest index 62f50af96ffd..399b57043888 100644 --- a/sys-apps/firejail/Manifest +++ b/sys-apps/firejail/Manifest @@ -1,7 +1,6 @@ AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230 -DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319 SHA512 dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f -EBUILD firejail-0.9.60-r1.ebuild 1739 BLAKE2B 42e3ab59089ac04bd56768985de0ecdff1a1c4aa81a5bafc98409b0d15c3f1a85676d28149da9acff3c0df416327cff3f3cf2396ce036fd3f03809236c482593 SHA512 7c24163c7742575152ba862fd5cb0e33144fc7072bc914c9f102fffb4b939078ce6193f0de626d38da0dbd0ae306fd251038f3e762058e0064af2b6936c58977 -EBUILD firejail-0.9.62.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a +EBUILD firejail-0.9.62-r1.ebuild 2102 BLAKE2B d30a3fa1db880a665b7f3754b14046d3e82e6a53fe9aa059dbfe6dfe48d97ece348efec04c94bba3f13961663bd39686a863039cd03a1ee2789a16511db3fe9d SHA512 6b6657dedcfea70e330e9240e0ee66c6658635bae9e10f58e07e0aa428803b8c4ece403f6530defca9782c2fe83972c223c9d1b7287445e6e88427e02884c679 +EBUILD firejail-0.9.62.ebuild 2162 BLAKE2B fbeced554b46369107e56846ebb4d8b4accd3c81996f81222a145a4d054ff1426f3514c59c4558c2f517cbc7a1f5035005c10fe778f152fa56a51c752eaaa40d SHA512 449e60bf793afa228f106e3b8913e8d7ba24e31f6e09da141750d0e607b91cd4dcdfa0092c88dcc16e593907182ada3fe20491df850e09cc95895ec1cb75a6c3 EBUILD firejail-9999.ebuild 2163 BLAKE2B 9a1b8a0925982dc0e4f47f7aa767ab7c3c8f3b917c8931053182bd8132d8ecfce87a25ca3a76d6af834b262fff2abb12fccd6567fa777284a791a5fefc6594a1 SHA512 e0511928163c3ef42a46b31aa14a9f347388ef27e5f429cbda9294f7d5966092ebbf6a3a22d4cbf329058d9326bfe3566c93bd6aa5972aab0c4b923647d41a5a MISC metadata.xml 1685 BLAKE2B dad0274bfdc82a077e254d7659d66a6070e538205f7bb5dba600096a3771404071a60f571e556065bd15bbc4f0d6a12562a9e43ca39b8cbdc32bb19813bfeb0c SHA512 0ce8e6291fbebfb9d80232b414838eaa2e00842880084276caec236338b60886047ae3a936646466bdd6ee6d8079038a59b34785ba559207fc7bebe3b93f392e diff --git a/sys-apps/firejail/firejail-0.9.60-r1.ebuild b/sys-apps/firejail/firejail-0.9.60-r1.ebuild deleted file mode 100644 index 888368183f58..000000000000 --- a/sys-apps/firejail/firejail-0.9.60-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" - -SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~x86" -IUSE="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor ) - test? ( dev-tcltk/expect )" - -RDEPEND="apparmor? ( sys-libs/libapparmor )" - -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${PN}-compressed-manpages.patch" ) - -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 - - sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die -} - -src_configure() { - econf \ - $(use_enable apparmor) \ - $(use_enable chroot) \ - $(use_enable contrib contrib-install) \ - $(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) -} - -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 - fi -} diff --git a/sys-apps/firejail/firejail-0.9.62-r1.ebuild b/sys-apps/firejail/firejail-0.9.62-r1.ebuild new file mode 100644 index 000000000000..0521f812dbf4 --- /dev/null +++ b/sys-apps/firejail/firejail-0.9.62-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +if [[ ${PV} != 9999 ]]; then + KEYWORDS="amd64 ~x86" + SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +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="apparmor +chroot contrib debug +file-transfer +globalcfg +network +overlayfs +private-home +seccomp +suid test +userns vim-syntax +whitelist x11" +RESTRICT="!test? ( test )" + +RDEPEND="apparmor? ( sys-libs/libapparmor )" + +DEPEND="${RDEPEND} + !sys-apps/firejail-lts + test? ( dev-tcltk/expect )" + +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 -i -r \ + -e '/^\tinstall .*COPYING /d' \ + -e '/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 -e '/gzip -9n $$man; \\/d' Makefile.in || die + sed -i -e '/rm -f $$man.gz; \\/d' Makefile.in || die + sed -i -r -e 's|\*\.([[:digit:]])\) install -c -m 0644 \$\$man\.gz|\*\.\1\) install -c -m 0644 \$\$man|g' Makefile.in || die +} + +src_configure() { + econf \ + --disable-firetunnel \ + $(use_enable apparmor) \ + $(use_enable chroot) \ + $(use_enable contrib contrib-install) \ + $(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) +} + +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 + fi +} diff --git a/sys-apps/firejail/firejail-0.9.62.ebuild b/sys-apps/firejail/firejail-0.9.62.ebuild index 8dfef8571888..1b6e14740a13 100644 --- a/sys-apps/firejail/firejail-0.9.62.ebuild +++ b/sys-apps/firejail/firejail-0.9.62.ebuild @@ -4,7 +4,7 @@ EAPI=7 if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" SRC_URI="https://github.com/netblue30/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" else inherit git-r3 -- cgit v1.2.3