Hello community,

here is the log from the commit of package sddm for openSUSE:Factory checked in 
at 2018-10-01 08:13:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sddm (Old)
 and      /work/SRC/openSUSE:Factory/.sddm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "sddm"

Mon Oct  1 08:13:38 2018 rev:41 rq:638834 version:0.18.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/sddm/sddm.changes        2018-08-03 
12:30:37.334977332 +0200
+++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes   2018-10-01 
08:13:48.718106849 +0200
@@ -1,0 +2,13 @@
+Thu Sep 27 17:58:38 UTC 2018 - [email protected]
+
+- Fix wayland session start if fish is used as shell:
+  * 0001-Revert-Adds-sourcing-of-etc-profile-to-fish.patch
+
+-------------------------------------------------------------------
+Sun Sep 23 10:54:12 UTC 2018 - [email protected]
+
+- Rewrite sddm-relaxed-auth.diff as sddm-relaxed-auth.patch:
+  * Set XAUTHLOCALHOSTNAME only where necessary
+  * Also set it for the Greeter session (boo#1091784)
+
+-------------------------------------------------------------------

Old:
----
  sddm-relaxed-auth.diff

New:
----
  0001-Revert-Adds-sourcing-of-etc-profile-to-fish.patch
  sddm-relaxed-auth.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ sddm.spec ++++++
--- /var/tmp/diff_new_pack.jZu5Db/_old  2018-10-01 08:13:49.250106506 +0200
+++ /var/tmp/diff_new_pack.jZu5Db/_new  2018-10-01 08:13:49.254106503 +0200
@@ -34,13 +34,15 @@
 Patch50:        0001-Remove-suffix-for-Wayland-session.patch
 # Not merged yet: https://github.com/sddm/sddm/pull/1017
 Patch51:        0006-Don-t-fill-UserModel-if-theme-does-not-require-it.patch
+# Open issue: https://github.com/sddm/sddm/issues/1059
+Patch52:        0001-Revert-Adds-sourcing-of-etc-profile-to-fish.patch
 # Patch100-?: PATCH-FIX-OPENSUSE
 # Use openSUSE pam config
 Patch100:       proper_pam.diff
 Patch101:       0001-Write-the-daemon-s-PID-to-a-file-on-startup.patch
 # Insert XAUTHLOCALHOSTNAME into users enviroment, so the session handles 
hostname changes with a single X instance/run
 # related patches: libxcb/bug-262309_xcb-xauthlocalhostname.diff, 
xauth/xauth-tolerant-hostname-changes.diff, 
kdebase4-workspace/kdm-relaxed-auth.diff
-Patch102:       sddm-relaxed-auth.diff
+Patch102:       sddm-relaxed-auth.patch
 Patch103:       0001-Read-the-DISPLAYMANAGER_AUTOLOGIN-value-from-sysconf.patch
 # sddm has some rudimentary support for plymouth handling, which only works 
with plymouth-quit.service
 # (the servce is not enabled on openSUSE). For users of sddm.service, we need 
to issue plymouth quit command by hand in this case

++++++ 0001-Revert-Adds-sourcing-of-etc-profile-to-fish.patch ++++++
>From 35a1af25f7b58e96fb19accb4b3c376a9b362571 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <[email protected]>
Date: Thu, 27 Sep 2018 19:53:55 +0200
Subject: [PATCH] Revert "Adds sourcing of /etc/profile to fish"

This reverts commit f749f1d65165de7ce7b9ae073b19f057b205ab35.

See https://github.com/sddm/sddm/issues/1059
---
 data/scripts/Xsession        | 1 -
 data/scripts/wayland-session | 1 -
 2 files changed, 2 deletions(-)

diff --git a/data/scripts/Xsession b/data/scripts/Xsession
index c7fa214..2a0691e 100755
--- a/data/scripts/Xsession
+++ b/data/scripts/Xsession
@@ -39,7 +39,6 @@ case $SHELL in
     rm -f $xsess_tmp
     ;;
   */fish)
-    [ -f /etc/profile ] && . /etc/profile
     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
     . $xsess_tmp
diff --git a/data/scripts/wayland-session b/data/scripts/wayland-session
index 42be624..de4f519 100755
--- a/data/scripts/wayland-session
+++ b/data/scripts/wayland-session
@@ -39,7 +39,6 @@ case $SHELL in
     rm -f $wlsess_tmp
     ;;
   */fish)
