From 49256c107f512437eb3ecbf614a8822ac38163a8 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 25 Mar 2018 10:25:31 -0400
Subject: Fixup blender-2.8 and thunderbird-beta

---
 README.md                    |  2 +-
 RELNOTES                     |  2 +-
 etc/blender-2.8.profile      | 30 +++---------------------------
 etc/thunderbird-beta.profile | 33 +++------------------------------
 src/firecfg/firecfg.config   |  2 ++
 5 files changed, 10 insertions(+), 59 deletions(-)

diff --git a/README.md b/README.md
index d3f5db872..73d9390d9 100644
--- a/README.md
+++ b/README.md
@@ -293,4 +293,4 @@ firefox-common-addons.inc in firefox-common.profile.
 Basilisk browser, Tor Browser language packs, PlayOnLinux, sylpheed, discord-canary,
 pycharm-community, pycharm-professional, Pitivi, OnionShare, Fritzing, Kaffeine, pdfchain,
 tilp, vivaldi-snapshot, bitcoin-qt, VS Code, falkon, gnome-builder, lobase, asunder,
-gnome-recipes, akonadi_control
+gnome-recipes, akonadi_control, blender-2.8, thunderbird-beta
diff --git a/RELNOTES b/RELNOTES
index 681e2a865..18a4bf346 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -29,7 +29,7 @@ firejail (0.9.53) baseline; urgency=low
   * new profiles: discord-canary, pycharm-community, pycharm-professional,
   * new profiles: pdfchain, tilp, vivaldi-snapshot, bitcoin-qt, kaffeine,
   * new profiles: falkon, gnome-builder, asunder, VS Code, gnome-recipes
-  * new profiles: akonadi_control
+  * new profiles: akonadi_control, blender-2.8, thunderbird-beta
  -- netblue30 <netblue30@yahoo.com>  Thu, 1 Mar 2018 08:00:00 -0500
 
 firejail (0.9.52) baseline; urgency=low
diff --git a/etc/blender-2.8.profile b/etc/blender-2.8.profile
index 29df27759..4b907018e 100644
--- a/etc/blender-2.8.profile
+++ b/etc/blender-2.8.profile
@@ -1,30 +1,6 @@
-# Firejail profile for blender
+# Firejail profile alias for blender
 # This file is overwritten after every install/update
-# Persistent local customizations
-include /etc/firejail/blender.local
-# Persistent global definitions
-include /etc/firejail/globals.local
 
-noblacklist ${HOME}/.config/blender
 
-include /etc/firejail/disable-common.inc
-include /etc/firejail/disable-devel.inc
-include /etc/firejail/disable-passwdmgr.inc
-include /etc/firejail/disable-programs.inc
-
-caps.drop all
-netfilter
-nodvd
-nogroups
-nonewprivs
-noroot
-notv
-protocol unix,inet,inet6,netlink
-seccomp
-shell none
-
-private-dev
-private-tmp
-
-noexec ${HOME}
-noexec /tmp
+# Redirect
+include /etc/firejail/blender.profile
diff --git a/etc/thunderbird-beta.profile b/etc/thunderbird-beta.profile
index fb1ee46e2..73d2419da 100644
--- a/etc/thunderbird-beta.profile
+++ b/etc/thunderbird-beta.profile
@@ -1,35 +1,8 @@
-# Firejail profile for thunderbird
+# Firejail profile alias for thunderbird-beta
 # This file is overwritten after every install/update
-# Persistent local customizations
-include /etc/firejail/thunderbird.local
-# Persistent global definitions
-include /etc/firejail/globals.local
 
-# Users have thunderbird set to open a browser by clicking a link in an email
-# We are not allowed to blacklist browser-specific directories
-whitelist /opt/thunderbird-beta
-noblacklist ${HOME}/.cache/thunderbird
-noblacklist ${HOME}/.gnupg
-# noblacklist ${HOME}/.icedove
-noblacklist ${HOME}/.thunderbird
-
-mkdir ${HOME}/.cache/thunderbird
-mkdir ${HOME}/.gnupg
-# mkdir ${HOME}/.icedove
-mkdir ${HOME}/.thunderbird
-whitelist ${HOME}/.cache/thunderbird
-whitelist ${HOME}/.gnupg
-# whitelist ${HOME}/.icedove
-whitelist ${HOME}/.thunderbird
 
-# We need the real /tmp for data exchange when xdg-open handles email attachments on KDE
-ignore private-tmp
-# machine-id breaks audio in browsers; enable it when sound is not required
-# machine-id
-read-only ${HOME}/.config/mimeapps.list
-# writable-run-user is needed for signing and encrypting emails
-writable-run-user
+whitelist /opt/thunderbird-beta
 
-# allow browsers
 # Redirect
-include /etc/firejail/firefox.profile
+include /etc/firejail/thunderbird.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 2ffaa8b98..fafbc83d9 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -44,6 +44,7 @@ bibletime
 bitlbee
 bleachbit
 blender
+blender-2.8
 bless
 bluefish
 bnox
@@ -350,6 +351,7 @@ telegram
 telegram-desktop
 terasology
 thunderbird
+thunderbird-beta
 tilp
 tor-browser-ar
 tor-browser-en
-- 
cgit v1.2.3-70-g09d2