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

etc/akonadi_control.profile

@@ -23,8 +23,8 @@ include /etc/firejail/disable-programs.inc
 
 include /etc/firejail/whitelist-var-common.inc
 
-# the default mysqld-akonadi apparmor profile in debian and ubuntu
-# is not compatible with the commented options below
+# disabled options below are not compatible with the apparmor profile for mysqld-akonadi.
+# this affects ubuntu and debian currently
 
 # apparmor
 caps.drop all

etc/disable-programs.inc

@@ -385,6 +385,7 @@ blacklist ${HOME}/.local/share/kate
 blacklist ${HOME}/.local/share/kdenlive
 blacklist ${HOME}/.local/share/kget
 blacklist ${HOME}/.local/share/kmail2
+blacklist ${HOME}/.local/share/knotes
 blacklist ${HOME}/.local/share/krita
 blacklist ${HOME}/.local/share/ktorrentrc
 blacklist ${HOME}/.local/share/ktorrent

etc/kmail.profile

@@ -28,6 +28,8 @@ include /etc/firejail/disable-devel.inc
 include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 
+include /etc/firejail/whitelist-var-common.inc
+
 # apparmor
 caps.drop all
 netfilter

etc/knotes.profile

@@ -5,34 +5,12 @@ include /etc/firejail/knotes.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
-noblacklist ${HOME}/.config/akonadi*
+# knotes has problems launching akonadi in debian and ubuntu.
+# one solution is to have akonadi already running when knotes is started
+
 noblacklist ${HOME}/.config/knotesrc
-noblacklist ${HOME}/.local/share/akonadi*
-noblacklist /tmp/akonadi-*
+noblacklist ${HOME}/.local/share/knotes
 
-include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-passwdmgr.inc
-include /etc/firejail/disable-programs.inc
 
-include /etc/firejail/whitelist-var-common.inc
-
-caps.drop all
-netfilter
-nodvd
-nogroups
-nonewprivs
-noroot
-nosound
-notv
-novideo
-protocol unix
-seccomp
-shell none
-tracelog
-
-private-dev
-# private-tmp - interrupts connection to akonadi
-
-noexec ${HOME}
-noexec /tmp
+# Redirect
+include /etc/firejail/kmail.profile

etc/krunner.profile

@@ -11,6 +11,7 @@ include /etc/firejail/globals.local
 
 # noblacklist ${HOME}/.cache/krunner
 # noblacklist ${HOME}/.cache/krunnerbookmarkrunnerfirefoxdbfile.sqlite
+# noblacklist ${HOME}/.config/chromium
 noblacklist ${HOME}/.config/krunnerrc
 noblacklist ${HOME}/.kde/share/config/krunnerrc
 noblacklist ${HOME}/.kde4/share/config/krunnerrc

etc/smplayer.profile

@@ -18,7 +18,7 @@ include /etc/firejail/whitelist-var-common.inc
 apparmor
 caps.drop all
 netfilter
-# nodbus
+# nodbus - problems with KDE
 # nogroups
 nonewprivs
 noroot

etc/vlc.profile

@@ -19,7 +19,7 @@ include /etc/firejail/whitelist-var-common.inc
 apparmor
 caps.drop all
 netfilter
-# nodbus
+# nodbus - problems with KDE
 # nogroups
 nonewprivs
 noroot