12 files changed, 133 insertions, 22 deletions

diff --git a/README b/README
index ba29905f0..c3a046ead 100644
--- a/README
+++ b/README
@@ -33,14 +33,15 @@ Maintainer:
 - netblue30 (netblue30@yahoo.com)
 
 Committers
+- chiraag-nataraj (https://github.com/chiraag-nataraj)
+- crass (https://github.com/crass)
 - Fred-Barclay (https://github.com/Fred-Barclay)
 - Reiner Herrmann (https://github.com/reinerh - Debian/Ubuntu maintainer)
 - smithsohu (https://github.com/smitsohu)
 - SkewedZeppelin (https://github.com/SkewedZeppelin)
-- startx2017 (https://github.com/startx2017) - 0.9.38-LTS and *bugfixes branches maintainer)
+- startx2017 (https://github.com/startx2017) - LTS and *bugfixes branches maintainer)
 - Topi Miettinen (https://github.com/topimiettinen)
 - Vincent43 (https://github.com/Vincent43)
-- chiraag-nataraj (https://github.com/chiraag-nataraj)
 - netblue30 (netblue30@yahoo.com)
 
 
diff --git a/README.md b/README.md
index 0c3cd38bb..e5b38827d 100644
--- a/README.md
+++ b/README.md
@@ -98,4 +98,36 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
 `````
 
 `````
-# Current development version: 0.9.57
+# Current development version: 0.9.56.1
+
+This is probably a bugfix release: fixes, small features, new profiles. If we end up implementing something major
+we'll switch to a regular 0.9.57 release.
+
+# New Long Term Support (LTS) version
+
+We are rebasing our Long Term Support branch of Firejail. The current LTS version (0.9.38.x) is more than two years old.
+The new version updates the code base to 0.9.56. We target a reduction of approx. 40% of the code by removing rarely
+used features (chroot, overlay, rlimits, cgroups), incomplete features (private-bin, private-lib),
+and a lot of instrumentation (build profile feature, tracing, auditing, etc). Sandbox-specific security features such as
+seccomp, capabilities, filesystem whitelist/blacklist and networking are updated and hardened.
+
+We have an rc1 release out, the final version will follow in the next few weeks:
+`````
+firejail (0.9.56-LTS~rc1) baseline; urgency=low
+  * code based on Firejail version 0.9.56
+  * much smaller code base for SUID executable
+  * command line options removed:
+     --audit, --build, --cgroup, --chroot, --get, --ls, --output,
+     --output-stderr, --overlay, --overlay-named, --overlay-tmpfs,
+     --overlay-clean, --private-home, --private-bin, --private-etc,
+     --private-opt, --private-srv, --put, --rlimit*, --trace, --tracelog,
+     --x11*, --xephyr*
+  * compile-time options: --enable-apparmor, --disable-seccomp,
+     --disable-globalcfg, --disable-network, --disable-userns,
+     --disable-whitelist, --disable-suid, --enable-fatal-warnings,
+     --enable-busybox-workaround
+ -- netblue30 <netblue30@yahoo.com>  Wed, 3 Oct 2018 08:00:00 -0500
+`````
+
+The new LTS branch is here: https://github.com/netblue30/firejail/tree/LTSbase
+
diff --git a/RELNOTES b/RELNOTES
index 98398e51f..e3e3cdf35 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,8 @@
+firejail (0.9.56.1) baseline; urgency=low
+  * work in progress
+  * --disable-mnt rework
+ -- netblue30 <netblue30@yahoo.com>  Thu, 11 Oct 2018 08:00:00 -0500
+
 firejail (0.9.56) baseline; urgency=low
   * modif: removed CFG_CHROOT_DESKTOP configuration option
   * modif: removed compile time --enable-network=restricted
diff --git a/configure b/configure
index a7ef3a392..9e117dcbe 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for firejail 0.9.57.
+# Generated by GNU Autoconf 2.69 for firejail 0.9.56.1.
 #
 # Report bugs to <netblue30@yahoo.com>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='firejail'
 PACKAGE_TARNAME='firejail'
-PACKAGE_VERSION='0.9.57'
-PACKAGE_STRING='firejail 0.9.57'
+PACKAGE_VERSION='0.9.56.1'
+PACKAGE_STRING='firejail 0.9.56.1'
 PACKAGE_BUGREPORT='netblue30@yahoo.com'
 PACKAGE_URL='https://firejail.wordpress.com'
 
@@ -1275,7 +1275,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures firejail 0.9.57 to adapt to many kinds of systems.
+\`configure' configures firejail 0.9.56.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1337,7 +1337,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of firejail 0.9.57:";;
+     short | recursive ) echo "Configuration of firejail 0.9.56.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1442,7 +1442,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-firejail configure 0.9.57
+firejail configure 0.9.56.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1744,7 +1744,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by firejail $as_me 0.9.57, which was
+It was created by firejail $as_me 0.9.56.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4379,7 +4379,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by firejail $as_me 0.9.57, which was
+This file was extended by firejail $as_me 0.9.56.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4433,7 +4433,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-firejail config.status 0.9.57
+firejail config.status 0.9.56.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index d1b827fef..2084b66f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.68])
-AC_INIT(firejail, 0.9.57, netblue30@yahoo.com, , https://firejail.wordpress.com)
+AC_INIT(firejail, 0.9.56.1, netblue30@yahoo.com, , https://firejail.wordpress.com)
 AC_CONFIG_SRCDIR([src/firejail/main.c])
 #AC_CONFIG_HEADERS([config.h])
 
diff --git a/etc/QMediathekView.profile b/etc/QMediathekView.profile
new file mode 100644
index 000000000..558f62f0e
--- /dev/null
+++ b/etc/QMediathekView.profile
@@ -0,0 +1,54 @@
+# Firejail profile for QMediathekView
+# Description: Search, download or stream files from mediathek.de
+# This file is overwritten after every install/update
+# Persistent local customizations
+include /etc/firejail/QMediathekView.local
+# Persistent global definitions
+include /etc/firejail/globals.local
+
+noblacklist ${HOME}/.config/QMediathekView
+noblacklist ${HOME}/.local/share/QMediathekView
+
+noblacklist ${HOME}/.config/mpv
+noblacklist ${HOME}/.config/smplayer
+noblacklist ${HOME}/.config/totem
+noblacklist ${HOME}/.config/vlc
+noblacklist ${HOME}/.config/xplayer
+noblacklist ${HOME}/.local/share/totem
+noblacklist ${HOME}/.local/share/xplayer
+noblacklist ${HOME}/.mplayer
+
+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
+
+include /etc/firejail/whitelist-var-common.inc
+
+caps.drop all
+netfilter
+# no3d
+# nodbus
+nodvd
+nogroups
+nonewprivs
+noroot
+notv
+nou2f
+protocol unix,inet,inet6
+seccomp
+shell none
+tracelog
+
+disable-mnt
+private-bin QMediathekView,mplayer,mpv,smplayer,totem,vlc,xplayer
+private-cache
+private-dev
+# private-etc none
+# private-lib
+private-tmp
+
+# memory-deny-write-execute - breaks on Arch
+noexec ${HOME}
+noexec /tmp
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 1213e4f24..15499930d 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -70,6 +70,7 @@ blacklist ${HOME}/.config/MuseScore
 blacklist ${HOME}/.config/MusicBrainz
 blacklist ${HOME}/.config/Nylas Mail
 blacklist ${HOME}/.config/Qlipper
+blacklist ${HOME}/.config/QMediathekView
 blacklist ${HOME}/.config/QuiteRss
 blacklist ${HOME}/.config/QuiteRssrc
 blacklist ${HOME}/.config/Rambox
@@ -360,6 +361,7 @@ blacklist ${HOME}/.local/share/3909/PapersPlease
 blacklist ${HOME}/.local/share/Empathy
 blacklist ${HOME}/.local/share/JetBrains
 blacklist ${HOME}/.local/share/Mumble
+blacklist ${HOME}/.local/share/QMediathekView
 blacklist ${HOME}/.local/share/QuiteRss
 blacklist ${HOME}/.local/share/Ricochet
 blacklist ${HOME}/.local/share/Steam
diff --git a/etc/file.profile b/etc/file.profile
index 5d1227520..00e18de20 100644
--- a/etc/file.profile
+++ b/etc/file.profile
@@ -30,10 +30,12 @@ shell none
 tracelog
 x11 none
 
-private-bin file
+#private-bin file
+private-cache
 private-dev
 private-etc magic.mgc,magic,localtime
 private-lib
+private-tmp
 
 memory-deny-write-execute
 noexec ${HOME}
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 746c70c53..1146e2d13 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -13,6 +13,7 @@ Fritzing
 JDownloader
 Mathematica
 Natron
+QMediathekView
 Telegram
 Viber
 VirtualBox
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 40155b155..1d74dc8dc 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -453,7 +453,7 @@ void fs_chroot(const char *rootdir);
 void fs_check_chroot_dir(const char *rootdir);
 void fs_private_tmp(void);
 void fs_private_cache(void);
-void fs_mnt(void);
+void fs_mnt(const int enforce);
 
 // profile.c
 // find and read the profile specified by name from dir directory
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 83830cff6..b958df81a 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -545,11 +545,23 @@ void fs_noexec(const char *dir) {
 }
 
 // Disable /mnt, /media, /run/mount and /run/media access
-void fs_mnt(void) {
-        disable_file(BLACKLIST_FILE, "/mnt");
-        disable_file(BLACKLIST_FILE, "/media");
-        disable_file(BLACKLIST_FILE, "/run/mount");
-        disable_file(BLACKLIST_FILE, "//run/media");
+void fs_mnt(const int enforce) {
+        if (enforce) {
+                // disable-mnt set in firejail.config
+                // overriding with noblacklist is not possible in this case
+                disable_file(BLACKLIST_FILE, "/mnt");
+                disable_file(BLACKLIST_FILE, "/media");
+                disable_file(BLACKLIST_FILE, "/run/mount");
+                disable_file(BLACKLIST_FILE, "/run/media");
+        }
+        else {
+                EUID_USER();
+                profile_add("blacklist /mnt");
+                profile_add("blacklist /media");
+                profile_add("blacklist /run/mount");
+                profile_add("blacklist /run/media");
+                EUID_ROOT();
+        }
 }
 
 
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 5441522ab..8eede6f93 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -923,8 +923,10 @@ int sandbox(void* sandbox_arg) {
         //****************************
         // handle /mnt and /media
         //****************************
-        if (arg_disable_mnt || checkcfg(CFG_DISABLE_MNT))
-                fs_mnt();
+        if (checkcfg(CFG_DISABLE_MNT))
+                fs_mnt(1);
+        else if (arg_disable_mnt)
+                fs_mnt(0);
 
         //****************************
         // apply the profile file