Merges

6 files changed, 12 insertions, 4 deletions

diff --git a/README.md b/README.md
index 99da04f54..527a6cec2 100644
--- a/README.md
+++ b/README.md
@@ -370,4 +370,4 @@ gnome-recipes, akonadi_control, evince-previewer, evince-thumbnailer, blender-2.
 thunderbird-beta, ncdu, gnome-logs, gcloud, musixmatch, gunzip, bunzip2, enchant,
 enchant-2, enchant-lsmod, enchant-lsmod-2, Discord, acat, adiff, als, apack, arepack,
 aunpack profiles, ppsspp, scallion, clion, baloo_filemetadata_temp_extractor,
-AnyDesk
+AnyDesk, webstorm
diff --git a/RELNOTES b/RELNOTES
index 52d139551..d83f30ad9 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -43,7 +43,7 @@ firejail (0.9.53) baseline; urgency=low
   * new profiles: musixmatch, gunzip, bunzip2, enchant-lsmod, enchant-lsmod-2,
   * new profiles: enchant, enchant-2, Discord, acat, adiff, als, apack,
   * new profiles: arepack, aunpack profiles, ppsspp, scallion, clion,
-  * new profiles: baloo_filemetadata_temp_extractor, AnyDesk
+  * new profiles: baloo_filemetadata_temp_extractor, AnyDesk, webstorm
  -- netblue30 <netblue30@yahoo.com>  Thu, 1 Mar 2018 08:00:00 -0500
 
 firejail (0.9.52) baseline; urgency=low
diff --git a/etc/anydesk.profile b/etc/anydesk.profile
index 6d6f2bb26..17e083f4e 100644
--- a/etc/anydesk.profile
+++ b/etc/anydesk.profile
@@ -5,8 +5,7 @@ include /etc/firejail/anydesk.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
-mkdir ${HOME}/.anydesk
-whitelist ${HOME}/.anydesk
+noblacklist ${HOME}/.anydesk
 
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-devel.inc
@@ -14,6 +13,10 @@ include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 include /etc/firejail/disable-interpreters.inc
 
+mkdir ${HOME}/.anydesk
+whitelist ${HOME}/.anydesk
+include /etc/firejail/whitelist-common.inc
+
 caps.drop all
 netfilter
 nodvd
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 4abf4da78..c12d841d6 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -28,6 +28,7 @@ blacklist ${HOME}/.Wolfram Research
 blacklist ${HOME}/.ZAP
 blacklist ${HOME}/.aMule
 blacklist ${HOME}/.android
+blacklist ${HOME}/.anydesk
 blacklist ${HOME}/.arduino15
 blacklist ${HOME}/.arm
 blacklist ${HOME}/.asunder_album_genre
diff --git a/etc/kodi.profile b/etc/kodi.profile
index 54d548291..85058da3e 100644
--- a/etc/kodi.profile
+++ b/etc/kodi.profile
@@ -19,6 +19,8 @@ include /etc/firejail/disable-interpreters.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
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 19d787679..5b73a5214 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -332,6 +332,7 @@ ristretto
 rocketchat
 rtorrent
 runenpass.sh
+scallion
 scribus
 sdat2img
 seamonkey
@@ -411,6 +412,7 @@ vym
 w3m
 warzone2100
 waterfox
+webstorm
 weechat
 weechat-curses
 wesnoth