version bump that fixes security issues, bug 524390

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xB2EFA1D4)

8 files changed, 44 insertions, 209 deletions

diff --git a/x11-misc/sddm/ChangeLog b/x11-misc/sddm/ChangeLog
index d2ba908da515..cc4347e2fc0a 100644
--- a/x11-misc/sddm/ChangeLog
+++ b/x11-misc/sddm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/sddm
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.12 2014/10/06 22:04:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/ChangeLog,v 1.13 2014/10/18 17:49:16 jauhien Exp $
+
+*sddm-0.10.0 (18 Oct 2014)
+
+  18 Oct 2014; Jauhien Piatlicki <jauhien@gentoo.org>
+  +files/sddm-0.10.0-consolekit.patch, +files/sddm-0.10.0-upower.patch,
+  +sddm-0.10.0.ebuild, -files/sddm-0.1.0-clang.patch,
+  -files/sddm-0.1.0-cmake.patch, -files/sddm-0.1.0-consolekit.patch,
+  -sddm-0.1.0-r2.ebuild, -sddm-0.9.0-r1.ebuild:
+  version bump that fixes security issues, bug 524390
 
   06 Oct 2014; Manuel Rüger <mrueg@gentoo.org> sddm-0.9.0-r1.ebuild:
   Add ~arm keyword. Tested on armv7. See bug #524408.
