merges

6 files changed, 8 insertions, 6 deletions

diff --git a/README b/README
index 7384a8c99..368feb827 100644
--- a/README
+++ b/README
@@ -435,6 +435,7 @@ Pixel Fairy (https://github.com/xahare)
 PizzaDude (https://github.com/pizzadude)
         - add mpv support to smplayer
         - added profile for torbrowser-launcher
+        - added profile for sayonara and qmmp
 probonopd (https://github.com/probonopd)
         - automatic build on Travis CI
 pshpsh (https://github.com/pshpsh)
diff --git a/README.md b/README.md
index cb040852a..854e02cd1 100644
--- a/README.md
+++ b/README.md
@@ -376,4 +376,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, webstorm, xmind
+AnyDesk, webstorm, xmind, qmmp, sayonara
diff --git a/RELNOTES b/RELNOTES
index 4945e3d3c..61cedd286 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -43,7 +43,8 @@ firejail (0.9.54~rc1) 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, webstorm, xmind
+  * new profiles: baloo_filemetadata_temp_extractor, AnyDesk, webstorm, xmind,
+  * new profiles: qmmp, sayonara
  -- netblue30 <netblue30@yahoo.com>  Sun, 6 May 2018 08:00:00 -0500
 
 firejail (0.9.52) baseline; urgency=low
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index ea334c289..c7605d660 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -16,6 +16,7 @@ blacklist ${HOME}/.LuminanceHDR
 blacklist ${HOME}/.Mathematica
 blacklist ${HOME}/.Natron
 blacklist ${HOME}/.PyCharm*
+blacklist ${HOME}/.Sayonara
 blacklist ${HOME}/.Skype
 blacklist ${HOME}/.Steam
 blacklist ${HOME}/.Steampath
@@ -465,6 +466,7 @@ blacklist ${HOME}/.passwd-s3fs
 blacklist ${HOME}/.pingus
 blacklist ${HOME}/.purple
 blacklist ${HOME}/.qemu-launcher
+blacklist ${HOME}/.qmmp
 blacklist ${HOME}/.redeclipse
 blacklist ${HOME}/.remmina
 blacklist ${HOME}/.repo_.gitconfig.json
diff --git a/etc/qmmp.profile b/etc/qmmp.profile
index 49b400c26..d785ddbbe 100644
--- a/etc/qmmp.profile
+++ b/etc/qmmp.profile
@@ -5,14 +5,13 @@ include /etc/firejail/qmmp.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
+noblacklist ${HOME}/.qmmp
 
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-devel.inc
 include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 
-noblacklist ~/.qmmp
-
 caps.drop all
 netfilter
 # no3d
diff --git a/etc/sayonara.profile b/etc/sayonara.profile
index 3b593945a..756bd99eb 100644
--- a/etc/sayonara.profile
+++ b/etc/sayonara.profile
@@ -5,14 +5,13 @@ include /etc/firejail/sayonara.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
+noblacklist ${HOME}/.Sayonara
 
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-devel.inc
 include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 
-noblacklist ~/.Sayonara
-
 caps.drop all
 netfilter
 no3d