sys-apps/firejail: Bump version to 0.9.42

Package-Manager: portage-2.3.0

5 files changed, 90 insertions, 0 deletions

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 5a7ce03482cf..5d3256f4ad91 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -2,3 +2,4 @@ DIST firejail-0.9.36.tar.bz2 151123 SHA256 db16c93e6f838048b0bbcb3b90aa191f79860
 DIST firejail-0.9.38.2.tar.bz2 158132 SHA256 d76d82d18c45c64f04924a03d7fab0cbf023d86a92a16a13c5f51e09b40ad446 SHA512 d20ff48c39da7941cf61d5d2dc4a126dc7eeb2657d75b8d9bec9e53225fc79b55489b36727d6383c837bbe4e412d4bd5b4bde645b064a539d16e80fe972e3506 WHIRLPOOL 94f96f9696ce4a7cc3bb7084e7d04410b36540a50d2fdf7ae25b3c82114adf6e32169ecf24be501a916b487bf044a87429cf13c9bd2d332d9a761378eac047a5
 DIST firejail-0.9.38.tar.bz2 157543 SHA256 b61b15c03a30b92f5ffddc458b6488eedd1cf87ffe22d77d423e5a254efd16bb SHA512 c1f5e0f56eb0fa6796f3b6eb6037aa8ae4c79b2440dfd64d5a656a775ac01c55db71c5a45d85d4ffb456d1d551038f87ad587dc822d470d41dfdc9a6f8eac9fc WHIRLPOOL 78823d088d8b8f2a15d2f68083c75a1ad5c5638a62cc93fb7358db821f813eb7aab3c3aa29b48ab8b5c6b3818571fd2ffa4e8992e101d4bea0f603bbdf4b26a6
 DIST firejail-0.9.40.tar.bz2 197184 SHA256 49ed9c76fb77bf71543f0e6cacf9491f8280ae5602ecf805b57a011b528222b6 SHA512 aef20c5061d5e8e8d064f8cfb807a3b0034f2eb108bde234af56c2d2fd3c06cd7129539db22e142b251c15cbb0b82b89a9acee98ebaa36d3029ffc91c37456fc WHIRLPOOL 622dc3a10beb23a4d2756850eb69bd911aa0610442e6e73b8bedcf7d455f0e6580984ca1010eae35ac313f7c26660fd6e78e3e0911f24a7e35c1e5f438fa02d8
+DIST firejail-0.9.42.tar.xz 204608 SHA256 4f3bceee973b84fdf13a5d5ab0060d140ecc8e42c19c945e7fb93f0fd8499b47 SHA512 bea126c41cbd275ef64bce1fa65419a168a3d39a5eeb2bc78d904e1f7c93357caca0446cdaced2f1e0757d30ebc9dfadce14fe283597abad430f1a2df05581ad WHIRLPOOL 2dacfc0ac8e2707609c53d36fff568b23700d68a464e4f251f1b414d6abdb379403883ac25a3886cfe8c671ac20baf98467190ac36ed0d9b0276005d29edb852
diff --git a/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch b/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch
new file mode 100644
index 000000000000..936c01ea9c3f
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.42-libstdc++.patch
@@ -0,0 +1,11 @@
+diff -Naur firejail-0.9.42/etc/disable-devel.inc firejail-0.9.42.new/etc/disable-devel.inc
+--- firejail-0.9.42/etc/disable-devel.inc	2016-09-06 20:48:23.000000000 +0100
++++ firejail-0.9.42.new/etc/disable-devel.inc	2016-09-19 22:21:14.579410841 +0100
+@@ -2,7 +2,6 @@
+ 
+ # GCC
+ blacklist /usr/include
+-blacklist /usr/lib/gcc
+ blacklist /usr/bin/gcc*
+ blacklist /usr/bin/cpp*
+ blacklist /usr/bin/c9*
diff --git a/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch b/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch
new file mode 100644
index 000000000000..85830a40cacf
--- /dev/null
+++ b/sys-apps/firejail/files/firejail-0.9.42-sysmacros.patch
@@ -0,0 +1,27 @@
+From c15fc4754a05cc2b2aec4ca75f87bf3d61578843 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 20 Apr 2016 00:14:21 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev
+
+These funcs have been defined in sys/sysmacros.h forever, and Linux C
+libs are moving away from implicitly including it.  Update the files
+to include it explicitly.
+---
+ src/firejail/fs_dev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
+index 97ee9de..2f66980 100644
+--- a/src/firejail/fs_dev.c
++++ b/src/firejail/fs_dev.c
+@@ -28,6 +28,7 @@
+ #ifndef _BSD_SOURCE
+ #define _BSD_SOURCE 
+ #endif
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ static void create_char_dev(const char *path, mode_t mode, int major, int minor) {
+-- 
+2.7.4
+
diff --git a/sys-apps/firejail/firejail-0.9.42.ebuild b/sys-apps/firejail/firejail-0.9.42.ebuild
new file mode 100644
index 000000000000..1d9159d17e68
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.42.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+IUSE="apparmor +bind +busybox +chroot +file-transfer +network
+	network-restricted +seccomp +userns x11"
+
+DEPEND="apparmor? ( sys-libs/libapparmor )"
+RDEPEND="${DEPEND}
+	x11? ( x11-wm/xpra[client,server] )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sysmacros.patch
+	"${FILESDIR}"/${P}-libstdc++.patch )
+
+src_prepare() {
+	default
+	find -name Makefile.in -exec sed -i -r \
+			-e '/CFLAGS/s: (-O2|-ggdb) : :g' \
+			-e '1iCC=@CC@' {} + || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable apparmor)
+		$(use_enable bind)
+		$(use_enable busybox busybox-workaround)
+		$(use_enable chroot)
+		$(use_enable file-transfer)
+		$(use_enable network)
+		$(use_enable seccomp)
+		$(use_enable userns)
+		$(use_enable x11)
+	)
+	use network-restricted && myeconfargs+=( --enable-network=restricted )
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 004a53cb064b..a1fc573a1756 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -17,7 +17,10 @@
 		<remote-id type="sourceforge">firejail</remote-id>
 	</upstream>
 	<use>
+		<flag name="apparmor">Enable support for custom AppArmor
+			profiles</flag>
 		<flag name="bind">Enable custom bind mounts</flag>
+		<flag name="busybox">Enable support (workaround) for busybox</flag>
 		<flag name="chroot">Enable chrooting to custom directory</flag>
 		<flag name="file-transfer">Enable file transfers between sandboxes and
 			the host system</flag>