merges

5 files changed, 71 insertions, 44 deletions

diff --git a/README b/README
index 45b4c1833..1acb268d0 100644
--- a/README
+++ b/README
@@ -385,8 +385,10 @@ Simon Peter (https://github.com/probonopd)
 sinkuu (https://github.com/sinkuu)
         - blacklisting kwalletd
         - fix symlink invocation for programs placing symlinks in $PATH
-sshirokov (http://sourceforge.net/u/yshirokov/profile/)
-        - Patch to output "Reading profile" to stderr instead of stdout
+smithsohu (https://github.com/smitsohu)
+        - read-only kde4 services directory
+soredake (https://github.com/soredake)
+        - fix steam startup with >=llvm-4
 SpotComms (https://github.com/SpotComms)
         - added Bless, Gnome 2048, Gnome Calculator, Gnome Contacts, JD-GUI, Lollypop, MultiMC5 profiles
         - added PDFSam, Pithos, and Xonotic profiles
@@ -405,8 +407,13 @@ SpotComms (https://github.com/SpotComms)
         - added novideo and disable-mnt support in all profile files
         - added Peek and silent profiles
         - added IntelliJ IDEA and Android Studio profiles
-    - added arm profile
-    - lots of profile improvements/tightening
+        - added arm profile
+        - lots of profile improvements/tightening
+        - added apktool, baobab, dex2jar, gitg, hashcat, obs, picard, remmina, sdat2img,
+        soundconverter, sqlitebrowser, and truecraft profiles
+        - added gnome-twitch profile
+sshirokov (http://sourceforge.net/u/yshirokov/profile/)
+        - Patch to output "Reading profile" to stderr instead of stdout
 SYN-cook (https://github.com/SYN-cook)
         - keepass/keepassx browser fixes
         - disable-common.inc fixes
@@ -501,6 +508,8 @@ vismir2 (https://github.com/vismir2)
         -  support for truecrypt and zuluCrypt
 Vladimir Schowalter (https://github.com/VladimirSchowalter20)
         - apparmor profile enhancements
+        - various KDE profile enhancements
+        read-only kde5 services directory
 xee5ch (https://github.com/xee5ch)
         - skypeforlinux profile
 yumkam (https://github.com/yumkam)
diff --git a/README.md b/README.md
index 83473b714..63ee3f51a 100644
--- a/README.md
+++ b/README.md
@@ -150,5 +150,5 @@ playing youtube videos on Firefox Nightly.
 curl, mplayer2, SMPlayer, Calibre, ebook-viewer, KWrite, Geary, Liferea, peek, silentarmy,
 IntelliJ IDEA, Android Studio, electron, riot-web,
 Extreme Tux Racer, Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux,
-telegram-desktop, arm, rambox
-
+telegram-desktop, arm, rambox, apktool, baobab, dex2jar, gitg, hashcat, obs, picard,
+remmina, sdat2img, soundconverter, sqlitebrowse, truecraft, gnome-twitch
diff --git a/RELNOTES b/RELNOTES
index f4617765d..901fde66e 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -11,7 +11,9 @@ firejail (0.9.49) baseline; urgency=low
   * new profiles: Geary, Liferea, peek, silentarmy, IntelliJ IDEA,
   * new profiles: Android Studio, electron, riot-web, Extreme Tux Racer,
   * new profiles: Frozen Bubble, Open Invaders, Pingus, Simutrans, SuperTux
-  * new profiles: telegram-desktop, arm, rambox
+  * new profiles: telegram-desktop, arm, rambox, apktool, baobab, dex2jar, gitg,
+  * new profiles: hashcat, obs, picard, remmina, sdat2img, soundconverter, sqlitebrowse,
+  * new profiles: truecraft, gnome-twitch
   * bugfixes
  -- netblue30 <netblue30@yahoo.com>  Mon, 12 Jun 2017 20:00:00 -0500
 
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index 03dd65327..afd22c041 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -15,9 +15,10 @@
 /etc/firejail/akregator.profile
 /etc/firejail/amarok.profile
 /etc/firejail/android-studio.profile
+/etc/firejail/apktool.profile
 /etc/firejail/arduino.profile
-/etc/firejail/arm.profile
 /etc/firejail/ark.profile
+/etc/firejail/arm.profile
 /etc/firejail/atom-beta.profile
 /etc/firejail/atom.profile
 /etc/firejail/atool.profile
@@ -26,6 +27,7 @@
 /etc/firejail/audacity.profile
 /etc/firejail/aweather.profile
 /etc/firejail/baloo_file.profile
+/etc/firejail/baobab.profile
 /etc/firejail/bibletime.profile
 /etc/firejail/bitlbee.profile
 /etc/firejail/bleachbit.profile
@@ -34,23 +36,27 @@
 /etc/firejail/brasero.profile
 /etc/firejail/brave.profile
 /etc/firejail/caja.profile
+/etc/firejail/calibre.profile
 /etc/firejail/catfish.profile
 /etc/firejail/cherrytree.profile
 /etc/firejail/chromium-browser.profile
 /etc/firejail/chromium.profile
 /etc/firejail/claws-mail.profile
-/etc/firejail/clipit.profile
 /etc/firejail/clementine.profile
+/etc/firejail/clipit.profile
 /etc/firejail/cmus.profile
 /etc/firejail/conkeror.profile
 /etc/firejail/corebird.profile
 /etc/firejail/cpio.profile
 /etc/firejail/cryptocat.profile
+/etc/firejail/curl.profile
 /etc/firejail/cvlc.profile
 /etc/firejail/cyberfox.profile
+/etc/firejail/darktable.profile
 /etc/firejail/deadbeef.profile
 /etc/firejail/default.profile
 /etc/firejail/deluge.profile
+/etc/firejail/dex2jar.profile
 /etc/firejail/dia.profile
 /etc/firejail/digikam.profile
 /etc/firejail/dillo.profile
@@ -66,8 +72,9 @@
 /etc/firejail/dosbox.profile
 /etc/firejail/dragon.profile
 /etc/firejail/dropbox.profile
-/etc/firejail/elinks.profile
+/etc/firejail/ebook-viewer.profile
 /etc/firejail/electron.profile
+/etc/firejail/elinks.profile
 /etc/firejail/emacs.profile
 /etc/firejail/empathy.profile
 /etc/firejail/enchant.profile
@@ -75,6 +82,7 @@
 /etc/firejail/eog.profile
 /etc/firejail/eom.profile
 /etc/firejail/epiphany.profile
+/etc/firejail/etr.profile
 /etc/firejail/evince.profile
 /etc/firejail/evolution.profile
 /etc/firejail/exiftool.profile
@@ -91,14 +99,18 @@
 /etc/firejail/fontforge.profile
 /etc/firejail/fossamail.profile
 /etc/firejail/franz.profile
+/etc/firejail/frozen-bubble.profile
 /etc/firejail/gajim.profile
 /etc/firejail/galculator.profile
 /etc/firejail/geany.profile
+/etc/firejail/geary.profile
 /etc/firejail/gedit.profile
 /etc/firejail/geeqie.profile
-/etc/firejail/gimp.profile
+/etc/firejail/ghb.profile
 /etc/firejail/gimp-2.8.profile
+/etc/firejail/gimp.profile
 /etc/firejail/git.profile
+/etc/firejail/gitg.profile
 /etc/firejail/gitter.profile
 /etc/firejail/gjs.profile
 /etc/firejail/globaltime.profile
@@ -114,6 +126,7 @@
 /etc/firejail/gnome-mplayer.profile
 /etc/firejail/gnome-music.profile
 /etc/firejail/gnome-photos.profile
+/etc/firejail/gnome-twitch.profile
 /etc/firejail/gnome-weather.profile
 /etc/firejail/goobox.profile
 /etc/firejail/google-chrome-beta.profile
@@ -132,6 +145,9 @@
 /etc/firejail/gucharmap.profile
 /etc/firejail/gwenview.profile
 /etc/firejail/gzip.profile
+/etc/firejail/handbrake-gtk.profile
+/etc/firejail/handbrake.profile
+/etc/firejail/hashcat.profile
 /etc/firejail/hedgewars.profile
 /etc/firejail/hexchat.profile
 /etc/firejail/highlight.profile
@@ -143,8 +159,8 @@
 /etc/firejail/img2txt.profile
 /etc/firejail/inkscape.profile
 /etc/firejail/inox.profile
-/etc/firejail/iridium.profile
 /etc/firejail/iridium-browser.profile
+/etc/firejail/iridium.profile
 /etc/firejail/jd-gui.profile
 /etc/firejail/jitsi.profile
 /etc/firejail/k3b.profile
@@ -161,9 +177,11 @@
 /etc/firejail/kodi.profile
 /etc/firejail/konversation.profile
 /etc/firejail/ktorrent.profile
+/etc/firejail/kwrite.profile
 /etc/firejail/leafpad.profile
 /etc/firejail/less.profile
 /etc/firejail/libreoffice.profile
+/etc/firejail/liferea.profile
 /etc/firejail/localc.profile
 /etc/firejail/lodraw.profile
 /etc/firejail/loffice.profile
@@ -190,6 +208,7 @@
 /etc/firejail/meld.profile
 /etc/firejail/midori.profile
 /etc/firejail/mousepad.profile
+/etc/firejail/mplayer.profile
 /etc/firejail/mpv.profile
 /etc/firejail/multimc5.profile
 /etc/firejail/mumble.profile
@@ -201,8 +220,10 @@
 /etc/firejail/netsurf.profile
 /etc/firejail/nolocal.net
 /etc/firejail/nylas.profile
+/etc/firejail/obs.profile
 /etc/firejail/odt2txt.profile
 /etc/firejail/okular.profile
+/etc/firejail/open-invaders.profile
 /etc/firejail/openbox.profile
 /etc/firejail/openshot.profile
 /etc/firejail/opera-beta.profile
@@ -214,7 +235,9 @@
 /etc/firejail/pdfsam.profile
 /etc/firejail/pdftotext.profile
 /etc/firejail/peek.profile
+/etc/firejail/picard.profile
 /etc/firejail/pidgin.profile
+/etc/firejail/pingus.profile
 /etc/firejail/pithos.profile
 /etc/firejail/pix.profile
 /etc/firejail/pluma.profile
@@ -232,31 +255,39 @@
 /etc/firejail/qutebrowser.profile
 /etc/firejail/rambox.profile
 /etc/firejail/ranger.profile
+/etc/firejail/remmina.profile
 /etc/firejail/rhythmbox.profile
 /etc/firejail/riot-web.profile
 /etc/firejail/ristretto.profile
 /etc/firejail/rtorrent.profile
 /etc/firejail/scribus.profile
+/etc/firejail/sdat2img.profile
 /etc/firejail/seamonkey-bin.profile
 /etc/firejail/seamonkey.profile
 /etc/firejail/server.profile
 /etc/firejail/silentarmy.profile
 /etc/firejail/simple-scan.profile
+/etc/firejail/simutrans.profile
 /etc/firejail/skanlite.profile
 /etc/firejail/skype.profile
 /etc/firejail/skypeforlinux.profile
 /etc/firejail/slack.profile
+/etc/firejail/smplayer.profile
 /etc/firejail/snap.profile
 /etc/firejail/soffice.profile
+/etc/firejail/soundconverter.profile
 /etc/firejail/spotify.profile
+/etc/firejail/sqlitebrowser.profile
 /etc/firejail/ssh-agent.profile
 /etc/firejail/ssh.profile
 /etc/firejail/start-tor-browser.profile
 /etc/firejail/steam.profile
 /etc/firejail/stellarium.profile
 /etc/firejail/strings.profile
+/etc/firejail/supertux2.profile
 /etc/firejail/synfigstudio.profile
 /etc/firejail/tar.profile
+/etc/firejail/telegram-desktop.profile
 /etc/firejail/telegram.profile
 /etc/firejail/thunar.profile
 /etc/firejail/thunderbird.profile
@@ -266,6 +297,7 @@
 /etc/firejail/transmission-gtk.profile
 /etc/firejail/transmission-qt.profile
 /etc/firejail/transmission-show.profile
+/etc/firejail/truecraft.profile
 /etc/firejail/uget-gtk.profile
 /etc/firejail/unbound.profile
 /etc/firejail/unknown-horizons.profile
@@ -277,12 +309,14 @@
 /etc/firejail/viking.profile
 /etc/firejail/vim.profile
 /etc/firejail/virtualbox.profile
-/etc/firejail/vivaldi.profile
 /etc/firejail/vivaldi-beta.profile
 /etc/firejail/vivaldi-stable.profile
+/etc/firejail/vivaldi.profile
 /etc/firejail/vlc.profile
+/etc/firejail/vym.profile
 /etc/firejail/w3m.profile
 /etc/firejail/warzone2100.profile
+/etc/firejail/waterfox.profile
 /etc/firejail/webserver.net
 /etc/firejail/weechat-curses.profile
 /etc/firejail/weechat.profile
@@ -291,6 +325,8 @@
 /etc/firejail/whitelist-common.inc
 /etc/firejail/wine.profile
 /etc/firejail/wire.profile
+/etc/firejail/wireshark-gtk.profile
+/etc/firejail/wireshark-qt.profile
 /etc/firejail/wireshark.profile
 /etc/firejail/xchat.profile
 /etc/firejail/xed.profile
@@ -299,9 +335,9 @@
 /etc/firejail/xfce4-notes.profile
 /etc/firejail/xiphos.profile
 /etc/firejail/xmms.profile
-/etc/firejail/xonotic.profile
 /etc/firejail/xonotic-glx.profile
 /etc/firejail/xonotic-sdl.profile
+/etc/firejail/xonotic.profile
 /etc/firejail/xpdf.profile
 /etc/firejail/xplayer.profile
 /etc/firejail/xpra.profile
@@ -312,24 +348,3 @@
 /etc/firejail/youtube-dl.profile
 /etc/firejail/zathura.profile
 /etc/firejail/zoom.profile
-/etc/firejail/vym.profile
-/etc/firejail/darktable.profile
-/etc/firejail/waterfox.profile
-/etc/firejail/handbrake.profile
-/etc/firejail/curl.profile
-/etc/firejail/mplayer.profile
-/etc/firejail/smplayer.profile
-/etc/firejail/ebook-viewer.profile
-/etc/firejail/calibre.profile
-/etc/firejail/handbrake-gtk.profile
-/etc/firejail/ghb.profile
-/etc/firejail/kwrite.profile
-/etc/firejail/geary.profile
-/etc/firejail/liferea.profile
-/etc/firejail/etr.profile
-/etc/firejail/frozen-bubble.profile
-/etc/firejail/open-invaders.profile
-/etc/firejail/pingus.profile
-/etc/firejail/simutrans.profile
-/etc/firejail/supertux2.profile
-/etc/firejail/telegram-desktop.profile
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 2d2c48b23..bcf2ced1e 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -1,8 +1,17 @@
 # /usr/lib/firejail/firecfg.config - firecfg utility configuration file
 # This is the list of programs in alphabetical order handled by firecfg utility
 #
+# Cryptocat is added but commented since isn't installed to a */bin... keep an eye on this
+#qemu-system-x86_64
 0ad
 2048-qt
+Cyberfox
+FossaMail
+Mathematica
+Telegram
+VirtualBox
+Wire
+Xephyr
 abrowser
 akregator
 amarok
@@ -38,10 +47,8 @@ clipit
 cmus
 conkeror
 corebird
-# Cryptocat is added but commented since isn't installed to a */bin... keep an eye on this
 cvlc
 cyberfox
-Cyberfox
 darktable
 deadbeef
 deluge
@@ -76,7 +83,6 @@ firefox-esr
 flashpeak-slimjet
 flowblade
 fontforge
-FossaMail
 franz
 frozen-bubble
 gajim
@@ -174,7 +180,6 @@ mate-calculator
 mate-color-select
 mate-dictionary
 mathematica
-Mathematica
 mcabber
 mediainfo
 mediathekview
@@ -214,7 +219,6 @@ polari
 psi-plus
 qbittorrent
 qemu-launcher
-#qemu-system-x86_64
 qlipper
 qpdfview
 qtox
@@ -254,7 +258,6 @@ strings
 supertux2
 synfigstudio
 telegram
-Telegram
 telegram-desktop
 thunderbird
 totem
@@ -263,6 +266,7 @@ transmission-cli
 transmission-gtk
 transmission-qt
 transmission-show
+truecraft
 uget-gtk
 unbound
 unknown-horizons
@@ -271,7 +275,6 @@ uzbl-browser
 viewnior
 viking
 virtualbox
-VirtualBox
 vivaldi
 vivaldi-beta
 vivaldi-stable
@@ -286,13 +289,11 @@ wesnoth
 wget
 wine
 wire
-Wire
 wireshark
 wireshark-gtk
 wireshark-qt
 xchat
 xed
-Xephyr
 xfburn
 xfce4-dict
 xfce4-notes