6 files changed, 56 insertions, 14 deletions

diff --git a/RELNOTES b/RELNOTES
index 119bead76..3ebf790c5 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,5 +1,4 @@
-firejail (0.9.46-rc1) baseline; urgency=low
-  * development version, work in progress
+firejail (0.9.46) baseline; urgency=low
   * security: split most of networking code in a separate executable
   * security: split seccomp filter code configuration in a separate executable
   * security: split file copying in private option in a separate executable
@@ -53,7 +52,7 @@ firejail (0.9.46-rc1) baseline; urgency=low
   * new profiles: clipit, leafpad, lximage-qt, lxmusic, qlipper, Xvfb, Xephyr
   * new profiles: Blender, 2048-qt
   * bugfixes
- -- netblue30 <netblue30@yahoo.com>  Fri, 7 Apr 2017 08:00:00 -0500
+ -- netblue30 <netblue30@yahoo.com>  Sun, 14 May 2017 08:00:00 -0500
 
 firejail (0.9.44.10) baseline; urgency=low
   * security: when using --x11=xorg and --net, incorrect processing of
diff --git a/platform/debian/conffiles b/platform/debian/conffiles
index b9eadb9fc..965f18501 100644
--- a/platform/debian/conffiles
+++ b/platform/debian/conffiles
@@ -301,4 +301,3 @@
 /etc/firejail/blender.profile
 /etc/firejail/2048-qt.profile
 /etc/firejail/gimp-2.8.profile
-
diff --git a/platform/debian/control b/platform/debian/control
index 4287d6561..4161cbfb2 100644
--- a/platform/debian/control
+++ b/platform/debian/control
@@ -2,7 +2,7 @@ Package: firejail
 Version: FIREJAILVER-1
 Architecture: amd64
 Maintainer: netblue30 <netblue30@yahoo.com>
-Installed-Size: 272
+Installed-Size: 2024
 Depends: libc6
 Suggests: python, python3
 Section: admin
diff --git a/platform/rpm/old-mkrpm.sh b/platform/rpm/old-mkrpm.sh
index 46a2c613d..78e93507c 100755
--- a/platform/rpm/old-mkrpm.sh
+++ b/platform/rpm/old-mkrpm.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION="0.9.46~rc1"
+VERSION="0.9.46"
 rm -fr ~/rpmbuild
 rm -f firejail-$VERSION-1.x86_64.rpm
 
@@ -366,6 +366,50 @@ rm -rf %{buildroot}
 %{_sysconfdir}/%{name}/xonotic.profile
 %{_sysconfdir}/%{name}/xpra.profile
 %{_sysconfdir}/%{name}/zoom.profile
