Merge branch 'master' of https://github.com/netblue30/firejail

3 files changed, 64 insertions, 4 deletions

diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index d10d59657..7d7fad0a6 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -14,6 +14,8 @@ qbittorrent
 rtorrent
 transmission-gtk
 transmission-qt
+transmission-cli
+transmission-show
 uget-gtk
 
 # browsers/email
@@ -51,6 +53,9 @@ thunderbird
 vivaldi-beta
 vivaldi
 evolution
+elinks
+lynx
+w3m
 
 # chat/messaging
 bitlbee
@@ -94,21 +99,41 @@ wesnot
 warzone2100
 
 # Media
+amarok
 audacious
 audacity
+bleachbit
+brasero
 clementine
 cmus
 deadbeef
 display
+dolphin
+dragon
+exiftool
 feh
+gjs
+gnome-books
+gnome-clocks
+gnome-documents
+gnome-maps
 gnome-mplayer
+gnome-music
+goobox
 google-play-music-desktop-player
+img2txt
+k3b
+mediainfo
 mpv
+nautilus
 parole
 rhythmbox
+simple-scan
+skanlite
 spotify
 totem
 vlc
+xfburn
 xplayer
 xviewer
 eom
@@ -121,10 +146,13 @@ atril
 cherrytree
 evince
 fbreader
+gedit
 gimp
 gthumb
 gwenview
+highlight
 inkscape
+kate
 libreoffice
 localc
 lodraw
@@ -141,7 +169,9 @@ soffice
 synfigstudio
 Mathematica
 mathematica
+odt2txt
 okular
+pdftotext
 pix
 xpdf
 xreader
@@ -151,14 +181,40 @@ flowblade
 eog
 
 # other
-ssh
-atom-beta
 atom
+atom-beta
+gpa
+gpg
+# don't run ssh-agent and gpg-agent with firejail by default
+# this will break many processes using them in the background 
+# ssh-agent
+# gpg-agent
+git
 ranger
 keepass
 keepass2
 keepassx
+ssh
+tracker
 xiphos
+xpra
 
 # weather/climate
 aweather
+gnome-weather
+
+# compressing tools
+ark
+atool
+file-roller
+
+# when used by other processes in the background, it will break stuff
+#7z
+#cpio
+#gtar
+#gzip
+#tar
+#unrar
+#unzip
+#xz
+#xzdec
diff --git a/src/fseccomp/main.c b/src/fseccomp/main.c
index 471e0b193..2f85a786b 100644
--- a/src/fseccomp/main.c
+++ b/src/fseccomp/main.c
@@ -38,7 +38,7 @@ static void usage(void) {
 }
 
 int main(int argc, char **argv) {
-//#if 0
+#if 0
 {
 //system("cat /proc/self/status");
 int i;
@@ -46,7 +46,7 @@ for (i = 0; i < argc; i++)
         printf("*%s* ", argv[i]);
 printf("\n");
 }       
-//#endif
+#endif
         if (argc < 2) {
                 usage();
                 return 1;
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index bb9ae270c..8441f25d5 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -1341,6 +1341,10 @@ both 32-bit and 64-bit filters are installed.
 .br
 
 .br
+Firejail will print seccomp violations to the audit log if the kernel was compiled with audit support (CONFIG_AUDIT flag).
+.br
+
+.br
 Example:
 .br
 $ firejail \-\-seccomp