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

6 files changed, 78 insertions, 3 deletions

diff --git a/README b/README
index 7709de028..c122a006b 100644
--- a/README
+++ b/README
@@ -123,6 +123,8 @@ bn0785ac (https://github.com/bn0785ac)
         - fix inox, add snox profile
 BogDan Vatra (https://github.com/bog-dan-ro)
         - zoom profile
+Brad Ackerman
+        - blacklist Bitwarden config in disable-passwdmgr.inc
 Bruno Nova (https://github.com/brunonova)
         - whitelist fix
         - bash arguments fix
@@ -282,7 +284,8 @@ glitsj16 (https://github.com/glitsj16)
         - new profiles: lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat
         - new profiles: xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore
         - new profiles: lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh
-        - new profiles: nirtoshare-send, nitroshare-ui
+        - new profiles: nirtoshare-send, nitroshare-ui, mencoder, gnome-pie
+        - new profiles: masterpdfeditor
 graywolf (https://github.com/graywolf)
         - spelling fix
 greigdp (https://github.com/greigdp)
diff --git a/README.md b/README.md
index f0fcec6db..8ce9a84fa 100644
--- a/README.md
+++ b/README.md
@@ -136,5 +136,6 @@ The new LTS branch is here: https://github.com/netblue30/firejail/tree/LTSbase
 QMediathekView, aria2c, Authenticator, checkbashisms, devilspie, devilspie2, easystroke, github-desktop, min,
 bsdcat, bsdcpio, bsdtar, lzmadec, lbunzip2, lbzcat, lbzip2, lzcat, lzcmp, lzdiff, lzegrep, lzfgrep, lzgrep,
 lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat, xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore,
-lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh, nirtoshare-send, nitroshare-ui
+lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh, nirtoshare-send, nitroshare-ui, mencoder, gnome-pie,
+masterpdfeditor
 
diff --git a/RELNOTES b/RELNOTES
index 67a03be10..85f0c2b7a 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -8,7 +8,8 @@ firejail (0.9.56.1) baseline; urgency=low
   * new profiles: lzless, lzma, lzmainfo, lzmore, unlzma, unxz, xzcat
   * new profiles: xzcmp, xzdiff, xzegrep, xzfgrep, xzgrep, xzless, xzmore
   * new profiles: lzip, artha, nitroshare, nitroshare-cli, nitroshare-nmh
-  * new profiles: nirtoshare-send, nitroshare-ui
+  * new profiles: nirtoshare-send, nitroshare-ui, mencoder, gnome-pie
+  * new profiles: masterpdfeditor
  -- netblue30 <netblue30@yahoo.com>  Thu, 11 Oct 2018 08:00:00 -0500
 
 firejail (0.9.56) baseline; urgency=low
diff --git a/etc/disable-passwdmgr.inc b/etc/disable-passwdmgr.inc
index 6ef11780e..19fd871d3 100644
--- a/etc/disable-passwdmgr.inc
+++ b/etc/disable-passwdmgr.inc
@@ -2,6 +2,7 @@
 # Persistent customizations should go in a .local file.
 include /etc/firejail/disable-passwdmgr.local
 
+blacklist ${HOME}/.config/Bitwarden
 blacklist ${HOME}/.config/KeePass
 blacklist ${HOME}/.config/keepass
 blacklist ${HOME}/.config/keepassx
diff --git a/etc/gnome-pie.profile b/etc/gnome-pie.profile
new file mode 100644
index 000000000..be408ea93
--- /dev/null
+++ b/etc/gnome-pie.profile
@@ -0,0 +1,41 @@
+# Firejail profile for gnome-pie
+# Description: Alternative AppMenu
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/gnome-pie.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+
+#include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-devel.inc
+#include /etc/firejail/disable-interpreters.inc
+include /etc/firejail/disable-passwdmgr.inc
+#include /etc/firejail/disable-programs.inc
+
+caps.drop all
+ipc-namespace
+machine-id
+net none
+no3d
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+nou2f
+novideo
+protocol unix
+seccomp
+shell none
+
+disable-mnt
+private-cache
+private-dev
+private-etc fonts
+private-lib gdk-pixbuf-2.*,gio,gvfs/libgvfscommon.so,libgconf-2.so.*,librsvg-2.so.*
+private-tmp
+
+memory-deny-write-execute
+noexec ${HOME}
+noexec /tmp
diff --git a/etc/mencoder.profile b/etc/mencoder.profile
new file mode 100644
index 000000000..9306d268e
--- /dev/null
+++ b/etc/mencoder.profile
@@ -0,0 +1,28 @@
+# Firejail profile for mencoder
+# Description: Free command line video decoding, encoding and filtering tool
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/mencoder.local
+# Persistent global definitions
+# added by included profile
+#include /etc/firejail/globals.local
+
+include /etc/firejail/disable-common.inc
+include /etc/firejail/disable-devel.inc
+include /etc/firejail/disable-interpreters.inc
+include /etc/firejail/disable-passwdmgr.inc
+include /etc/firejail/disable-programs.inc
+
+net none
+no3d
+nodbus
+nosound
+notv
+nou2f
+protocol unix
+seccomp
+shell none
+
+private-bin mencoder
+
+include /etc/firejail/mplayer.profile