| 1 |
commit: 659b987d6f023a2dfc104454ef7dbe83a8a37144 |
| 2 |
Author: Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 29 14:36:33 2017 +0000 |
| 4 |
Commit: Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 29 14:37:07 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659b987d |
| 7 |
|
| 8 |
sys-apps/firejail: Bump version |
| 9 |
|
| 10 |
Gentoo-Bug: 6201180 |
| 11 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 12 |
|
| 13 |
sys-apps/firejail/Manifest | 1 + |
| 14 |
sys-apps/firejail/files/0.9.46-contrib-fix.patch | 57 ++++++++++++++++++++++++ |
| 15 |
sys-apps/firejail/firejail-0.9.46.ebuild | 47 +++++++++++++++++++ |
| 16 |
sys-apps/firejail/metadata.xml | 1 + |
| 17 |
4 files changed, 106 insertions(+) |
| 18 |
|
| 19 |
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest |
| 20 |
index 10a1a4e77fa..d07d98a47a9 100644 |
| 21 |
--- a/sys-apps/firejail/Manifest |
| 22 |
+++ b/sys-apps/firejail/Manifest |
| 23 |
@@ -1,2 +1,3 @@ |
| 24 |
DIST firejail-0.9.44.10.tar.xz 216216 SHA256 b21e264a0cbe14b09f8220e79066b1791fd8f2d5a8ceca1e669a7152e0b094a7 SHA512 d9d259c25964eeea87311353a4488e56d1bd65c024aa79f5f2493100f58de4904e081db42132e8d190a05a105fb51dba1d0ac174bf786dc3ec43f356380b3fa6 WHIRLPOOL 34c8beac00a706ed3aea6429f4297421716e473460a9079b2ab9d5796e8ee5e560e5359202ec14beab0f470a076b635513b1082a07dac0f579e86a8113b3a8ee |
| 25 |
DIST firejail-0.9.44.8.tar.xz 214624 SHA256 b9fe191771db2d19344bfc8b1117c33793f78ae1ba10a76e948bfafd71b10771 SHA512 5dc56e259b18c1bd853d15b44bd266b59f45b8ede7e370ce59bfeff7e390d7f4a1784c1c0986d039e2f8de6329984748c8ed287a4a715e95886607f0fd91fd4f WHIRLPOOL f679f7f9592b27382b3653042d15bdc6c69d7ee95cb87a9dbcf1022b284901cfde26efc572e6d540ce15332418e6f80456dec2e9cc133b8b85815b57707245f1 |
| 26 |
+DIST firejail-0.9.46.tar.xz 254748 SHA256 82f5691de90f8652b78803b6a5d8b93e749e107a86fd03518f5a3e2cdbd17b1d SHA512 839f3d6146129ceb9e9a613a51ce76d1d0a8a9ccab85c807bb0e71354b5c25fbc2a76e1004400bba8b70434dd886bc67250a2fe0b0eaa7d1ee65f6472bc9f786 WHIRLPOOL 18e493370072acb71c37ef7dd8ea4d1cdbf102fbf2e91e03519b5e92e1279be733560300294aa353e2ba34f5b9b4e495e973ed5e77b7673e562dfe674c8bd314 |
| 27 |
|
| 28 |
diff --git a/sys-apps/firejail/files/0.9.46-contrib-fix.patch b/sys-apps/firejail/files/0.9.46-contrib-fix.patch |
| 29 |
new file mode 100644 |
| 30 |
index 00000000000..fc882b4dc6e |
| 31 |
--- /dev/null |
| 32 |
+++ b/sys-apps/firejail/files/0.9.46-contrib-fix.patch |
| 33 |
@@ -0,0 +1,57 @@ |
| 34 |
+diff -Naur firejail-0.9.46/contrib/fix_private-bin.py firejail-0.9.46.new/contrib/fix_private-bin.py |
| 35 |
+--- firejail-0.9.46/contrib/fix_private-bin.py 2017-05-13 14:44:54.000000000 +0100 |
| 36 |
++++ firejail-0.9.46.new/contrib/fix_private-bin.py 2017-05-29 15:25:56.355489307 +0100 |
| 37 |
+@@ -1,4 +1,4 @@ |
| 38 |
+-#!/usr/bin/python3 |
| 39 |
++#!/usr/bin/env python3 |
| 40 |
+ |
| 41 |
+ __author__ = "KOLANICH" |
| 42 |
+ __copyright__ = """This is free and unencumbered software released into the public domain. |
| 43 |
+diff -Naur firejail-0.9.46/contrib/fjclip.py firejail-0.9.46.new/contrib/fjclip.py |
| 44 |
+--- firejail-0.9.46/contrib/fjclip.py 2017-05-13 14:44:54.000000000 +0100 |
| 45 |
++++ firejail-0.9.46.new/contrib/fjclip.py 2017-05-29 15:25:39.463236203 +0100 |
| 46 |
+@@ -1,4 +1,4 @@ |
| 47 |
+-#!/usr/bin/env python |
| 48 |
++#!/usr/bin/env python2 |
| 49 |
+ |
| 50 |
+ import re |
| 51 |
+ import sys |
| 52 |
+@@ -32,4 +32,4 @@ |
| 53 |
+ else: |
| 54 |
+ display = fjdisplay.getdisplay(sys.argv[2]) |
| 55 |
+ clipout = subprocess.Popen(['xsel','-b','-i','--display',display],stdin=subprocess.PIPE) |
| 56 |
+- clipout.communicate(clipin) |
| 57 |
+\ Brak znaku nowej linii na końcu pliku |
| 58 |
++ clipout.communicate(clipin) |
| 59 |
+diff -Naur firejail-0.9.46/contrib/fjdisplay.py firejail-0.9.46.new/contrib/fjdisplay.py |
| 60 |
+--- firejail-0.9.46/contrib/fjdisplay.py 2017-05-13 14:44:54.000000000 +0100 |
| 61 |
++++ firejail-0.9.46.new/contrib/fjdisplay.py 2017-05-29 15:25:47.191351983 +0100 |
| 62 |
+@@ -1,4 +1,4 @@ |
| 63 |
+-#!/usr/bin/env python |
| 64 |
++#!/usr/bin/env python2 |
| 65 |
+ |
| 66 |
+ import re |
| 67 |
+ import sys |
| 68 |
+@@ -40,4 +40,4 @@ |
| 69 |
+ if len(sys.argv) == 1: |
| 70 |
+ print(getfirejails()) |
| 71 |
+ if len(sys.argv) == 2: |
| 72 |
+- print (getdisplay(sys.argv[1])) |
| 73 |
+\ Brak znaku nowej linii na końcu pliku |
| 74 |
++ print (getdisplay(sys.argv[1])) |
| 75 |
+diff -Naur firejail-0.9.46/contrib/fjresize.py firejail-0.9.46.new/contrib/fjresize.py |
| 76 |
+--- firejail-0.9.46/contrib/fjresize.py 2017-05-13 14:44:54.000000000 +0100 |
| 77 |
++++ firejail-0.9.46.new/contrib/fjresize.py 2017-05-29 15:26:03.728599816 +0100 |
| 78 |
+@@ -1,4 +1,4 @@ |
| 79 |
+-#!/usr/bin/env python |
| 80 |
++#!/usr/bin/env python2 |
| 81 |
+ |
| 82 |
+ import sys |
| 83 |
+ import fjdisplay |
| 84 |
+@@ -22,4 +22,4 @@ |
| 85 |
+ out = subprocess.check_output(['xrandr','--display',fjdisplay.getdisplay(sys.argv[1]),'--output','default','--mode',sys.argv[2]]) |
| 86 |
+ print(out) |
| 87 |
+ else: |
| 88 |
+- print(usage) |
| 89 |
+\ Brak znaku nowej linii na końcu pliku |
| 90 |
++ print(usage) |
| 91 |
|
| 92 |
diff --git a/sys-apps/firejail/firejail-0.9.46.ebuild b/sys-apps/firejail/firejail-0.9.46.ebuild |
| 93 |
new file mode 100644 |
| 94 |
index 00000000000..ca110fb38c4 |
| 95 |
--- /dev/null |
| 96 |
+++ b/sys-apps/firejail/firejail-0.9.46.ebuild |
| 97 |
@@ -0,0 +1,47 @@ |
| 98 |
+# Copyright 1999-2017 Gentoo Foundation |
| 99 |
+# Distributed under the terms of the GNU General Public License v2 |
| 100 |
+ |
| 101 |
+EAPI=6 |
| 102 |
+ |
| 103 |
+inherit eutils |
| 104 |
+ |
| 105 |
+DESCRIPTION="Security sandbox for any type of processes" |
| 106 |
+HOMEPAGE="https://firejail.wordpress.com/" |
| 107 |
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" |
| 108 |
+ |
| 109 |
+LICENSE="GPL-2" |
| 110 |
+SLOT="0" |
| 111 |
+KEYWORDS="~amd64" |
| 112 |
+IUSE="apparmor +bind +chroot contrib +file-transfer +network |
| 113 |
+ network-restricted +seccomp +userns x11" |
| 114 |
+ |
| 115 |
+DEPEND="!sys-apps/firejail-lts |
| 116 |
+ apparmor? ( sys-libs/libapparmor )" |
| 117 |
+RDEPEND="${DEPEND} |
| 118 |
+ x11? ( x11-wm/xpra[client,server] )" |
| 119 |
+ |
| 120 |
+PATCHES=( "${FILESDIR}/${PV}-contrib-fix.patch" ) |
| 121 |
+ |
| 122 |
+src_prepare() { |
| 123 |
+ default |
| 124 |
+ find -name Makefile.in -exec sed -i -r \ |
| 125 |
+ -e '/^\tinstall .*COPYING /d' \ |
| 126 |
+ -e '/CFLAGS/s: (-O2|-ggdb) : :g' \ |
| 127 |
+ -e '1iCC=@CC@' {} + || die |
| 128 |
+} |
| 129 |
+ |
| 130 |
+src_configure() { |
| 131 |
+ local myeconfargs=( |
| 132 |
+ $(use_enable apparmor) |
| 133 |
+ $(use_enable bind) |
| 134 |
+ $(use_enable chroot) |
| 135 |
+ $(use_enable contrib contrib-install) |
| 136 |
+ $(use_enable file-transfer) |
| 137 |
+ $(use_enable network) |
| 138 |
+ $(use_enable seccomp) |
| 139 |
+ $(use_enable userns) |
| 140 |
+ $(use_enable x11) |
| 141 |
+ ) |
| 142 |
+ use network-restricted && myeconfargs+=( --enable-network=restricted ) |
| 143 |
+ econf "${myeconfargs[@]}" |
| 144 |
+} |
| 145 |
|
| 146 |
diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml |
| 147 |
index 34eb184d921..395160fe393 100644 |
| 148 |
--- a/sys-apps/firejail/metadata.xml |
| 149 |
+++ b/sys-apps/firejail/metadata.xml |
| 150 |
@@ -24,6 +24,7 @@ |
| 151 |
profiles</flag> |
| 152 |
<flag name="bind">Enable custom bind mounts</flag> |
| 153 |
<flag name="chroot">Enable chrooting to custom directory</flag> |
| 154 |
+ <flag name="contrib">Install contrib scripts</flag> |
| 155 |
<flag name="file-transfer">Enable file transfers between sandboxes and |
| 156 |
the host system</flag> |
| 157 |
<flag name="network">Enable networking features</flag> |
Archives