diff options
author | Tad <tad@spotco.us> | 2018-07-22 05:50:14 -0400 |
---|---|---|
committer | Tad <tad@spotco.us> | 2018-07-22 05:50:14 -0400 |
commit | 3df7af1935c98ae226cd0ba6f903a5e006689b00 (patch) | |
tree | d1d9e6e08b5828ecec5aabb84e0ccc18cdd00f9b | |
parent | Merge pull request #2052 from veloute/master (diff) | |
download | firejail-3df7af1935c98ae226cd0ba6f903a5e006689b00.tar.gz firejail-3df7af1935c98ae226cd0ba6f903a5e006689b00.tar.zst firejail-3df7af1935c98ae226cd0ba6f903a5e006689b00.zip |
Merges
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | RELNOTES | 1 | ||||
-rw-r--r-- | etc/disable-programs.inc | 2 | ||||
-rw-r--r-- | etc/standardnotes-desktop.profile | 4 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 1 |
6 files changed, 9 insertions, 3 deletions
@@ -646,6 +646,8 @@ Vasya Novikov (https://github.com/vn971) | |||
646 | - seccomp syscall list update for glibc 2.26-10 | 646 | - seccomp syscall list update for glibc 2.26-10 |
647 | Veeti Paananen (https://github.com/veeti) | 647 | Veeti Paananen (https://github.com/veeti) |
648 | - fixed Spotify profile | 648 | - fixed Spotify profile |
649 | veloute (https://github.com/veloute) | ||
650 | - added standardnotes profile | ||
649 | Vincent43 (https://github.com/Vincent43) | 651 | Vincent43 (https://github.com/Vincent43) |
650 | - apparmor enhancements | 652 | - apparmor enhancements |
651 | vismir2 (https://github.com/vismir2) | 653 | vismir2 (https://github.com/vismir2) |
@@ -165,4 +165,4 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe | |||
165 | ````` | 165 | ````` |
166 | 166 | ||
167 | ## New profiles | 167 | ## New profiles |
168 | Microsoft Office Online, riot-desktop, gnome-mpv, snox, gradio | 168 | Microsoft Office Online, riot-desktop, gnome-mpv, snox, gradio, standardnotes-desktop |
@@ -11,6 +11,7 @@ firejail (0.9.55) baseline; urgency=low | |||
11 | * globbing support in private-lib | 11 | * globbing support in private-lib |
12 | * new profiles: ms-excel, ms-office, ms-onenote, ms-outlook, ms-powerpoint | 12 | * new profiles: ms-excel, ms-office, ms-onenote, ms-outlook, ms-powerpoint |
13 | * new profiles: ms-skype, ms-word, riot-desktop, gnome-mpv, snox, gradio | 13 | * new profiles: ms-skype, ms-word, riot-desktop, gnome-mpv, snox, gradio |
14 | * new profiles: standardnotes-desktop | ||
14 | -- netblue30 <netblue30@yahoo.com> Fri, 25 May 2018 08:00:00 -0500 | 15 | -- netblue30 <netblue30@yahoo.com> Fri, 25 May 2018 08:00:00 -0500 |
15 | 16 | ||
16 | firejail (0.9.54) baseline; urgency=low | 17 | 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 @@ | |||
3 | include /etc/firejail/disable-programs.local | 3 | include /etc/firejail/disable-programs.local |
4 | 4 | ||
5 | blacklist ${HOME}/Monero/wallets | 5 | blacklist ${HOME}/Monero/wallets |
6 | blacklist ${HOME}/Standard Notes Backups | ||
6 | blacklist ${HOME}/snap | 7 | blacklist ${HOME}/snap |
7 | blacklist ${HOME}/.*coin | 8 | blacklist ${HOME}/.*coin |
8 | blacklist ${HOME}/.8pecxstudios | 9 | blacklist ${HOME}/.8pecxstudios |
@@ -75,6 +76,7 @@ blacklist ${HOME}/.config/Riot | |||
75 | blacklist ${HOME}/.config/Rocket.Chat | 76 | blacklist ${HOME}/.config/Rocket.Chat |
76 | blacklist ${HOME}/.config/Signal | 77 | blacklist ${HOME}/.config/Signal |
77 | blacklist ${HOME}/.config/Slack | 78 | blacklist ${HOME}/.config/Slack |
79 | blacklist ${HOME}/.config/Standard Notes | ||
78 | blacklist ${HOME}/.config/Thunar | 80 | blacklist ${HOME}/.config/Thunar |
79 | blacklist ${HOME}/.config/VirtualBox | 81 | blacklist ${HOME}/.config/VirtualBox |
80 | blacklist ${HOME}/.config/Wire | 82 | 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 | |||
11 | include /etc/firejail/disable-passwdmgr.inc | 11 | include /etc/firejail/disable-passwdmgr.inc |
12 | include /etc/firejail/disable-programs.inc | 12 | include /etc/firejail/disable-programs.inc |
13 | 13 | ||
14 | include /etc/firejail/whitelist-var-common.inc | ||
15 | |||
16 | mkdir ${HOME}/Standard Notes Backups | 14 | mkdir ${HOME}/Standard Notes Backups |
17 | mkdir ${HOME}/.config/Standard Notes | 15 | mkdir ${HOME}/.config/Standard Notes |
18 | whitelist ${HOME}/Standard Notes Backups | 16 | whitelist ${HOME}/Standard Notes Backups |
19 | whitelist ${HOME}/.config/Standard Notes | 17 | whitelist ${HOME}/.config/Standard Notes |
18 | include /etc/firejail/whitelist-var-common.inc | ||
20 | 19 | ||
21 | apparmor | 20 | apparmor |
22 | caps.drop all | 21 | caps.drop all |
@@ -31,6 +30,7 @@ nosound | |||
31 | notv | 30 | notv |
32 | protocol unix,inet,inet6,netlink | 31 | protocol unix,inet,inet6,netlink |
33 | seccomp | 32 | seccomp |
33 | |||
34 | disable-mnt | 34 | disable-mnt |
35 | private-dev | 35 | private-dev |
36 | private-tmp | 36 | 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 | |||
371 | sqlitebrowser | 371 | sqlitebrowser |
372 | ssh | 372 | ssh |
373 | # ssh-agent - problems on Arch with Fish shell (#1568) | 373 | # ssh-agent - problems on Arch with Fish shell (#1568) |
374 | standardnotes-desktop | ||
374 | start-tor-browser | 375 | start-tor-browser |
375 | steam | 376 | steam |
376 | steam-native | 377 | steam-native |