cleanup and doc update after merge #1221 #1222 #1224 #1225 #1226 and #1228

7 files changed, 18 insertions, 4 deletions

diff --git a/README b/README
index e6b8b75a6..d6258e8e4 100644
--- a/README
+++ b/README
@@ -357,7 +357,9 @@ SpotComms (https://github.com/SpotComms)
         - disabled Go, Rust, and OpenSSL in disable-devel.conf
         - added dino profile
         - added Kodi profile
-        - lots of profile hardening
+        - lots of profile tightening
+        - added viking, youtube-dl, meld profiles
+        - more profile tightening
 SYN-cook (https://github.com/SYN-cook)
         - keepass/keepassx browser fixes
         - disable-common.inc fixes
diff --git a/README.md b/README.md
index ab9123057..ddc1a9639 100644
--- a/README.md
+++ b/README.md
@@ -196,4 +196,4 @@ simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show,
 xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5,
 PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser,
 Kino, Thunar, Geeqie, Engrampa, Scribus, mousepad, gpicview, keepassxc, cvlc, MediathekView, baloo_file,
-Nylas, dino, BibleTime, viewnior
+Nylas, dino, BibleTime, viewnior, Kodi, viking, youtube-dl, meld
diff --git a/RELNOTES b/RELNOTES
index 252965f82..77a097506 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -36,7 +36,8 @@ firejail (0.9.46-rc1) baseline; urgency=low
   * new profiles: Xonotic, wireshark, keepassx2, QupZilla, FossaMail,
   * new profiles: Uzbl browser, iridium browser, Thunar, Geeqie, Engrampa,
   * new profiles: Scribus, mousepad, gpicview, keepassxc, cvlc, MediathekView,
-  * new profiles: baloo_file, Nylas, dino, BibleTime, viewnior
+  * new profiles: baloo_file, Nylas, dino, BibleTime, viewnior, Kodi, viking,
+  * new profiles: youtube-dl, meld
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Fri, 7 Apr 2017 08:00:00 -0500
 
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index e9ed47e38..32adac298 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -199,6 +199,7 @@ blacklist ${HOME}/.kde/share/config/okularrc
 blacklist ${HOME}/.killingfloor
 blacklist ${HOME}/.kino-history
 blacklist ${HOME}/.kinorc
+blacklist ${HOME}/.kodi
 blacklist ${HOME}/.linphone-history.db
 blacklist ${HOME}/.linphonerc
 blacklist ${HOME}/.lmmsrc.xml
@@ -231,6 +232,7 @@ blacklist ${HOME}/.local/share/gnome-music
 blacklist ${HOME}/.local/share/gnome-photos
 blacklist ${HOME}/.local/share/kate
 blacklist ${HOME}/.local/share/lollypop
+blacklist ${HOME}/.local/share/meld
 blacklist ${HOME}/.local/share/multimc5
 blacklist ${HOME}/.local/share/mupen64plus
 blacklist ${HOME}/.local/share/nautilus
@@ -287,6 +289,8 @@ blacklist ${HOME}/.synfig
 blacklist ${HOME}/.tconn
 blacklist ${HOME}/.thunderbird
 blacklist ${HOME}/.ts3client
+blacklist ${HOME}/.viking
+blacklist ${HOME}/.viking-maps
 blacklist ${HOME}/.vst
 blacklist ${HOME}/.w3m
 blacklist ${HOME}/.warzone2100-3.*
diff --git a/etc/kodi.profile b/etc/kodi.profile
index 45a8430f1..b81b010bf 100644
--- a/etc/kodi.profile
+++ b/etc/kodi.profile
@@ -4,7 +4,6 @@ include /etc/firejail/kodi.local
 
 # Firejail profile for kodi
 noblacklist ${HOME}/.kodi
-mkdir ${HOME}/.kodi
 
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-passwdmgr.inc
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index dca17bfbe..0f1f14bf5 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -119,6 +119,7 @@
 /etc/firejail/keepassx2.profile
 /etc/firejail/keepassxc.profile
 /etc/firejail/kmail.profile
+/etc/firejail/kodi.profile
 /etc/firejail/konversation.profile
 /etc/firejail/less.profile
 /etc/firejail/libreoffice.profile
@@ -137,6 +138,7 @@
 /etc/firejail/mathematica.profile
 /etc/firejail/mcabber.profile
 /etc/firejail/mediainfo.profile
+/etc/firejail/meld.profile
 /etc/firejail/midori.profile
 /etc/firejail/mousepad.profile
 /etc/firejail/mpv.profile
@@ -206,6 +208,7 @@
 /etc/firejail/unzip.profile
 /etc/firejail/uudeview.profile
 /etc/firejail/viewnior.profile
+/etc/firejail/viking.profile
 /etc/firejail/vim.profile
 /etc/firejail/virtualbox.profile
 /etc/firejail/vivaldi.profile
@@ -233,6 +236,7 @@
 /etc/firejail/xviewer.profile
 /etc/firejail/xz.profile
 /etc/firejail/xzdec.profile
+/etc/firejail/youtube-dl.profile
 /etc/firejail/zathura.profile
 /etc/firejail/zoom.profile
 /etc/firejail/wget.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 27a34472d..dc8df9bac 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -17,6 +17,7 @@ transmission-qt
 transmission-cli
 transmission-show
 uget-gtk
+youtube-dl
 
 # browsers/email
 abrowser
@@ -130,6 +131,7 @@ google-play-music-desktop-player
 gpicview
 img2txt
 k3b
+kodi
 mediainfo
 mediathekview
 mpv
@@ -202,11 +204,13 @@ keepass2
 keepassx
 keepassx2
 keepassxc
+meld
 mousepad
 pluma
 Thunar
 thunar
 tracker
+viking
 wireshark
 xiphos
 xed