pool/xdm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1010460 from X11:XOrg

Browse Source 
- 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

- Update xdm-tarball.patch:
  * create /etc/X11/xinit directory if not present.

OBS-URL: https://build.opensuse.org/request/show/1010460
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=97
This commit is contained in:
Dominique Leuenberger 2022-10-13 13:40:21 +00:00 committed by Git OBS Bridge
commit 6ca8667358
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
display-manager.service
View File

@ -1,9 +1,9 @@
[Unit] [Unit]
Description=X Display Manager Description=X Display Manager
Conflicts=getty@tty7.service plymouth-quit.service Conflicts=getty@tty7.service plymouth-quit.service
After=ypbind.service gpm.service time-sync.target winbind.service acpid.service After=ypbind.service gpm.service winbind.service acpid.service
Wants=remote-fs.target dbus.socket systemd-user-sessions.service systemd-logind.service Wants=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=systemd-user-sessions.service systemd-logind.service
OnFailure=plymouth-quit.service OnFailure=plymouth-quit.service
[Service] [Service]

14
xdm-tarball.patch
View File

@ -28,7 +28,6 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
fi fi
if test -s $hostxkbmap -a -x $xkbcomp ; then if test -s $hostxkbmap -a -x $xkbcomp ; then
cat $hostxkbmap | $xkbcomp - $DISPLAY 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 --- ../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 +++ ./etc/X11/xdm/Xreset 2020-09-10 04:31:19.957604000 +0200
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
@ -40,7 +39,6 @@ diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset
BINDIR=/usr/bin BINDIR=/usr/bin
xmessage=${BINDIR}/xmessage xmessage=${BINDIR}/xmessage
xconsole=${BINDIR}/xconsole 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 --- ../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 +++ ./etc/X11/xdm/Xresources 2020-09-10 04:31:19.961602000 +0200
@@ -100,4 +100,4 @@ @@ -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 "/etc/X11/Xresources"
+#include "/usr/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 --- ../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 +++ ./etc/X11/xdm/Xsession 2020-09-10 04:31:19.964605000 +0200
@@ -34,10 +34,18 @@ @@ -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 # Restore arguments but skip window manager
set -- "${argv[@]}" 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 --- ../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 +++ ./etc/X11/xdm/Xsetup 2020-09-10 04:31:19.968602000 +0200
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
@ -152,7 +148,6 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup
fi fi
if test -s $hostxkbmap -a -x $xkbcomp ; then if test -s $hostxkbmap -a -x $xkbcomp ; then
cat $hostxkbmap | $xkbcomp - $DISPLAY 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 --- ../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 +++ ./etc/X11/xdm/Xstartup 2020-09-10 04:31:19.971608000 +0200
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
@ -164,7 +159,6 @@ diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup
BINDIR=/usr/bin BINDIR=/usr/bin
xmessage=${BINDIR}/xmessage xmessage=${BINDIR}/xmessage
NOLOGIN=/etc/nologin 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 --- ../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 +++ ./etc/X11/xdm/sys.xsession 2020-09-10 04:31:19.975602000 +0200
@@ -38,10 +38,16 @@ @@ -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 unset STARTUP WINDOW_MANAGER
set -- ${1+"$@"} $WINDOWMANAGER 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 --- ../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 +++ ./etc/X11/xdm/xdm-config 2020-09-10 04:31:19.978602000 +0200
@@ -4,10 +4,10 @@ @@ -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 DisplayManager.*.terminateServer: false
! !
! SECURITY: do not listen for XDMCP or Chooser requests ! 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 --- ../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 +++ ./usr/lib/X11/display-manager 2020-09-10 04:40:30.456843000 +0200
@@ -16,8 +16,11 @@ @@ -16,8 +16,11 @@
@ -301,7 +293,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager
/bin/logger /bin/logger
return 0 return 0
fi fi
@@ -130,6 +133,12 @@ @@ -130,6 +133,13 @@
exit 0 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/xdm-config || cp $DMDIR/xdm-config /etc/X11/xdm/xdm-config
+ test -r /etc/X11/xdm/Xservers || cp $DMDIR/Xservers /etc/X11/xdm/Xservers + test -r /etc/X11/xdm/Xservers || cp $DMDIR/Xservers /etc/X11/xdm/Xservers
+ # still often sourced by old ~/.xinitrc or ~/.xsession user files ... + # 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 + 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/* for i in /usr/lib/X11/displaymanagers/*
do do
tmp=${i%.fallback} tmp=${i%.fallback}
@@ -159,8 +176,8 @@ @@ -159,8 +177,8 @@
start) start)
# use system keyboard as global X keyboard configuration # 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 fi
[ -n "$STARTPROC" ] && $STARTPROC [ -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 --- ../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 +++ ./usr/lib/X11/displaymanagers/xdm 2020-09-10 04:31:20.007599000 +0200
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@

15
xdm.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Oct 13 09:55:49 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- 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 <fcrozat@suse.com>
- Update xdm-tarball.patch:
* create /etc/X11/xinit directory if not present.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 9 09:53:34 UTC 2022 - Callum Farmer <gmbr3@opensuse.org> Fri Sep 9 09:53:34 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>