diff --git a/x11-misc/sddm/files/sddm-0.1.0-clang.patch b/x11-misc/sddm/files/sddm-0.1.0-clang.patch
deleted file mode 100644
index 7f0a0e722a14..000000000000
--- a/x11-misc/sddm/files/sddm-0.1.0-clang.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-clang-3.4 and earlier has a bug with intitialization of QStringList with initialization lists
---- src/daemon/Authenticator.cpp
-+++ src/daemon/Authenticator.cpp
-@@ -314,7 +314,7 @@
-         process->setProcessEnvironment(env);
- 
-         // start session
--        process->start(Configuration::instance()->sessionCommand(), { command });
-+        process->start(Configuration::instance()->sessionCommand(), QStringList(command));
- 
-         // connect signal
-         connect(process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished()));
-
---- src/daemon/DisplayServer.cpp
-+++ src/daemon/DisplayServer.cpp
-@@ -60,6 +60,7 @@
-         // log message
-         qDebug() << " DAEMON: Display server starting...";
- 
-+        QStringList start_parameters;
- #if !TEST
-         // set process environment
-         QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-@@ -72,9 +73,11 @@
-         Display *display = qobject_cast<Display *>(parent());
- 
-         // start display server
--        process->start(Configuration::instance()->serverPath(), { m_display, "-auth", m_authPath, "-nolisten", "tcp", QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0')});
-+        start_parameters << m_display << "-auth" << m_authPath << "-nolisten" << "tcp" << QString("vt%1").arg(QString::number(display->vtNumber()), 2, '0');
-+        process->start(Configuration::instance()->serverPath(), start_parameters);
- #else
--        process->start("/usr/bin/Xephyr", { m_display, "-ac", "-br", "-noreset", "-screen",  "800x600"});
-+        start_parameters << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600";
-+        process->start("/usr/bin/Xephyr", start_parameters);
- #endif
-         // wait for display server to start
-         if (!process->waitForStarted()) {
-
---- src/daemon/Greeter.cpp
-+++ src/daemon/Greeter.cpp
-@@ -70,12 +70,15 @@
-         env.insert("XCURSOR_THEME", Configuration::instance()->cursorTheme());
-         process->setProcessEnvironment(env);
- 
-+        QStringList start_parameters;
- #if !TEST
-         // start greeter
--        process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), { "--socket", m_socket, "--theme", m_theme });
-+        start_parameters << "--socket" << m_socket << "--theme" << m_theme;
-+        process->start(QString("%1/sddm-greeter").arg(BIN_INSTALL_DIR), start_parameters);
- #else
-         // start greeter
--        process->start(QString("%1/sddm-greeter").arg("."), { "--socket", m_socket, "--theme", m_theme });
-+        start_parameters << "--socket" << m_socket << "--theme" << m_theme;
-+        process->start(QString("%1/sddm-greeter").arg("."), start_parameters);
- #endif
-         // wait for greeter to start
-         if (!process->waitForStarted()) {
diff --git a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch b/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
deleted file mode 100644
index f0e68ac97247..000000000000
--- a/x11-misc/sddm/files/sddm-0.1.0-cmake.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -6,7 +6,7 @@
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- set(CMAKE_AUTOMOC ON)
- 
--add_definitions(-Wall -march=native -std=c++11)
-+add_definitions(-Wall -std=c++11)
- 
- if(NOT CMAKE_BUILD_TYPE)
-         set(CMAKE_BUILD_TYPE Release)
-@@ -19,7 +19,6 @@
- else()
-         message(STATUS "Release build")
-         add_definitions(-DNDEBUG)
--        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
- endif()
- 
- # PKG-CONFIG
-@@ -52,26 +51,26 @@
- 
- add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
- 
-+if(USE_systemd)
- # login1
--pkg_check_modules(LOGIN1 "libsystemd-login")
-+pkg_check_modules(LOGIN1 REQUIRED "libsystemd-login")
- 
--if(LOGIN1_FOUND)
--    # do nothing
- else()
-     set(LOGIN1_FOUND 0)
- endif()
- 
-+if(USE_upower)
- # upower
--pkg_check_modules(UPOWER "upower-glib")
-+pkg_check_modules(UPOWER REQUIRED "upower-glib")
- 
--if(UPOWER_FOUND)
--    # do nothing
- else()
-     set(UPOWER_FOUND 0)
- endif()
- 
-+if(USE_systemd)
- # systemd
--pkg_check_modules(SYSTEMD "systemd")
-+pkg_check_modules(SYSTEMD REQUIRED "systemd")
-+endif()
- 
- if(SYSTEMD_FOUND)
-     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SYSTEM_UNIT_DIR)
diff --git a/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch
deleted file mode 100644
index a5ac62ac47f8..000000000000
--- a/x11-misc/sddm/files/sddm-0.1.0-consolekit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- data/scripts/Xsession
-+++ data/scripts/Xsession
-@@ -74,13 +74,13 @@
-     exec xterm -geometry 80x24-0-0
-     ;;
-   custom)
--    exec $HOME/.xsession
-+    exec ck-launch-session $HOME/.xsession
-     ;;
-   default)
--    exec /usr/bin/startkde
-+    exec ck-launch-session /usr/bin/startkde
-     ;;
-   *)
--    eval exec "$session"
-+    eval ck-launch-session "$session"
-     ;;
- esac
- exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch
new file mode 100644
index 000000000000..acdfdc1a43e2
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.10.0-consolekit.patch
@@ -0,0 +1,13 @@
+diff --git a/data/scripts/Xsession b/data/scripts/Xsession
+index a5d270d..4b48524 100755
+--- a/data/scripts/Xsession
++++ b/data/scripts/Xsession
+@@ -74,7 +74,7 @@ case $session in
+     exec xterm -geometry 80x24-0-0
+     ;;
+   *)
+-    eval exec "$session"
++    eval exec ck-launch-session "$session"
+     ;;
+ esac
+ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
diff --git a/x11-misc/sddm/files/sddm-0.10.0-upower.patch b/x11-misc/sddm/files/sddm-0.10.0-upower.patch
new file mode 100644
index 000000000000..8c0f34c27e8b
--- /dev/null
+++ b/x11-misc/sddm/files/sddm-0.10.0-upower.patch
@@ -0,0 +1,12 @@
+diff -u -r sddm-0.9.0.orig/src/daemon/PowerManager.cpp sddm-0.9.0/src/daemon/PowerManager.cpp
+--- sddm-0.9.0.orig/src/daemon/PowerManager.cpp	2014-10-01 18:40:37.402683578 +0200
++++ sddm-0.9.0/src/daemon/PowerManager.cpp	2014-10-01 18:40:43.502618164 +0200
+@@ -197,7 +197,7 @@
+             m_backends << new Login1Backend();
+ 
+         // check if upower interface exists
+-        if (interface->isServiceRegistered(UPOWER_SERVICE))
++//        if (interface->isServiceRegistered(UPOWER_SERVICE))
+             m_backends << new UPowerBackend();
+     }
+ 
diff --git a/x11-misc/sddm/sddm-0.1.0-r2.ebuild b/x11-misc/sddm/sddm-0.1.0-r2.ebuild
deleted file mode 100644
index a659d7db216e..000000000000
--- a/x11-misc/sddm/sddm-0.1.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.1.0-r2.ebuild,v 1.1 2014/10/01 17:20:46 jauhien Exp $
-
-EAPI=5
-inherit cmake-utils toolchain-funcs
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="http://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit systemd +upower"
-REQUIRED_USE="?? ( upower systemd )"
-
-RDEPEND="sys-libs/pam
-	>=x11-base/xorg-server-1.15.1
-	x11-libs/libxcb[xkb(-)]
-	dev-qt/qtdeclarative:4
-	dev-qt/qtdbus:4
-	consolekit? ( sys-auth/consolekit )
-	systemd? ( sys-apps/systemd:= )
-	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.7.0
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-version) < 4.7 ]] && \
-			die 'The active compiler needs to be gcc 4.7 (or newer)'
-	fi
-}
-
-src_prepare() {
-	default
-
-	epatch "${FILESDIR}/${P}-cmake.patch" "${FILESDIR}/${P}-clang.patch"
-	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use systemd)
-		$(cmake-utils_use_use upower)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use consolekit; then
-		ewarn "This display manager doesn't have native built-in ConsoleKit support."
-		ewarn "In order to use ConsoleKit pam module with this display manager,"
-		ewarn "you should remove the \"nox11\" parameter from pm_ck_connector.so"
-		ewarn "line in /etc/pam.d/system-login"
-	fi
-}
diff --git a/x11-misc/sddm/sddm-0.9.0-r1.ebuild b/x11-misc/sddm/sddm-0.10.0.ebuild
index e88a58636996..7a57840a6d01 100644
--- a/x11-misc/sddm/sddm-0.9.0-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.9.0-r1.ebuild,v 1.2 2014/10/06 22:04:35 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/sddm/sddm-0.10.0.ebuild,v 1.1 2014/10/18 17:49:16 jauhien Exp $
 
 EAPI=5
 inherit cmake-utils toolchain-funcs user
@@ -8,28 +8,20 @@ inherit cmake-utils toolchain-funcs user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
 SRC_URI="http://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain"
 SLOT="0"
-IUSE="consolekit +qt4 qt5 systemd +upower"
-REQUIRED_USE="?? ( upower systemd )
-	^^ ( qt4 qt5 )"
+IUSE="consolekit systemd +upower"
+REQUIRED_USE="?? ( upower systemd )"
 
 RDEPEND="sys-libs/pam
-	>=x11-base/xorg-server-1.15.1
 	x11-libs/libxcb[xkb(-)]
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtdeclarative:4
-		dev-qt/qttest:4 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/linguist-tools:5
-		dev-qt/qttest:5 )
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
 	systemd? ( sys-apps/systemd:= )
 	upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )"
 DEPEND="${RDEPEND}
@@ -45,7 +37,6 @@ pkg_pretend() {
 
 src_prepare() {
 	use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
-	use upower && epatch "${FILESDIR}/${P}-upower.patch"
 
 	# respect user's cflags
 	sed -e 's|-Wall -march=native||' \
@@ -55,7 +46,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_use qt5 QT5)
 		$(cmake-utils_use_no systemd SYSTEMD)
 	)
 	cmake-utils_src_configure