gentoo resync : 22.10.2018

3 files changed, 87 insertions, 0 deletions

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index b5e877cb6414..cccd304d4e51 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -3,6 +3,7 @@ AUX 0.9.48-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5
 AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 AUX 0.9.52-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 AUX 0.9.54-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
+AUX 0.9.56-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 DIST firejail-0.9.44.10.tar.xz 216216 BLAKE2B 15e0a9b2dec55639006efc39271dc5317fc06c9a764109e4d11df37d564eee9d017d9cf83ebb16adf39a6229e3119072137a4256906366c5e52f7ad7b429c2b7 SHA512 d9d259c25964eeea87311353a4488e56d1bd65c024aa79f5f2493100f58de4904e081db42132e8d190a05a105fb51dba1d0ac174bf786dc3ec43f356380b3fa6
 DIST firejail-0.9.44.8.tar.xz 214624 BLAKE2B 05faddb65ea1736ff0a098f5ac8ae8bec62a74aa4e7cbaf1acc2d3c9b549c322a141ab424f73272ad2517817bfff053c798ca8acdfa4e11b1b0829bbdbda162a SHA512 5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f
 DIST firejail-0.9.46.tar.xz 254748 BLAKE2B bf9c6af2bbc53c153d39c16b4d1720f61110e40b5b7a57fd1f4edc4d758d7edb3cbfde17dbc1865ab1d3ad7cfc58e28d0e4d6aab1109bcdf9a4fb0179d1f5c98 SHA512 839f3d6146129ceb9e9a613a51ce76d1d0a8a9ccab85c807bb0e71354b5c25fbc2a76e1004400bba8b70434dd886bc67250a2fe0b0eaa7d1ee65f6472bc9f786
@@ -10,6 +11,7 @@ DIST firejail-0.9.48.tar.xz 257592 BLAKE2B 6e346f97417ceb2fbd31779715b652130466d
 DIST firejail-0.9.50.tar.xz 279488 BLAKE2B 96d8e9161f0631ebfa400fd79c1d8d139d014da46cc2bf7fd3683f75ef7dced6a435e09e1733b675bc549662d50fddca9bd8811872a5ed186d731bb3c16903ea SHA512 766fe8a0c65ddc717759f0ea54a4fe72213f43ecf241c385e484eb7e47bebd5896976998c76e6a5ef9c153d4007c2a01e9d942cc9f352c4b085fb02fe708a87d
 DIST firejail-0.9.52.tar.xz 299396 BLAKE2B 62b7798e46b69f1ae12ac85f219cc7414652e64d3bf9e1b206f8956febdc53c78151f08052fe694c691b787356b6821e8ff0df71a4277a238a4dc7d724165969 SHA512 f7318bcbd68f6d8c709cdc1f5065cb1019c1c64fdbd47c0fd698975412c4e075c7209bd275056daf61558b79d79127c88f1580cb8e4e034cc0551c7d34e11d06
 DIST firejail-0.9.54.tar.xz 315884 BLAKE2B 62eaf42711aa3560c7ecb965903b64b10e04ea2898950b13c5371d859ccb1633634e1455c5558bf6fc02211d9937270fbc82cdd8409ff060f3a2c5aa8eb51517 SHA512 84bb5992ea4846d4398cc72dd9d65a8c4f20da9a2798ccd74a9157088313b768ef361bada62617d02b31174bca4b95e6560140f448021e1b93740a37992fe3df
