From 0fcbc06e1148a50daa72a982a3f2a1b85de44309 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Mon, 3 Sep 2018 04:06:12 -0400
Subject: Merges

---
 README                     | 1 +
 README.md                  | 2 +-
 RELNOTES                   | 3 ++-
 etc/JDownloader.profile    | 6 +++---
 etc/disable-programs.inc   | 1 +
 src/firecfg/firecfg.config | 2 ++
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README b/README
index d84c36fa1..9ca6e6f60 100644
--- a/README
+++ b/README
@@ -656,6 +656,7 @@ Veeti Paananen (https://github.com/veeti)
 veloute (https://github.com/veloute)
 	- added standardnotes profile
 	- added flameshot profile
+	- added jdownloader profile
 Vincent43 (https://github.com/Vincent43)
 	- apparmor enhancements
 vismir2 (https://github.com/vismir2)
diff --git a/README.md b/README.md
index 89b85a09a..18cdeb407 100644
--- a/README.md
+++ b/README.md
@@ -167,4 +167,4 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
 ## New profiles
 Microsoft Office Online, riot-desktop, gnome-mpv, snox, gradio, standardnotes-desktop,
 shellcheck, patch, flameshot, rview, rvim, vimcat, vimdiff, vimpager, vimtutor,
-xxd, Beaker, electrum, clamtk, pybitmessage, dig, whois
+xxd, Beaker, electrum, clamtk, pybitmessage, dig, whois, jdownloader
diff --git a/RELNOTES b/RELNOTES
index 74c7551f5..7d78aab58 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -19,7 +19,8 @@ firejail (0.9.56~rc1) baseline; urgency=low
   * new profiles: ms-skype, ms-word, riot-desktop, gnome-mpv, snox, gradio,
   * new profiles: standardnotes-desktop, shellcheck, patch, flameshot,
   * new profiles: rview, rvim, vimcat, vimdiff, vimpager, vimtutor, xxd,
-  * new profiles: Beaker, electrum, clamtk, pybitmessage, dig, whois
+  * new profiles: Beaker, electrum, clamtk, pybitmessage, dig, whois,
+  * new profiles: jdownloader
  -- netblue30 <netblue30@yahoo.com>  Sat, 11 Aug 2018 08:00:00 -0500
 
 firejail (0.9.54) baseline; urgency=low
diff --git a/etc/JDownloader.profile b/etc/JDownloader.profile
index 748203806..659a41603 100644
--- a/etc/JDownloader.profile
+++ b/etc/JDownloader.profile
@@ -5,6 +5,7 @@ include /etc/firejail/JDownloader.local
 # Persistent global definitions
 include /etc/firejail/globals.local
 
+
 noblacklist ${HOME}/.jd
 
 # Allow access to java
@@ -13,7 +14,6 @@ noblacklist /usr/lib/java
 noblacklist /etc/java
 noblacklist /usr/share/java
 
-
 include /etc/firejail/disable-common.inc
 include /etc/firejail/disable-devel.inc
 include /etc/firejail/disable-interpreters.inc
@@ -21,11 +21,11 @@ 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
-
 mkdir ${HOME}/.jd
 whitelist ${HOME}/.jd
 whitelist ${DOWNLOADS}
+include /etc/firejail/whitelist-common.inc
+include /etc/firejail/whitelist-var-common.inc
 
 caps.drop all
 ipc-namespace
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index d685fceed..1213e4f24 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -287,6 +287,7 @@ blacklist ${HOME}/.inkscape
 blacklist ${HOME}/.jack-server
 blacklist ${HOME}/.jack-settings
 blacklist ${HOME}/.java
+blacklist ${HOME}/.jd
 blacklist ${HOME}/.jitsi
 blacklist ${HOME}/.kde/share/apps/digikam
 blacklist ${HOME}/.kde/share/apps/gwenview
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 5ae1c28cd..676c2d90a 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -10,6 +10,7 @@ Discord
 DiscordCanary
 FossaMail
 Fritzing
+JDownloader
 Mathematica
 Natron
 Telegram
@@ -218,6 +219,7 @@ inox
 iridium
 iridium-browser
 jd-gui
+jdownloader
 jitsi
 k3b
 kaffeine
-- 
cgit v1.2.3-70-g09d2