Merge branch 'master' of https://github.com/netblue30/firejail

7 files changed, 75 insertions, 0 deletions

diff --git a/etc/clawsker.profile b/etc/clawsker.profile
new file mode 100644
index 000000000..e863a6a45
--- /dev/null
+++ b/etc/clawsker.profile
@@ -0,0 +1,53 @@
+# Firejail profile for clawsker
+# Description: An applet to edit Claws Mail's hidden preferences
+# This file is overwritten after every install/update
+# Persistent local customizations
+include clawsker.local
+# Persistent global definitions
+include globals.local
+
+noblacklist ${HOME}/.claws-mail
+whitelist ${HOME}/.claws-mail
+
+# Allow perl (blacklisted by disable-interpreters.inc)
+noblacklist ${PATH}/cpan*
+noblacklist ${PATH}/core_perl
+noblacklist ${PATH}/perl
+noblacklist /usr/lib/perl*
+noblacklist /usr/share/perl*
+
+include disable-common.inc
+include disable-devel.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include whitelist-common.inc
+
+caps.drop all
+net none
+no3d
+nodbus
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+nou2f
+novideo
+protocol unix
+seccomp
+shell none
+
+# disable-mnt
+# private
+private-bin clawsker,perl
+private-cache
+private-dev
+private-etc fonts
+private-lib girepository-1.*,libgirepository-1.*,perl*
+private-tmp
+
+# memory-deny-write-execute - breaks on Arch
+noexec ${HOME}
+noexec /tmp
diff --git a/etc/eog.profile b/etc/eog.profile
index 8cb64009c..75d343d4e 100644
--- a/etc/eog.profile
+++ b/etc/eog.profile
@@ -37,6 +37,7 @@ seccomp
 shell none
 
 private-bin eog
+private-cache
 private-dev
 private-etc fonts
 private-lib gdk-pixbuf-2.*,gio,girepository-1.*,gvfs,libgconf-2.so.*
diff --git a/etc/gcalccmd.profile b/etc/gcalccmd.profile
new file mode 100644
index 000000000..691d6b0c4
--- /dev/null
+++ b/etc/gcalccmd.profile
@@ -0,0 +1,13 @@
+# Firejail profile for gcalccmd
+# Description: GNOME console calculator
+# This file is overwritten after every install/update
+# Persistent local customizations
+include gcalccmd.local
+# Persistent global definitions
+# added by included profile
+#include globals.local
+
+private-bin gcalccmd
+
+# Redirect
+include gnome-calculator.profile
diff --git a/etc/gnome-calculator.profile b/etc/gnome-calculator.profile
index 7974211c7..be4b0c03f 100644
--- a/etc/gnome-calculator.profile
+++ b/etc/gnome-calculator.profile
@@ -37,6 +37,7 @@ shell none
 
 disable-mnt
 private-bin gnome-calculator
+private-cache
 private-dev
 private-lib gdk-pixbuf-2.*,gio,girepository-1.*,gvfs,libgconf-2.so.*,libgnutls.so.*,libproxy.so.*,librsvg-2.so.*,libxml2.so.*
 private-tmp
diff --git a/etc/google-earth-pro.profile b/etc/google-earth-pro.profile
new file mode 100644
index 000000000..d62319fa2
--- /dev/null
+++ b/etc/google-earth-pro.profile
@@ -0,0 +1,4 @@
+# Redirect
+include google-earth.profile
+
+private-bin google-earth-pro
diff --git a/etc/google-earth.profile b/etc/google-earth.profile
index 6e5f99745..e075bfe9a 100644
--- a/etc/google-earth.profile
+++ b/etc/google-earth.profile
@@ -43,8 +43,10 @@ protocol unix,inet,inet6
 seccomp
 shell none
 
+disable-mnt
 private-bin google-earth,sh,bash,grep,sed,ls,dirname
 private-dev
+private-opt google
 
 noexec ${HOME}
 noexec /tmp
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 0dd5f7ec5..ac94d16d6 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -86,6 +86,7 @@ clamdtop
 clamscan
 clamtk
 claws-mail
+clawsker
 clementine
 clipit
 cliqz