Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2020-10-07 14:16:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm"
Wed Oct 7 14:16:22 2020 rev:84 rq:839607 version:1.1.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2020-08-31 17:14:59.221045259
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.4249/xdm.changes 2020-10-07
14:16:25.221387099 +0200
@@ -1,0 +2,115 @@
+Mon Oct 5 14:57:23 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- removed /etc/X11/xdm/Keyboard.map since it meanwhile has been
+ replaced by /usr/share/systemd/kbd-model-map (used by YaST)
+
+-------------------------------------------------------------------
+Sun Oct 4 09:40:50 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Don't create the compat symlinks in /etc on the fly, track them
+ properly as %config
+
+-------------------------------------------------------------------
+Sat Oct 3 16:52:18 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- /etc/X11/xdm/scripts/11-ssh-agent
+ * ssh-askpass now moved to /usr/libexec/ssh (boo#1175991)
+
+-------------------------------------------------------------------
+Tue Sep 29 09:57:42 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- moved xdm/xdm-np PAM files to /usr/etc/pam.d, since lightdm has
+ been adjusted meanwhile
+
+-------------------------------------------------------------------
+Tue Sep 15 10:16:41 UTC 2020 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Switch to /usr/bin/pidof dependency, provided by procps-ng.
+
+-------------------------------------------------------------------
+Thu Sep 10 02:42:45 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- fixes in xdm-tarball.patch
+ * /usr/lib/X11/display-manager: fixes sddm, which didn't use
+ xdm_reload_files in xdm_start_proc() of
+ /usr/lib/X11/displaymanagers/sddm (boo#1173049)
+
+-------------------------------------------------------------------
+Wed Sep 9 15:50:51 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- fixes in xdm-tarball.patch
+ * symlink also $XDMDIR/xinitrc.common in /etc/X11/xinit; it
+ is still often sourced in old ~/.xinitrc user files ...
+
+-------------------------------------------------------------------
+Wed Sep 9 13:53:33 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- 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)
+- specfile:
+ * 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 <sndir...@suse.com>
+
+- reenabled move to /usr/etc/X11/xdm; updated xdm-tarball.patch
+ (includes changes from xinit-UsrEtcMove.patch) [boo#1176212]
+
+-------------------------------------------------------------------
+Tue Sep 8 15:00:50 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- xinit-UsrEtcMove.patch
+ * changes needed with xinitrc moving to %{_libexecdir}/xinit and
+ xinitrc.common moving to /usr/etc/X11/xinit/
+
+-------------------------------------------------------------------
+Tue Sep 8 09:29:10 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- reverted move to /usr/etc/X11/xdm for now due to boo#1176212
+
+-------------------------------------------------------------------
+Sat Sep 5 03:41:38 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- updated xdm-tarball.patch
+ * adjusted for changes in xmodmap and xinit (boo#1173049)
+
+-------------------------------------------------------------------
+Fri Sep 4 22:33:30 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- xdm-tarball.patch
+ * /usr/etc changes still needed for xdm.tar.bz2; will need
+ more changes once xmodmap and xinit files are also moved to
+ /usr/etc (boo#1173049)
+
+-------------------------------------------------------------------
+Fri Sep 4 20:20:05 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- move /etc/X11/xdm --> /usr/etc/X11/xdm and
+ /etc/pam.d -> /usr/etc/pam.d; still TODO: adjust scripts in
+ xdm.tar.bz2 (boo#1173049)
+
+-------------------------------------------------------------------
+Fri Sep 4 11:17:34 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- more cleanup
+ * no longer support sle12; adjusted xdm.tar.bz2 and
+ applied xdm-with-update-alternative.patch to this tarball
+
+-------------------------------------------------------------------
+Fri Sep 4 10:29:39 UTC 2020 - Stefan Dirsch <sndir...@suse.com>
+
+- cleanup
+ * get rid of xdm-fallbacks.tar.bz2, which wasn't used any longer
+ since SUSE 12.1
+ * no longer support systmed based OSes like SUSE < 12.1 and sle11;
+ removed therefore also xdm-consolekit.diff
+ * no longer support sle11
+
+-------------------------------------------------------------------
Old:
----
xdm-consolekit.diff
xdm-fallbacks.tar.bz2
xdm-with-update-alternative.patch
New:
----
xdm-tarball.patch
xinit-UsrEtcMove.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.6Nv8Yg/_old 2020-10-07 14:16:25.909387647 +0200
+++ /var/tmp/diff_new_pack.6Nv8Yg/_new 2020-10-07 14:16:25.909387647 +0200
@@ -16,25 +16,16 @@
#
+%if 0%{?suse_version} >= 1550
+%define UsrEtcMove 1
+%endif
+
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define _dminitdir /usr/lib/X11/displaymanagers
-%if 0%{?suse_version} > 1230
-%define with_systemd 1
-%else
-%define with_systemd 0
-%endif
-%if 0%{?suse_version} < 01210
-%define dm_fallbacks 1
-%else
-%define dm_fallbacks 0
-%endif
-%if !%with_systemd
-%define _unitdir %{_prefix}/lib/systemd/system
-%endif
Name: xdm
Version: 1.1.12
Release: 0
@@ -45,14 +36,13 @@
Source0:
http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2
Source1: xdm.tar.bz2
Source2: HOWTO.xdm
-Source3: xdm-fallbacks.tar.bz2
Source4: display-manager.service
Source5: xsession.desktop
Patch1: xdm-tolerant-hostname-changes.diff
-# PATCH-FEATURE-OPENSUSE xdm-with-update-alternative.patch
dims...@opensuse.org -- Choice of default DM by means of u-a
-Patch2: xdm-with-update-alternative.patch
-# needed for patch0, patch2, patch3, patch4
+Patch2: xdm-tarball.patch
Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch
+Patch4: xinit-UsrEtcMove.patch
+BuildRequires: firewall-macros
BuildRequires: libtool
BuildRequires: pam-devel
BuildRequires: pkgconfig
@@ -68,17 +58,9 @@
BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtrans)
-%if 0%{?suse_version} > 1320
-BuildRequires: firewall-macros
-%endif
-Requires: /sbin/pidof
-Requires: /sbin/startproc
-%if 0%{?with_systemd}
Requires: %fillup_prereq
-%endif
-%if 0%{?suse_version} < 1315
-Requires: insserv-compat
-%endif
+Requires: %{_bindir}/pidof
+Requires: /sbin/startproc
Requires: logrotate
Requires: sessreg
Requires: xconsole
@@ -91,25 +73,9 @@
Recommends: dbus-1-x11
# This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6
-%if !%with_systemd
-Patch0: xdm-consolekit.diff
-%endif
-%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320
-# Needed to create the man page symlink to init.d
-BuildRequires: aaa_base-extras
-%endif
-%if !%with_systemd
-BuildRequires: ConsoleKit-devel
-Requires: ConsoleKit
-%else
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
-%endif
-%if 0%{?suse_version} > 1320
Requires: xterm-bin
-%else
-Requires: xterm
-%endif
%description
Xdm manages a collection of X displays, which may be on the local host
@@ -129,14 +95,9 @@
%prep
%setup -q
cp %{SOURCE2} .
-%if !%with_systemd
-%patch0 -p1
-%endif
pushd xdm
%patch1 -p1
popd
-# Special note: patch 2 is applied in install section; tagging it here for the
source validator only
-#patch2 -p1
# reverse apply (boo#1130321)
%patch3 -p1 -R
@@ -159,19 +120,21 @@
pushd %{buildroot}
# SuSE default XDM configuration
tar xf %{SOURCE1}
-%if 0%{?suse_version} > 1320
-rm etc/sysconfig/SuSEfirewall2.d/services/xdmcp
-rmdir etc/sysconfig/SuSEfirewall2.d/services
-rmdir etc/sysconfig/SuSEfirewall2.d
-rmdir etc/sysconfig
+%if 0%{?UsrEtcMove}
+patch -p0 < %{PATCH2}
+mkdir -p usr/etc/X11/xdm
+mv etc/X11/xdm/* usr/etc/X11/xdm
+# Install compatibility symlinks. Remove once DMs adjusted
+for i in Xsession Xsetup Xstartup Xreset; do
+ ln -s /usr/etc/X11/xdm/$i etc/X11/xdm/$i
+done
+# Edited by SUSEConfig.xdm, package a copy
+for i in xdm-config Xservers; do
+ cp usr/etc/X11/xdm/$i etc/X11/xdm/$i
+done
+mv etc/pam.d usr/etc/
%else
-rm usr/lib/firewalld/services/x11.xml
-rmdir usr/lib/firewalld/services
-rmdir usr/lib/firewalld
-%endif
-%if 0%{?suse_version} >= 1330
-patch -p1 < %{PATCH2}
-rm -f usr/lib/X11/display-manager.orig
+patch -p0 < %{PATCH4}
%endif
%if "%{_fillupdir}" != "/var/adm/fillup-templates"
mkdir -p %{buildroot}$(dirname %{_fillupdir})
@@ -179,9 +142,6 @@
%{buildroot}$(dirname %{_fillupdir})
%endif
-%if %dm_fallbacks
-tar xf %{SOURCE3}
-%endif
%ifarch s390 s390x
sed -i -e
"s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\"+g" \
-e
"s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
@@ -190,7 +150,11 @@
popd
# Correct location (FHS-2.1)
+%if 0%{?UsrEtcMove}
+ln -s %{_localstatedir}/lib/xdm/authdir
%{buildroot}%{_distconfdir}/X11/xdm/authdir
+%else
ln -s %{_localstatedir}/lib/xdm/authdir
%{buildroot}%{_sysconfdir}/X11/xdm/authdir
+%endif
# bnc#223734
rm %{buildroot}%{_libdir}/X11/xdm/libXdmGreet.la
# for FHS compliance (bnc#21857)
@@ -198,12 +162,6 @@
# fdo#35868 (closed INVALID, but because of above fix, we want it)
ln -s xdm.8%{?ext_man} %{buildroot}%{_mandir}/man8/chooser.8%{?ext_man}
install -D %{SOURCE5} -m 0644
%{buildroot}%{_datadir}/xsessions/xsession.desktop
-%if 0%{?suse_version} < 1315
-# missing manual page
-mkdir -p %{buildroot}%{_mandir}/man8
-ln -s ../man7/init.d.7%{?ext_man}
%{buildroot}%{_mandir}/man8/rcxdm.8%{?ext_man}
-ln -sf %{_sysconfdir}/init.d/xdm %{buildroot}%{_sbindir}/rcxdm
-%else
rm -f %{buildroot}%{_sbindir}/rcxdm
install -D %{SOURCE4} -m 0444 %{buildroot}%{_unitdir}/display-manager.service
ln -sf service %{buildroot}%{_sbindir}/rcdisplay-manager
@@ -212,58 +170,37 @@
exec -a rcdisplay-manager %{_sbindir}/rcdisplay-manager ${1+"$@"}
EOF
chmod 0755 %{buildroot}%{_sbindir}/rcxdm
-%endif
-%if 0%{?suse_version} >= 1330
# prepare for defaul-dm to be chosen by means of update-alternatives
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
ln -s %{_sysconfdir}/alternatives/default-displaymanager
%{buildroot}/usr/lib/X11/displaymanagers/default-displaymanager
# Inject a dummy 'console' selection - which used to be choice in
/etc/sysconfig/displaymanager
touch %{buildroot}/usr/lib/X11/displaymanagers/console
-%endif
%post
-%if 0%{?suse_version} < 1315
-%{fillup_and_insserv -Y xdm}
-%else
%service_add_post display-manager.service
%{fillup_only -n displaymanager}
-%endif
-%if 0%{?suse_version} >= 1330
%{_sbindir}/update-alternatives --install
/usr/lib/X11/displaymanagers/default-displaymanager \
default-displaymanager /usr/lib/X11/displaymanagers/console 5
%{_sbindir}/update-alternatives --install
/usr/lib/X11/displaymanagers/default-displaymanager \
default-displaymanager /usr/lib/X11/displaymanagers/xdm 10
# get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager (boo#1125040)
sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
-%endif
-%if 0%{?suse_version} > 1320
%firewalld_reload
-%endif
%pre
-%if !0%{?suse_version} < 1315
- %service_add_pre display-manager.service
-%endif
+%service_add_pre display-manager.service
%postun
-%if 0%{?suse_version} < 1315
-%{insserv_cleanup}
-%else
# Do not restart DM on update (bnc#886641)
%service_del_postun -n display-manager.service
-%endif
-%if 0%{?suse_version} >= 1330
[ -f /usr/lib/X11/displaymanagers/console ] || %{_sbindir}/update-alternatives
\
--remove default-displaymanager /usr/lib/X11/displaymanagers/console
[ -f /usr/lib/X11/displaymanagers/xdm ] || %{_sbindir}/update-alternatives \
--remove default-displaymanager /usr/lib/X11/displaymanagers/xdm
-%endif
%preun
-%if !0%{?suse_version} < 1315
- %service_del_preun display-manager.service
-%endif
+%service_del_preun display-manager.service
%files
%defattr(-,root,root)
@@ -271,39 +208,32 @@
%doc HOWTO.xdm
%dir %{_dminitdir}
%{_dminitdir}/xdm
-%if 0%{?suse_version} >= 1330
%{_dminitdir}/console
/usr/lib/X11/displaymanagers/default-displaymanager
%ghost %{_sysconfdir}/alternatives/default-displaymanager
-%endif
-%if %dm_fallbacks
-%{_dminitdir}/entrance.fallback
-%{_dminitdir}/gdm.fallback
-%{_dminitdir}/kdm.fallback
-%{_dminitdir}/lxdm.fallback
-%{_dminitdir}/slim.fallback
-%{_dminitdir}/wdm.fallback
+%if 0%{?UsrEtcMove}
+%dir %{_distconfdir}/X11
+%{_distconfdir}/X11/xdm/
%endif
%config %{_sysconfdir}/X11/xdm/
+%if 0%{?UsrEtcMove}
+%dir %{_distconfdir}/X11/xdm/scripts
+%else
%dir %{_sysconfdir}/X11/xdm/scripts
-%if 0%{?suse_version} > 1320
+%endif
%dir /usr/lib/firewalld
%dir /usr/lib/firewalld/services
/usr/lib/firewalld/services/x11.xml
-%else
-%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
-%endif
-%if 0%{?suse_version} < 1315
-%{_sysconfdir}/init.d/xdm
-%exclude /usr/lib/X11/display-manager
-%else
-%exclude %{_sysconfdir}/init.d/xdm
%{_unitdir}/display-manager.service
/usr/lib/X11/display-manager
-%endif
%config %{_sysconfdir}/logrotate.d/xdm
+%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
%dir %{_localstatedir}/lib/xdm/
%{_fillupdir}/sysconfig.displaymanager
%{_localstatedir}/lib/xdm/authdir/
@@ -311,17 +241,12 @@
%{_bindir}/chooser
%{_bindir}/xdm
%{_sbindir}/rcxdm
-%if 0%{?suse_version} >= 1315
%{_sbindir}/rcdisplay-manager
-%endif
%{_libdir}/X11/xdm/
%dir %{_datadir}/X11/app-defaults
%{_datadir}/X11/app-defaults/Chooser
%{_mandir}/man8/chooser.8%{?ext_man}
%{_mandir}/man8/xdm.8%{?ext_man}
-%if 0%{?suse_version} < 1315
-%{_mandir}/man8/rcxdm.8%{?ext_man}
-%endif
%ifnarch %ix86
%dir %{_libdir}/X11
%endif
++++++ xdm-tarball.patch ++++++
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
@@ -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
@@ -107,6 +107,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)
@@ -114,6 +116,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
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 @@
#
LIBDIR=/usr/lib/X11
ETCDIR=/etc/X11
- XDMDIR=${ETCDIR}/xdm
+ XDMDIR=/usr/${ETCDIR}/xdm
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 @@
!
! 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-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[@]}"
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 @@
#
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
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 @@
#
LIBDIR=/usr/lib/X11
ETCDIR=/etc/X11
- XDMDIR=${ETCDIR}/xdm
+ XDMDIR=/usr/${ETCDIR}/xdm
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 @@
argv=("$@")
set --
-for script in /etc/X11/xdm/scripts/*
+for script in /usr/etc/X11/xdm/scripts/* \
+ /etc/X11/xdm/scripts/*
do
test -e $script || continue
test -d $script && continue
+ # higher priority for /etc/X11/xdm/scripts ...
+ if echo $script | grep -q ^/usr; then
+ sname=$(basename $script)
+ test -e /etc/X11/xdm/scripts/$sname && continue
+ fi
case "${script##*/}" in
.*) continue ;;
*.rpm*) continue ;;
@@ -63,7 +69,16 @@
#
# Use system default xinitrc if the users does not have one.
#
-XINITRCFILE=/etc/X11/xinit/xinitrc
+
+# xinitrc moved to %{_libexecdir}/xinit in xinit package
+if [ -r /usr/libexec/xinit/xinitrc ]; then
+ XINITRCFILE=/usr/libexec/xinit/xinitrc
+elif [ -r /usr/lib/xinit/xinitrc ]; then
+ XINITRCFILE=/usr/lib/xinit/xinitrc
+else
+ XINITRCFILE=/etc/X11/xinit/xinitrc
+fi
+
test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc"
if test -f "$XINITRCFILE" ; then
@@ -77,7 +92,11 @@
# 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
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 @@
DisplayManager.errorLogFile: /var/log/xdm.errors
DisplayManager.pidFile: /run/xdm.pid
DisplayManager.authDir: /var/lib/xdm
-DisplayManager.keyFile: /etc/X11/xdm/xdm-keys
+DisplayManager.keyFile: /usr/etc/X11/xdm/xdm-keys
DisplayManager.servers: /etc/X11/xdm/Xservers
-DisplayManager.accessFile: /etc/X11/xdm/Xaccess
-DisplayManager.willing: su nobody -c /etc/X11/xdm/Xwilling
+DisplayManager.accessFile: /usr/etc/X11/xdm/Xaccess
+DisplayManager.willing: su nobody -c /usr/etc/X11/xdm/Xwilling
!
! ATTENTION: `authName' should be in general MIT-MAGIC-COOKIE-1
! For XDM-AUTHENTICATION-1 which is default for xterminals see
@@ -27,16 +27,16 @@
! The scripts handling the setup, the startup, the session its self,
! and the reset of an X session.
!
-DisplayManager.*.setup: /etc/X11/xdm/Xsetup
-DisplayManager.*.chooser: /etc/X11/xdm/RunChooser
-DisplayManager.*.startup: /etc/X11/xdm/Xstartup
-DisplayManager.*.session: /etc/X11/xdm/Xsession
-DisplayManager.*.reset: /etc/X11/xdm/Xreset
+DisplayManager.*.setup: /usr/etc/X11/xdm/Xsetup
+DisplayManager.*.chooser: /usr/etc/X11/xdm/RunChooser
+DisplayManager.*.startup: /usr/etc/X11/xdm/Xstartup
+DisplayManager.*.session: /usr/etc/X11/xdm/Xsession
+DisplayManager.*.reset: /usr/etc/X11/xdm/Xreset
!
DisplayManager._0.terminateServer: true
DisplayManager._93.terminateServer: true
!
-DisplayManager*resources: /etc/X11/xdm/Xresources
+DisplayManager*resources: /usr/etc/X11/xdm/Xresources
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 @@
. /etc/sysconfig/displaymanager
. /etc/sysconfig/language
. /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
+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
+ . /usr/etc/profile.d/desktop-data.sh
+fi
locale_vars=" \
LANG \
@@ -67,14 +70,14 @@
unset DEFAULT_WM
export WINDOWMANAGER
-DMDIR=/etc/X11/xdm
+DMDIR=/usr/etc/X11/xdm
RELOADSIGNAL="-HUP"
PIDFILELNK="/run/displaymanager.pid"
xdm_reload_files () {
- if [ -x /etc/X11/xdm/SuSEconfig.xdm ]; then
+ 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 +90,8 @@
fi
fi
MD5DIR="/var/adm/SuSEconfig/md5" \
- /etc/X11/xdm/SuSEconfig.xdm | \
- sed 's+\(.*\)+/etc/init.d/xdm: \1+g' | \
+ $DMDIR/SuSEconfig.xdm | \
+ sed 's+\(.*\)+/usr/lib/X11/display-manager: \1+g' | \
/bin/logger
return 0
fi
@@ -130,6 +133,12 @@
exit 0
;;
*)
+ test -d /etc/X11/xdm || mkdir -p /etc/X11/xdm
+ # SUSEconfig.xdm edits these files appropriate to
/etc/sysconfig/displaymanager
+ 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 -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 @@
start)
# use system keyboard as global X keyboard configuration
- if [ -x /etc/X11/xdm/keytable ]; then
- /etc/X11/xdm/keytable
+ if [ -x $DMDIR/keytable ]; then
+ $DMDIR/keytable
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 @@
}
xdm_probe_proc() {
- if test $XDMDIR/xdm-config -nt $PIDFILE -o \
- $XDMDIR/Xservers -nt $PIDFILE
+ if test /etc/X11/xdm/xdm-config -nt $PIDFILE -o \
+ /etc/X11/xdm/Xservers -nt $PIDFILE
then
echo reload
fi
++++++ xdm.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Keyboard.map new/etc/X11/xdm/Keyboard.map
--- old/etc/X11/xdm/Keyboard.map 2014-03-04 13:53:31.000000000 +0100
+++ new/etc/X11/xdm/Keyboard.map 1970-01-01 01:00:00.000000000 +0100
@@ -1,150 +0,0 @@
-# /.../
-# Mapping table for console -> X11 mapping
-#==================================================================================
-# CONSOLE | MODEL | LAYOUT | VARIANT | KEYCODE | LA| RA| SL|
RC| OPT
-#---------------|-------|--------------|------------|---------|---|---|---|---|----
-ANSI-dvorak : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-de_CH-latin1 : microsoftpro : ch : de_nodeadkeys: xfree86 : x : x
: x : x : x
-amiga-de : microsoftpro : de : nodeadkeys : xfree86 : x : x
: x : x : x
-amiga-us : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-arabic : microsoftpro : ara,us : x : xfree86 : x : x
: x : x : grp:shift_toggle
-atari-de : microsoftpro : de : nodeadkeys : xfree86 : x : x
: x : x : x
-atari-se : microsoftpro : se : x : xfree86 : x : x
: x : x : x
-atari-uk-falcon : microsoftpro : gb : x : xfree86 : x : x
: x : x : x
-atari-us : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-azerty : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-be-latin1 : microsoftpro : be : x : xfree86 : x : x
: x : x : caps:capslock
-be2-latin1 : microsoftpro : be : x : xfree86 : x : x
: x : x : caps:capslock
-bg : microsoftpro : bg : x : xfree86 : x : x
: x : x : x
-cf : microsoftpro : ca : fr : xfree86 : x : x
: x : x : x
-croat : microsoftpro : hr : x : xfree86 : x : x
: x : x : x
-lt.baltic : microsoftpro : lt : x : xfree86 : x : x
: x : x : x
-lt.std : microsoftpro : lt : std : xfree86 : x : x
: x : x : x
-cz-lat2-prog : microsoftpro : cz,us : x : xfree86 : x : x
: x : x : grp:shift_toggle
-cz-lat2 : microsoftpro : cz,us : qwerty,basic : xfree86 : x : x
: x : x : grp:shift_toggle
-cz-lat2-us : microsoftpro : cz,us : qwerty,basic : xfree86 : x : x
: x : x : grp:shift_toggle
-cz-us-qwertz : microsoftpro : cz,us : x : xfree86 : x : x
: x : x : grp:shift_toggle
-de-lat1-nd : microsoftpro : de : nodeadkeys : xfree86 : x : x : x :
x : x
-de-latin1-en : microsoftpro : de : x : xfree86 : x : x : x :
x : x
-de-latin1 : microsoftpro : de : x : xfree86 : x : x : x :
x : x
-de : microsoftpro : de : nodeadkeys : xfree86 : x : x : x :
x : x
-defkeymap : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-defkeymap_V1.0 : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-dk-latin1 : microsoftpro : dk : x : xfree86 : x : x
: x : x : x
-dk : microsoftpro : dk : x : xfree86 : x : x
: x : x : x
-dvorak-l : microsoftpro : dvorak : x : xfree86 : x : x
: x : x : x
-dvorak-r : microsoftpro : dvorak : x : xfree86 : x : x
: x : x : x
-dvorak : microsoftpro : dvorak : x : xfree86 : x : x
: x : x : x
-mac-dvorak : microsoftpro : dvorak : x : xfree86 : x : x
: x : x : x
-emacs : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-emacs2 : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-es : microsoftpro : es : x : xfree86 : x : x
: x : x : x
-fi-latin1 : microsoftpro : fi : x : xfree86 : x : x
: x : x : x
-fi : microsoftpro : fi : x : xfree86 : x : x
: x : x : x
-fr-latin1 : microsoftpro : fr : x : xfree86 : x : x
: x : x : caps:capslock
-fr-pc : microsoftpro : fr : x : xfree86 : x : x
: x : x : caps:capslock
-fr : microsoftpro : fr : x : xfree86 : x : x
: x : x : caps:capslock
-fr_CH-latin1 : microsoftpro : ch : fr : xfree86 : x : x
: x : x : x
-fr_CH : microsoftpro : ch : fr : xfree86 : x : x
: x : x : x
-gr-pc : microsoftpro : us,gr : ,extended : xfree86 : x : x
: x : x : grp:alt_shift_toggle,grp_led:scroll
-gr : microsoftpro : us,gr : ,extended : xfree86 : x : x
: x : x : grp:alt_shift_toggle,grp_led:scroll
-hebrew : microsoftpro : he : x : xfree86 : x : x
: x : x : x
-hu : microsoftpro : hu : x : xfree86 : x : x
: x : x : x
-hu101 : microsoftpro : hu : x : xfree86 : x : x
: x : x : x
-is-latin1 : microsoftpro : is : x : xfree86 : x :
ModeShift : Compose : x : x
-it-ibm : microsoftpro : it : x : xfree86 : x : x
: x : x : x
-it : microsoftpro : it : x : xfree86 : x : x
: x : x : x
-it2 : microsoftpro : it : x : xfree86 : x : x
: x : x : x
-jp106 : microsoftpro : jp : x : xfree86 : x : x
: x : x : x
-la-latin1 : microsoftpro : latam : x : xfree86 : x : x
: x : x : x
-es-cp850 : microsoftpro : es : x : xfree86 : x : x
: x : x : x
-lt.l4 : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-lt : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-mac-Pl02 : macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-be : macintosh : be : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-br-abnt2 : macintosh : br : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-cz-us-qwertz: macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-de-latin1 : macintosh : de : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-de_CH : macintosh : ch : de_nodeadkeys: xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-dk-latin1 : macintosh : dk : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-es : macintosh : es : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-fi-latin1 : macintosh : fi : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-fr : macintosh : fr : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-fr-latin1 : macintosh : fr : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-fr2-ext : macintosh : fr : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-fr3-ext : macintosh : fr : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-fr_CH-latin1: macintosh : ch : fr : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-gr : macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-hu : macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-it : macintosh : it : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-jp106 : macintosh : jp : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-no-latin1 : macintosh : no : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-pt-latin1 : macintosh : pt : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-ru1 : macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-se : macintosh : se : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-uk : macintosh : gb : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-us : macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-us-ext : macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-us-std : macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-mac-mac-template: macintosh : us : x : xfree86 : x : x : x :
x : altwin:swap_lalt_lwin,lv3:alt_switch
-no-latin1 : microsoftpro : no : x : xfree86 : x : x
: x : x : x
-no : microsoftpro : no : x : xfree86 : x : x
: x : x : x
-pc110 : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-pl : microsoftpro : pl : x : xfree86 : x : x
: x : x : x
-Pl02 : microsoftpro : pl : x : xfree86 : x : x
: x : x : x
-pt : microsoftpro : pt : x : xfree86 : x : x
: x : x : x
-pt2 : microsoftpro : pt : x : xfree86 : x : x
: x : x : x
-pt-latin9 : microsoftpro : pt : x : xfree86 : x : x
: x : x : x
-pt-latin1 : microsoftpro : pt : x : xfree86 : x : x
: x : x : x
-ro : microsoftpro : ro : x : xfree86 : x : x
: x : x : x
-ru-cp1251 : microsoftpro : us,ru : ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
-ru : microsoftpro : us,ru : ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
-ru1 : microsoftpro : us,ru : ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
-ru2 : microsoftpro : us,ru : ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
-ru_win : microsoftpro : us,ru : ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
-russian : microsoftpro : us,ru : ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
-ruwin_alt-UTF-8 : microsoftpro : us,ru : ,winkeys : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
-sv-latin1 : microsoftpro : se : x : xfree86 : x : x
: x : x : x
-se-latin1 : microsoftpro : se : x : xfree86 : x : x
: x : x : x
-sg-l1-lk450 : microsoftpro : ch : de : xfree86 : x : x
: x : x : x
-sg-latin1-lk450 : microsoftpro : ch : de : xfree86 : x : x
: x : x : x
-sg-latin1 : microsoftpro : ch : de : xfree86 : x : x
: x : x : x
-sg : microsoftpro : ch : de : xfree86 : x : x
: x : x : x
-sk-prog-qwerty : microsoftpro : sk,us : qwerty,basic : xfree86 : x : x
: x : x : grp:shift_toggle
-sk-qwerty : microsoftpro : sk,us : qwerty,basic : xfree86 : x : x
: x : x : grp:shift_toggle
-sk-qwertz : microsoftpro : sk,us : x : xfree86 : x : x
: x : x : grp:shift_toggle
-slovene : microsoftpro : si : x : xfree86 : x : x
: x : x : x
-sunkeymap : type5 : us : x : xfree86 : x : x : x :
x : x
-sunt4-es : type4 : es : x : xfree86 : x : x : x :
x : x
-sunt5-de-latin1 : type5_euro : de : nodeadkeys : xfree86 : x : x : x :
x : x
-sunt5-es : type5 : es : x : xfree86 : x : x : x :
x : x
-sunt5-fi-latin1 : type5 : fi : x : xfree86 : x : x : x :
x : x
-sunt5-fr-latin1 : type5 : fr : x : xfree86 : x : x : x :
x : x
-sunt5-ru : type5 : ru : x : xfree86 : x : x : x :
x : x
-tj_alt-UTF8 : microsoftpro : tj,us : x : xfree86 : x : x
: x : x : grp:ctrl_shift_toggle,grp_led:scroll
-tr_f-latin5 : microsoftpro : tr : x : xfree86 : x : x
: x : x : caps:shift
-tr_q-latin5 : microsoftpro : tr : x : xfree86 : x : x
: x : x : caps:shift
-tralt : microsoftpro : tr : x : xfree86 : x : x
: x : x : caps:shift
-trf : microsoftpro : tr : x : xfree86 : x : x
: x : x : caps:shift
-trq : microsoftpro : tr : x : xfree86 : x : x
: x : x : caps:shift
-uk : microsoftpro : gb : x : xfree86 : x : x
: x : x : x
-us : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-wangbe : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-br-abnt-alt : microsoftpro : br : x : xfree86 : x : x
: x : x : x
-br-abnt : microsoftpro : br : x : xfree86 : x : x
: x : x : x
-br-abnt2 : microsoftpro : br : x : xfree86 : x : x
: x : x : x
-br-latin1-abnt2 : microsoftpro : br : x : xfree86 : x : x
: x : x : x
-br-latin1-us : microsoftpro : br : x : xfree86 : x : x
: x : x : x
-us-acentos : microsoftpro : us_intl : x : xfree86 : x : x
: x : x : x
-et : microsoftpro : ee : x : xfree86 : x : x
: x : x : x
-et-nodeadkeys : microsoftpro : ee : nodeadkeys : xfree86 : x : x
: x : x : x
-default : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-de-latin1-nodeadkeys : microsoftpro : de : nodeadkeys : xfree86 : x : x : x
: x : x
-mac-de-latin1-nodeadkeys : macbook79 : de : ,mac_nodeadkeys : xfree86 : x : x
: x : x : altwin:swap_lalt_lwin,lv3:alt_switch
-nl : microsoftpro : nl : x : xfree86 : x : x
: x : x : x
-nl2 : microsoftpro : nl : x : xfree86 : x : x
: x : x : x
-khmer : microsoftpro : us,kh : x : xfree86 : x : x
: x : x : grp:alt_shift_toggle
-korean : microsoftpro : kr : x : xfree86 : x : x
: x : x : x
-cn-latin1 : microsoftpro : ca : multix : xfree86 : x : x
: x : x : x
-chinese : microsoftpro : us : x : xfree86 : x : x
: x : x : x
-taiwanese : microsoftpro : us : x : xfree86 : x : x
: x : x : x
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xservers new/etc/X11/xdm/Xservers
--- old/etc/X11/xdm/Xservers 2014-03-04 13:53:31.000000000 +0100
+++ new/etc/X11/xdm/Xservers 2020-09-04 13:11:23.022523000 +0200
@@ -13,6 +13,7 @@
# use such a line to enable the console login option in the kdm menu
#:0 local@tty1 /usr/bin/X vt7
# "reserve" means that the X server gets only started on request (only kdm)
+# -keeptty implies that controlling tty is not detached (breaks startx!)
-:0 local /usr/bin/X -nolisten tcp -br vt7
+:0 local /usr/bin/X -nolisten tcp -br vt7 -keeptty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/scripts/11-ssh-agent
new/etc/X11/xdm/scripts/11-ssh-agent
--- old/etc/X11/xdm/scripts/11-ssh-agent 2016-06-03 13:59:30.000000000
+0200
+++ new/etc/X11/xdm/scripts/11-ssh-agent 2020-10-03 18:50:14.806173000
+0200
@@ -40,5 +40,8 @@
elif test -x /usr/lib64/ssh/ssh-askpass ; then
SSH_ASKPASS=/usr/lib64/ssh/ssh-askpass
export SSH_ASKPASS
+ elif test -x /usr/libexec/ssh/ssh-askpass ; then
+ SSH_ASKPASS=/usr/libexec/ssh/ssh-askpass
+ export SSH_ASKPASS
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm
--- old/etc/init.d/xdm 2020-08-26 15:34:47.799449368 +0200
+++ new/etc/init.d/xdm 1970-01-01 01:00:00.000000000 +0100
@@ -1,284 +0,0 @@
-#! /bin/bash
-# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany.
-# All rights reserved.
-#
-# Author: Florian La Roche, 1996
-# Werner Fink <wer...@suse.de>, 1996,98,99
-# Martin Scherbaum, 1997
-# Reinhard Max <m...@suse.de>, 1997
-#
-# Please send feedback to http://www.suse.de/feedback
-#
-# /etc/init.d/xdm
-#
-### BEGIN INIT INFO
-# Provides: xdm display-manager
-# Required-Start: $remote_fs dbus
-# Required-Stop: $remote_fs
-# Should-Start: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid
ntp systemd-user-sessions
-# Should-Stop: ypbind $syslog gpm firstboot kbd resmgr earlyxdm winbind acpid
ntp
-# Default-Start: 5
-# Default-Stop:
-# Description: X Display Manager
-# Short-Description: X Display Manager
-### END INIT INFO
-
-# Avoid duplicated messages when earlyxdm was active
-case "$EARLYXDM" in
- start)
- # earlyxdm is calling us, remember this
- > /run/earlyxdm.start
- ;;
- "")
- # earlyxdm was already active, exit now
- if test -e /run/earlyxdm.start ; then
- rm -f /run/earlyxdm.start
- exit 0
- fi
-esac
-
-. /etc/rc.status
-. /etc/sysconfig/displaymanager
-. /etc/sysconfig/language
-. /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
-
-locale_vars=" \
-LANG \
-LC_CTYPE \
-LC_NUMERIC \
-LC_TIME \
-LC_COLLATE \
-LC_MONETARY \
-LC_MESSAGES \
-LC_PAPER \
-LC_NAME \
-LC_ADDRESS \
-LC_TELEPHONE \
-LC_MEASUREMENT \
-LC_IDENTIFICATION \
-LC_ALL"
-
-unset LC_ALL
-for lc in $locale_vars
-do
- eval val="\$RC_$lc"
- if test -n "$val"; then
- eval $lc="\$RC_$lc"
- export $lc
- fi
-done
-unset lc val
-
-if test -z "$WINDOWMANAGER" -a -n "$DEFAULT_WM" ; then
- SAVEPATH=$PATH
- PATH=$PATH:/usr/X11R6/bin:/usr/openwin/bin
- desktop=/usr/share/xsessions/${DEFAULT_WM}.desktop
- if test -s "$desktop" ; then
- while read -r line; do
- case ${line} in
- Exec=*) WINDOWMANAGER="$(command -v ${line#Exec=})"
- break
- esac
- done < $desktop
- fi
- if test -n "$DEFAULT_WM" -a -z "$WINDOWMANAGER" ; then
- WINDOWMANAGER="$(command -v ${DEFAULT_WM##*/})"
- fi
- PATH=$SAVEPATH
- unset SAVEPATH desktop
-fi
-unset DEFAULT_WM
-export WINDOWMANAGER
-
-DMDIR=/etc/X11/xdm
-RELOADSIGNAL="-HUP"
-
-PIDFILELNK="/run/displaymanager.pid"
-
-
-xdm_reload_files () {
- test -x /etc/X11/xdm/SuSEconfig.xdm && \
- MD5DIR="/var/adm/SuSEconfig/md5" \
- /etc/X11/xdm/SuSEconfig.xdm | \
- sed 's+\(.*\)+/etc/init.d/xdm: \1+g' | \
- /bin/logger
- return 0
-}
-
-splashcopy()
-{
- local from=$1
- local to=$2
- if [ "$SPLASH" = yes ]
- then
- ver=$(sed "s/.*v\([[:digit:]]\)\.\([[:digit:]]\).*/\\1\\2/"
/proc/splash)
- if [ $ver -gt 31 ]
- then
- echo "copy $from $to" > /proc/splash
- echo "@$to silent" > /proc/splash
- echo "@$to show -1" > /proc/splash
- fi
- fi
-}
-
-plymouth_quit()
-{
- if [ -x /usr/bin/plymouth ]; then
- plymouth quit
- plymouth --wait
- fi
-}
-
-#set -x
-
-DM=${DISPLAYMANAGER##*/}
-
-case "$DM" in
- console)
- exit 0
- ;;
- *)
- for i in /usr/lib/X11/displaymanagers/*
- do
- tmp=${i%.fallback}
- test "$tmp" != "$i" -a -e $tmp && continue # pick foodm over
foodm.fallback
- DISPLAY_MANAGERS="$DISPLAY_MANAGERS ${tmp##*/}"
- . $i
- done
- for i in $DISPLAY_MANAGERS
- do
- name="${i}_vars"
- PIDFILE=/run/$i.pid;
- $name $DM && break;
- done
- if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
- then
- PIDFILE=/run/xdm.pid
- xdm_vars xdm # FALLBACK
- fi
- unset i
- ;;
-esac
-
-DM=${DISPLAYMANAGER##*/}
-
-rc_reset
-case "$1" in
- start)
-
- # use system keyboard as global X keyboard configuration
- if [ -x /etc/X11/xdm/keytable ]; then
- /etc/X11/xdm/keytable
- fi
-
- [ -n "$STARTPROC" ] && $STARTPROC
- echo -n "Starting service $DM"
- # Don't start xdm if no Xserver is configured and xdm is not
- # configured for remote access
- if [ ! -x /usr/bin/X -a "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ];
- then
- rc_status -u
- rc_exit
- fi
- # Graphical failsafe mode (Bug #246158).
- #
- # Needs changes in kernel commandline of "Failsafe" entry in
- # /boot/grub/menu.lst.
- #
- # * use the same "vga" option value as in the non-"Failsafe" entry
- # * remove "3" option (runlevel)
- # * add "x11failsafe" option
- if cat /proc/cmdline | grep -q x11failsafe; then
- if [ -f /etc/X11/xorg.conf.install ]; then
- export XORGCONFIG=xorg.conf.install
- echo
- echo "Using failsafe X.Org configuration
/etc/X11/xorg.conf.install"
- else
- echo
- echo "The failsafe X.Org configuration
/etc/X11/xorg.conf.install no longer exists."
- echo "Either move it back (if still available) or copy
/etc/X11/xorg.conf to"
- echo "/etc/X11/xorg.conf.install to use the native graphics
driver instead of the"
- echo "failsafe graphics driver. Of course the latter option no
longer can be called"
- echo "failsafe."
- rc_status -u
- rc_exit
- fi
- fi
- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
- if rc_status ; then
- # when started up successfuly, use DMs PID file as ours
- ln -snf $PIDFILE $PIDFILELNK
- else
- # After a crash or a kill signal we may have
- # a wrong ownership of /dev/xconsole
- if test -x $DMDIR/TakeDevices ; then
- $DMDIR/TakeDevices
- else
- chown root:tty /dev/xconsole /dev/tty0
- chmod 622 /dev/xconsole /dev/tty0
- fi
- fi
- rc_status -v
- ;;
- stop)
- # make sure to stop the running one (Bug #306035)
- if test -s $PIDFILELNK; then
- read -t 1 PID < $PIDFILELNK
- if CHECKDM=$(ps ho command= -p $PID) ; then
- DISPLAYMANAGER_BIN=${CHECKDM%%[[:blank:]]*}
- PIDFILE=$(readlink $PIDFILELNK)
- else
- rm -f $PIDFILELNK $(readlink $PIDFILELNK)
- fi
- unset CHECKDM
- else
- rm -f $PIDFILELNK
- fi
-
- test -n "$DISPLAYMANAGER_BIN" && \
- echo -n "Shutting down service ${DISPLAYMANAGER_BIN##*/}"
-
- #
- # killproc(8) sleep upto five seconds and sends
- # SIGKILL if xdm does not terminate within
- #
-
- killproc -p $PIDFILE -TERM $DISPLAYMANAGER_BIN
- rm -f $PIDFILELNK $PIDFILE
- rc_status -v
- ;;
- restart)
- $0 stop
- $0 start
- rc_status
- ;;
- reload|force-reload)
- echo -n "Reload service $DM"
- [ -n "$RELOADPROC" ] && $RELOADPROC
- killproc -p $PIDFILE $RELOADSIGNAL $DISPLAYMANAGER
- rc_status -v
- ;;
- status|check)
- echo -n "Checking for service ${DM}: "
- checkproc -p $PIDFILE $DISPLAYMANAGER
- rc_status -v
- ;;
- probe)
- [ -n "$PROBEPROC" ] && $PROBEPROC
- ;;
- try-restart|condrestart)
- $0 status
- if test $? = 0; then
- $0 restart
- else
- rc_reset
- fi
- rc_status
- ;;
- *)
- echo "Usage: $0
{start|stop|status|restart|reload|force-reload|probe|try-restart}"
- exit 1
-esac
-rc_exit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/sysconfig/SuSEfirewall2.d/services/xdmcp
new/etc/sysconfig/SuSEfirewall2.d/services/xdmcp
--- old/etc/sysconfig/SuSEfirewall2.d/services/xdmcp 2014-03-04
13:53:31.000000000 +0100
+++ new/etc/sysconfig/SuSEfirewall2.d/services/xdmcp 1970-01-01
01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-## Name: xdmcp
-## Description: Allow other hosts to access your display manager via XDMCP
-
-# space separated list of allowed TCP ports
-TCP="6000:6005"
-
-# space separated list of allowed UDP ports
-UDP="xdmcp"
-
-# space separated list of allowed RPC services
-RPC=""
-
-# space separated list of allowed IP protocols
-IP=""
-
-# space separated list of allowed UDP broadcast ports
-BROADCAST="xdmcp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/display-manager
new/usr/lib/X11/display-manager
--- old/usr/lib/X11/display-manager 2020-08-27 12:56:11.936333494 +0200
+++ new/usr/lib/X11/display-manager 2020-09-04 13:11:23.054517000 +0200
@@ -120,6 +120,8 @@
#set -x
+# DISPLAYMANAGER used to be set in /etc/sysconfig/displaymanager, but the
default is now set by update-alternatives
+DISPLAYMANAGER=$(realpath --relative-base=/usr/lib/X11/displaymanagers
/usr/lib/X11/displaymanagers/default-displaymanager)
DM=${DISPLAYMANAGER##*/}
case "$DM" in
@@ -138,8 +140,9 @@
for i in $DISPLAY_MANAGERS
do
name="${i}_vars"
- PIDFILE=/run/$i.pid;
- $name $DM && break;
+ type -t $name &> /dev/null || continue
+ PIDFILE=/run/$i.pid
+ $name $DM && break
done
if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/var/adm/fillup-templates/sysconfig.displaymanager
new/var/adm/fillup-templates/sysconfig.displaymanager
--- old/var/adm/fillup-templates/sysconfig.displaymanager 2017-01-04
11:15:56.259500000 +0100
+++ new/var/adm/fillup-templates/sysconfig.displaymanager 2020-09-04
13:11:23.144512000 +0200
@@ -1,14 +1,6 @@
## Path: Desktop/Display manager
## Description: settings to generate a proper displaymanager config
-## Type: string(kdm,xdm,gdm,wdm,entrance,console,lightdm,sddm)
-## Default: ""
-#
-# Here you can set the default Display manager
(kdm/xdm/gdm/wdm/entrance/console).
-# all changes in this file require a restart of the displaymanager
-#
-DISPLAYMANAGER=""
-
## Type: yesno
## Default: no
#
++++++ xinit-UsrEtcMove.patch ++++++
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 16:49:26.220507000 +0200
@@ -35,9 +35,17 @@
#
XETCDIR=/etc/X11
XDMDIR=$XETCDIR/xdm
- XINITDIR=$XETCDIR/xinit
: ${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
@@ -291,7 +299,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[@]}"
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 16:54:30.682569000 +0200
@@ -63,7 +63,16 @@
#
# Use system default xinitrc if the users does not have one.
#
-XINITRCFILE=/etc/X11/xinit/xinitrc
+
+# xinitrc moved to %{_libexecdir}/xinit in xinit package
+if [ -r /usr/libexec/xinit/xinitrc ]; then
+ XINITRCFILE=/usr/libexec/xinit/xinitrc
+elif [ -r /usr/lib/xinit/xinitrc ]; then
+ XINITRCFILE=/usr/lib/xinit/xinitrc
+else
+ XINITRCFILE=/etc/X11/xinit/xinitrc
+fi
+
test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc"
if test -f "$XINITRCFILE" ; then
@@ -77,7 +86,11 @@
# 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
unset STARTUP WINDOW_MANAGER
set -- ${1+"$@"} $WINDOWMANAGER
