gentoo resync : 02.08.2019

3 files changed, 72 insertions, 19 deletions

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index d56f8bf2a32a..dbff4bd257af 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -2,7 +2,9 @@ AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5
 AUX 0.9.56-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 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
-MISC metadata.xml 1540 BLAKE2B 5d93ad4a397a7b6dcae5648c9cb293172e5079a6a4812a972a4c59e7f47a3cb56095ffc55ff8fdfafa16e38344ff7aa1c49e1b98fa938037a696f97d3f65dad2 SHA512 0288f7663646a74184d5ad0680b0637edac58dbeaf7711e3b24c8f43a329e70315824c0abb66a5e996413dd1f3aeb0f26ef4896df15f10a4b4e41eabf825c6a7
+EBUILD firejail-0.9.60.ebuild 1444 BLAKE2B aa0d758ee3e7e4582736eb60445ca62ff47a397f1432c8653448e0e67a20b2e9d3fbafb69c1675c87256f52d8f84564d59a6855fbc9f64c7601124f4743f06f0 SHA512 58a264fe9b11cdfb00eb3ff1b9b4117b2abcbceb4d9b0ddd48e998e03d4ab79b0b888b4344de95e4ad64257706604d742b9b15065ee03326387dac59fdccf2c0
+MISC metadata.xml 1834 BLAKE2B 8c8e167dd5cc7b3ccf6d65ef6766f52631bc569676b0fe0fa6527af5c6d2fb2d003c368a484a7e6dff06a601d0b53a120eede324f6cbd7d7871d9bed6748a80b SHA512 76799530328fc5d0341493a0633edf2b7512f2c9e99999f5b0f85b1d864c155ab2414e1ff3fdad9f15677b2cb5b54e9b01ac7cd20c107f40e0036c6047ac7934
diff --git a/sys-apps/firejail/firejail-0.9.60.ebuild b/sys-apps/firejail/firejail-0.9.60.ebuild
new file mode 100644
index 000000000000..31390b5dea62
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.60.ebuild
@@ -0,0 +1,51 @@
+# 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/metadata.xml b/sys-apps/firejail/metadata.xml
index ab427dfd4c8a..ff858199d284 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>expeditioneer@gentoo.org</email>
+		<name>Dennis Lamm</name>
+	</maintainer>
 	<longdescription lang="en">
-		Firejail is a SUID program that reduces the risk of security breaches
-		by restricting the running environment of untrusted applications using
-		Linux namespaces and seccomp-bpf. It allows a process and all its
-		descendants to have their own private view of the globally shared
-		kernel resources, such as the network stack, process table, mount
-		table.
+		Firejail is a SUID program that reduces the risk of security breaches by restricting the running environment of
+		untrusted applications using Linux namespaces and seccomp-bpf. It allows a process and all its descendants to 
+		have their own private view of the globally shared kernel resources, such as the network stack, process table,
+		mount table.
 
-		This is bleeding edge branch. For long term support version see
-		sys-apps/firejail-lts.
+		This is the regular version. For a long term support version see sys-apps/firejail-lts.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">firejail</remote-id>
 	</upstream>
 	<use>
-		<flag name="apparmor">Enable support for custom AppArmor
-			profiles</flag>
+		<flag name="apparmor">Enable support for custom AppArmor profiles</flag>
 		<flag name="bind">Enable custom bind mounts</flag>
 		<flag name="chroot">Enable chrooting to custom directory</flag>
 		<flag name="contrib">Install contrib scripts</flag>
-		<flag name="file-transfer">Enable file transfers between sandboxes and
-			the host system</flag>
+		<flag name="file-transfer">Enable file transfers between sandboxes and the host system</flag>
+		<flag name="globalcfg">Enable global config file</flag>
 		<flag name="network">Enable networking features</flag>
-		<flag name="network-restricted">Grant access to --interface,
-			--net=ethXXX and --netfilter only to root user; regular users are
-			only allowed --net=none</flag>
+		<flag name="network-restricted">Grant access to --interface, --net=ethXXX and --netfilter only to root user;
+										regular users are	only allowed --net=none</flag>
+		<flag name="overlayfs">Enable overlayfs</flag>
+		<flag name="private-home">Enable private home feature</flag>
 		<flag name="seccomp">Enable system call filtering</flag>
-		<flag name="userns">Enable attaching a new user namespace to a
-			sandbox (--noroot option)</flag>
+		<flag name="userns">Enable attaching a new user namespace to a sandbox (--noroot option)</flag>
+		<flag name="whitelist">Enable whitelist</flag>
 		<flag name="x11">Enable X11 sandboxing</flag>
 	</use>
 </pkgmetadata>