merges

2 files changed, 22 insertions, 21 deletions

diff --git a/etc/mpsyt.profile b/etc/mpsyt.profile
index eb51a45cc..9fb52c0a8 100644
--- a/etc/mpsyt.profile
+++ b/etc/mpsyt.profile
@@ -2,9 +2,17 @@
 # Description: Terminal based YouTube player and downloader
 # This file is overwritten after every install/update
 # Persistent local customizations
-include /etc/firejail/mpsyt.local
+include mpsyt.local
 # Persistent global definitions
-include /etc/firejail/globals.local
+include globals.local
+
+# Allow python (blacklisted by disable-interpreters.inc)
+noblacklist ${PATH}/python2*
+noblacklist ${PATH}/python3*
+noblacklist /usr/lib/python2*
+noblacklist /usr/lib/python3*
+noblacklist /usr/local/lib/python2*
+noblacklist /usr/local/lib/python3*
 
 noblacklist ${HOME}/.config/mpv
 noblacklist ${HOME}/.mplayer
@@ -15,8 +23,14 @@ noblacklist ${MUSIC}
 noblacklist ${VIDEOS}
 noblacklist ${DOWNLOADS}
 
-mkdir ${HOME}/.config/mps-youtube
+include disable-common.inc
+include disable-devel.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include disable-xdg.inc
 
+mkdir ${HOME}/.config/mps-youtube
 whitelist ${HOME}/.config/mpv
 whitelist ${HOME}/.mplayer
 whitelist ${HOME}/.config/mps-youtube
@@ -25,23 +39,8 @@ whitelist ${HOME}/mps
 whitelist ${MUSIC}
 whitelist ${VIDEOS}
 whitelist ${DOWNLOADS}
-
-# Allow python (blacklisted by disable-interpreters.inc)
-noblacklist ${PATH}/python2*
-noblacklist ${PATH}/python3*
-noblacklist /usr/lib/python2*
-noblacklist /usr/lib/python3*
-noblacklist /usr/local/lib/python2*
-noblacklist /usr/local/lib/python3*
-
-include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-interpreters.inc
-include /etc/firejail/disable-passwdmgr.inc
-include /etc/firejail/disable-programs.inc
-include /etc/firejail/disable-xdg.inc
-
-include /etc/firejail/whitelist-var-common.inc
+include whitelist-common.inc
+include whitelist-var-common.inc
 
 apparmor
 caps.drop all
@@ -55,7 +54,7 @@ seccomp
 shell none
 tracelog
 
-private-bin mpsyt,mplayer,mpv,youtube-dl,python*,env
+private-bin mpsyt,mplayer,mpv,youtube-dl,python*,env,ffmpeg
 private-dev
 private-tmp
 
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index c26ac278f..68ef5e5d1 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -140,6 +140,7 @@ evolution
 exiftool
 falkon
 fbreader
+feedreader
 feh
 ffmpeg
 file-roller
@@ -290,6 +291,7 @@ min
 minetest
 mousepad
 mplayer
+mpsyt
 mpv
 ms-excel
 ms-office