+DIST firejail-0.9.56.tar.xz 327336 BLAKE2B 4fe2276c3007e995ca2113ef870918287e1178ff0effdcd5d635fce6d170b6c3df2f75b45315fed1e58e1c993324b84091f7e6912493608233f96661c85ce7e2 SHA512 f9685be0cbfdf45f8f895041c63e005da483d9b09482ebda2776633ae0b048cd355b57bf4431348295507059633dfda45b0c8b2c1f4a83ad02ff661d32448d24
 EBUILD firejail-0.9.44.10.ebuild 1073 BLAKE2B c23401fc4ec21fb065ec425cbfb0884ecbd8ccb47de2a8440b8cc06684c4700f323045336ef7e932c42d688a8f728dae30cd07ca4c84535c730a2c84960c4ed7 SHA512 f325496430f7b4603cea1e9401398d7ac36ca7904aa89c5c4a99ab07a03a38d38b34f85078a0ce1b2928464ff6290817e1ae0525d5efcefe12c74fa82506514f
 EBUILD firejail-0.9.44.8.ebuild 1072 BLAKE2B 645fa0f1fc4663dcedc59a8751e78a136a8e2a95c069f9842fec18feef4a39dc3db3c2a9b899bb59ff9c601d6be7f65574d137d59d5998164987c5fe0e4ed694 SHA512 37ebb09a4198526c968e569aab7c0b9ed8b55ca60c5b0e48a14d9deceb458a8ad63513a3867f2c28da0ede185e656cc32309873303eae498ebcd691662480e97
 EBUILD firejail-0.9.46.ebuild 1172 BLAKE2B 9135994888bbaa4993a28a82b21f1e15b5fb8aa61916f3f40b8ef2f11eab2dbddda43585b0bc0d60d5065fcf0dc8f6f1e565b713d65f7857ea07cc17ab031fda SHA512 425127acc54623c7a4715a1170a620720030a126937bcadcd8322736751178d75501c4cd8ec88a22ee036e137b405cad88885f1b331eb8856ce510c21e57538b
@@ -17,4 +19,5 @@ EBUILD firejail-0.9.48.ebuild 1172 BLAKE2B 9135994888bbaa4993a28a82b21f1e15b5fb8
 EBUILD firejail-0.9.50.ebuild 1171 BLAKE2B 5b36b05b69a2936a8a94e56950fed464abc9719960305adbab0a228baedd930492ffca5cba4097db8ca68ca4371db74eaebbf702dd136876941c9a4556cbf0fc SHA512 639bebf94119505b10629c481c5db8df7eff476d84afe9795f4b9b9d56bb720c9e2a2507e9c50fa8156156badbe5ccfddc1d5f6f15b6b16591a594a4eea4b0df
 EBUILD firejail-0.9.52.ebuild 1172 BLAKE2B 5f3823c3164430d96a09f43dfad141baa75c204b1d31a6320aa1bda9c0cf89dd368a10aed89be01f74b2dcc670d944d181883502a63283b4d392494a41cf4cea SHA512 5164b018431a665f66073d1f0d182e736cfda8a0ec0fa9371f93f7f77d4ee2b7fabc2a02a2363ae0d100d0b0bd987e3cab153a97aa6d2cdfea3b5cf9a9ca5965
 EBUILD firejail-0.9.54.ebuild 1198 BLAKE2B 667e689b728eb60cea02afbe4f3afa2cfc0f9116bcc3bb57c6ba80ce417fe726c44b1a39b9c922a08c9d744b830d4300323e86fe6d79dbcd4e8c36c321641f2d SHA512 0ab3d2b8772981fc713f525acfad263a34fac2191b2a2ea365e0470d7da5f884b7414147bad6128f77e66a5f863f6b4f703911b1b6654f2056b0ffebde32a97d
+EBUILD firejail-0.9.56.ebuild 1080 BLAKE2B 3b582b3ecd88c9ec67bb8033c3d5c545e01a9f9e8121ca4986131d786dff15150f27d3d61942b41b590f9e21e643cd6f2695247c6f3b251809ae5cea046e3ecb SHA512 136fcf1f21e23427766e2580c2b94702700d7cc4bde298a28c4cdd82d47425f30dc84123434229e1a0d71d231565e3904ecb0438fcf19293b8699af9ef80490c
 MISC metadata.xml 1627 BLAKE2B 1029e5cce7af2355b66b4c600e96273669a0876ebc1c85dd1c169eaf6419e48d4173db1a99851963ace27f90b7965d7032a00309f124ffe3545d3325b450fcbf SHA512 081d4f02dafd4c82aca839117c52b744ba50d3816b2ee01916c8f5fe60ae914717c7d3a36cdd0d064f3bc2ae1d4a7fa75e946536fce509c6aac37c84832ef946
diff --git a/sys-apps/firejail/files/0.9.56-contrib-fix.patch b/sys-apps/firejail/files/0.9.56-contrib-fix.patch
new file mode 100644
index 000000000000..7192bba34807
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.56-contrib-fix.patch
@@ -0,0 +1,36 @@
+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/firejail-0.9.56.ebuild b/sys-apps/firejail/firejail-0.9.56.ebuild
new file mode 100644
index 000000000000..e3704836fb2a
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.56.ebuild
@@ -0,0 +1,48 @@
+# 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[@]}"
+}