diff --git a/xdm-1.1.14.tar.xz b/xdm-1.1.14.tar.xz deleted file mode 100644 index 33aa308..0000000 --- a/xdm-1.1.14.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e9bf25636797ec9e595286dd6820ecc33901439f07705eaf608ecda012c3d5f -size 419324 diff --git a/xdm-1.1.16.tar.xz b/xdm-1.1.16.tar.xz new file mode 100644 index 0000000..c4a8d02 --- /dev/null +++ b/xdm-1.1.16.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcf2209881e95708363777b282fedb1c1055790f38046fa46beff2f1d087679c +size 420072 diff --git a/xdm-tarball.patch b/xdm-tarball.patch index 93360ab..b6073a1 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-10 04:31:19.817621000 +0200 +diff -upr xdm.orig/etc/X11/xdm/RunChooser xdm/etc/X11/xdm/RunChooser +--- xdm.orig/etc/X11/xdm/RunChooser 2015-07-29 14:46:22.000000000 +0200 ++++ xdm/etc/X11/xdm/RunChooser 2024-11-20 14:47:22.156525704 +0100 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -10,7 +10,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser BINDIR=/usr/bin no_exit_on_failed_exec=1 -@@ -107,6 +107,8 @@ +@@ -107,6 +107,8 @@ if test -x $xmodmap -o -x $xkbcomp ; the cat $sysxkbmap | $xkbcomp - $DISPLAY elif test -r $sysmodmap ; then $xmodmap $sysmodmap @@ -19,7 +19,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser fi else # TCP/IP connection (remote or local) -@@ -114,6 +116,8 @@ +@@ -114,6 +116,8 @@ if test -x $xmodmap -o -x $xkbcomp ; the cat $defxkbmap | $xkbcomp - $DISPLAY elif test -r $defmodmap ; then $xmodmap $defmodmap @@ -28,140 +28,10 @@ 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 ---- ../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 @@ - # - LIBDIR=/usr/lib/X11 - ETCDIR=/etc/X11 -- XDMDIR=${ETCDIR}/xdm -+ XDMDIR=/usr/${ETCDIR}/xdm - BINDIR=/usr/bin - xmessage=${BINDIR}/xmessage - xconsole=${BINDIR}/xconsole ---- ../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 @@ - ! - ! Include system wide Xresources - ! --#include "/etc/X11/Xresources" -+#include "/usr/etc/X11/Xresources" ---- ../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 @@ - # Some system defaults - # - XETCDIR=/etc/X11 -- XDMDIR=$XETCDIR/xdm -- XINITDIR=$XETCDIR/xinit -+ XDMDIR=/usr/$XETCDIR/xdm - : ${TMPDIR=/tmp} - -+# xinitrc moved to %{_libexecdir}/xinit in xinit package -+if [ -r /usr/libexec/xinit/xinitrc ]; then -+ XINITDIR=/usr/libexec/xinit -+elif [ -r /usr/lib/xinit/xinitrc ]; then -+ XINITDIR=/usr/lib/xinit -+else -+ XINITDIR=$XETCDIR/xinit -+fi -+ - export OPENWINHOME TMPDIR - test -n "$XAUTHORITY" || unset XAUTHORITY - -@@ -187,7 +195,11 @@ - # - # By default we set system defaults for the language - # --. /etc/profile.d/lang.sh -+if [ -r /etc/profile.d/lang.sh ]; then -+ . /etc/profile.d/lang.sh -+elif [ -r /usr/etc/profile.d/lang.sh ]; then -+ . /usr/etc/profile.d/lang.sh -+fi - - # - # Handle arguments given by xdm/kdm/gdm. -@@ -261,7 +273,11 @@ - # No window manager? Get system default - # - if test -z "$WINDOWMANAGER" ; then -- . /etc/profile.d/profile.sh -+ if [ -r /etc/profile.d/profile.sh ]; then -+ . /etc/profile.d/profile.sh -+ elif [ -r /usr/etc/profile.d/profile.sh ]; then -+ . /usr/etc/profile.d/profile.sh -+ fi - fi - - # -@@ -291,7 +307,12 @@ - # Source common code shared between the - # X session and X init scripts - # --. /etc/X11/xinit/xinitrc.common -+ -+if [ -r /etc/X11/xinit/xinitrc.common ]; then -+ . /etc/X11/xinit/xinitrc.common -+elif [ -r /usr/etc/X11/xinit/xinitrc.common ]; then -+ . /usr/etc/X11/xinit/xinitrc.common -+fi - - # Restore arguments but skip window manager - set -- "${argv[@]}" ---- ../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 @@ - # - LIBDIR=/usr/lib/X11 - ETCDIR=/etc/X11 -- XDMDIR=${ETCDIR}/xdm -+ XDMDIR=/usr/${ETCDIR}/xdm - BINDIR=/usr/bin - - no_exit_on_failed_exec=1 -@@ -184,7 +184,7 @@ - #endif - EOF - else -- $xrdb $cpp -override -retain ${ETCDIR}/Xresources -+ $xrdb $cpp -override -retain ${XDMDIR}/Xresources - fi - - # -@@ -206,6 +206,8 @@ - cat $sysxkbmap | $xkbcomp - $DISPLAY - elif test -r $sysmodmap ; then - $xmodmap $sysmodmap -+ elif test -r /usr/etc/X11/Xmodmap ; then -+ $xmodmap /usr/etc/X11/Xmodmap - fi - else - # TCP/IP connection (remote or local) -@@ -213,6 +215,8 @@ - cat $defxkbmap | $xkbcomp - $DISPLAY - elif test -r $defmodmap ; then - $xmodmap $defmodmap -+ elif test -r /usr/etc/X11/Xmodmap.remote ; then -+ $xmodmap /usr/etc/X11/Xmodmap.remote - fi - if test -s $hostxkbmap -a -x $xkbcomp ; then - cat $hostxkbmap | $xkbcomp - $DISPLAY ---- ../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 @@ - # - LIBDIR=/usr/lib/X11 - ETCDIR=/etc/X11 -- XDMDIR=${ETCDIR}/xdm -+ XDMDIR=/usr/${ETCDIR}/xdm - BINDIR=/usr/bin - xmessage=${BINDIR}/xmessage - NOLOGIN=/etc/nologin ---- ../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 @@ +diff -upr xdm.orig/etc/X11/xdm/sys.xsession xdm/etc/X11/xdm/sys.xsession +--- xdm.orig/etc/X11/xdm/sys.xsession 2016-06-03 15:25:42.000000000 +0200 ++++ xdm/etc/X11/xdm/sys.xsession 2024-11-20 14:47:22.173192466 +0100 +@@ -38,10 +38,16 @@ checkproc () argv=("$@") set -- @@ -179,7 +49,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser case "${script##*/}" in .*) continue ;; *.rpm*) continue ;; -@@ -63,7 +69,16 @@ +@@ -63,7 +69,16 @@ done # # Use system default xinitrc if the users does not have one. # @@ -197,7 +67,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc" if test -f "$XINITRCFILE" ; then -@@ -77,7 +92,11 @@ +@@ -77,7 +92,11 @@ else # Source common code shared between the # X session and X init scripts # @@ -210,8 +80,9 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser unset STARTUP WINDOW_MANAGER set -- ${1+"$@"} $WINDOWMANAGER ---- ../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 +diff -upr xdm.orig/etc/X11/xdm/xdm-config xdm/etc/X11/xdm/xdm-config +--- xdm.orig/etc/X11/xdm/xdm-config 2020-08-26 15:36:22.290004407 +0200 ++++ xdm/etc/X11/xdm/xdm-config 2024-11-20 14:47:22.173192466 +0100 @@ -4,10 +4,10 @@ DisplayManager.errorLogFile: /var/log/xdm.errors DisplayManager.pidFile: /run/xdm.pid @@ -226,7 +97,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser ! ! ATTENTION: `authName' should be in general MIT-MAGIC-COOKIE-1 ! For XDM-AUTHENTICATION-1 which is default for xterminals see -@@ -27,16 +27,16 @@ +@@ -27,16 +27,16 @@ DisplayManager._93.authorize: true ! The scripts handling the setup, the startup, the session its self, ! and the reset of an X session. ! @@ -249,14 +120,255 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser DisplayManager.*.terminateServer: false ! ! SECURITY: do not listen for XDMCP or Chooser requests ---- ../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 @@ +diff -upr xdm.orig/etc/X11/xdm/Xreset xdm/etc/X11/xdm/Xreset +--- xdm.orig/etc/X11/xdm/Xreset 2014-12-15 19:34:46.000000000 +0100 ++++ xdm/etc/X11/xdm/Xreset 2024-11-20 14:47:22.173192466 +0100 +@@ -10,7 +10,7 @@ + # + LIBDIR=/usr/lib/X11 + ETCDIR=/etc/X11 +- XDMDIR=${ETCDIR}/xdm ++ XDMDIR=/usr/${ETCDIR}/xdm + BINDIR=/usr/bin + xmessage=${BINDIR}/xmessage + xconsole=${BINDIR}/xconsole +diff -upr xdm.orig/etc/X11/xdm/Xresources xdm/etc/X11/xdm/Xresources +--- xdm.orig/etc/X11/xdm/Xresources 2015-08-04 12:13:36.000000000 +0200 ++++ xdm/etc/X11/xdm/Xresources 2024-11-21 09:38:25.194243785 +0100 +@@ -10,37 +10,38 @@ xlogin*login.translations: #override\ + #undef linux + #undef Linux + #undef LINUX +-xlogin*greeting: Welcome at CLIENTHOST ++xlogin*greeting: CLIENTHOST + xlogin*namePrompt: \040\040\040\040\040\040\040Login: + xlogin*fail: Login incorrect + +-#define FAMILY Serif ++#define FAMILY Helvetica + #if (WIDTH < 800) +-xlogin*login.failFace: FAMILY-16:bold +-xlogin*login.greetFace: FAMILY-18:italic +-xlogin*login.promptFace: FAMILY-16:bold +-xlogin*login.Font: FAMILY-16 ++xlogin*login.failFace: FAMILY-16:regular ++xlogin*login.greetFace: FAMILY-18:regular ++xlogin*login.promptFace: FAMILY-16:regular ++xlogin*login.Font: FAMILY-16 + #else +-xlogin*login.failFace: FAMILY-18:bold +-xlogin*login.greetFace: FAMILY-24:italic +-xlogin*login.promptFace: FAMILY-18:bold +-xlogin*login.face: FAMILY-18 ++login*login.failFace: FAMILY-18:regular ++xlogin*login.greetFace: FAMILY-24:bold ++xlogin*login.promptFace: FAMILY-18:regular ++xlogin*login.face: FAMILY-16 + #endif + #undef FAMILY + + #ifdef COLOR +-xlogin*useShape: true +-xlogin*greetColor: CadetBlue +-xlogin*failColor: red +-*Foreground: black +-*Background: #c0c0c0 +-xlogin*borderWidth: 0 +-xlogin*frameWidth: 5 +-xlogin*innerFramesWidth: 2 +-xlogin*Foreground: black +-xlogin*Background: #c0c0c0 +-xlogin*shdColor: #828282 +-xlogin*hiColor: #e0e0e0 ++xlogin*foreground: #6C6C6C ++xlogin*background: #35968c ++xlogin.Login.foreground: #9adcd5 ++xlogin.Login.greetColor: #9adcd5 ++xlogin.Login.promptColor: #97CC56 ++xlogin.Login.failColor: #9adcd5 ++xlogin.Login.failTimeout: 2 ++xlogin.Login.hiColor: #63bbb2 ++xlogin.Login.shdColor: #63bbb2 ++xlogin.Login.frameWidth: 2 ++xlogin.Login.innerFramesWidth: 1 ++xlogin.Login.sepWidth: 1 ++xlogin.Login.echoPasswd: true + #else + xlogin*useShape: false + xlogin*borderWidth: 4 +@@ -59,6 +60,8 @@ xlogin*hiColor: black + !#endif + !xlogin*logoPadding: 10 + ++XConsole*background: black ++XConsole*foreground: #9adcd5 + #if (WIDTH < 320) + XConsole*geometry: 125x80-0-0 + XConsole*font: 5x7 +@@ -100,4 +103,4 @@ Chooser*Command.font: -*-new century sc + ! + ! Include system wide Xresources + ! +-#include "/etc/X11/Xresources" ++#include "/usr/etc/X11/Xresources" +diff -upr xdm.orig/etc/X11/xdm/Xsession xdm/etc/X11/xdm/Xsession +--- xdm.orig/etc/X11/xdm/Xsession 2021-01-04 15:20:27.548208000 +0100 ++++ xdm/etc/X11/xdm/Xsession 2024-11-20 14:47:22.173192466 +0100 +@@ -34,10 +34,18 @@ fi + # Some system defaults + # + XETCDIR=/etc/X11 +- XDMDIR=$XETCDIR/xdm +- XINITDIR=$XETCDIR/xinit ++ XDMDIR=/usr/$XETCDIR/xdm + : ${TMPDIR=/tmp} + ++# xinitrc moved to %{_libexecdir}/xinit in xinit package ++if [ -r /usr/libexec/xinit/xinitrc ]; then ++ XINITDIR=/usr/libexec/xinit ++elif [ -r /usr/lib/xinit/xinitrc ]; then ++ XINITDIR=/usr/lib/xinit ++else ++ XINITDIR=$XETCDIR/xinit ++fi ++ + export OPENWINHOME TMPDIR + test -n "$XAUTHORITY" || unset XAUTHORITY + +@@ -187,7 +195,11 @@ sessions=( $XDMDIR/sys.xsession $XINITDI + # + # By default we set system defaults for the language + # +-. /etc/profile.d/lang.sh ++if [ -r /etc/profile.d/lang.sh ]; then ++ . /etc/profile.d/lang.sh ++elif [ -r /usr/etc/profile.d/lang.sh ]; then ++ . /usr/etc/profile.d/lang.sh ++fi + + # + # Handle arguments given by xdm/kdm/gdm. +@@ -261,7 +273,11 @@ readonly argv + # No window manager? Get system default + # + if test -z "$WINDOWMANAGER" ; then +- . /etc/profile.d/profile.sh ++ if [ -r /etc/profile.d/profile.sh ]; then ++ . /etc/profile.d/profile.sh ++ elif [ -r /usr/etc/profile.d/profile.sh ]; then ++ . /usr/etc/profile.d/profile.sh ++ fi + fi + + # +@@ -291,7 +307,12 @@ fi + # Source common code shared between the + # X session and X init scripts + # +-. /etc/X11/xinit/xinitrc.common ++ ++if [ -r /etc/X11/xinit/xinitrc.common ]; then ++ . /etc/X11/xinit/xinitrc.common ++elif [ -r /usr/etc/X11/xinit/xinitrc.common ]; then ++ . /usr/etc/X11/xinit/xinitrc.common ++fi + + # Restore arguments but skip window manager + set -- "${argv[@]}" +diff -upr xdm.orig/etc/X11/xdm/Xsetup xdm/etc/X11/xdm/Xsetup +--- xdm.orig/etc/X11/xdm/Xsetup 2020-08-26 15:35:43.014615021 +0200 ++++ xdm/etc/X11/xdm/Xsetup 2024-11-21 09:38:57.287767888 +0100 +@@ -9,7 +9,7 @@ + # + LIBDIR=/usr/lib/X11 + ETCDIR=/etc/X11 +- XDMDIR=${ETCDIR}/xdm ++ BKGDIR=/usr/share/wallpapers/openSUSEdefault/contents/images + BINDIR=/usr/bin + + no_exit_on_failed_exec=1 +@@ -29,7 +29,7 @@ type cpp >/dev/null 2>&1 && cpp= + # Store your preferred picture in XPM format (see xv(1) or ppm(5)) + # You can run gzip on the file BackGround.xpm to save disk space. + # +- background=${XDMDIR}/BackGround.xpm ++ background=${BKGDIR}/1920x1200.png + + # + # Special screensaver parameters for xset, see manual page xset(1x). +@@ -68,6 +68,7 @@ hostxkbmap=${ETCDIR}/Xkbmap.${DISPLAY%:* + xrdb=${BINDIR}/xrdb + backprg=${BINDIR}/BackGround + qiv=${BINDIR}/qiv ++ feh=${BINDIR}/feh + # halporp=/usr/bin/hal-find-by-property + xvkbd=${BINDIR}/xvkbd + xvkbdargs="-compact -geometry -0-0 -xdm -always-on-top -keyfile /usr/share/X11/app-defaults/xvkbd.default" +@@ -135,6 +136,8 @@ fi + # + if test "$xdm" = "no" ; then + : # $xsetroot -solid '#738dc6' ++elif test -s ${background} -a -x $feh ; then ++ $feh --bg-scale ${background} + elif test -s ${background}.gz -a -x $xpmroot ; then + $xpmroot ${background}.gz + elif test -s ${background} -a -x $xpmroot ; then +@@ -184,7 +187,7 @@ if test "$xdm" = "yes" ; then + #endif + EOF + else +- $xrdb $cpp -override -retain ${ETCDIR}/Xresources ++ $xrdb $cpp -override -retain ${XDMDIR}/Xresources + fi + + # +@@ -206,6 +209,8 @@ if test -x $xmodmap -o -x $xkbcomp ; the + cat $sysxkbmap | $xkbcomp - $DISPLAY + elif test -r $sysmodmap ; then + $xmodmap $sysmodmap ++ elif test -r /usr/etc/X11/Xmodmap ; then ++ $xmodmap /usr/etc/X11/Xmodmap + fi + else + # TCP/IP connection (remote or local) +@@ -213,6 +218,8 @@ if test -x $xmodmap -o -x $xkbcomp ; the + cat $defxkbmap | $xkbcomp - $DISPLAY + elif test -r $defmodmap ; then + $xmodmap $defmodmap ++ elif test -r /usr/etc/X11/Xmodmap.remote ; then ++ $xmodmap /usr/etc/X11/Xmodmap.remote + fi + if test -s $hostxkbmap -a -x $xkbcomp ; then + cat $hostxkbmap | $xkbcomp - $DISPLAY +Only in xdm/etc/X11/xdm: Xsetup.orig +Only in xdm/etc/X11/xdm: Xsetup.rej +diff -upr xdm.orig/etc/X11/xdm/Xstartup xdm/etc/X11/xdm/Xstartup +--- xdm.orig/etc/X11/xdm/Xstartup 2020-08-26 15:35:26.270871116 +0200 ++++ xdm/etc/X11/xdm/Xstartup 2024-11-20 14:47:22.173192466 +0100 +@@ -10,7 +10,7 @@ + # + LIBDIR=/usr/lib/X11 + ETCDIR=/etc/X11 +- XDMDIR=${ETCDIR}/xdm ++ XDMDIR=/usr/${ETCDIR}/xdm + BINDIR=/usr/bin + xmessage=${BINDIR}/xmessage + NOLOGIN=/etc/nologin +diff -upr xdm.orig/usr/lib/X11/display-manager xdm/usr/lib/X11/display-manager +--- xdm.orig/usr/lib/X11/display-manager 2020-09-04 13:11:23.054517000 +0200 ++++ xdm/usr/lib/X11/display-manager 2024-11-20 14:47:22.173192466 +0100 +@@ -13,11 +13,16 @@ + # /usr/lib/X11/display-manager + # + ++DEFAULT_WM="default" ++ . /etc/sysconfig/displaymanager . /etc/sysconfig/language - . /etc/sysconfig/windowmanager +-. /etc/sysconfig/windowmanager -test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile -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 + . /etc/profile.d/desktop-data.sh +elif [ -r /usr/etc/profile.d/desktop-data.sh ]; then @@ -265,7 +377,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser locale_vars=" \ LANG \ -@@ -67,14 +70,14 @@ +@@ -67,14 +72,14 @@ fi unset DEFAULT_WM export WINDOWMANAGER @@ -282,7 +394,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 # graphics card (bsc#1039497) if [ "$(arch)" == "aarch64" -o "$(arch)" == "ppc64le" ]; then -@@ -87,8 +90,8 @@ +@@ -87,8 +92,8 @@ xdm_reload_files () { fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -293,7 +405,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser /bin/logger return 0 fi -@@ -130,6 +133,13 @@ +@@ -130,6 +135,13 @@ case "$DM" in exit 0 ;; *) @@ -307,7 +419,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser for i in /usr/lib/X11/displaymanagers/* do tmp=${i%.fallback} -@@ -159,8 +177,8 @@ +@@ -159,8 +171,8 @@ case "$1" in start) # use system keyboard as global X keyboard configuration @@ -318,9 +430,10 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser fi [ -n "$STARTPROC" ] && $STARTPROC ---- ../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 -upr xdm.orig/usr/lib/X11/displaymanagers/xdm xdm/usr/lib/X11/displaymanagers/xdm +--- xdm.orig/usr/lib/X11/displaymanagers/xdm 2014-03-04 13:53:31.000000000 +0100 ++++ xdm/usr/lib/X11/displaymanagers/xdm 2024-11-20 14:47:22.173192466 +0100 +@@ -5,8 +5,8 @@ xdm_start_proc() { } xdm_probe_proc() { diff --git a/xdm-tolerant-hostname-changes.diff b/xdm-tolerant-hostname-changes.diff index edfa410..fb4b500 100644 --- a/xdm-tolerant-hostname-changes.diff +++ b/xdm-tolerant-hostname-changes.diff @@ -1,6 +1,8 @@ ---- xdm/auth.c.orig 2011-09-25 09:35:47.000000000 +0200 -+++ xdm/auth.c 2014-07-18 14:55:03.244300844 +0200 -@@ -767,7 +767,7 @@ writeAddr ( +Index: xdm/auth.c +=================================================================== +--- xdm.orig/auth.c ++++ xdm/auth.c +@@ -744,7 +744,7 @@ writeAddr ( } static void @@ -9,8 +11,8 @@ { char displayname[100]; int len = _XGetHostname (displayname, sizeof(displayname)); -@@ -803,6 +803,9 @@ DefineLocal (FILE *file, Xauth *auth) - #endif +@@ -759,6 +759,9 @@ DefineLocal (FILE *file, Xauth *auth) + writeAddr (FamilyLocal, len, displayname, file, auth); + @@ -19,7 +21,7 @@ } #ifdef HAVE_GETIFADDRS -@@ -1236,7 +1239,7 @@ setAuthNumber (Xauth *auth, char *name) +@@ -1019,7 +1022,7 @@ setAuthNumber (Xauth *auth, char *name) } static void @@ -28,7 +30,7 @@ { int fd; -@@ -1263,13 +1266,13 @@ writeLocalAuth (FILE *file, Xauth *auth, +@@ -1034,13 +1037,13 @@ writeLocalAuth (FILE *file, Xauth *auth, DefineSelf (fd, file, auth); close (fd); #endif @@ -44,7 +46,7 @@ { int family = FamilyLocal; char *addr; -@@ -1288,7 +1291,7 @@ writeRemoteAuth (FILE *file, Xauth *auth +@@ -1059,7 +1062,7 @@ writeRemoteAuth (FILE *file, Xauth *auth } else { @@ -53,7 +55,7 @@ } } -@@ -1312,6 +1315,7 @@ SetUserAuthorization (struct display *d, +@@ -1083,6 +1086,7 @@ SetUserAuthorization (struct display *d, #ifdef HAVE_MKSTEMP int fd; #endif @@ -61,7 +63,7 @@ Debug ("SetUserAuthorization\n"); auths = d->authorizations; -@@ -1404,10 +1408,10 @@ SetUserAuthorization (struct display *d, +@@ -1175,10 +1179,10 @@ SetUserAuthorization (struct display *d, { magicCookie = i; if (d->displayType.location == Local) @@ -74,7 +76,7 @@ #endif break; } -@@ -1425,10 +1429,10 @@ SetUserAuthorization (struct display *d, +@@ -1196,10 +1200,10 @@ SetUserAuthorization (struct display *d, !strncmp (auths[i]->name, "MIT-KERBEROS-5", 14)) auths[i]->data_length = 0; if (d->displayType.location == Local) @@ -87,7 +89,7 @@ #endif auths[i]->data_length = data_len; } -@@ -1473,6 +1477,12 @@ SetUserAuthorization (struct display *d, +@@ -1244,6 +1248,12 @@ SetUserAuthorization (struct display *d, verify->systemEnviron = setEnv (verify->systemEnviron, "XAUTHORITY", envname); } @@ -100,7 +102,7 @@ XauUnlockAuth (name); if (envname) chown (envname, verify->uid, verify->gid); -@@ -1511,10 +1521,10 @@ RemoveUserAuthorization (struct display +@@ -1282,10 +1292,10 @@ RemoveUserAuthorization (struct display for (i = 0; i < d->authNum; i++) { if (d->displayType.location == Local) diff --git a/xdm.changes b/xdm.changes index 644fdd6..fe0499f 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Wed Nov 27 13:07:24 UTC 2024 - Dominique Leuenberger + +- Split out displaymanager-sycconfig package: The central + configuration part that is used by all display managers. This is + needed in order to progress towards 'xdm' not acting as wrapper + around DMs, but only be used as Dislplay Manager when XDM is + supposed to be used, or use the real systemd services of the + various DMs (e.g gdm.service, sddm.service). + +------------------------------------------------------------------- +Wed Nov 20 13:11:22 UTC 2024 - pgajdos@suse.com + +- tweak the login screen: + * use sans serif font + * use branding wallpaper and colors + * do not require xli, recommend feh + +------------------------------------------------------------------- +Fri Aug 9 09:40:13 UTC 2024 - Thorsten Kukuk + +- 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 + +- Update to release 1.1.16 + * This release fixes a failure to build with the recent libXaw 1.0.16 + release due to a change introduced in xdm 1.1.15 to address gcc 14 + build issues. + +------------------------------------------------------------------- +Sun Mar 24 08:32:09 UTC 2024 - Stefan Dirsch + +- Update to release 1.1.15 + * This release fixes a failure to build with the upcoming gcc 14, + cleans up several other compiler warnings, fixes a bug in the + generation of the xdm.service file for systemd, and removes a + lot of dead code checks for platforms & features that have not + been supported since the conversion from Imake to autoconf in + 2005. +- supersedes u_gcc14-fix.patch + +------------------------------------------------------------------- +Wed Mar 6 09:21:36 UTC 2024 - Stefan Dirsch + +- u_gcc14-fix.patch + * fix build against gcc14 (boo#1221028) + +------------------------------------------------------------------- +Mon Feb 26 12:07:38 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Thu May 11 12:17:55 UTC 2023 - Stefan Dirsch diff --git a/xdm.spec b/xdm.spec index 636c8b5..2390a9c 100644 --- a/xdm.spec +++ b/xdm.spec @@ -1,7 +1,7 @@ # # spec file for package xdm # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif Name: xdm -Version: 1.1.14 +Version: 1.1.16 Release: 0 Summary: X Display Manager License: MIT @@ -57,14 +57,13 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.4 BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtrans) -Requires: %fillup_prereq Requires: /sbin/startproc Requires: cpp Requires: logrotate Requires: sessreg Requires: xconsole Requires: xinit -Requires: xli +Recommends: feh Requires: xmessage Requires: xrdb Requires: xset @@ -80,6 +79,8 @@ Requires: %{_bindir}/pidof %else Requires: /sbin/pidof %endif +Requires: displaymanager-sysconfig +Requires(post): displaymanager-sysconfig %description Xdm manages a collection of X displays, which may be on the local host @@ -96,14 +97,25 @@ This package contains the System desktop file which will cause the execution of a user provided $HOME/.xsession script or pick the system wide DM default set in %{_sysconfdir}/sysconfig/displaymanager. +%package -n displaymanager-sysconfig +Summary: Central configuration for Display Managers +Requires: %fillup_prereq + +%description -n displaymanager-sysconfig +openSUSE tries to concentrate common configuration of multiple display managers +in a central place (/etc/sysconfig/displaymanager). The most relevant setting to +configure there is AUTOLOGIN. + +This package is required by the various display managers that integrate into the config hooks. + %prep %setup -q cp %{SOURCE2} . pushd xdm -%patch1 -p1 +%patch -P 1 -p1 popd # reverse apply (boo#1130321) -%patch3 -p1 -R +%patch -P 3 -p1 -R %build # needed for patch0 @@ -125,7 +137,7 @@ pushd %{buildroot} # SuSE default XDM configuration tar xf %{SOURCE1} %if 0%{?UsrEtcMove} -patch -p0 < %{PATCH2} +patch -p1 < %{PATCH2} mkdir -p usr%{_sysconfdir}/X11/xdm mv etc/X11/xdm/* usr%{_sysconfdir}/X11/xdm # Edited by SUSEConfig.xdm, package a copy @@ -199,7 +211,6 @@ if [ $1 -eq 1 ] ; then fi fi %service_add_post display-manager.service -%{fillup_only -n displaymanager} %{_sbindir}/update-alternatives --install %{_prefix}/lib/X11/displaymanagers/default-displaymanager \ default-displaymanager %{_prefix}/lib/X11/displaymanagers/console 5 %{_sbindir}/update-alternatives --install %{_prefix}/lib/X11/displaymanagers/default-displaymanager \ @@ -226,6 +237,9 @@ sed -i 's/DISPLAYMANAGER=.*//g' %{_sysconfdir}/sysconfig/displaymanager %preun %service_del_preun display-manager.service +%post -n displaymanager-sysconfig +%{fillup_only -n displaymanager} + %files %license COPYING %doc AUTHORS ChangeLog README.md @@ -263,7 +277,6 @@ sed -i 's/DISPLAYMANAGER=.*//g' %{_sysconfdir}/sysconfig/displaymanager %config(noreplace) %{_sysconfdir}/pam.d/xdm-np %endif %dir %{_localstatedir}/lib/xdm/ -%{_fillupdir}/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ %ghost %{_localstatedir}/log/xdm.errors %{_bindir}/chooser @@ -282,4 +295,7 @@ sed -i 's/DISPLAYMANAGER=.*//g' %{_sysconfdir}/sysconfig/displaymanager %files xsession %{_datadir}/xsessions/xsession.desktop +%files -n displaymanager-sysconfig +%{_fillupdir}/sysconfig.displaymanager + %changelog