diff options
author | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-04-15 11:45:13 -0500 |
---|---|---|
committer | Fred Barclay <Fred-Barclay@users.noreply.github.com> | 2017-04-15 11:45:13 -0500 |
commit | fb85de2ae5227751324de3e9d497f455a71023ef (patch) | |
tree | 81700790b3c09b57a9444de8dbc6a51562c7671b | |
parent | Merge pull request #1219 from SpotComms/master (diff) | |
download | firejail-fb85de2ae5227751324de3e9d497f455a71023ef.tar.gz firejail-fb85de2ae5227751324de3e9d497f455a71023ef.tar.zst firejail-fb85de2ae5227751324de3e9d497f455a71023ef.zip |
update after dino profile merge
-rw-r--r-- | README | 1 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | RELNOTES | 2 | ||||
-rw-r--r-- | etc/dino.profile | 19 | ||||
-rw-r--r-- | etc/disable-programs.inc | 1 | ||||
-rw-r--r-- | platform/debian/conffiles | 1 | ||||
-rw-r--r-- | src/firecfg/firecfg.config | 1 |
7 files changed, 14 insertions, 13 deletions
@@ -354,6 +354,7 @@ SpotComms (https://github.com/SpotComms) | |||
354 | - added Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5 profiles | 354 | - added Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5 profiles |
355 | - added PDFSam, Pithos, and Xonotic profiles | 355 | - added PDFSam, Pithos, and Xonotic profiles |
356 | - disabled Go, Rust, and OpenSSL in disable-devel.conf | 356 | - disabled Go, Rust, and OpenSSL in disable-devel.conf |
357 | - added dino profile | ||
357 | SYN-cook (https://github.com/SYN-cook) | 358 | SYN-cook (https://github.com/SYN-cook) |
358 | - keepass/keepassx browser fixes | 359 | - keepass/keepassx browser fixes |
359 | - disable-common.inc fixes | 360 | - disable-common.inc fixes |
@@ -196,4 +196,4 @@ simple-scan, skanlite, ssh-agent, tracker, transmission-cli, transmission-show, | |||
196 | xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, | 196 | xed, pluma, Cryptocat, Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5, |
197 | PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser, | 197 | PDFSam, Pithos, Xonotic, wireshark, keepassx2, QupZilla, FossaMail, Uzbl browser, xmms, iridium browser, |
198 | Kino, Thunar, Geeqie, Engrampa, Scribus, mousepad, gpicview, keepassxc, cvlc, MediathekView, baloo_file, | 198 | Kino, Thunar, Geeqie, Engrampa, Scribus, mousepad, gpicview, keepassxc, cvlc, MediathekView, baloo_file, |
199 | Nylas | 199 | Nylas,dino |
@@ -36,7 +36,7 @@ firejail (0.9.46-rc1) baseline; urgency=low | |||
36 | * new profiles: Xonotic, wireshark, keepassx2, QupZilla, FossaMail, | 36 | * new profiles: Xonotic, wireshark, keepassx2, QupZilla, FossaMail, |
37 | * new profiles: Uzbl browser, iridium browser, Thunar, Geeqie, Engrampa, | 37 | * new profiles: Uzbl browser, iridium browser, Thunar, Geeqie, Engrampa, |
38 | * new profiles: Scribus, mousepad, gpicview, keepassxc, cvlc, MediathekView, | 38 | * new profiles: Scribus, mousepad, gpicview, keepassxc, cvlc, MediathekView, |
39 | * new profiles: baloo_file, Nylas | 39 | * new profiles: baloo_file, Nylas,dino |
40 | * bugfixes | 40 | * bugfixes |
41 | -- netblue30 <netblue30@yahoo.com> Fri, 7 Apr 2017 08:00:00 -0500 | 41 | -- netblue30 <netblue30@yahoo.com> Fri, 7 Apr 2017 08:00:00 -0500 |
42 | 42 | ||
diff --git a/etc/dino.profile b/etc/dino.profile index 7634eae91..a71ab27d7 100644 --- a/etc/dino.profile +++ b/etc/dino.profile | |||
@@ -5,22 +5,23 @@ include /etc/firejail/dino.local | |||
5 | # Firejail profile for Dino | 5 | # Firejail profile for Dino |
6 | noblacklist ${HOME}/.local/share/dino | 6 | noblacklist ${HOME}/.local/share/dino |
7 | 7 | ||
8 | mkdir ${HOME}/.local/share/dino | ||
9 | mkdir ${HOME}/Downloads | ||
10 | |||
11 | whitelist ${HOME}/.local/share/dino | ||
12 | whitelist ${HOME}/Downloads | ||
13 | |||
14 | include /etc/firejail/disable-common.inc | 8 | include /etc/firejail/disable-common.inc |
9 | include /etc/firejail/disable-devel.inc | ||
15 | include /etc/firejail/disable-passwdmgr.inc | 10 | include /etc/firejail/disable-passwdmgr.inc |
16 | include /etc/firejail/disable-programs.inc | 11 | include /etc/firejail/disable-programs.inc |
17 | include /etc/firejail/disable-devel.inc | 12 | |
13 | whitelist ${HOME}/Downloads | ||
14 | mkdir ${HOME}/.local/share/dino | ||
15 | whitelist ${HOME}/.local/share/dino | ||
18 | 16 | ||
19 | caps.drop all | 17 | caps.drop all |
18 | machine-id | ||
20 | netfilter | 19 | netfilter |
20 | no3d | ||
21 | nogroups | 21 | nogroups |
22 | nonewprivs | 22 | nonewprivs |
23 | noroot | 23 | noroot |
24 | nosound | ||
24 | protocol unix,inet,inet6 | 25 | protocol unix,inet,inet6 |
25 | seccomp | 26 | seccomp |
26 | shell none | 27 | shell none |
@@ -29,7 +30,3 @@ private-bin dino | |||
29 | #private-etc fonts #breaks server connection | 30 | #private-etc fonts #breaks server connection |
30 | private-dev | 31 | private-dev |
31 | private-tmp | 32 | private-tmp |
32 | machine-id | ||
33 | |||
34 | no3d | ||
35 | nosound | ||
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc index c8777ea08..87f8e13b9 100644 --- a/etc/disable-programs.inc +++ b/etc/disable-programs.inc | |||
@@ -215,6 +215,7 @@ blacklist ${HOME}/.local/share/aspyr-media | |||
215 | blacklist ${HOME}/.local/share/baloo | 215 | blacklist ${HOME}/.local/share/baloo |
216 | blacklist ${HOME}/.local/share/cdprojektred | 216 | blacklist ${HOME}/.local/share/cdprojektred |
217 | blacklist ${HOME}/.local/share/data/Mumble | 217 | blacklist ${HOME}/.local/share/data/Mumble |
218 | blacklist ${HOME}./local/share/dino | ||
218 | blacklist ${HOME}/.local/share/dolphin | 219 | blacklist ${HOME}/.local/share/dolphin |
219 | blacklist ${HOME}/.local/share/epiphany | 220 | blacklist ${HOME}/.local/share/epiphany |
220 | blacklist ${HOME}/.local/share/evolution | 221 | blacklist ${HOME}/.local/share/evolution |
diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 84557cd1f..4e6904b6a 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles | |||
@@ -36,6 +36,7 @@ | |||
36 | /etc/firejail/default.profile | 36 | /etc/firejail/default.profile |
37 | /etc/firejail/deluge.profile | 37 | /etc/firejail/deluge.profile |
38 | /etc/firejail/dillo.profile | 38 | /etc/firejail/dillo.profile |
39 | /etc/firejail/dino.profile | ||
39 | /etc/firejail/disable-common.inc | 40 | /etc/firejail/disable-common.inc |
40 | /etc/firejail/disable-devel.inc | 41 | /etc/firejail/disable-devel.inc |
41 | /etc/firejail/disable-passwdmgr.inc | 42 | /etc/firejail/disable-passwdmgr.inc |
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config index 826de6260..7fb64144a 100644 --- a/src/firecfg/firecfg.config +++ b/src/firecfg/firecfg.config | |||
@@ -63,6 +63,7 @@ w3m | |||
63 | bitlbee | 63 | bitlbee |
64 | corebird | 64 | corebird |
65 | # Cryptocat is added but commented since isn't installed to a */bin... keep an eye on this | 65 | # Cryptocat is added but commented since isn't installed to a */bin... keep an eye on this |
66 | dino | ||
66 | empathy | 67 | empathy |
67 | gitter | 68 | gitter |
68 | hexchat | 69 | hexchat |