From ddaddd40c21048d05e034020b51ce4ccc6b92f651b781d4a8695df47dc52c860 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 9 Sep 2020 15:55:14 +0000 Subject: [PATCH] - fixes in xdm-tarball.patch * symlink also $XDMDIR/xinitrc.common in /etc/X11/xinit; it is still often sourced in old ~/.xinitrc user files ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=219 --- xdm-tarball.patch | 28 +++++++++++++++------------- xdm.changes | 7 +++++++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/xdm-tarball.patch b/xdm-tarball.patch index 9242dca..b971d1d 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 14:46:10.144869000 +0200 ++++ ./etc/X11/xdm/RunChooser 2020-09-09 17:49:39.002118000 +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 14:46:10.226350000 +0200 ++++ ./etc/X11/xdm/Xreset 2020-09-09 17:49:39.049133000 +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 14:58:23.851125000 +0200 ++++ ./etc/X11/xdm/Xresources 2020-09-09 17:49:39.053112000 +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 14:54:03.233265000 +0200 ++++ ./etc/X11/xdm/Xsession 2020-09-09 17:49:39.056112000 +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 14:46:10.232358000 +0200 ++++ ./etc/X11/xdm/Xsetup 2020-09-09 17:49:39.059117000 +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 14:46:10.235360000 +0200 ++++ ./etc/X11/xdm/Xstartup 2020-09-09 17:49:39.063112000 +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 14:46:48.229301000 +0200 ++++ ./etc/X11/xdm/sys.xsession 2020-09-09 17:49:39.066112000 +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 14:46:10.241358000 +0200 ++++ ./etc/X11/xdm/xdm-config 2020-09-09 17:49:39.069123000 +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 14:57:41.828919000 +0200 ++++ ./usr/lib/X11/display-manager 2020-09-09 17:50:00.145519000 +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,26 @@ +@@ -67,14 +70,28 @@ unset DEFAULT_WM export WINDOWMANAGER @@ -298,11 +298,13 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager + 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 +102,8 @@ +@@ -87,8 +104,8 @@ fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -313,7 +315,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi -@@ -159,8 +174,8 @@ +@@ -159,8 +176,8 @@ start) # use system keyboard as global X keyboard configuration @@ -326,7 +328,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 14:46:10.344352000 +0200 ++++ ./usr/lib/X11/displaymanagers/xdm 2020-09-09 17:49:39.100110000 +0200 @@ -5,8 +5,8 @@ } diff --git a/xdm.changes b/xdm.changes index 41cfd97..a32e24e 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 9 15:50:51 UTC 2020 - Stefan Dirsch + +- fixes in xdm-tarball.patch + * symlink also $XDMDIR/xinitrc.common in /etc/X11/xinit; it + is still often sourced in old ~/.xinitrc user files ... + ------------------------------------------------------------------- Wed Sep 9 13:53:33 UTC 2020 - Stefan Dirsch