[gentoo-commits] repo/gentoo:master commit in: x11-misc/sddm/files/, x11-misc/sddm/

["Jauhien Piatlicki" <jauhien@gentoo.org>]

commit:     e496c6a3a3ea5b91f27bf95fbd3e23e37ae1de66
Author:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 09:57:48 2015 +0000
Commit:     Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 10:13:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e496c6a3

x11-misc/sddm: fix CVE-2015-0856 patch for version 0.11.0

Package-Manager: portage-2.2.23

 x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch | 15 +++++++++++++++
 x11-misc/sddm/sddm-0.11.0-r4.ebuild                 |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch b/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch
new file mode 100644
index 0000000..37c1b97
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.11.0-CVE-2015-0856.patch
@@ -0,0 +1,15 @@
+Fix for CVE-2015-0856 (bug 563108) backported from the version 0.12.0.
+--- src/daemon/Greeter.cpp
++++ src/daemon/Greeter.cpp
+@@ -135,6 +135,11 @@
+             env.insert("XDG_VTNR", QString::number(m_display->terminalId()));
+             env.insert("XDG_SESSION_CLASS", "greeter");
+             env.insert("XDG_SESSION_TYPE", m_display->sessionType());
++
++            //some themes may use KDE components and that will automatically load KDE's crash handler which we don't want
++            //counterintuitively setting this env disables that handler
++            env.insert("KDE_DEBUG", "1");
++
+             m_auth->insertEnvironment(env);
+ 
+             // log message

diff --git a/x11-misc/sddm/sddm-0.11.0-r4.ebuild b/x11-misc/sddm/sddm-0.11.0-r4.ebuild
index 6c5dac9..50cbf07 100644
--- a/x11-misc/sddm/sddm-0.11.0-r4.ebuild
+++ b/x11-misc/sddm/sddm-0.11.0-r4.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
 	use !systemd && epatch "${FILESDIR}/${PN}-0.10.0-upower.patch"
 	# fix bug 552318 and bug 563108
-	epatch "${FILESDIR}/${P}-dbus-config.patch" "${FILESDIR}/${PN}-0.12.0-CVE-2015-0856.patch"
+	epatch "${FILESDIR}/${P}-dbus-config.patch" "${FILESDIR}/${P}-CVE-2015-0856.patch"
 
 	# respect user's cflags
 	sed -e 's|-Wall -march=native||' \