diff --git a/xdm-tarball.patch b/xdm-tarball.patch index b971d1d..de45712 100644 --- a/xdm-tarball.patch +++ b/xdm-tarball.patch @@ -1,6 +1,6 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser --- ../old/etc/X11/xdm/RunChooser 2015-07-29 14:46:22.000000000 +0200 -+++ ./etc/X11/xdm/RunChooser 2020-09-09 17:49:39.002118000 +0200 ++++ ./etc/X11/xdm/RunChooser 2020-09-10 04:31:19.817621000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -30,7 +30,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser cat $hostxkbmap | $xkbcomp - $DISPLAY diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset --- ../old/etc/X11/xdm/Xreset 2014-12-15 19:34:46.000000000 +0100 -+++ ./etc/X11/xdm/Xreset 2020-09-09 17:49:39.049133000 +0200 ++++ ./etc/X11/xdm/Xreset 2020-09-10 04:31:19.957604000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -42,7 +42,7 @@ diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset xconsole=${BINDIR}/xconsole diff -u -r ../old/etc/X11/xdm/Xresources ./etc/X11/xdm/Xresources --- ../old/etc/X11/xdm/Xresources 2015-08-04 12:13:36.000000000 +0200 -+++ ./etc/X11/xdm/Xresources 2020-09-09 17:49:39.053112000 +0200 ++++ ./etc/X11/xdm/Xresources 2020-09-10 04:31:19.961602000 +0200 @@ -100,4 +100,4 @@ ! ! Include system wide Xresources @@ -51,7 +51,7 @@ diff -u -r ../old/etc/X11/xdm/Xresources ./etc/X11/xdm/Xresources +#include "/usr/etc/X11/Xresources" diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession --- ../old/etc/X11/xdm/Xsession 2017-07-25 11:58:00.067080000 +0200 -+++ ./etc/X11/xdm/Xsession 2020-09-09 17:49:39.056112000 +0200 ++++ ./etc/X11/xdm/Xsession 2020-09-10 04:31:19.964605000 +0200 @@ -34,10 +34,18 @@ # Some system defaults # @@ -115,7 +115,7 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession set -- "${argv[@]}" diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup --- ../old/etc/X11/xdm/Xsetup 2020-08-26 15:35:43.014615021 +0200 -+++ ./etc/X11/xdm/Xsetup 2020-09-09 17:49:39.059117000 +0200 ++++ ./etc/X11/xdm/Xsetup 2020-09-10 04:31:19.968602000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -154,7 +154,7 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup cat $hostxkbmap | $xkbcomp - $DISPLAY diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup --- ../old/etc/X11/xdm/Xstartup 2020-08-26 15:35:26.270871116 +0200 -+++ ./etc/X11/xdm/Xstartup 2020-09-09 17:49:39.063112000 +0200 ++++ ./etc/X11/xdm/Xstartup 2020-09-10 04:31:19.971608000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -166,7 +166,7 @@ diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup NOLOGIN=/etc/nologin diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession --- ../old/etc/X11/xdm/sys.xsession 2016-06-03 15:25:42.000000000 +0200 -+++ ./etc/X11/xdm/sys.xsession 2020-09-09 17:49:39.066112000 +0200 ++++ ./etc/X11/xdm/sys.xsession 2020-09-10 04:31:19.975602000 +0200 @@ -38,10 +38,16 @@ argv=("$@") set -- @@ -218,7 +218,7 @@ diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession set -- ${1+"$@"} $WINDOWMANAGER diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config --- ../old/etc/X11/xdm/xdm-config 2020-08-26 15:36:22.290004407 +0200 -+++ ./etc/X11/xdm/xdm-config 2020-09-09 17:49:39.069123000 +0200 ++++ ./etc/X11/xdm/xdm-config 2020-09-10 04:31:19.978602000 +0200 @@ -4,10 +4,10 @@ DisplayManager.errorLogFile: /var/log/xdm.errors DisplayManager.pidFile: /run/xdm.pid @@ -258,7 +258,7 @@ diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config ! SECURITY: do not listen for XDMCP or Chooser requests diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager --- ../old/usr/lib/X11/display-manager 2020-09-04 13:11:23.054517000 +0200 -+++ ./usr/lib/X11/display-manager 2020-09-09 17:50:00.145519000 +0200 ++++ ./usr/lib/X11/display-manager 2020-09-10 04:40:30.456843000 +0200 @@ -16,8 +16,11 @@ . /etc/sysconfig/displaymanager . /etc/sysconfig/language @@ -273,7 +273,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager locale_vars=" \ LANG \ -@@ -67,14 +70,28 @@ +@@ -67,14 +70,14 @@ unset DEFAULT_WM export WINDOWMANAGER @@ -286,25 +286,11 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager xdm_reload_files () { - if [ -x /etc/X11/xdm/SuSEconfig.xdm ]; then -+ test -d /etc/X11/xdm || mkdir -p /etc/X11/xdm -+ # SUSEconfig edits these files appropriate to /etc/sysconfig/displaymanager -+ test -r /etc/X11/xdm/xdm-config || cp $DMDIR/xdm-config /etc/X11/xdm/xdm-config -+ test -r /etc/X11/xdm/Xservers || cp $DMDIR/Xservers /etc/X11/xdm/Xservers -+ # needed by sddm -+ test -r /etc/X11/xdm/Xsession || ln -snf $DMDIR/Xsession /etc/X11/xdm/Xsession -+ test -r /etc/X11/xdm/Xsetup || ln -snf $DMDIR/Xsetup /etc/X11/xdm/Xsetup -+ # needed by lightdm -+ test -r /etc/X11/xdm/Xstartup || ln -snf $DMDIR/Xstartup /etc/X11/xdm/Xstartup -+ test -r /etc/X11/xdm/Xreset || ln -snf $DMDIR/Xreset /etc/X11/xdm/Xreset -+ # possibly needed by who knows ... -+ test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map -+ # still often sourced by old ~/.xinitrc user files ... -+ test -r /etc/X11/xinit/xinitrc.common || ln -snf /usr/etc/X11/xinit/xinitrc.common /etc/X11/xinit/xinitrc.common + if [ -x $DMIR/SuSEconfig.xdm ]; then # Do no try to start Xserver on platforms which may ship without # graphics card (bsc#1039497) if [ "$(arch)" == "aarch64" -o "$(arch)" == "ppc64le" ]; then -@@ -87,8 +104,8 @@ +@@ -87,8 +90,8 @@ fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -315,6 +301,27 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi +@@ -130,6 +133,20 @@ + exit 0 + ;; + *) ++ test -d /etc/X11/xdm || mkdir -p /etc/X11/xdm ++ # SUSEconfig edits these files appropriate to /etc/sysconfig/displaymanager ++ test -r /etc/X11/xdm/xdm-config || cp $DMDIR/xdm-config /etc/X11/xdm/xdm-config ++ test -r /etc/X11/xdm/Xservers || cp $DMDIR/Xservers /etc/X11/xdm/Xservers ++ # needed by sddm ++ test -r /etc/X11/xdm/Xsession || ln -snf $DMDIR/Xsession /etc/X11/xdm/Xsession ++ test -r /etc/X11/xdm/Xsetup || ln -snf $DMDIR/Xsetup /etc/X11/xdm/Xsetup ++ # needed by lightdm ++ test -r /etc/X11/xdm/Xstartup || ln -snf $DMDIR/Xstartup /etc/X11/xdm/Xstartup ++ test -r /etc/X11/xdm/Xreset || ln -snf $DMDIR/Xreset /etc/X11/xdm/Xreset ++ # possibly needed by who knows ... ++ test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map ++ # still often sourced by old ~/.xinitrc or ~/.xsession user files ... ++ test -r /etc/X11/xinit/xinitrc.common || ln -snf /usr/etc/X11/xinit/xinitrc.common /etc/X11/xinit/xinitrc.common + for i in /usr/lib/X11/displaymanagers/* + do + tmp=${i%.fallback} @@ -159,8 +176,8 @@ start) @@ -328,7 +335,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager [ -n "$STARTPROC" ] && $STARTPROC diff -u -r ../old/usr/lib/X11/displaymanagers/xdm ./usr/lib/X11/displaymanagers/xdm --- ../old/usr/lib/X11/displaymanagers/xdm 2014-03-04 13:53:31.000000000 +0100 -+++ ./usr/lib/X11/displaymanagers/xdm 2020-09-09 17:49:39.100110000 +0200 ++++ ./usr/lib/X11/displaymanagers/xdm 2020-09-10 04:31:20.007599000 +0200 @@ -5,8 +5,8 @@ } diff --git a/xdm.changes b/xdm.changes index a32e24e..17ba16c 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 10 02:42:45 UTC 2020 - Stefan Dirsch + +- fixes in xdm-tarball.patch + * /usr/lib/X11/display-manager: fixes sddm, which didn't use + xdm_reload_files in xdm_start_proc() of + /usr/lib/X11/displaymanagers/sddm (boo#1173049) + ------------------------------------------------------------------- Wed Sep 9 15:50:51 UTC 2020 - Stefan Dirsch