From 3df7af1935c98ae226cd0ba6f903a5e006689b00 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 22 Jul 2018 05:50:14 -0400
Subject: Merges

---
 README                            | 2 ++
 README.md                         | 2 +-
 RELNOTES                          | 1 +
 etc/disable-programs.inc          | 2 ++
 etc/standardnotes-desktop.profile | 4 ++--
 src/firecfg/firecfg.config        | 1 +
 6 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 77fa231b1..552c679ea 100644
--- a/README
+++ b/README
@@ -646,6 +646,8 @@ Vasya Novikov (https://github.com/vn971)
 	- seccomp syscall list update for glibc 2.26-10
 Veeti Paananen (https://github.com/veeti)
 	- fixed Spotify profile
+veloute (https://github.com/veloute)
+	- added standardnotes profile
 Vincent43 (https://github.com/Vincent43)
 	- apparmor enhancements
 vismir2 (https://github.com/vismir2)
diff --git a/README.md b/README.md
index b6e3026c0..fd7d87ecd 100644
--- a/README.md
+++ b/README.md
@@ -165,4 +165,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
+Microsoft Office Online, riot-desktop, gnome-mpv, snox, gradio, standardnotes-desktop
diff --git a/RELNOTES b/RELNOTES
index 7eb075e4c..f91ce203b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -11,6 +11,7 @@ firejail (0.9.55) baseline; urgency=low
   * globbing support in private-lib
   * new profiles: ms-excel, ms-office, ms-onenote, ms-outlook, ms-powerpoint
   * new profiles: ms-skype, ms-word, riot-desktop, gnome-mpv, snox, gradio
+  * new profiles: standardnotes-desktop
  -- netblue30 <netblue30@yahoo.com>  Fri, 25 May 2018 08:00:00 -0500
 
 firejail (0.9.54) baseline; urgency=low
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 9f3587446..6d5b45da8 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -3,6 +3,7 @@
 include /etc/firejail/disable-programs.local
 
 blacklist ${HOME}/Monero/wallets
+blacklist ${HOME}/Standard Notes Backups
 blacklist ${HOME}/snap
 blacklist ${HOME}/.*coin
 blacklist ${HOME}/.8pecxstudios
@@ -75,6 +76,7 @@ blacklist ${HOME}/.config/Riot
 blacklist ${HOME}/.config/Rocket.Chat
 blacklist ${HOME}/.config/Signal
 blacklist ${HOME}/.config/Slack
+blacklist ${HOME}/.config/Standard Notes
 blacklist ${HOME}/.config/Thunar
 blacklist ${HOME}/.config/VirtualBox
 blacklist ${HOME}/.config/Wire
diff --git a/etc/standardnotes-desktop.profile b/etc/standardnotes-desktop.profile
index 202d3761d..1123bf6bf 100644
--- a/etc/standardnotes-desktop.profile
+++ b/etc/standardnotes-desktop.profile
@@ -11,12 +11,11 @@ include /etc/firejail/disable-interpreters.inc
 include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 
-include /etc/firejail/whitelist-var-common.inc
-
 mkdir ${HOME}/Standard Notes Backups
 mkdir ${HOME}/.config/Standard Notes
 whitelist ${HOME}/Standard Notes Backups
 whitelist ${HOME}/.config/Standard Notes
+include /etc/firejail/whitelist-var-common.inc
 
 apparmor
 caps.drop all
@@ -31,6 +30,7 @@ nosound
 notv
 protocol unix,inet,inet6,netlink
 seccomp
+
 disable-mnt
 private-dev
 private-tmp
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 5e5a5a967..2c7e21813 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -371,6 +371,7 @@ spotify
 sqlitebrowser
 ssh
 # ssh-agent - problems on Arch with Fish shell (#1568)
+standardnotes-desktop
 start-tor-browser
 steam
 steam-native
-- 
cgit v1.2.3-54-g00ecf