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

Accepting request 1193363 from X11:XOrg

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1193363
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=106
This commit is contained in:
Dominique Leuenberger 2024-08-13 11:22:15 +00:00 committed by Git OBS Bridge
commit 5b4e1658ec
2 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
xdm-tarball.patch
View File

@ -1,6 +1,6 @@
diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser 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 --- ../old/etc/X11/xdm/RunChooser 2015-07-29 14:46:22.000000000 +0200
+++ ./etc/X11/xdm/RunChooser 2020-09-10 04:31:19.817621000 +0200 +++ ./etc/X11/xdm/RunChooser 2024-08-09 11:27:04.390249591 +0200
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
# #
LIBDIR=/usr/lib/X11 LIBDIR=/usr/lib/X11
@ -28,8 +28,9 @@ 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 2024-08-09 11:27:04.390249591 +0200
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
# #
LIBDIR=/usr/lib/X11 LIBDIR=/usr/lib/X11
@ -39,16 +40,18 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
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 2024-08-09 11:27:04.390249591 +0200
@@ -100,4 +100,4 @@ @@ -100,4 +100,4 @@
! !
! Include system wide Xresources ! Include system wide Xresources
! !
-#include "/etc/X11/Xresources" -#include "/etc/X11/Xresources"
+#include "/usr/etc/X11/Xresources" +#include "/usr/etc/X11/Xresources"
--- ../old/etc/X11/xdm/Xsession 2017-07-25 11:58:00.067080000 +0200 diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession
+++ ./etc/X11/xdm/Xsession 2020-09-10 04:31:19.964605000 +0200 --- ../old/etc/X11/xdm/Xsession 2021-01-04 15:20:27.548208000 +0100
+++ ./etc/X11/xdm/Xsession 2024-08-09 11:27:04.390249591 +0200
@@ -34,10 +34,18 @@ @@ -34,10 +34,18 @@
# Some system defaults # Some system defaults
# #
@ -110,8 +113,9 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
# 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 2024-08-09 11:27:04.390249591 +0200
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
# #
LIBDIR=/usr/lib/X11 LIBDIR=/usr/lib/X11
@ -148,8 +152,9 @@ 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/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 2024-08-09 11:27:04.390249591 +0200
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
# #
LIBDIR=/usr/lib/X11 LIBDIR=/usr/lib/X11
@ -159,8 +164,9 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
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 2024-08-09 11:27:04.390249591 +0200
@@ -38,10 +38,16 @@ @@ -38,10 +38,16 @@
argv=("$@") argv=("$@")
set -- set --
@ -210,8 +216,9 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
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 2024-08-09 11:27:04.390249591 +0200
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
DisplayManager.errorLogFile: /var/log/xdm.errors DisplayManager.errorLogFile: /var/log/xdm.errors
DisplayManager.pidFile: /run/xdm.pid DisplayManager.pidFile: /run/xdm.pid
@ -249,14 +256,21 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
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 2024-08-09 11:36:39.578216426 +0200
@@ -16,8 +16,11 @@ @@ -13,11 +13,16 @@
# /usr/lib/X11/display-manager
#
+DEFAULT_WM="default"
+
. /etc/sysconfig/displaymanager . /etc/sysconfig/displaymanager
. /etc/sysconfig/language . /etc/sysconfig/language
. /etc/sysconfig/windowmanager -. /etc/sysconfig/windowmanager
-test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile -test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile
-test -r /etc/profile.d/desktop-data.sh && . /etc/profile.d/desktop-data.sh -test -r /etc/profile.d/desktop-data.sh && . /etc/profile.d/desktop-data.sh
+test -f /etc/sysconfig/windowmanager && . /etc/sysconfig/windowmanager
+if [ -r /etc/profile.d/desktop-data.sh ]; then +if [ -r /etc/profile.d/desktop-data.sh ]; then
+ . /etc/profile.d/desktop-data.sh + . /etc/profile.d/desktop-data.sh
+elif [ -r /usr/etc/profile.d/desktop-data.sh ]; then +elif [ -r /usr/etc/profile.d/desktop-data.sh ]; then
@ -265,7 +279,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
locale_vars=" \ locale_vars=" \
LANG \ LANG \
@@ -67,14 +70,14 @@ @@ -67,14 +72,14 @@
unset DEFAULT_WM unset DEFAULT_WM
export WINDOWMANAGER export WINDOWMANAGER
@ -282,7 +296,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
# Do no try to start Xserver on platforms which may ship without # Do no try to start Xserver on platforms which may ship without
# graphics card (bsc#1039497) # graphics card (bsc#1039497)
if [ "$(arch)" == "aarch64" -o "$(arch)" == "ppc64le" ]; then if [ "$(arch)" == "aarch64" -o "$(arch)" == "ppc64le" ]; then
@@ -87,8 +90,8 @@ @@ -87,8 +92,8 @@
fi fi
fi fi
MD5DIR="/var/adm/SuSEconfig/md5" \ MD5DIR="/var/adm/SuSEconfig/md5" \
@ -293,7 +307,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
/bin/logger /bin/logger
return 0 return 0
fi fi
@@ -130,6 +133,13 @@ @@ -130,6 +135,13 @@
exit 0 exit 0
;; ;;
*) *)
@ -307,7 +321,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
for i in /usr/lib/X11/displaymanagers/* for i in /usr/lib/X11/displaymanagers/*
do do
tmp=${i%.fallback} tmp=${i%.fallback}
@@ -159,8 +177,8 @@ @@ -159,8 +171,8 @@
start) start)
# use system keyboard as global X keyboard configuration # use system keyboard as global X keyboard configuration
@ -318,8 +332,9 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser
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 2024-08-09 11:27:04.390249591 +0200
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
} }

6
xdm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 9 09:40:13 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
- sysconfig/windowmanager is deprecated since 7 years, don't
read it if it does not exist.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 5 00:54:48 UTC 2024 - Stefan Dirsch <sndirsch@suse.com> Fri Apr 5 00:54:48 UTC 2024 - Stefan Dirsch <sndirsch@suse.com>