aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--README.md2
-rw-r--r--RELNOTES2
-rw-r--r--etc/anki.profile57
-rw-r--r--etc/disable-programs.inc1
-rw-r--r--etc/evince.profile2
-rw-r--r--src/firecfg/util.c4
-rw-r--r--src/man/firejail.txt4
8 files changed, 66 insertions, 8 deletions
diff --git a/README b/README
index 33ba45a88..4bcbdd4b2 100644
--- a/README
+++ b/README
@@ -536,7 +536,7 @@ rusty-snake (https://github.com/rusty-snake)
536 - added profiles: thunderbird-wayland, supertuxkart, ghostwriter 536 - added profiles: thunderbird-wayland, supertuxkart, ghostwriter
537 - added profiles: klavaro, mypaint, mypaint-ora-thumbnailer, nano 537 - added profiles: klavaro, mypaint, mypaint-ora-thumbnailer, nano
538 - added profiles: gajim-history-manager, freemind, nomacs, kid3 538 - added profiles: gajim-history-manager, freemind, nomacs, kid3
539 - added profiles: kid3-qt, kid3-cli 539 - added profiles: kid3-qt, kid3-cli, anki, anki
540 - fixed profiles: kdenlive, bibletime, rhythmbox, gajim, seahorse 540 - fixed profiles: kdenlive, bibletime, rhythmbox, gajim, seahorse
541 - fixed profiles: libreoffice, gnome-maps, wget, seahorse-tool 541 - fixed profiles: libreoffice, gnome-maps, wget, seahorse-tool
542 - hardened profiles: disable-common.inc, disable-programs.inc 542 - hardened profiles: disable-common.inc, disable-programs.inc
diff --git a/README.md b/README.md
index 30256ad4a..29a2fadff 100644
--- a/README.md
+++ b/README.md
@@ -102,5 +102,5 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
102## Current development version: 0.9.59 102## Current development version: 0.9.59
103 103
104## New profiles: 104## New profiles:
105crow, nyx, klavaro, mypaint, celluoid, nano, transgui, sysprof, simplescreenrecorder, geekbench, xfce4-mixer, pavucontrol, d-feet, seahorse, secret-tool, gnome-keyring, regextester, hardinfo, gnome-system-log, gnome-nettool, netactview, redshift, devhelp, assogiate, subdownloader, font-manager, exfalso, gconf-editor, dconf-editor, mpdris2, sysprof-cli, seahorse-tool, secret-tool, dconf, gsettings, code-oss, pragha, Maelstrom, ostrichriders, bzflag, freeciv, lincity-ng, megaglest, openttd, crawl, crawl-tiles, teeworlds, torcs, tremulous, warsow, lugaru, manaplus, pioneer, scorched3d, widelands, freemind, kid3, kid3-cli, kid3-qt, nomacs, freecol, opencity, openclonk, slashem, vulturesclaw, vultureseye 105crow, nyx, klavaro, mypaint, celluoid, nano, transgui, sysprof, simplescreenrecorder, geekbench, xfce4-mixer, pavucontrol, d-feet, seahorse, secret-tool, gnome-keyring, regextester, hardinfo, gnome-system-log, gnome-nettool, netactview, redshift, devhelp, assogiate, subdownloader, font-manager, exfalso, gconf-editor, dconf-editor, mpdris2, sysprof-cli, seahorse-tool, secret-tool, dconf, gsettings, code-oss, pragha, Maelstrom, ostrichriders, bzflag, freeciv, lincity-ng, megaglest, openttd, crawl, crawl-tiles, teeworlds, torcs, tremulous, warsow, lugaru, manaplus, pioneer, scorched3d, widelands, freemind, kid3, kid3-cli, kid3-qt, nomacs, freecol, opencity, openclonk, slashem, vulturesclaw, vultureseye, anki
106 106
diff --git a/RELNOTES b/RELNOTES
index 6b5f19a8b..3e5329a52 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -11,7 +11,7 @@ firejail (0.9.59) baseline; urgency=low
11 * new profiles: teeworlds, torcs, tremulous, warsow, lugaru, manaplus 11 * new profiles: teeworlds, torcs, tremulous, warsow, lugaru, manaplus
12 * new profiles: pioneer, scorched3d, widelands, freemind, kid3, kid3-qt 12 * new profiles: pioneer, scorched3d, widelands, freemind, kid3, kid3-qt
13 * new profiles: kid3-cli, nomacs, freecol, opencity, openclonk, slashem 13 * new profiles: kid3-cli, nomacs, freecol, opencity, openclonk, slashem
14 * new profiles: vultureseye, vulturesclaw 14 * new profiles: vultureseye, vulturesclaw, anki
15 * memory-deny-write-execute now also blocks memfd_create 15 * memory-deny-write-execute now also blocks memfd_create
16 * drop support for flatpak/snap packages 16 * drop support for flatpak/snap packages
17 17
diff --git a/etc/anki.profile b/etc/anki.profile
new file mode 100644
index 000000000..6ab95dd52
--- /dev/null
+++ b/etc/anki.profile
@@ -0,0 +1,57 @@
1# Firejail profile for anki
2# Description: flexible, intelligent flashcard program
3# This file is overwritten after every install/update
4# Persistent local customizations
5include anki.local
6# Persistent global definitions
7include globals.local
8
9noblacklist ${DOCUMENTS}
10noblacklist ${HOME}/.local/share/Anki2
11
12# Allow python (blacklisted by disable-interpreters.inc)
13noblacklist ${PATH}/python2*
14noblacklist ${PATH}/python3*
15noblacklist /usr/lib/python2*
16noblacklist /usr/lib/python3*
17noblacklist /usr/local/lib/python2*
18noblacklist /usr/local/lib/python3*
19
20include disable-common.inc
21include disable-devel.inc
22include disable-exec.inc
23include disable-interpreters.inc
24include disable-passwdmgr.inc
25include disable-programs.inc
26include disable-xdg.inc
27
28whitelist ${DOCUMENTS}
29whitelist ${HOME}/.local/share/Anki2
30include whitelist-common.inc
31include whitelist-var-common.inc
32
33apparmor
34caps.drop all
35machine-id
36netfilter
37no3d
38nodbus
39nodvd
40nogroups
41nonewprivs
42noroot
43nosound
44notv
45nou2f
46novideo
47protocol unix,inet,inet6
48seccomp
49shell none
50tracelog
51
52disable-mnt
53private-bin anki,python*
54private-cache
55private-dev
56private-etc alternatives,ca-certificates,fonts,gtk-2.0,hostname,hosts,machine-id,pki,resolv.conf,Trolltech.conf,ssl
57private-tmp
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index f5a40ff5f..96fd80daf 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -422,6 +422,7 @@ blacklist ${HOME}/.lmmsrc.xml
422blacklist ${HOME}/.local/lib/vivaldi 422blacklist ${HOME}/.local/lib/vivaldi
423blacklist ${HOME}/.local/share/0ad 423blacklist ${HOME}/.local/share/0ad
424blacklist ${HOME}/.local/share/3909/PapersPlease 424blacklist ${HOME}/.local/share/3909/PapersPlease
425blacklist ${HOME}/.local/share/Anki2
425blacklist ${HOME}/.local/share/Empathy 426blacklist ${HOME}/.local/share/Empathy
426blacklist ${HOME}/.local/share/JetBrains 427blacklist ${HOME}/.local/share/JetBrains
427blacklist ${HOME}/.local/share/Mendeley Ltd. 428blacklist ${HOME}/.local/share/Mendeley Ltd.
diff --git a/etc/evince.profile b/etc/evince.profile
index c10e3b04f..c3c6d4be0 100644
--- a/etc/evince.profile
+++ b/etc/evince.profile
@@ -23,7 +23,7 @@ machine-id
23# net none - breaks AppArmor on Ubuntu systems 23# net none - breaks AppArmor on Ubuntu systems
24netfilter 24netfilter
25no3d 25no3d
26nodbus 26nodbus # might break two-page-view on some systems
27nodvd 27nodvd
28nogroups 28nogroups
29nonewprivs 29nonewprivs
diff --git a/src/firecfg/util.c b/src/firecfg/util.c
index 00dbad073..23a66ba67 100644
--- a/src/firecfg/util.c
+++ b/src/firecfg/util.c
@@ -59,8 +59,8 @@ int which(const char *program) {
59 char *ptr = strtok(path2, ":"); 59 char *ptr = strtok(path2, ":");
60 while (ptr) { 60 while (ptr) {
61 // Ubuntu 18.04 is adding /snap/bin to PATH; 61 // Ubuntu 18.04 is adding /snap/bin to PATH;
62 // they populate /snap/bin with simbolic links to /usr/bin/ programs; 62 // they populate /snap/bin with symbolic links to /usr/bin/ programs;
63 // most simlinked programs are not installed by default. 63 // most symlinked programs are not installed by default.
64 // Removing /snap/bin from our search 64 // Removing /snap/bin from our search
65 if (strcmp(ptr, "/snap/bin") != 0) { 65 if (strcmp(ptr, "/snap/bin") != 0) {
66 if (find(program, ptr)) { 66 if (find(program, ptr)) {
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 048db098c..eed98710b 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -2500,7 +2500,7 @@ Make a firefox symlink to /usr/bin/firejail:
2500.br 2500.br
2501 2501
2502.br 2502.br
2503$ ln -s /usr/bin/firejail /usr/local/bin/firefox 2503$ sudo ln -s /usr/bin/firejail /usr/local/bin/firefox
2504.br 2504.br
2505 2505
2506.br 2506.br
@@ -2540,7 +2540,7 @@ $ firejail --tree
2540 1221:netblue:/usr/lib/firefox/firefox 2540 1221:netblue:/usr/lib/firefox/firefox
2541.RE 2541.RE
2542 2542
2543We provide a tool that automates all this integration, please see \fBman 1 firecfg\fR for more details. 2543We provide a tool that automates all this integration, please see \&\flfirecfg\fR\|(1) for more details.
2544 2544
2545.SH EXAMPLES 2545.SH EXAMPLES
2546.TP 2546.TP