From 2b68cae520a64ccdacc45cfb28edaaa7dcdf29ccfef2155933510e34bbf47cf8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 12 Oct 2022 14:32:46 +0000 Subject: [PATCH 1/2] Accepting request 1010138 from home:fcrozat:branches:X11:XOrg - Update xdm-tarball.patch: * create /etc/X11/xinit directory if not present. OBS-URL: https://build.opensuse.org/request/show/1010138 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=254 --- xdm-tarball.patch | 14 +++----------- xdm.changes | 6 ++++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/xdm-tarball.patch b/xdm-tarball.patch index c887ec7..93360ab 100644 --- a/xdm-tarball.patch +++ b/xdm-tarball.patch @@ -28,7 +28,6 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser fi if test -s $hostxkbmap -a -x $xkbcomp ; then 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-10 04:31:19.957604000 +0200 @@ -10,7 +10,7 @@ @@ -40,7 +39,6 @@ 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-10 04:31:19.961602000 +0200 @@ -100,4 +100,4 @@ @@ -49,7 +47,6 @@ diff -u -r ../old/etc/X11/xdm/Xresources ./etc/X11/xdm/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-10 04:31:19.964605000 +0200 @@ -34,10 +34,18 @@ @@ -113,7 +110,6 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession # Restore arguments but skip window manager 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-10 04:31:19.968602000 +0200 @@ -9,7 +9,7 @@ @@ -152,7 +148,6 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup fi if test -s $hostxkbmap -a -x $xkbcomp ; then 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-10 04:31:19.971608000 +0200 @@ -10,7 +10,7 @@ @@ -164,7 +159,6 @@ diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup BINDIR=/usr/bin xmessage=${BINDIR}/xmessage 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-10 04:31:19.975602000 +0200 @@ -38,10 +38,16 @@ @@ -216,7 +210,6 @@ diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession unset STARTUP WINDOW_MANAGER 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-10 04:31:19.978602000 +0200 @@ -4,10 +4,10 @@ @@ -256,7 +249,6 @@ 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 -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-10 04:40:30.456843000 +0200 @@ -16,8 +16,11 @@ @@ -301,7 +293,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi -@@ -130,6 +133,12 @@ +@@ -130,6 +133,13 @@ exit 0 ;; *) @@ -310,11 +302,12 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager + 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 + # still often sourced by old ~/.xinitrc or ~/.xsession user files ... ++ test -d /etc/X11/xinit || mkdir -p /etc/X11/xinit + 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 @@ +@@ -159,8 +177,8 @@ start) # use system keyboard as global X keyboard configuration @@ -325,7 +318,6 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager fi [ -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-10 04:31:20.007599000 +0200 @@ -5,8 +5,8 @@ diff --git a/xdm.changes b/xdm.changes index 0fb2dfd..eb8e21c 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 11 15:46:37 UTC 2022 - Frederic Crozat + +- Update xdm-tarball.patch: + * create /etc/X11/xinit directory if not present. + ------------------------------------------------------------------- Fri Sep 9 09:53:34 UTC 2022 - Callum Farmer From 06df4e1a39c3774c857c52a9a60d3217425229375fedc7319866cc576750e218 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 13 Oct 2022 10:03:21 +0000 Subject: [PATCH 2/2] - display-manager.service: simplified deps (boo#1203662) * remove deps to time-sync.target, remote-fs.target, dbus.socket, getty@tty7.service, plymouth-quit.service * keep Conflicts to plymouth-quit.service * keep dep to systemd-logind.service OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=255 --- display-manager.service | 6 +++--- xdm.changes | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/display-manager.service b/display-manager.service index 458d81e..972c659 100644 --- a/display-manager.service +++ b/display-manager.service @@ -1,9 +1,9 @@ [Unit] Description=X Display Manager Conflicts=getty@tty7.service plymouth-quit.service -After=ypbind.service gpm.service time-sync.target winbind.service acpid.service -Wants=remote-fs.target dbus.socket systemd-user-sessions.service systemd-logind.service -After=remote-fs.target dbus.socket systemd-user-sessions.service systemd-logind.service getty@tty7.service plymouth-quit.service +After=ypbind.service gpm.service winbind.service acpid.service +Wants=systemd-user-sessions.service systemd-logind.service +After=systemd-user-sessions.service systemd-logind.service OnFailure=plymouth-quit.service [Service] diff --git a/xdm.changes b/xdm.changes index eb8e21c..264f258 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Oct 13 09:55:49 UTC 2022 - Stefan Dirsch + +- display-manager.service: simplified deps (boo#1203662) + * remove deps to time-sync.target, remote-fs.target, dbus.socket, + getty@tty7.service, plymouth-quit.service + * keep Conflicts to plymouth-quit.service + * keep dep to systemd-logind.service + ------------------------------------------------------------------- Tue Oct 11 15:46:37 UTC 2022 - Frederic Crozat