From 0c7e9e6c25a71d9162d54f9f7b66ef38d8b5fc92 Mon Sep 17 00:00:00 2001 From: Dennis Lamm Date: Sun, 26 Jul 2020 11:08:46 +0200 Subject: sys-apps/firejail: general ebuild improvement Signed-off-by: Dennis Lamm --- .../firejail-lts/firejail-lts-0.9.56.2-r2.ebuild | 22 +++--- sys-apps/firejail/firejail-0.9.62-1.ebuild | 82 ---------------------- sys-apps/firejail/firejail-0.9.62-r1.ebuild | 81 +++++++++++++++++++++ 3 files changed, 94 insertions(+), 91 deletions(-) delete mode 100644 sys-apps/firejail/firejail-0.9.62-1.ebuild create mode 100644 sys-apps/firejail/firejail-0.9.62-r1.ebuild (limited to 'sys-apps') diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild index 162766f95cd6..85c060bc9701 100644 --- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild +++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r2.ebuild @@ -18,24 +18,28 @@ KEYWORDS="amd64" IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist" RESTRICT="!test? ( test )" -DEPEND="!sys-apps/firejail - apparmor? ( sys-libs/libapparmor ) - test? ( dev-tcltk/expect )" - RDEPEND="apparmor? ( sys-libs/libapparmor )" -PATCHES=( "${FILESDIR}/${PN}-fix-compressed-manpages.patch" ) +DEPEND="${RDEPEND} + !sys-apps/firejail + test? ( dev-tcltk/expect )" + S="${WORKDIR}/${MY_PN}-${PV}-LTS" src_prepare() { default - 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 | 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 - sed --in-place --regexp-extended '/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() { diff --git a/sys-apps/firejail/firejail-0.9.62-1.ebuild b/sys-apps/firejail/firejail-0.9.62-1.ebuild deleted file mode 100644 index 73255223e87f..000000000000 --- a/sys-apps/firejail/firejail-0.9.62-1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# 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" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor ) - test? ( dev-tcltk/expect )" - -RDEPEND="apparmor? ( sys-libs/libapparmor )" - -# TODO: enable tests -RESTRICT="test" - -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 - - # 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 -} - -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-r1.ebuild b/sys-apps/firejail/firejail-0.9.62-r1.ebuild new file mode 100644 index 000000000000..57071c6bd578 --- /dev/null +++ b/sys-apps/firejail/firejail-0.9.62-r1.ebuild @@ -0,0 +1,81 @@ +# 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 +} -- cgit v1.2.3-65-gdbad