-    [ -f /etc/profile ] && . /etc/profile
     xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
     $SHELL --login -c "/bin/sh -c 'export -p' > $xsess_tmp"
     . $xsess_tmp
-- 
2.18.0

++++++ sddm-relaxed-auth.patch ++++++
From: Fabian Vogt <[email protected]>
Subject: Set XAUTHLOCALHOSTNAME to allow hostname changes

Our libxcb is patched to retry with $XAUTHLOCALHOSTNAME as hostname if the
Xauthority entry for the current hostname does not work.
There's a stale PR to do something similar (FamilyWild using libXau) upstream:
https://github.com/sddm/sddm/pull/863
FamilyWild is not a complete solution either, only when using a temporary
Xauthority file for each session separately.

Index: sddm-0.18.0/src/helper/Backend.cpp
===================================================================
--- sddm-0.18.0.orig/src/helper/Backend.cpp
+++ sddm-0.18.0/src/helper/Backend.cpp
@@ -27,6 +27,7 @@
 #include "UserSession.h"
 
 #include <QtCore/QProcessEnvironment>
+#include <QtNetwork/QHostInfo>
 
 #include <pwd.h>
 
@@ -69,6 +70,7 @@ namespace SDDM {
                         .arg(QString::fromLocal8Bit(pw->pw_dir))
                         .arg(mainConfig.X11.UserAuthFile.get());
                 env.insert(QStringLiteral("XAUTHORITY"), value);
+                env.insert(QStringLiteral("XAUTHLOCALHOSTNAME"), 
QHostInfo::localHostName());
             }
             // TODO: I'm fairly sure this shouldn't be done for PAM sessions, 
investigate!
             m_app->session()->setProcessEnvironment(env);
Index: sddm-0.18.0/src/daemon/Display.cpp
===================================================================
--- sddm-0.18.0.orig/src/daemon/Display.cpp
+++ sddm-0.18.0/src/daemon/Display.cpp
@@ -316,8 +316,10 @@ namespace SDDM {
 
         QProcessEnvironment env;
         env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
-        if (session.xdgSessionType() == QLatin1String("x11"))
+        if (session.xdgSessionType() == QLatin1String("x11")) {
             env.insert(QStringLiteral("DISPLAY"), name());
+            env.insert(QStringLiteral("XAUTHLOCALHOSTNAME"), 
daemonApp->hostName());
+        }
         env.insert(QStringLiteral("XDG_SEAT_PATH"), 
daemonApp->displayManager()->seatPath(seat()->name()));
         env.insert(QStringLiteral("XDG_SESSION_PATH"), 
daemonApp->displayManager()->sessionPath(QStringLiteral("Session%1").arg(daemonApp->newSessionId())));
         env.insert(QStringLiteral("DESKTOP_SESSION"), 
session.desktopSession());
Index: sddm-0.18.0/src/daemon/Greeter.cpp
===================================================================
--- sddm-0.18.0.orig/src/daemon/Greeter.cpp
+++ sddm-0.18.0/src/daemon/Greeter.cpp
@@ -114,6 +114,7 @@ namespace SDDM {
             // set process environment
             QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
             env.insert(QStringLiteral("DISPLAY"), m_display->name());
+            env.insert(QStringLiteral("XAUTHLOCALHOSTNAME"), 
daemonApp->hostName());
             env.insert(QStringLiteral("XAUTHORITY"), m_authPath);
             env.insert(QStringLiteral("XCURSOR_THEME"), xcursorTheme);
             env.insert(QStringLiteral("QT_IM_MODULE"), 
mainConfig.InputMethod.get());
@@ -175,6 +176,7 @@ namespace SDDM {
             env.insert(QStringLiteral("PATH"), 
mainConfig.Users.DefaultPath.get());
             env.insert(QStringLiteral("DISPLAY"), m_display->name());
             env.insert(QStringLiteral("XAUTHORITY"), m_authPath);
+            env.insert(QStringLiteral("XAUTHLOCALHOSTNAME"), 
daemonApp->hostName());
             env.insert(QStringLiteral("XCURSOR_THEME"), xcursorTheme);
             env.insert(QStringLiteral("XDG_SEAT"), m_display->seat()->name());
             env.insert(QStringLiteral("XDG_SEAT_PATH"), 
daemonApp->displayManager()->seatPath(m_display->seat()->name()));

Reply via email to