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

4 files changed, 53 insertions, 11 deletions

diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 8cfcaa838..4d9c4d85f 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -416,6 +416,7 @@ blacklist ${HOME}/.passwd-s3fs
 blacklist ${HOME}/.pingus
 blacklist ${HOME}/.purple
 blacklist ${HOME}/.qemu-launcher
+blacklist ${HOME}/.redeclipse
 blacklist ${HOME}/.remmina
 blacklist ${HOME}/.repo_.gitconfig.json
 blacklist ${HOME}/.repoconfig
@@ -453,6 +454,7 @@ blacklist ${HOME}/.wireshark
 blacklist ${HOME}/.wine64
 blacklist ${HOME}/.xiphos
 blacklist ${HOME}/.xmms
+blacklist ${HOME}/.xmr-stak
 blacklist ${HOME}/.xonotic
 blacklist ${HOME}/.xpdfrc
 blacklist ${HOME}/.zoom
diff --git a/etc/xmr-stak-cpu.profile b/etc/redeclipse.profile
index 9cc6e0c1f..f0a993c54 100644
--- a/etc/xmr-stak-cpu.profile
+++ b/etc/redeclipse.profile
@@ -1,27 +1,28 @@
-# Firejail profile for xmr-stak-cpu
+# Firejail profile for redeclipse
 # This file is overwritten after every install/update
 # Persistent local customizations
-include /etc/firejail/xmr-stak-cpu.local
+include /etc/firejail/redeclipse.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
+noblacklist ${HOME}/.redeclipse
 
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-devel.inc
 include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 
+mkdir ${HOME}/.redeclipse
+whitelist ${HOME}/.redeclipse
+include /etc/firejail/whitelist-common.inc
 include /etc/firejail/whitelist-var-common.inc
 
 caps.drop all
-ipc-namespace
 netfilter
-no3d
 nodvd
 nogroups
 nonewprivs
 noroot
-nosound
 notv
 novideo
 protocol unix,inet,inet6
@@ -29,14 +30,8 @@ seccomp
 shell none
 
 disable-mnt
-private
-private-bin xmr-stak-cpu
 private-dev
-private-etc xmr-stak-cpu.json
-private-lib
-private-opt none
 private-tmp
 
-memory-deny-write-execute
 noexec ${HOME}
 noexec /tmp
diff --git a/etc/xmr-stak.profile b/etc/xmr-stak.profile
new file mode 100644
index 000000000..151a4c694
--- /dev/null
+++ b/etc/xmr-stak.profile
@@ -0,0 +1,44 @@
+# Firejail profile for xmr-stak
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/xmr-stak.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+
+noblacklist ${HOME}/.xmr-stak
+noblacklist /usr/lib/llvm*
+
+include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-devel.inc
+include /etc/firejail/disable-passwdmgr.inc
+include /etc/firejail/disable-programs.inc
+
+mkdir ${HOME}/.xmr-stak
+include /etc/firejail/whitelist-var-common.inc
+
+caps.drop all
+ipc-namespace
+netfilter
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+novideo
+protocol unix,inet,inet6
+seccomp
+shell none
+
+disable-mnt
+private ${HOME}/.xmr-stak
+private-bin xmr-stak
+private-dev
+private-etc ca-certificates,crypto-policies,nsswitch.conf,pki,resolv.conf,ssl
+#private-lib libxmrstak_opencl_backend,libxmrstak_cuda_backend
+private-opt cuda
+private-tmp
+
+memory-deny-write-execute
+noexec ${HOME}
+noexec /tmp
diff --git a/etc/xonotic.profile b/etc/xonotic.profile
index d17d2b612..7a466db9b 100644
--- a/etc/xonotic.profile
+++ b/etc/xonotic.profile
@@ -15,6 +15,7 @@ include /etc/firejail/disable-programs.inc
 mkdir ${HOME}/.xonotic
 whitelist ${HOME}/.xonotic
 include /etc/firejail/whitelist-common.inc
+include /etc/firejail/whitelist-var-common.inc
 
 caps.drop all
 netfilter