From 01b903901655f673d64f0706143274f319e2aba2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 Nov 2015 20:12:09 -0600 Subject: [PATCH] 0.13.0 --- .gitignore | 1 + ...th-environment-variables-from-parent.patch | 35 --------------- 0011-Don-t-cast-QByteArray-to-char.patch | 44 ------------------- ...ters-from-loading-KDE-s-debug-hander.patch | 39 ---------------- sddm.spec | 11 +++-- sources | 2 +- 6 files changed, 7 insertions(+), 125 deletions(-) delete mode 100644 0008-Inherit-path-environment-variables-from-parent.patch delete mode 100644 0011-Don-t-cast-QByteArray-to-char.patch delete mode 100644 0012-Disable-greeters-from-loading-KDE-s-debug-hander.patch diff --git a/.gitignore b/.gitignore index 426eebe..3a8aa2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /v0.12.0.tar.gz +/v0.13.0.tar.gz diff --git a/0008-Inherit-path-environment-variables-from-parent.patch b/0008-Inherit-path-environment-variables-from-parent.patch deleted file mode 100644 index 4f96cc2..0000000 --- a/0008-Inherit-path-environment-variables-from-parent.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3349d1d84dd2ab317ba4fa15eac2e62fa906f9cd Mon Sep 17 00:00:00 2001 -From: Pier Luigi Fiorini -Date: Sun, 6 Sep 2015 02:25:39 +0200 -Subject: [PATCH 08/11] Inherit path environment variables from parent - -Make themes installed in non-standard locations work. - -Issue: #410 - -[ChangeLog][Daemon][Greater] Inherit path environment variables from -parent so that themes installed in non-standard paths will work. ---- - src/daemon/Greeter.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp -index 32f4a40..68c4dc3 100644 ---- a/src/daemon/Greeter.cpp -+++ b/src/daemon/Greeter.cpp -@@ -128,7 +128,11 @@ namespace SDDM { - insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"), - QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"), - QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"), -- QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION") -+ QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"), -+ QStringLiteral("LD_LIBRARY_PATH"), -+ QStringLiteral("QML2_IMPORT_PATH"), -+ QStringLiteral("QT_PLUGIN_PATH"), -+ QStringLiteral("XDG_DATA_DIRS") - }, sysenv, env); - - env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get()); --- -1.9.3 - diff --git a/0011-Don-t-cast-QByteArray-to-char.patch b/0011-Don-t-cast-QByteArray-to-char.patch deleted file mode 100644 index 480fa1b..0000000 --- a/0011-Don-t-cast-QByteArray-to-char.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c637727c958286659e9905993fca276a63f6f6d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?D=C4=81vis?= -Date: Thu, 24 Sep 2015 02:52:46 +0300 -Subject: [PATCH 11/11] Don't cast QByteArray to (char *) - -They're obsolete members [1] and caused #489. - -[1] http://doc.qt.io/qt-5/qbytearray-obsolete.html ---- - CMakeLists.txt | 2 +- - src/helper/UserSession.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0f10f92..c2192a0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,7 +33,7 @@ option(BUILD_MAN_PAGES "Build man pages" OFF) - option(ENABLE_JOURNALD "Enable logging to journald" ON) - - # Definitions --add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII) -+add_definitions(-Wall -std=c++11 -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY) - - # Default build type - if(NOT CMAKE_BUILD_TYPE) -diff --git a/src/helper/UserSession.cpp b/src/helper/UserSession.cpp -index 68c87d1..0f3d7ff 100644 ---- a/src/helper/UserSession.cpp -+++ b/src/helper/UserSession.cpp -@@ -110,8 +110,8 @@ namespace SDDM { - } - } - -- const char *username = qobject_cast(parent())->user().toLocal8Bit(); -- struct passwd *pw = getpwnam(username); -+ const QByteArray username = qobject_cast(parent())->user().toLocal8Bit(); -+ struct passwd *pw = getpwnam(username.constData()); - if (setgid(pw->pw_gid) != 0) { - qCritical() << "setgid(" << pw->pw_gid << ") failed for user: " << username; - exit(Auth::HELPER_OTHER_ERROR); --- -1.9.3 - diff --git a/0012-Disable-greeters-from-loading-KDE-s-debug-hander.patch b/0012-Disable-greeters-from-loading-KDE-s-debug-hander.patch deleted file mode 100644 index b42f2d2..0000000 --- a/0012-Disable-greeters-from-loading-KDE-s-debug-hander.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4cfed6b0a625593fb43876f04badc4dd99799d86 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Wed, 14 Oct 2015 00:08:59 +0100 -Subject: [PATCH 12/13] Disable greeters from loading KDE's debug hander - -Some themes may use KDE components which will automatically load KDE's -crash handler. - -If the greeter were to then somehow crash, that would leave a crash -handler allowing other actions, albeit as the locked down SDDM user. - -Only SDDM users using the breeze theme from plasma-workspace are -affected. Safest and simplest fix is to handle this inside SDDM -disabling kcrash via an environment variable for all future themes that -may use these libraries. - -CVE-2015-0856 ---- - src/daemon/Greeter.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp -index 68c4dc3..8c936b7 100644 ---- a/src/daemon/Greeter.cpp -+++ b/src/daemon/Greeter.cpp -@@ -145,6 +145,10 @@ namespace SDDM { - env.insert(QStringLiteral("XDG_VTNR"), QString::number(m_display->terminalId())); - env.insert(QStringLiteral("XDG_SESSION_CLASS"), QStringLiteral("greeter")); - env.insert(QStringLiteral("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(QStringLiteral("KDE_DEBUG"), QStringLiteral("1")); - m_auth->insertEnvironment(env); - - // log message --- -2.5.0 - diff --git a/sddm.spec b/sddm.spec index 1ad7232..fee7269 100644 --- a/sddm.spec +++ b/sddm.spec @@ -1,8 +1,8 @@ %global _hardened_build 1 Name: sddm -Version: 0.12.0 -Release: 6%{?dist} +Version: 0.13.0 +Release: 1%{?dist} # code GPLv2+, fedora theme CC-BY-SA License: GPLv2+ and CC-BY-SA Summary: QML based X11 desktop manager @@ -11,10 +11,6 @@ Url: https://github.com/sddm/sddm Source0: https://github.com/sddm/sddm/archive/v%{version}.tar.gz ## upstream patches -#Patch8: 0008-Inherit-path-environment-variables-from-parent.patch -Patch11: 0011-Don-t-cast-QByteArray-to-char.patch -# CVE-2015-0856 -Patch12: 0012-Disable-greeters-from-loading-KDE-s-debug-hander.patch ## downstream patches # downstream fedora-specific configuration @@ -174,6 +170,9 @@ exit 0 %changelog +* Sat Nov 07 2015 Rex Dieter 0.13.0-1 +- 0.13.0 + * Thu Oct 29 2015 Rex Dieter 0.12.0-6 - tweak DefaultPath (#1276450) diff --git a/sources b/sources index e487053..2dbae4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3261ac93a50c71c973cc79b85387765 v0.12.0.tar.gz +ecfd285a463eb6490da1333bb2e304a7 v0.13.0.tar.gz