From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- sys-apps/firejail/Manifest | 10 ++- sys-apps/firejail/files/0.9.56-contrib-fix.patch | 36 ----------- .../files/firejail-compressed-manpages.patch | 17 +++++ sys-apps/firejail/firejail-0.9.56-r1.ebuild | 47 -------------- sys-apps/firejail/firejail-0.9.56.ebuild | 48 -------------- sys-apps/firejail/firejail-0.9.60-r1.ebuild | 65 +++++++++++++++++++ sys-apps/firejail/firejail-0.9.60.ebuild | 51 --------------- sys-apps/firejail/firejail-9999.ebuild | 75 ++++++++++++++++++++++ sys-apps/firejail/metadata.xml | 2 +- 9 files changed, 162 insertions(+), 189 deletions(-) delete mode 100644 sys-apps/firejail/files/0.9.56-contrib-fix.patch create mode 100644 sys-apps/firejail/files/firejail-compressed-manpages.patch delete mode 100644 sys-apps/firejail/firejail-0.9.56-r1.ebuild delete mode 100644 sys-apps/firejail/firejail-0.9.56.ebuild create mode 100644 sys-apps/firejail/firejail-0.9.60-r1.ebuild delete mode 100644 sys-apps/firejail/firejail-0.9.60.ebuild create mode 100644 sys-apps/firejail/firejail-9999.ebuild (limited to 'sys-apps/firejail') diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest index dbff4bd257af..837f51fc51e6 100644 --- a/sys-apps/firejail/Manifest +++ b/sys-apps/firejail/Manifest @@ -1,10 +1,8 @@ AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889 -AUX 0.9.56-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889 +AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230 DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d -DIST firejail-0.9.56.tar.xz 327336 BLAKE2B 4fe2276c3007e995ca2113ef870918287e1178ff0effdcd5d635fce6d170b6c3df2f75b45315fed1e58e1c993324b84091f7e6912493608233f96661c85ce7e2 SHA512 f9685be0cbfdf45f8f895041c63e005da483d9b09482ebda2776633ae0b048cd355b57bf4431348295507059633dfda45b0c8b2c1f4a83ad02ff661d32448d24 DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a EBUILD firejail-0.9.50.ebuild 1171 BLAKE2B 5b36b05b69a2936a8a94e56950fed464abc9719960305adbab0a228baedd930492ffca5cba4097db8ca68ca4371db74eaebbf702dd136876941c9a4556cbf0fc SHA512 639bebf94119505b10629c481c5db8df7eff476d84afe9795f4b9b9d56bb720c9e2a2507e9c50fa8156156badbe5ccfddc1d5f6f15b6b16591a594a4eea4b0df -EBUILD firejail-0.9.56-r1.ebuild 1043 BLAKE2B dc1d81125051047c0d0a8b253adc439f1e407435efaaa97411b31a2fd9c8135a459426cf0a40c0dc7f94353506434da60d18890903bc02b6221cc097645cc31b SHA512 894b1503497f7a63823680c90f06de25f8100036b3b5c5742b84921dac420abf9f678b59afd66d04e96aa577d94977cd5eb19cc1d7107174840e57025473b5a5 -EBUILD firejail-0.9.56.ebuild 1080 BLAKE2B 3b582b3ecd88c9ec67bb8033c3d5c545e01a9f9e8121ca4986131d786dff15150f27d3d61942b41b590f9e21e643cd6f2695247c6f3b251809ae5cea046e3ecb SHA512 136fcf1f21e23427766e2580c2b94702700d7cc4bde298a28c4cdd82d47425f30dc84123434229e1a0d71d231565e3904ecb0438fcf19293b8699af9ef80490c -EBUILD firejail-0.9.60.ebuild 1444 BLAKE2B aa0d758ee3e7e4582736eb60445ca62ff47a397f1432c8653448e0e67a20b2e9d3fbafb69c1675c87256f52d8f84564d59a6855fbc9f64c7601124f4743f06f0 SHA512 58a264fe9b11cdfb00eb3ff1b9b4117b2abcbceb4d9b0ddd48e998e03d4ab79b0b888b4344de95e4ad64257706604d742b9b15065ee03326387dac59fdccf2c0 -MISC metadata.xml 1834 BLAKE2B 8c8e167dd5cc7b3ccf6d65ef6766f52631bc569676b0fe0fa6527af5c6d2fb2d003c368a484a7e6dff06a601d0b53a120eede324f6cbd7d7871d9bed6748a80b SHA512 76799530328fc5d0341493a0633edf2b7512f2c9e99999f5b0f85b1d864c155ab2414e1ff3fdad9f15677b2cb5b54e9b01ac7cd20c107f40e0036c6047ac7934 +EBUILD firejail-0.9.60-r1.ebuild 1740 BLAKE2B 14fe571b2acabfd6623cb3eab1dbfb79d2909b07aa3036d08534eacb08e88634f4ec005363017b3bed9315f5dba2388356ad16102e0f357883869d426b50b264 SHA512 e913417f982a39906b2c0eee5bd1956a3291dae3489fad13944057cea04fe8c606cfc74b2c344aaffd4a278e5e0ea55ed33414c7817e88506ec7cb9725ad4b02 +EBUILD firejail-9999.ebuild 2138 BLAKE2B 5f5134f7714330077f997a1d2714204dff80c4f41ed204ebc6d0e84c728e2d55b292b0bbad79903d01725492b4d9a45454948a8b9967379e694f82e49712ec1b SHA512 74426f3056a37ef9e9f8d430deafc9af15ba6957fef58cf0e43fdb9edf4321971ef92136c8261e528d53efba9602e304bf72c7096d65ba872808db0fe8e6d9c3 +MISC metadata.xml 1839 BLAKE2B 89a65b4a6f02a94778bee8b4fadb9b54cfb1220407f5fb256e7b0bb0a439a10069d7c84470be6a12ad478413eb2563b5f18f8cea0c60a11fb6582c94f991c06f SHA512 539f6f95e5df4bd194a473e140205414620dfa47d0be1e51a3557b04f3185b8471d6f378b9dc661c41f1cb04962810b1276f79477377f8f0880171a2b0f47b9b diff --git a/sys-apps/firejail/files/0.9.56-contrib-fix.patch b/sys-apps/firejail/files/0.9.56-contrib-fix.patch deleted file mode 100644 index 7192bba34807..000000000000 --- a/sys-apps/firejail/files/0.9.56-contrib-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py ---- firejail-0.9.48/contrib/fix_private-bin.py 2017-05-24 23:01:32.000000000 +0100 -+++ firejail-0.9.48.new/contrib/fix_private-bin.py 2017-08-27 23:19:52.868481040 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/python3 -+#!/usr/bin/env python3 - - __author__ = "KOLANICH" - __copyright__ = """This is free and unencumbered software released into the public domain. -diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py ---- firejail-0.9.48/contrib/fjclip.py 2017-05-24 23:01:32.000000000 +0100 -+++ firejail-0.9.48.new/contrib/fjclip.py 2017-08-27 23:19:58.476562539 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - import re - import sys -diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py ---- firejail-0.9.48/contrib/fjdisplay.py 2017-05-24 23:01:32.000000000 +0100 -+++ firejail-0.9.48.new/contrib/fjdisplay.py 2017-08-27 23:20:01.932612762 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - import re - import sys -diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py ---- firejail-0.9.48/contrib/fjresize.py 2017-05-24 23:01:32.000000000 +0100 -+++ firejail-0.9.48.new/contrib/fjresize.py 2017-08-27 23:20:06.932685422 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - - import sys - import fjdisplay diff --git a/sys-apps/firejail/files/firejail-compressed-manpages.patch b/sys-apps/firejail/files/firejail-compressed-manpages.patch new file mode 100644 index 000000000000..8a43bcac2618 --- /dev/null +++ b/sys-apps/firejail/files/firejail-compressed-manpages.patch @@ -0,0 +1,17 @@ +diff --git a/Makefile b/Makefile +index 9c9b93d..2eb8ab2 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -141,10 +141,9 @@ endif + install -m 0755 -d $(DESTDIR)/$(mandir)/man5 + for man in $(MANPAGES); do \ + rm -f $$man.gz; \ +- gzip -9n $$man; \ + case "$$man" in \ +- *.1) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man1/; ;; \ +- *.5) install -c -m 0644 $$man.gz $(DESTDIR)/$(mandir)/man5/; ;; \ ++ *.1) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man1/; ;; \ ++ *.5) install -c -m 0644 $$man $(DESTDIR)/$(mandir)/man5/; ;; \ + esac; \ + done + rm -f $(MANPAGES) $(MANPAGES:%=%.gz) diff --git a/sys-apps/firejail/firejail-0.9.56-r1.ebuild b/sys-apps/firejail/firejail-0.9.56-r1.ebuild deleted file mode 100644 index 6da35dbc147b..000000000000 --- a/sys-apps/firejail/firejail-0.9.56-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apparmor +chroot contrib +file-transfer +network - +seccomp suid +userns x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor )" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" ) - -RESTRICT=test - -src_prepare() { - default - find -name Makefile.in -exec sed -i -r \ - -e '/^\tinstall .*COPYING /d' \ - -e '/CFLAGS/s: (-O2|-ggdb) : :g' \ - -e '1iCC=@CC@' {} + || die -} - -src_configure() { - local myeconfargs=( - $(use_enable apparmor) - $(use_enable chroot) - $(use_enable contrib contrib-install) - $(use_enable file-transfer) - $(use_enable network) - $(use_enable seccomp) - $(use_enable suid) - $(use_enable userns) - $(use_enable x11) - ) - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/firejail/firejail-0.9.56.ebuild b/sys-apps/firejail/firejail-0.9.56.ebuild deleted file mode 100644 index e3704836fb2a..000000000000 --- a/sys-apps/firejail/firejail-0.9.56.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="Security sandbox for any type of processes" -HOMEPAGE="https://firejail.wordpress.com/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="apparmor +chroot contrib +file-transfer +network - +seccomp suid +userns x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor )" -RDEPEND="${DEPEND} - x11? ( x11-wm/xpra[client,server] )" - -PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" ) - -RESTRICT=test - -src_prepare() { - default - find -name Makefile.in -exec sed -i -r \ - -e '/^\tinstall .*COPYING /d' \ - -e '/CFLAGS/s: (-O2|-ggdb) : :g' \ - -e '1iCC=@CC@' {} + || die -} - -src_configure() { - local myeconfargs=( - $(use_enable apparmor) - $(use_enable chroot) - $(use_enable contrib contrib-install) - $(use_enable file-transfer) - $(use_enable network) - $(use_enable seccomp) - $(use_enable suid) - $(use_enable userns) - $(use_enable x11) - ) - econf "${myeconfargs[@]}" -} diff --git a/sys-apps/firejail/firejail-0.9.60-r1.ebuild b/sys-apps/firejail/firejail-0.9.60-r1.ebuild new file mode 100644 index 000000000000..c8262c74d0d9 --- /dev/null +++ b/sys-apps/firejail/firejail-0.9.60-r1.ebuild @@ -0,0 +1,65 @@ +# 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.60.ebuild b/sys-apps/firejail/firejail-0.9.60.ebuild deleted file mode 100644 index 31390b5dea62..000000000000 --- a/sys-apps/firejail/firejail-0.9.60.ebuild +++ /dev/null @@ -1,51 +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 +whitelist x11" - -DEPEND="!sys-apps/firejail-lts - apparmor? ( sys-libs/libapparmor ) - test? ( dev-tcltk/expect )" - -RDEPEND=" apparmor? ( sys-libs/libapparmor )" - -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 -} - -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) -} diff --git a/sys-apps/firejail/firejail-9999.ebuild b/sys-apps/firejail/firejail-9999.ebuild new file mode 100644 index 000000000000..f47575ac444f --- /dev/null +++ b/sys-apps/firejail/firejail-9999.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 \ + $(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/metadata.xml b/sys-apps/firejail/metadata.xml index ff858199d284..3af2a06d7a1d 100644 --- a/sys-apps/firejail/metadata.xml +++ b/sys-apps/firejail/metadata.xml @@ -14,7 +14,7 @@ This is the regular version. For a long term support version see sys-apps/firejail-lts. - firejail + netblue30/firejail Enable support for custom AppArmor profiles -- cgit v1.2.3