Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2017-12-03 10:11:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Sun Dec 3 10:11:38 2017 rev:26 rq:547175 version:0.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2017-10-29 20:24:03.820006110 +0100 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2017-12-03 10:11:40.386802549 +0100 @@ -1,0 +2,13 @@ +Thu Nov 30 13:05:37 UTC 2017 - [email protected] + +- Add patch to add back Xauthority truncation in a way that does + not break ssh -X (boo#1043221, boo#1069498): + * 0001-Move-Xauthority-to-a-different-location-and-truncate.patch + +------------------------------------------------------------------- +Tue Nov 28 07:08:56 UTC 2017 - [email protected] + +- Amend patch toremove elogind from sddm-greeter.pam: + * proper_pam.diff + +------------------------------------------------------------------- New: ---- 0001-Move-Xauthority-to-a-different-location-and-truncate.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.Saqavq/_old 2017-12-03 10:11:41.138775209 +0100 +++ /var/tmp/diff_new_pack.Saqavq/_new 2017-12-03 10:11:41.142775064 +0100 @@ -50,6 +50,8 @@ Patch18: 0003-Leave-duplicate-symlinks-out-of-the-SessionModel.patch # PATCH-FIX-UPSTREAM Patch19: 0001-Do-not-truncate-XAUTHORITY-file-on-login.patch +# PATCH-FIX-UPSTREAM +Patch20: 0001-Move-Xauthority-to-a-different-location-and-truncate.patch BuildRequires: cmake BuildRequires: extra-cmake-modules >= 1.4.0 BuildRequires: fdupes @@ -123,6 +125,7 @@ %patch8 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %build %cmake \ ++++++ 0001-Move-Xauthority-to-a-different-location-and-truncate.patch ++++++ >From 87ff59b5558c3df9384a1d55590a53b9aca74bd0 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <[email protected]> Date: Thu, 30 Nov 2017 13:38:27 +0100 Subject: [PATCH] Move Xauthority to a different location and truncate it again When the hostname changes, started X applications try the new hostname first. If a cookie is found for that new hostname, they try to authenticate (which fails) and exit. So .Xauthority must not contain old cookies. Truncating ~/.Xauthority breaks ssh forwarding though, so the default location is changed to something sddm specific. As it's not possible to login twice as the same user simultaneously, a fixed path at a fixed location is enough. Issue #944 --- data/man/sddm.conf.rst.in | 2 +- src/common/Configuration.h | 2 +- src/daemon/XorgDisplayServer.cpp | 7 +++++-- src/helper/UserSession.cpp | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) Index: sddm-0.15.0/data/man/sddm.conf.rst.in =================================================================== --- sddm-0.15.0.orig/data/man/sddm.conf.rst.in +++ sddm-0.15.0/data/man/sddm.conf.rst.in @@ -110,7 +110,7 @@ OPTIONS `UserAuthFile=` Path to the Xauthority file, relative to the home directory. - Default value is ".Xauthority". + Default value is ".local/share/sddm/.Xauthority". `DisplayCommand=` Path of script to execute when starting the display server. Index: sddm-0.15.0/src/common/Configuration.h =================================================================== --- sddm-0.15.0.orig/src/common/Configuration.h +++ sddm-0.15.0/src/common/Configuration.h @@ -65,7 +65,7 @@ namespace SDDM { Entry(SessionDir, QString, _S("/usr/share/xsessions"), _S("Directory containing available X sessions")); Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); Entry(SessionLogFile, QString, _S(".local/share/sddm/xorg-session.log"), _S("Path to the user session log file")); - Entry(UserAuthFile, QString, _S(".Xauthority"), _S("Path to the Xauthority file")); + Entry(UserAuthFile, QString, _S(".local/share/sddm/.Xauthority"), _S("Path to the Xauthority file")); Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server")); Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server")); Entry(MinimumVT, int, MINIMUM_VT, _S("The lowest virtual terminal number that will be used.")); Index: sddm-0.15.0/src/daemon/XorgDisplayServer.cpp =================================================================== --- sddm-0.15.0.orig/src/daemon/XorgDisplayServer.cpp +++ sddm-0.15.0/src/daemon/XorgDisplayServer.cpp @@ -90,9 +90,12 @@ namespace SDDM { // log message qDebug() << "Adding cookie to" << file; - // Touch file + // Create and truncate the file + QFileInfo finfo(file); + QDir().mkpath(finfo.absolutePath()); + QFile file_handler(file); - file_handler.open(QIODevice::Append); + file_handler.open(QIODevice::WriteOnly); file_handler.close(); QString cmd = QStringLiteral("%1 -f %2 -q").arg(mainConfig.XDisplay.XauthPath.get()).arg(file); Index: sddm-0.15.0/src/helper/UserSession.cpp =================================================================== --- sddm-0.15.0.orig/src/helper/UserSession.cpp +++ sddm-0.15.0/src/helper/UserSession.cpp @@ -174,12 +174,12 @@ namespace SDDM { qDebug() << "Adding cookie to" << file; - // create the path + // Create and truncate the file QFileInfo finfo(file); QDir().mkpath(finfo.absolutePath()); QFile file_handler(file); - file_handler.open(QIODevice::Append); + file_handler.open(QIODevice::WriteOnly); file_handler.close(); QString cmd = QStringLiteral("%1 -f %2 -q").arg(mainConfig.XDisplay.XauthPath.get()).arg(file); ++++++ proper_pam.diff ++++++ --- /var/tmp/diff_new_pack.Saqavq/_old 2017-12-03 10:11:41.198773027 +0100 +++ /var/tmp/diff_new_pack.Saqavq/_new 2017-12-03 10:11:41.198773027 +0100 @@ -25,7 +25,7 @@ =================================================================== --- sddm-0.15.0.orig/services/sddm-greeter.pam +++ sddm-0.15.0/services/sddm-greeter.pam -@@ -1,18 +1,8 @@ +@@ -1,18 +1,7 @@ #%PAM-1.0 - -# Load environment from /etc/environment and ~/.pam_environment @@ -43,13 +43,13 @@ -# Setup session -session required pam_unix.so -session optional pam_systemd.so +-session optional pam_elogind.so +# PAM configuration used only for the greeter session +auth required pam_permit.so +account required pam_permit.so +password include common-password +session required pam_loginuid.so +session include common-session - session optional pam_elogind.so Index: sddm-0.15.0/services/sddm.pam =================================================================== --- sddm-0.15.0.orig/services/sddm.pam
