sys-apps/firejail: Bump version

Gentoo-Bug: 6201180
Package-Manager: Portage-2.3.5, Repoman-2.3.2

4 files changed, 106 insertions, 0 deletions

diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 10a1a4e77fa7..d07d98a47a9c 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,2 +1,3 @@
 DIST firejail-0.9.44.10.tar.xz 216216 SHA256 b21e264a0cbe14b09f8220e79066b1791fd8f2d5a8ceca1e669a7152e0b094a7 SHA512 d9d259c25964eeea87311353a4488e56d1bd65c024aa79f5f2493100f58de4904e081db42132e8d190a05a105fb51dba1d0ac174bf786dc3ec43f356380b3fa6 WHIRLPOOL 34c8beac00a706ed3aea6429f4297421716e473460a9079b2ab9d5796e8ee5e560e5359202ec14beab0f470a076b635513b1082a07dac0f579e86a8113b3a8ee
 DIST firejail-0.9.44.8.tar.xz 214624 SHA256 b9fe191771db2d19344bfc8b1117c33793f78ae1ba10a76e948bfafd71b10771 SHA512 5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f WHIRLPOOL f679f7f9592b27382b3653042d15bdc6c69d7ee95cb87a9dbcf1022b284901cfde26efc572e6d540ce15332418e6f80456dec2e9cc133b8b85815b57707245f1
+DIST firejail-0.9.46.tar.xz 254748 SHA256 82f5691de90f8652b78803b6a5d8b93e749e107a86fd03518f5a3e2cdbd17b1d SHA512 839f3d6146129ceb9e9a613a51ce76d1d0a8a9ccab85c807bb0e71354b5c25fbc2a76e1004400bba8b70434dd886bc67250a2fe0b0eaa7d1ee65f6472bc9f786 WHIRLPOOL 18e493370072acb71c37ef7dd8ea4d1cdbf102fbf2e91e03519b5e92e1279be733560300294aa353e2ba34f5b9b4e495e973ed5e77b7673e562dfe674c8bd314
diff --git a/sys-apps/firejail/files/0.9.46-contrib-fix.patch b/sys-apps/firejail/files/0.9.46-contrib-fix.patch
new file mode 100644
index 000000000000..fc882b4dc6e6
--- /dev/null
+++ b/sys-apps/firejail/files/0.9.46-contrib-fix.patch
@@ -0,0 +1,57 @@
+diff -Naur firejail-0.9.46/contrib/fix_private-bin.py firejail-0.9.46.new/contrib/fix_private-bin.py
+--- firejail-0.9.46/contrib/fix_private-bin.py	2017-05-13 14:44:54.000000000 +0100
++++ firejail-0.9.46.new/contrib/fix_private-bin.py	2017-05-29 15:25:56.355489307 +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.46/contrib/fjclip.py firejail-0.9.46.new/contrib/fjclip.py
+--- firejail-0.9.46/contrib/fjclip.py	2017-05-13 14:44:54.000000000 +0100
++++ firejail-0.9.46.new/contrib/fjclip.py	2017-05-29 15:25:39.463236203 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import re
+ import sys
+@@ -32,4 +32,4 @@
+ else:
+     display = fjdisplay.getdisplay(sys.argv[2])
+     clipout = subprocess.Popen(['xsel','-b','-i','--display',display],stdin=subprocess.PIPE)
+-    clipout.communicate(clipin)
+\ Brak znaku nowej linii na końcu pliku
++    clipout.communicate(clipin)
+diff -Naur firejail-0.9.46/contrib/fjdisplay.py firejail-0.9.46.new/contrib/fjdisplay.py
+--- firejail-0.9.46/contrib/fjdisplay.py	2017-05-13 14:44:54.000000000 +0100
++++ firejail-0.9.46.new/contrib/fjdisplay.py	2017-05-29 15:25:47.191351983 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import re
+ import sys
+@@ -40,4 +40,4 @@
+     if len(sys.argv) == 1:
+         print(getfirejails())
+     if len(sys.argv) == 2:
+-        print (getdisplay(sys.argv[1]))
+\ Brak znaku nowej linii na końcu pliku
++        print (getdisplay(sys.argv[1]))
+diff -Naur firejail-0.9.46/contrib/fjresize.py firejail-0.9.46.new/contrib/fjresize.py
+--- firejail-0.9.46/contrib/fjresize.py	2017-05-13 14:44:54.000000000 +0100
++++ firejail-0.9.46.new/contrib/fjresize.py	2017-05-29 15:26:03.728599816 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import sys
+ import fjdisplay
+@@ -22,4 +22,4 @@
+     out = subprocess.check_output(['xrandr','--display',fjdisplay.getdisplay(sys.argv[1]),'--output','default','--mode',sys.argv[2]])
+     print(out)
+ else:
+-    print(usage)
+\ Brak znaku nowej linii na końcu pliku
++    print(usage)
diff --git a/sys-apps/firejail/firejail-0.9.46.ebuild b/sys-apps/firejail/firejail-0.9.46.ebuild
new file mode 100644
index 000000000000..ca110fb38c4c
--- /dev/null
+++ b/sys-apps/firejail/firejail-0.9.46.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 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"
+IUSE="apparmor +bind +chroot contrib +file-transfer +network
+	network-restricted +seccomp +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" )
+
+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 bind)
+		$(use_enable chroot)
+		$(use_enable contrib contrib-install)
+		$(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 34eb184d921c..395160fe3935 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -24,6 +24,7 @@
 			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="network">Enable networking features</flag>