diff --git a/xdm-tarball.patch b/xdm-tarball.patch index 6274537..9242dca 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-08 22:50:45.711986000 +0200 ++++ ./etc/X11/xdm/RunChooser 2020-09-09 14:46:10.144869000 +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-08 22:53:48.699077000 +0200 ++++ ./etc/X11/xdm/Xreset 2020-09-09 14:46:10.226350000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -40,14 +40,25 @@ diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset BINDIR=/usr/bin xmessage=${BINDIR}/xmessage 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 +@@ -100,4 +100,4 @@ + ! + ! Include system wide Xresources + ! +-#include "/etc/X11/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-08 23:02:03.120815000 +0200 -@@ -35,9 +35,17 @@ ++++ ./etc/X11/xdm/Xsession 2020-09-09 14:54:03.233265000 +0200 +@@ -34,10 +34,18 @@ + # Some system defaults # XETCDIR=/etc/X11 - XDMDIR=$XETCDIR/xdm +- XDMDIR=$XETCDIR/xdm - XINITDIR=$XETCDIR/xinit ++ XDMDIR=/usr/$XETCDIR/xdm : ${TMPDIR=/tmp} +# xinitrc moved to %{_libexecdir}/xinit in xinit package @@ -104,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-08 23:06:32.524239000 +0200 ++++ ./etc/X11/xdm/Xsetup 2020-09-09 14:46:10.232358000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -143,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-08 23:13:05.476961000 +0200 ++++ ./etc/X11/xdm/Xstartup 2020-09-09 14:46:10.235360000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -155,14 +166,14 @@ 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-08 23:34:31.477856000 +0200 ++++ ./etc/X11/xdm/sys.xsession 2020-09-09 14:46:48.229301000 +0200 @@ -38,10 +38,16 @@ argv=("$@") set -- -for script in /etc/X11/xdm/scripts/* +for script in /usr/etc/X11/xdm/scripts/* \ -+ /etc/X11/xdm/scripts/*; do ++ /etc/X11/xdm/scripts/* do test -e $script || continue test -d $script && continue @@ -207,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-08 23:41:18.284830000 +0200 ++++ ./etc/X11/xdm/xdm-config 2020-09-09 14:46:10.241358000 +0200 @@ -4,10 +4,10 @@ DisplayManager.errorLogFile: /var/log/xdm.errors DisplayManager.pidFile: /run/xdm.pid @@ -245,10 +256,9 @@ diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config DisplayManager.*.terminateServer: false ! ! SECURITY: do not listen for XDMCP or Chooser requests -Only in ./usr/lib/X11: .nfs0000000004cd295200014457 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 00:01:56.326807000 +0200 ++++ ./usr/lib/X11/display-manager 2020-09-09 14:57:41.828919000 +0200 @@ -16,8 +16,11 @@ . /etc/sysconfig/displaymanager . /etc/sysconfig/language @@ -263,7 +273,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager locale_vars=" \ LANG \ -@@ -67,14 +70,23 @@ +@@ -67,14 +70,26 @@ unset DEFAULT_WM export WINDOWMANAGER @@ -283,13 +293,16 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager + # 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 + 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 +99,8 @@ +@@ -87,8 +102,8 @@ fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -300,7 +313,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi -@@ -159,8 +171,8 @@ +@@ -159,8 +174,8 @@ start) # use system keyboard as global X keyboard configuration @@ -313,7 +326,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-08 21:58:22.768049000 +0200 ++++ ./usr/lib/X11/displaymanagers/xdm 2020-09-09 14:46:10.344352000 +0200 @@ -5,8 +5,8 @@ } diff --git a/xdm.changes b/xdm.changes index f699750..e19acce 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Sep 9 13:53:33 UTC 2020 - Stefan Dirsch + +- fixes in xdm-tarball.patch + * fixed include path for generic Xresources in xdm's Xresources file + * fixed $XDMDIR in Xsession, so sys.xsession can be found + * sys.xsession: fixed syntax error in code, which reads + additional xdm scripts + * display-manager: also symlink Xstartup and Xreset in + /etc/X11/xdm (needed by lighdm) + * for now use again /etc/pam.d for xdm/xdm-np PAM files instead + of /usr/etc/pam.d (using the latter resulted in + "authentificataion failure" with lightdm) + ------------------------------------------------------------------- Tue Sep 8 22:02:59 UTC 2020 - Stefan Dirsch diff --git a/xdm.spec b/xdm.spec index 8f74f89..a5c06da 100644 --- a/xdm.spec +++ b/xdm.spec @@ -124,7 +124,8 @@ tar xf %{SOURCE1} patch -p0 < %{PATCH2} mkdir -p usr/etc/X11/xdm mv etc/X11/xdm/* usr/etc/X11/xdm -mv etc/pam.d usr/etc/ +### authentification error with lightdm when using /usr/etc/pam.d +#mv etc/pam.d usr/etc/ rmdir etc/X11/xdm etc/X11 %else patch -p0 < %{PATCH4} @@ -221,13 +222,14 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_unitdir}/display-manager.service /usr/lib/X11/display-manager %config %{_sysconfdir}/logrotate.d/xdm -%if 0%{?UsrEtcMove} -%{_distconfdir}/pam.d/xdm -%{_distconfdir}/pam.d/xdm-np -%else +### authentification failure with lightdm when using /usr/etc/pam.d +#%if 0%{?UsrEtcMove} +#%{_distconfdir}/pam.d/xdm +#%{_distconfdir}/pam.d/xdm-np +#%else %config(noreplace) %{_sysconfdir}/pam.d/xdm %config(noreplace) %{_sysconfdir}/pam.d/xdm-np -%endif +#%endif %dir %{_localstatedir}/lib/xdm/ %{_fillupdir}/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/