aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@yahoo.com>2018-05-01 11:38:13 -0400
committerLibravatar netblue30 <netblue30@yahoo.com>2018-05-01 11:38:13 -0400
commit1c187f79012f7d9267434f0449dd24862bcc8abd (patch)
tree000c15b5188f25f8ca595cb8dcc5f8ef4d1ad9e3
parentsmall fix (diff)
parentmerges (diff)
downloadfirejail-1c187f79012f7d9267434f0449dd24862bcc8abd.tar.gz
firejail-1c187f79012f7d9267434f0449dd24862bcc8abd.tar.zst
firejail-1c187f79012f7d9267434f0449dd24862bcc8abd.zip
Merge branch 'master' of http://github.com/netblue30/firejail
-rw-r--r--README2
-rw-r--r--etc/cin.profile8
-rw-r--r--etc/libreoffice.profile2
-rw-r--r--etc/natron.profile8
4 files changed, 15 insertions, 5 deletions
diff --git a/README b/README
index b9509f65a..fa15353c6 100644
--- a/README
+++ b/README
@@ -114,6 +114,8 @@ bn0785ac (https://github.com/bn0785ac)
114 - fixed bnox, dnox profiles 114 - fixed bnox, dnox profiles
115 - support all tor-browser langpacks 115 - support all tor-browser langpacks
116 - chromium canary (inox-family) fixes 116 - chromium canary (inox-family) fixes
117 - allow multithreading for cin and natron
118 - fix dbus access for libreoffice on KDE
117BogDan Vatra (https://github.com/bog-dan-ro) 119BogDan Vatra (https://github.com/bog-dan-ro)
118 - zoom profile 120 - zoom profile
119Bruno Nova (https://github.com/brunonova) 121Bruno Nova (https://github.com/brunonova)
diff --git a/etc/cin.profile b/etc/cin.profile
index 0a5b0c728..356509da0 100644
--- a/etc/cin.profile
+++ b/etc/cin.profile
@@ -18,15 +18,17 @@ ipc-namespace
18net none 18net none
19nodbus 19nodbus
20nodvd 20nodvd
21nogroups 21#nogroups
22nonewprivs 22#nonewprivs
23notv 23notv
24noroot 24noroot
25protocol unix 25protocol unix
26
27# if an 1-1.2% gap per thread hurts you, comment seccomp
26seccomp 28seccomp
27shell none 29shell none
28 30
29private-bin cin,ffmpeg 31#private-bin cin,ffmpeg
30private-dev 32private-dev
31 33
32noexec ${HOME} 34noexec ${HOME}
diff --git a/etc/libreoffice.profile b/etc/libreoffice.profile
index 18fcc59c6..4aafd7c7a 100644
--- a/etc/libreoffice.profile
+++ b/etc/libreoffice.profile
@@ -29,7 +29,7 @@ include /etc/firejail/whitelist-var-common.inc
29caps.drop all 29caps.drop all
30machine-id 30machine-id
31netfilter 31netfilter
32nodbus 32#nodbus
33nodvd 33nodvd
34nogroups 34nogroups
35#nonewprivs - fix for Ubuntu 18.04/Debian 10 35#nonewprivs - fix for Ubuntu 18.04/Debian 10
diff --git a/etc/natron.profile b/etc/natron.profile
index f6ebf2b65..e7c597fe2 100644
--- a/etc/natron.profile
+++ b/etc/natron.profile
@@ -5,6 +5,12 @@ include /etc/firejail/natron.local
5# Persistent global definitions 5# Persistent global definitions
6include /etc/firejail/globals.local 6include /etc/firejail/globals.local
7 7
8# Allow access to python
9noblacklist ${PATH}/python2*
10noblacklist ${PATH}/python3*
11noblacklist /usr/lib/python2*
12noblacklist /usr/lib/python3*
13
8noblacklist ${HOME}/.Natron 14noblacklist ${HOME}/.Natron
9noblacklist ${HOME}/.cache/INRIA/Natron 15noblacklist ${HOME}/.cache/INRIA/Natron
10noblacklist ${HOME}/.config/INRIA 16noblacklist ${HOME}/.config/INRIA
@@ -12,7 +18,7 @@ noblacklist /opt/natron
12 18
13include /etc/firejail/disable-common.inc 19include /etc/firejail/disable-common.inc
14include /etc/firejail/disable-devel.inc 20include /etc/firejail/disable-devel.inc
15include /etc/firejail/disable-interpreters.inc 21#include /etc/firejail/disable-interpreters.inc
16include /etc/firejail/disable-passwdmgr.inc 22include /etc/firejail/disable-passwdmgr.inc
17include /etc/firejail/disable-programs.inc 23include /etc/firejail/disable-programs.inc
18 24