+%{_sysconfdir}/%{name}/2048-qt.profile
+%{_sysconfdir}/%{name}/Xephyr.profile
+%{_sysconfdir}/%{name}/Xvfb.profile
+%{_sysconfdir}/%{name}/akregator.profile
+%{_sysconfdir}/%{name}/arduino.profile
+%{_sysconfdir}/%{name}/baloo_file.profile
+%{_sysconfdir}/%{name}/bibletime.profile
+%{_sysconfdir}/%{name}/blender.profile
+%{_sysconfdir}/%{name}/caja.profile
+%{_sysconfdir}/%{name}/clipit.profile
+%{_sysconfdir}/%{name}/dia.profile
+%{_sysconfdir}/%{name}/dino.profile
+%{_sysconfdir}/%{name}/fontforge.profile
+%{_sysconfdir}/%{name}/galculator.profile
+%{_sysconfdir}/%{name}/geany.profile
+%{_sysconfdir}/%{name}/gimp-2.8.profile
+%{_sysconfdir}/%{name}/globaltime.profile
+%{_sysconfdir}/%{name}/gnome-font-viewer.profile
+%{_sysconfdir}/%{name}/gucharmap.profile
+%{_sysconfdir}/%{name}/hugin.profile
+%{_sysconfdir}/%{name}/kcalc.profile
+%{_sysconfdir}/%{name}/knotes.profile
+%{_sysconfdir}/%{name}/kodi.profile
+%{_sysconfdir}/%{name}/ktorrent.profile
+%{_sysconfdir}/%{name}/leafpad.profile
+%{_sysconfdir}/%{name}/lximage-qt.profile
+%{_sysconfdir}/%{name}/lxmusic.profile
+%{_sysconfdir}/%{name}/mate-calc.profile
+%{_sysconfdir}/%{name}/mate-calculator.profile
+%{_sysconfdir}/%{name}/mate-color-select.profile
+%{_sysconfdir}/%{name}/mate-dictionary.profile
+%{_sysconfdir}/%{name}/meld.profile
+%{_sysconfdir}/%{name}/nemo.profile
+%{_sysconfdir}/%{name}/nylas.profile
+%{_sysconfdir}/%{name}/orage.profile
+%{_sysconfdir}/%{name}/pcmanfm.profile
+%{_sysconfdir}/%{name}/qlipper.profile
+%{_sysconfdir}/%{name}/ristretto.profile
+%{_sysconfdir}/%{name}/viewnior.profile
+%{_sysconfdir}/%{name}/viking.profile
+%{_sysconfdir}/%{name}/xfce4-dict.profile
+%{_sysconfdir}/%{name}/xfce4-notes.profile
+%{_sysconfdir}/%{name}/youtube-dl.profile
+  
 
 /usr/bin/firejail
 /usr/bin/firemon
@@ -407,7 +451,7 @@ rm -rf %{buildroot}
 chmod u+s /usr/bin/firejail
 
 %changelog
-* Fri Apr 7 2017  netblue30 <netblue30@yahoo.com> 0.9.46~rc1
+* Mon May 15 2017  netblue30 <netblue30@yahoo.com> 0.9.46-1
 
 * Fri Oct 21 2016  netblue30 <netblue30@yahoo.com> 0.9.44-1
   - CVE-2016-7545 submitted by Aleksey Manevich
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index 49af2eff4..f1d45adef 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -568,6 +568,7 @@ void x11_start_xephyr(int argc, char **argv) {
                 (void) rv;
         }
 
+        assert(display_str);
         setenv("DISPLAY", display_str, 1);
         // run attach command
         jail = fork();
@@ -785,6 +786,7 @@ void x11_start_xpra(int argc, char **argv) {
                 _exit(1);
         }
 
+        assert(display_str);
         setenv("DISPLAY", display_str, 1);
 
         // build jail command
diff --git a/src/man/firecfg.txt b/src/man/firecfg.txt
index 979d4fc06..55b60dcac 100644
--- a/src/man/firecfg.txt
+++ b/src/man/firecfg.txt
@@ -20,16 +20,14 @@ The integration covers:
 .br
 
 .br
-- programs started by clicking on file icons in file manager - only Cinnamon, KDE, LXDE, MATE and XFCE
+- programs started by clicking on file icons in file manager - only Cinnamon, KDE, LXDE/LXQT, MATE and XFCE
 desktop managers are supported in this moment
 .RE
 
-This brings us as very close to full desktop integration.
-
-To set it up, run "sudo firecfg" after installing
-Firejail software, and logout/login for the integration to take effect. "sudo firecfg" should also be run after
-you install new programs. If the program is supported by Firejail, the symbolic link in /usr/local/bin
-will be created. For a list of programs supported by default run "ls /etc/firejail".
+To set it up, run "sudo firecfg" after installing Firejail software.
+The same command should also be run after
+installing new programs. If the program is supported by Firejail, the symbolic link in /usr/local/bin
+will be created. For a full list of programs supported by default run "cat /usr/lib/firejail/firecfg.config".
 
 For user-driven manual integration, see \fBDESKTOP INTEGRATION\fR section in \fBman 1 firejail\fR.