From 0a60c1edee9edea4aff85647d3e9ac04375f2510e492844492d4f5e0f877fe9b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 4 Sep 2020 10:55:01 +0000 Subject: [PATCH 01/17] - 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 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=209 --- xdm-consolekit.diff | 241 ------------------------------------------ xdm-fallbacks.tar.bz2 | 3 - xdm.changes | 10 ++ xdm.spec | 76 +------------ 4 files changed, 13 insertions(+), 317 deletions(-) delete mode 100644 xdm-consolekit.diff delete mode 100644 xdm-fallbacks.tar.bz2 diff --git a/xdm-consolekit.diff b/xdm-consolekit.diff deleted file mode 100644 index db8226c..0000000 --- a/xdm-consolekit.diff +++ /dev/null @@ -1,241 +0,0 @@ ---- - dm.h | 3 + - resource.c | 13 +++++++ - session.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - xdm.man.cpp | 6 +++ - configure.ac | 14 ++++++++ - 5 files changed, 135 insertions(+), 1 deletion(-) - -Index: xdm-1.1.10/session.c -=================================================================== ---- xdm-1.1.10.orig/session.c -+++ xdm-1.1.10/xdm/session.c -@@ -67,6 +67,11 @@ extern int key_setnet(struct key_netstar - # endif - #endif /* USE_PAM */ - -+#ifdef USE_CONSOLEKIT -+#include -+#include -+#endif -+ - #ifdef __SCO__ - # include - #endif -@@ -514,6 +519,97 @@ UnsecureDisplay (struct display *d, Disp - } - } - -+#ifdef USE_CONSOLEKIT -+ -+static CkConnector *connector; -+ -+static int openCKSession(struct verify_info *verify, struct display *d) -+{ -+ int ret; -+ DBusError error; -+ char *remote_host_name = ""; -+ dbus_bool_t is_local; -+ char *display_name = ""; -+ char *display_device = ""; -+ char devtmp[16]; -+ -+ if (!use_consolekit) -+ return 1; -+ -+ is_local = d->displayType.location == Local; -+ if (d->peerlen > 0 && d->peer) -+ remote_host_name = d->peer; -+ if (d->name) -+ display_name = d->name; -+ /* how can we get the corresponding tty at best...? */ -+ if (d->windowPath) { -+ display_device = strchr(d->windowPath, ':'); -+ if (display_device && display_device[1]) -+ display_device++; -+ else -+ display_device = d->windowPath; -+ snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device); -+ display_device = devtmp; -+ } -+ -+ connector = ck_connector_new(); -+ if (!connector) { -+ LogOutOfMem("ck_connector"); -+ return 0; -+ } -+ -+ dbus_error_init(&error); -+ ret = ck_connector_open_session_with_parameters( -+ connector, &error, -+ "unix-user", &verify->uid, -+ "x11-display", &display_name, -+ "x11-display-device", &display_device, -+ "remote-host-name", &remote_host_name, -+ "is-local", &is_local, -+ NULL); -+ if (!ret) { -+ if (dbus_error_is_set(&error)) { -+ LogError("Dbus error: %s\n", error.message); -+ dbus_error_free(&error); -+ } else { -+ LogError("ConsoleKit error\n"); -+ } -+ LogError("console-kit-daemon not running?\n"); -+ ck_connector_unref(connector); -+ connector = NULL; -+ return 0; -+ } -+ -+ verify->userEnviron = setEnv(verify->userEnviron, -+ "XDG_SESSION_COOKIE", ck_connector_get_cookie(connector)); -+ return 1; -+} -+ -+static void closeCKSession(void) -+{ -+ DBusError error; -+ -+ if (!connector) -+ return; -+ -+ dbus_error_init(&error); -+ if (!ck_connector_close_session(connector, &error)) { -+ if (dbus_error_is_set(&error)) { -+ LogError("Dbus error: %s\n", error.message); -+ dbus_error_free(&error); -+ } else { -+ LogError("ConsoleKit close error\n"); -+ } -+ LogError("console-kit-daemon not running?\n"); -+ } -+ ck_connector_unref(connector); -+ connector = NULL; -+} -+#else -+#define openCKSession(v,d) 1 -+#define closeCKSession() -+#endif -+ - void - SessionExit (struct display *d, int status, int removeAuth) - { -@@ -528,6 +624,8 @@ SessionExit (struct display *d, int stat - } - #endif - -+ closeCKSession(); -+ - /* make sure the server gets reset after the session is over */ - if (d->serverPid >= 2 && d->resetSignal) - kill (d->serverPid, d->resetSignal); -@@ -610,6 +708,10 @@ StartClient ( - #ifdef USE_PAM - if (pamh) pam_open_session(pamh, 0); - #endif -+ -+ if (!openCKSession(verify, d)) -+ return 0; -+ - switch (pid = fork ()) { - case 0: - CleanUpChild (); -Index: xdm-1.1.10/dm.h -=================================================================== ---- xdm-1.1.10.orig/dm.h -+++ xdm-1.1.10/include/dm.h -@@ -323,6 +323,9 @@ extern char *randomFile; - extern char *prngdSocket; - extern int prngdPort; - # endif -+#ifdef USE_CONSOLEKIT -+extern int use_consolekit; -+#endif - - extern char *greeterLib; - extern char *willing; -Index: xdm-1.1.10/resource.c -=================================================================== ---- xdm-1.1.10.orig/resource.c -+++ xdm-1.1.10/xdm/resource.c -@@ -65,6 +65,9 @@ char *randomDevice; - char *prngdSocket; - int prngdPort; - #endif -+#ifdef USE_CONSOLEKIT -+int use_consolekit; -+#endif - - char *greeterLib; - char *willing; -@@ -196,6 +199,10 @@ struct dmResources { - "false"} , - { "willing", "Willing", DM_STRING, &willing, - ""} , -+#ifdef USE_CONSOLEKIT -+{ "consoleKit", "ConsoleKit", DM_BOOL, (char **) &use_consolekit, -+ "true"} , -+#endif - }; - - #define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0]) -@@ -378,7 +385,11 @@ XrmOptionDescRec optionTable [] = { - {"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL }, - {"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL }, - {"-daemon", ".daemonMode", XrmoptionNoArg, "true" }, --{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" } -+{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" }, -+#ifdef USE_CONSOLEKIT -+{"-consolekit", ".consoleKit", XrmoptionNoArg, "true" }, -+{"-noconsolekit", ".consoleKit", XrmoptionNoArg, "false" } -+#endif - }; - - static int originalArgc; -Index: xdm-1.1.10/xdm.man.cpp -=================================================================== ---- xdm-1.1.10.orig/xdm.man.cpp -+++ xdm-1.1.10/man/xdm.man -@@ -48,6 +48,8 @@ xdm \- X Display Manager with support fo - ] [ - .B \-session - .I session_program -+] [ -+.B \-noconsolekit - ] - .SH DESCRIPTION - .I Xdm -@@ -215,6 +217,10 @@ indicates the program to run as the sess - .IP "\fB\-xrm\fP \fIresource_specification\fP" - Allows an arbitrary resource to be specified, as in most - X Toolkit applications. -+.IP "\fB\-noconsolekit\fP" -+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP -+resource. -+This suppresses the session management using ConsoleKit. - .SH RESOURCES - At many stages the actions of - .I xdm ---- xdm-1.1.11/configure.ac.orig 2014-07-18 16:22:30.057882318 +0200 -+++ xdm-1.1.11/configure.ac 2014-07-18 16:26:55.415254913 +0200 -@@ -391,6 +391,20 @@ - XDMGREET_CFLAGS="$XDMGREET_CFLAGS $XDM_TOOLKIT_CFLAGS $DMCP_CFLAGS $XLIB_CFLAGS $GREETER_CFLAGS $AUTH_CFLAGS" - XDMGREET_LIBS="$XDMGREET_LIBS $XDM_TOOLKIT_LIBS $DMCP_LIBS $GREETER_LIBS" - -+# ConsoleKit support -+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]), -+ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes]) -+if test x"$USE_CONSOLEKIT" != xno; then -+ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector, -+ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no]) -+ if test x"$USE_CONSOLEKIT" = xyes; then -+ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit]) -+ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS" -+ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS" -+ fi -+fi -+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes) -+ - # - # XDM - # diff --git a/xdm-fallbacks.tar.bz2 b/xdm-fallbacks.tar.bz2 deleted file mode 100644 index 331593e..0000000 --- a/xdm-fallbacks.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:29ee58cb0c7923f7390e6e77e8fafab1e5e0c77ce7013680617a74403dbe66e4 -size 1050 diff --git a/xdm.changes b/xdm.changes index facc457..3fc46bc 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Sep 4 10:29:39 UTC 2020 - Stefan Dirsch + +- 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 + ------------------------------------------------------------------- Fri Aug 28 10:22:12 UTC 2020 - Dominique Leuenberger diff --git a/xdm.spec b/xdm.spec index d33e38f..701a3f6 100644 --- a/xdm.spec +++ b/xdm.spec @@ -22,19 +22,6 @@ %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,7 +32,6 @@ URL: http://xorg.freedesktop.org/ 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 @@ -71,14 +57,9 @@ BuildRequires: pkgconfig(xtrans) %if 0%{?suse_version} > 1320 BuildRequires: firewall-macros %endif +Requires: %fillup_prereq Requires: /sbin/pidof Requires: /sbin/startproc -%if 0%{?with_systemd} -Requires: %fillup_prereq -%endif -%if 0%{?suse_version} < 1315 -Requires: insserv-compat -%endif Requires: logrotate Requires: sessreg Requires: xconsole @@ -91,20 +72,12 @@ Requires: xsetroot 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 @@ -129,9 +102,6 @@ the system wide DM default set in %{_sysconfdir}/sysconfig/displaymanager. %prep %setup -q cp %{SOURCE2} . -%if !%with_systemd -%patch0 -p1 -%endif pushd xdm %patch1 -p1 popd @@ -179,9 +149,6 @@ rm -f usr/lib/X11/display-manager.orig %{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" \ @@ -198,12 +165,6 @@ mv %{buildroot}%{_libdir}/X11/xdm/chooser %{buildroot}%{_bindir} # 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,7 +173,6 @@ cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF' 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 @@ -223,12 +183,8 @@ 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 @@ -242,17 +198,11 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %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 @@ -261,9 +211,7 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %endif %preun -%if !0%{?suse_version} < 1315 - %service_del_preun display-manager.service -%endif +%service_del_preun display-manager.service %files %defattr(-,root,root) @@ -276,14 +224,6 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager /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 -%endif %config %{_sysconfdir}/X11/xdm/ %dir %{_sysconfdir}/X11/xdm/scripts %if 0%{?suse_version} > 1320 @@ -293,14 +233,9 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %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 %config(noreplace) %{_sysconfdir}/pam.d/xdm %config(noreplace) %{_sysconfdir}/pam.d/xdm-np @@ -311,17 +246,12 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_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 From af95512d55f45258ba1e43ab4405464268db35a85fcf478319005cff95188f18 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 4 Sep 2020 11:19:27 +0000 Subject: [PATCH 02/17] - more cleanup * no longer support sle12; adjusted xdm.tar.bz2 and applied xdm-with-update-alternative.patch to this tarball OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=210 --- xdm-with-update-alternative.patch | 57 ------------------------------- xdm.changes | 7 ++++ xdm.spec | 42 +---------------------- xdm.tar.bz2 | 4 +-- 4 files changed, 10 insertions(+), 100 deletions(-) delete mode 100644 xdm-with-update-alternative.patch diff --git a/xdm-with-update-alternative.patch b/xdm-with-update-alternative.patch deleted file mode 100644 index aff5389..0000000 --- a/xdm-with-update-alternative.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- - etc/X11/xdm/Xservers | 3 ++- - usr/lib/X11/display-manager | 7 +++++-- - var/adm/fillup-templates/sysconfig.displaymanager | 8 -------- - 3 files changed, 7 insertions(+), 11 deletions(-) - ---- xdm.old/etc/X11/xdm/Xservers 2018-04-05 14:48:56.669172739 +0200 -+++ xdm.new/etc/X11/xdm/Xservers 2018-04-05 14:45:33.129981406 +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 - ---- xdm.old/usr/lib/X11/display-manager -+++ xdm.new/usr/lib/X11/display-manager 2018-04-05 12:44:11.247521173 +0000 -@@ -121,6 +121,8 @@ plymouth_quit() - - #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 @@ case "$DM" in - 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 ---- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager -+++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager 2017-10-12 14:35:23.775259305 +0000 -@@ -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 - # diff --git a/xdm.changes b/xdm.changes index 3fc46bc..cb4dfe6 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 4 11:17:34 UTC 2020 - Stefan Dirsch + +- 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 diff --git a/xdm.spec b/xdm.spec index 701a3f6..e23d0a8 100644 --- a/xdm.spec +++ b/xdm.spec @@ -35,10 +35,9 @@ Source2: HOWTO.xdm Source4: display-manager.service Source5: xsession.desktop Patch1: xdm-tolerant-hostname-changes.diff -# PATCH-FEATURE-OPENSUSE xdm-with-update-alternative.patch dimstar@opensuse.org -- Choice of default DM by means of u-a -Patch2: xdm-with-update-alternative.patch # needed for patch0, patch2, patch3, patch4 Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch +BuildRequires: firewall-macros BuildRequires: libtool BuildRequires: pam-devel BuildRequires: pkgconfig @@ -54,9 +53,6 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.4 BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtrans) -%if 0%{?suse_version} > 1320 -BuildRequires: firewall-macros -%endif Requires: %fillup_prereq Requires: /sbin/pidof Requires: /sbin/startproc @@ -72,17 +68,9 @@ Requires: xsetroot Recommends: dbus-1-x11 # This was part of the xorg-x11 package up to version 7.6 Conflicts: xorg-x11 <= 7.6 -%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320 -# Needed to create the man page symlink to init.d -BuildRequires: aaa_base-extras -%endif BuildRequires: systemd-rpm-macros %{?systemd_requires} -%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,20 +117,6 @@ rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} 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 -%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 -%endif %if "%{_fillupdir}" != "/var/adm/fillup-templates" mkdir -p %{buildroot}$(dirname %{_fillupdir}) mv %{buildroot}/var/adm/fillup-templates \ @@ -173,29 +147,23 @@ cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF' exec -a rcdisplay-manager %{_sbindir}/rcdisplay-manager ${1+"$@"} EOF chmod 0755 %{buildroot}%{_sbindir}/rcxdm -%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 %service_add_post display-manager.service %{fillup_only -n displaymanager} -%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 %service_add_pre display-manager.service @@ -203,12 +171,10 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %postun # Do not restart DM on update (bnc#886641) %service_del_postun -n display-manager.service -%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 %service_del_preun display-manager.service @@ -219,20 +185,14 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %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 %config %{_sysconfdir}/X11/xdm/ %dir %{_sysconfdir}/X11/xdm/scripts -%if 0%{?suse_version} > 1320 %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 %exclude %{_sysconfdir}/init.d/xdm %{_unitdir}/display-manager.service /usr/lib/X11/display-manager diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index eb34c1d..4cedcbb 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3490e1140041d9bf6a9bfafc3f6e4ce0faf8ad04dbd53726ee0335f758882681 -size 23798 +oid sha256:8ae3032f832a90eae20a93fbde856450e702ab3f0b23f5c4abe70011bcc74de5 +size 23946 From ca99079511479e4267464b73060df09e1ab17a30c2a427952c3563be469b1c38 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 4 Sep 2020 20:26:29 +0000 Subject: [PATCH 03/17] - 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) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=211 --- xdm.changes | 7 +++++++ xdm.spec | 37 ++++++++++++++++++++++++++++++++++--- xdm.tar.bz2 | 4 ++-- 3 files changed, 43 insertions(+), 5 deletions(-) diff --git a/xdm.changes b/xdm.changes index cb4dfe6..987bc40 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 4 20:20:05 UTC 2020 - Stefan Dirsch + +- 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 diff --git a/xdm.spec b/xdm.spec index e23d0a8..d33b335 100644 --- a/xdm.spec +++ b/xdm.spec @@ -93,8 +93,6 @@ cp %{SOURCE2} . 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 @@ -104,19 +102,35 @@ autoreconf -fi %configure \ --disable-static \ --with-pam \ +%if 0%{?suse_version} >= 1550 + --with-xdmconfigdir=%{_distconfdir}/X11/xdm \ + --with-xdmscriptdir=%{_distconfdir}/X11/xdm \ +%else --with-xdmconfigdir=%{_sysconfdir}/X11/xdm \ --with-xdmscriptdir=%{_sysconfdir}/X11/xdm \ +%endif --with-systemdsystemunitdir=no make %{?_smp_mflags} %install %make_install # Not used anymore by SuSE +%if 0%{?suse_version} >= 1550 +rm %{buildroot}%{_distconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} +%else rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} +%endif pushd %{buildroot} # SuSE default XDM configuration tar xf %{SOURCE1} +%if 0%{?suse_version} >= 1550 +mkdir -p usr/etc/X11/xdm +mv etc/X11/xdm/* usr/etc/X11/xdm +mv etc/pam.d usr/etc/ +rmdir etc/X11/xdm +rmdir etc/X11 +%endif %if "%{_fillupdir}" != "/var/adm/fillup-templates" mkdir -p %{buildroot}$(dirname %{_fillupdir}) mv %{buildroot}/var/adm/fillup-templates \ @@ -131,7 +145,11 @@ sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\ popd # Correct location (FHS-2.1) +%if 0%{?suse_version} >= 1550 +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) @@ -188,17 +206,30 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_dminitdir}/console /usr/lib/X11/displaymanagers/default-displaymanager %ghost %{_sysconfdir}/alternatives/default-displaymanager +%if 0%{?suse_version} >= 1550 +%dir %{_distconfdir}/X11 +%{_distconfdir}/X11/xdm/ +%else %config %{_sysconfdir}/X11/xdm/ +%endif +%if 0%{?suse_version} >= 1550 +%dir %{_distconfdir}/X11/xdm/scripts +%else %dir %{_sysconfdir}/X11/xdm/scripts +%endif %dir /usr/lib/firewalld %dir /usr/lib/firewalld/services /usr/lib/firewalld/services/x11.xml -%exclude %{_sysconfdir}/init.d/xdm %{_unitdir}/display-manager.service /usr/lib/X11/display-manager %config %{_sysconfdir}/logrotate.d/xdm +%if 0%{?suse_version} >= 1550 +%{_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/ diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 4cedcbb..b6334fb 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ae3032f832a90eae20a93fbde856450e702ab3f0b23f5c4abe70011bcc74de5 -size 23946 +oid sha256:935637652aab80fee6961973845c7c4d2c58fa677c23a5fc8b8967fffc1f4659 +size 22638 From b1f394d12229d1f7afc8262c0118ff03ece18eab05dd8663f1cffd47a4ff2ad9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 4 Sep 2020 22:49:41 +0000 Subject: [PATCH 04/17] - 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) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=212 --- xdm-tarball.patch | 277 ++++++++++++++++++++++++++++++++++++++++++++++ xdm.changes | 8 ++ xdm.spec | 3 +- 3 files changed, 287 insertions(+), 1 deletion(-) create mode 100644 xdm-tarball.patch diff --git a/xdm-tarball.patch b/xdm-tarball.patch new file mode 100644 index 0000000..a1307f5 --- /dev/null +++ b/xdm-tarball.patch @@ -0,0 +1,277 @@ +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-05 00:40:17.437336000 +0200 +@@ -9,7 +9,7 @@ + # + LIBDIR=/usr/lib/X11 + ETCDIR=/etc/X11 +- XDMDIR=${ETCDIR}/xdm ++ XDMDIR=/usr/etc/X11/xdm + BINDIR=/usr/bin + + no_exit_on_failed_exec=1 +diff -u -r ../old/etc/X11/xdm/SUSEconfig.xdm ./etc/X11/xdm/SUSEconfig.xdm +--- ../old/etc/X11/xdm/SUSEconfig.xdm 2018-07-11 16:42:58.529260339 +0200 ++++ ./etc/X11/xdm/SUSEconfig.xdm 2020-09-04 23:59:30.125566000 +0200 +@@ -69,8 +69,8 @@ + echo "Using MD5DIR=\"$MD5DIR\"..." + } + +-if test -r $r/etc/X11/xdm/Xservers -a $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/Xservers; then +- file=$r/etc/X11/xdm/Xservers ++if test -r $r/usr/etc/X11/xdm/Xservers -a $r/etc/sysconfig/displaymanager -nt $r/usr/etc/X11/xdm/Xservers; then ++ file=$r/usr/etc/X11/xdm/Xservers + cp -p $file ${file}.SuSEconfig + if test "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ; then + sed -ri 's/^(:[0-9][[:blank:]]+local[[:blank:]]+)/#\1/g' ${file}.SuSEconfig +@@ -91,8 +91,8 @@ + check_md5_and_move $file + fi + +-if test -r $r/etc/X11/xdm/xdm-config -a $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/xdm-config; then +- file=$r/etc/X11/xdm/xdm-config ++if test -r $r/usr/etc/X11/xdm/xdm-config -a $r/etc/sysconfig/displaymanager -nt $r/usr/etc/X11/xdm/xdm-config; then ++ file=$r/usr/etc/X11/xdm/xdm-config + cp -p $file ${file}.SuSEconfig + if test "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ; then + sed -ri 's/^(DisplayManager\.requestPort:[[:blank:]]+0)/!\1/g' ${file}.SuSEconfig +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-04 23:49:39.498480000 +0200 +@@ -9,7 +9,7 @@ + # Author: Werner Fink, + # + LIBDIR=/usr/lib/X11 +- ETCDIR=/etc/X11 ++ ETCDIR=/usr/etc/X11 + XDMDIR=${ETCDIR}/xdm + BINDIR=/usr/bin + xmessage=${BINDIR}/xmessage +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-04 23:54:10.477826000 +0200 +@@ -34,7 +34,7 @@ + # Some system defaults + # + XETCDIR=/etc/X11 +- XDMDIR=$XETCDIR/xdm ++ XDMDIR=/usr/etc/X11/xdm + XINITDIR=$XETCDIR/xinit + : ${TMPDIR=/tmp} + +@@ -187,7 +187,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 +265,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 +299,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 + + # 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-04 23:56:20.188841000 +0200 +@@ -9,7 +9,7 @@ + # + LIBDIR=/usr/lib/X11 + ETCDIR=/etc/X11 +- XDMDIR=${ETCDIR}/xdm ++ XDMDIR=/usr/etc/X11/xdm + BINDIR=/usr/bin + + no_exit_on_failed_exec=1 +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-05 00:00:28.359409000 +0200 +@@ -9,7 +9,7 @@ + # Author: Werner Fink, + # + LIBDIR=/usr/lib/X11 +- ETCDIR=/etc/X11 ++ ETCDIR=/usr/etc/X11 + XDMDIR=${ETCDIR}/xdm + BINDIR=/usr/bin + xmessage=${BINDIR}/xmessage +diff -u -r ../old/etc/X11/xdm/keytable ./etc/X11/xdm/keytable +--- ../old/etc/X11/xdm/keytable 2017-10-18 16:58:19.074036000 +0200 ++++ ./etc/X11/xdm/keytable 2020-09-04 23:58:22.567705000 +0200 +@@ -6,8 +6,8 @@ + fi + + vconsole_conf_file=/etc/vconsole.conf +-previous_x11conf_file=/etc/X11/xorg.conf.d/90-keytable.conf +-systemd_x11conf_file=/etc/X11/xorg.conf.d/00-keyboard.conf ++previous_x11conf_file=/usr/etc/X11/xorg.conf.d/90-keytable.conf ++systemd_x11conf_file=/usr/etc/X11/xorg.conf.d/00-keyboard.conf + keyboard_map_systemd=/usr/share/systemd/kbd-model-map + + function setkeyboard { +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-04 23:55:09.331646000 +0200 +@@ -38,7 +38,7 @@ + argv=("$@") + set -- + +-for script in /etc/X11/xdm/scripts/* ++for script in /usr/etc/X11/xdm/scripts/* + do + test -e $script || continue + test -d $script && continue +@@ -63,7 +63,11 @@ + # + # Use system default xinitrc if the users does not have one. + # +-XINITRCFILE=/etc/X11/xinit/xinitrc ++if [ -r /etc/X11/xinit/xinitrc ]; then ++ XINITRCFILE=/etc/X11/xinit/xinitrc ++elif [ -r /usr/etc/X11/xinit/xinitrc ]; then ++ XINITRCFILE=/usr/etc/X11/xinit/xinitrc ++fi + test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc" + + if test -f "$XINITRCFILE" ; then +@@ -77,7 +81,11 @@ + # Source common code shared between the + # X session and X init scripts + # +- . /etc/X11/xinit/xinitrc.common ++ if [ -r /etc/X11/xinit/xinitrc ]; then ++ . /etc/X11/xinit/xinitrc.common ++ elif [ -r /usr/etc/X11/xinit/xinitrc ]; 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-04 23:56:41.284679000 +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.servers: /etc/X11/xdm/Xservers +-DisplayManager.accessFile: /etc/X11/xdm/Xaccess +-DisplayManager.willing: su nobody -c /etc/X11/xdm/Xwilling ++DisplayManager.keyFile: /usr/etc/X11/xdm/xdm-keys ++DisplayManager.servers: /usr/etc/X11/xdm/Xservers ++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-04 23:48:56.887780000 +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,18 @@ + unset DEFAULT_WM + export WINDOWMANAGER + +-DMDIR=/etc/X11/xdm ++if [ -d /usr/etc/X11/xdm ]; then ++ DMDIR=/usr/etc/X11/xdm ++else ++ DMDIR=/etc/X11/xdm ++fi + RELOADSIGNAL="-HUP" + + PIDFILELNK="/run/displaymanager.pid" + + + xdm_reload_files () { +- if [ -x /etc/X11/xdm/SuSEconfig.xdm ]; then ++ if [ -x $DMDIR/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 +94,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 +@@ -159,8 +166,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 --git a/xdm.changes b/xdm.changes index 987bc40..12bd083 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Sep 4 22:33:30 UTC 2020 - Stefan Dirsch + +- 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 diff --git a/xdm.spec b/xdm.spec index d33b335..10b2cd9 100644 --- a/xdm.spec +++ b/xdm.spec @@ -35,7 +35,7 @@ Source2: HOWTO.xdm Source4: display-manager.service Source5: xsession.desktop Patch1: xdm-tolerant-hostname-changes.diff -# needed for patch0, patch2, patch3, patch4 +Patch2: xdm-tarball.patch Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch BuildRequires: firewall-macros BuildRequires: libtool @@ -125,6 +125,7 @@ pushd %{buildroot} # SuSE default XDM configuration tar xf %{SOURCE1} %if 0%{?suse_version} >= 1550 +patch -p0 < %{PATCH2} mkdir -p usr/etc/X11/xdm mv etc/X11/xdm/* usr/etc/X11/xdm mv etc/pam.d usr/etc/ From 3274dbc317245645d695f644a4454b86f94ef49636df316c1017a2859fb1277c Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 5 Sep 2020 03:46:05 +0000 Subject: [PATCH 05/17] - updated xdm-tarball.patch * adjusted for changes in xmodmap and xinit (boo#1173049) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=213 --- xdm-tarball.patch | 128 +++++++++++++++++++++++++++++++--------------- xdm.changes | 6 +++ 2 files changed, 93 insertions(+), 41 deletions(-) diff --git a/xdm-tarball.patch b/xdm-tarball.patch index a1307f5..b0f0227 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-05 00:40:17.437336000 +0200 ++++ ./etc/X11/xdm/RunChooser 2020-09-05 05:19:59.967153000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -10,9 +10,44 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser BINDIR=/usr/bin no_exit_on_failed_exec=1 +@@ -85,7 +85,7 @@ + # + pidof -s gdm > /dev/null 2>&1 + if test $? -eq 0 ; then +- $xrdb -override -retain ${XDMDIR}/Xresources ++ $xrdb -override -retain /usr/etc/X11/Xresources + fi + + # +@@ -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 +@@ -123,7 +127,6 @@ + fi + fi + +- + # + # Handle background: + # First users choise, if no choise is given diff -u -r ../old/etc/X11/xdm/SUSEconfig.xdm ./etc/X11/xdm/SUSEconfig.xdm --- ../old/etc/X11/xdm/SUSEconfig.xdm 2018-07-11 16:42:58.529260339 +0200 -+++ ./etc/X11/xdm/SUSEconfig.xdm 2020-09-04 23:59:30.125566000 +0200 ++++ ./etc/X11/xdm/SUSEconfig.xdm 2020-09-05 04:59:05.050486000 +0200 @@ -69,8 +69,8 @@ echo "Using MD5DIR=\"$MD5DIR\"..." } @@ -37,7 +72,7 @@ diff -u -r ../old/etc/X11/xdm/SUSEconfig.xdm ./etc/X11/xdm/SUSEconfig.xdm sed -ri 's/^(DisplayManager\.requestPort:[[:blank:]]+0)/!\1/g' ${file}.SuSEconfig 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-04 23:49:39.498480000 +0200 ++++ ./etc/X11/xdm/Xreset 2020-09-05 05:21:10.346350000 +0200 @@ -9,7 +9,7 @@ # Author: Werner Fink, # @@ -49,16 +84,16 @@ diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset xmessage=${BINDIR}/xmessage 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-04 23:54:10.477826000 +0200 -@@ -34,7 +34,7 @@ ++++ ./etc/X11/xdm/Xsession 2020-09-05 05:27:05.666149000 +0200 +@@ -33,7 +33,7 @@ + # # Some system defaults # - XETCDIR=/etc/X11 -- XDMDIR=$XETCDIR/xdm -+ XDMDIR=/usr/etc/X11/xdm +- XETCDIR=/etc/X11 ++ XETCDIR=/usr/etc/X11 + XDMDIR=$XETCDIR/xdm XINITDIR=$XETCDIR/xinit : ${TMPDIR=/tmp} - @@ -187,7 +187,11 @@ # # By default we set system defaults for the language @@ -85,22 +120,18 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession fi # -@@ -291,7 +299,11 @@ +@@ -291,7 +299,7 @@ # 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 ++. /usr/etc/X11/xinit/xinitrc.common # 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-04 23:56:20.188841000 +0200 ++++ ./etc/X11/xdm/Xsetup 2020-09-05 05:31:57.346409000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -110,9 +141,36 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup 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 /usr/etc/X11/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-05 00:00:28.359409000 +0200 ++++ ./etc/X11/xdm/Xstartup 2020-09-05 04:59:05.067474000 +0200 @@ -9,7 +9,7 @@ # Author: Werner Fink, # @@ -124,7 +182,7 @@ diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup xmessage=${BINDIR}/xmessage diff -u -r ../old/etc/X11/xdm/keytable ./etc/X11/xdm/keytable --- ../old/etc/X11/xdm/keytable 2017-10-18 16:58:19.074036000 +0200 -+++ ./etc/X11/xdm/keytable 2020-09-04 23:58:22.567705000 +0200 ++++ ./etc/X11/xdm/keytable 2020-09-05 04:59:05.073490000 +0200 @@ -6,8 +6,8 @@ fi @@ -138,7 +196,7 @@ diff -u -r ../old/etc/X11/xdm/keytable ./etc/X11/xdm/keytable function setkeyboard { 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-04 23:55:09.331646000 +0200 ++++ ./etc/X11/xdm/sys.xsession 2020-09-05 05:35:14.220273000 +0200 @@ -38,7 +38,7 @@ argv=("$@") set -- @@ -148,35 +206,27 @@ diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession do test -e $script || continue test -d $script && continue -@@ -63,7 +63,11 @@ +@@ -63,7 +63,7 @@ # # Use system default xinitrc if the users does not have one. # -XINITRCFILE=/etc/X11/xinit/xinitrc -+if [ -r /etc/X11/xinit/xinitrc ]; then -+ XINITRCFILE=/etc/X11/xinit/xinitrc -+elif [ -r /usr/etc/X11/xinit/xinitrc ]; then -+ XINITRCFILE=/usr/etc/X11/xinit/xinitrc -+fi ++XINITRCFILE=/usr/etc/X11/xinit/xinitrc test -r "$HOME/.xinitrc" && XINITRCFILE="$HOME/.xinitrc" if test -f "$XINITRCFILE" ; then -@@ -77,7 +81,11 @@ +@@ -77,7 +77,7 @@ # Source common code shared between the # X session and X init scripts # - . /etc/X11/xinit/xinitrc.common -+ if [ -r /etc/X11/xinit/xinitrc ]; then -+ . /etc/X11/xinit/xinitrc.common -+ elif [ -r /usr/etc/X11/xinit/xinitrc ]; then -+ . /usr/etc/X11/xinit/xinitrc.common -+ fi ++ . /usr/etc/X11/xinit/xinitrc.common 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-04 23:56:41.284679000 +0200 ++++ ./etc/X11/xdm/xdm-config 2020-09-05 05:35:28.212994000 +0200 @@ -4,10 +4,10 @@ DisplayManager.errorLogFile: /var/log/xdm.errors DisplayManager.pidFile: /run/xdm.pid @@ -217,7 +267,7 @@ diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config ! 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-04 23:48:56.887780000 +0200 ++++ ./usr/lib/X11/display-manager 2020-09-05 05:01:39.171143000 +0200 @@ -16,8 +16,11 @@ . /etc/sysconfig/displaymanager . /etc/sysconfig/language @@ -232,16 +282,12 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager locale_vars=" \ LANG \ -@@ -67,14 +70,18 @@ +@@ -67,14 +70,14 @@ unset DEFAULT_WM export WINDOWMANAGER -DMDIR=/etc/X11/xdm -+if [ -d /usr/etc/X11/xdm ]; then -+ DMDIR=/usr/etc/X11/xdm -+else -+ DMDIR=/etc/X11/xdm -+fi ++DMDIR=/usr/etc/X11/xdm RELOADSIGNAL="-HUP" PIDFILELNK="/run/displaymanager.pid" @@ -253,7 +299,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager # 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 +94,8 @@ +@@ -87,8 +90,8 @@ fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -264,7 +310,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi -@@ -159,8 +166,8 @@ +@@ -159,8 +162,8 @@ start) # use system keyboard as global X keyboard configuration diff --git a/xdm.changes b/xdm.changes index 12bd083..62e617c 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Sep 5 03:41:38 UTC 2020 - Stefan Dirsch + +- updated xdm-tarball.patch + * adjusted for changes in xmodmap and xinit (boo#1173049) + ------------------------------------------------------------------- Fri Sep 4 22:33:30 UTC 2020 - Stefan Dirsch From 4ae4b23521a326849cff3dc7a10a5d08e40bdfef7f325ab6e088cd2de8c4c6a3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Sep 2020 09:40:57 +0000 Subject: [PATCH 06/17] - reverted move to /usr/etc/X11/xdm for now due to boo#1176212 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=214 --- xdm.changes | 5 +++++ xdm.spec | 16 +++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/xdm.changes b/xdm.changes index 62e617c..14293ba 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 8 09:29:10 UTC 2020 - Stefan Dirsch + +- reverted move to /usr/etc/X11/xdm for now due to boo#1176212 + ------------------------------------------------------------------- Sat Sep 5 03:41:38 UTC 2020 - Stefan Dirsch diff --git a/xdm.spec b/xdm.spec index 10b2cd9..882274b 100644 --- a/xdm.spec +++ b/xdm.spec @@ -16,6 +16,8 @@ # +%define UsrEtcMove 0 + #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} %define _fillupdir /var/adm/fillup-templates @@ -102,7 +104,7 @@ autoreconf -fi %configure \ --disable-static \ --with-pam \ -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} --with-xdmconfigdir=%{_distconfdir}/X11/xdm \ --with-xdmscriptdir=%{_distconfdir}/X11/xdm \ %else @@ -115,7 +117,7 @@ make %{?_smp_mflags} %install %make_install # Not used anymore by SuSE -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} rm %{buildroot}%{_distconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} %else rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} @@ -124,7 +126,7 @@ rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} pushd %{buildroot} # SuSE default XDM configuration tar xf %{SOURCE1} -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} patch -p0 < %{PATCH2} mkdir -p usr/etc/X11/xdm mv etc/X11/xdm/* usr/etc/X11/xdm @@ -146,7 +148,7 @@ sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\ popd # Correct location (FHS-2.1) -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 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 @@ -207,13 +209,13 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_dminitdir}/console /usr/lib/X11/displaymanagers/default-displaymanager %ghost %{_sysconfdir}/alternatives/default-displaymanager -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} %dir %{_distconfdir}/X11 %{_distconfdir}/X11/xdm/ %else %config %{_sysconfdir}/X11/xdm/ %endif -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} %dir %{_distconfdir}/X11/xdm/scripts %else %dir %{_sysconfdir}/X11/xdm/scripts @@ -224,7 +226,7 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_unitdir}/display-manager.service /usr/lib/X11/display-manager %config %{_sysconfdir}/logrotate.d/xdm -%if 0%{?suse_version} >= 1550 +%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} %{_distconfdir}/pam.d/xdm %{_distconfdir}/pam.d/xdm-np %else From f70ae16a8fedae92705ea534f642e77a9d4125074c3d6efbce926bb7c264e849 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Sep 2020 15:05:45 +0000 Subject: [PATCH 07/17] - xinit-UsrEtcMove.patch * changes needed with xinitrc moving to %{_libexecdir}/xinit and xinitrc.common moving to /usr/etc/X11/xinit/ OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=215 --- xdm.changes | 7 +++++ xdm.spec | 3 ++ xinit-UsrEtcMove.patch | 70 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 xinit-UsrEtcMove.patch diff --git a/xdm.changes b/xdm.changes index 14293ba..8701953 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 8 15:00:50 UTC 2020 - Stefan Dirsch + +- 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 diff --git a/xdm.spec b/xdm.spec index 882274b..33ce282 100644 --- a/xdm.spec +++ b/xdm.spec @@ -39,6 +39,7 @@ Source5: xsession.desktop Patch1: xdm-tolerant-hostname-changes.diff 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 @@ -133,6 +134,8 @@ mv etc/X11/xdm/* usr/etc/X11/xdm mv etc/pam.d usr/etc/ rmdir etc/X11/xdm rmdir etc/X11 +%else +patch -p0 < %{PATCH4} %endif %if "%{_fillupdir}" != "/var/adm/fillup-templates" mkdir -p %{buildroot}$(dirname %{_fillupdir}) diff --git a/xinit-UsrEtcMove.patch b/xinit-UsrEtcMove.patch new file mode 100644 index 0000000..21a4e19 --- /dev/null +++ b/xinit-UsrEtcMove.patch @@ -0,0 +1,70 @@ +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 From ab2756afc4c6d4d405593323b7f22a442fd5e056bed40ff68c50c96cee467fd7 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 8 Sep 2020 23:59:41 +0000 Subject: [PATCH 08/17] - reenabled move to /usr/etc/X11/xdm; updated xdm-tarball.patch (includes changes from xinit-UsrEtcMove.patch) [boo#1176212] OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=216 --- xdm-tarball.patch | 220 +++++++++++++++++++++++----------------------- xdm.changes | 6 ++ xdm.spec | 26 ++---- 3 files changed, 127 insertions(+), 125 deletions(-) diff --git a/xdm-tarball.patch b/xdm-tarball.patch index b0f0227..6274537 100644 --- a/xdm-tarball.patch +++ b/xdm-tarball.patch @@ -1,30 +1,21 @@ 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-05 05:19:59.967153000 +0200 ++++ ./etc/X11/xdm/RunChooser 2020-09-08 22:50:45.711986000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 ETCDIR=/etc/X11 - XDMDIR=${ETCDIR}/xdm -+ XDMDIR=/usr/etc/X11/xdm ++ XDMDIR=/usr/${ETCDIR}/xdm BINDIR=/usr/bin no_exit_on_failed_exec=1 -@@ -85,7 +85,7 @@ - # - pidof -s gdm > /dev/null 2>&1 - if test $? -eq 0 ; then -- $xrdb -override -retain ${XDMDIR}/Xresources -+ $xrdb -override -retain /usr/etc/X11/Xresources - fi - - # @@ -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 ++ elif test -r /usr/etc/X11/Xmodmap; then ++ $xmodmap /usr/etc/X11/Xmodmap fi else # TCP/IP connection (remote or local) @@ -32,69 +23,46 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser 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 ++ 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 -@@ -123,7 +127,6 @@ - fi - fi - -- - # - # Handle background: - # First users choise, if no choise is given -diff -u -r ../old/etc/X11/xdm/SUSEconfig.xdm ./etc/X11/xdm/SUSEconfig.xdm ---- ../old/etc/X11/xdm/SUSEconfig.xdm 2018-07-11 16:42:58.529260339 +0200 -+++ ./etc/X11/xdm/SUSEconfig.xdm 2020-09-05 04:59:05.050486000 +0200 -@@ -69,8 +69,8 @@ - echo "Using MD5DIR=\"$MD5DIR\"..." - } - --if test -r $r/etc/X11/xdm/Xservers -a $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/Xservers; then -- file=$r/etc/X11/xdm/Xservers -+if test -r $r/usr/etc/X11/xdm/Xservers -a $r/etc/sysconfig/displaymanager -nt $r/usr/etc/X11/xdm/Xservers; then -+ file=$r/usr/etc/X11/xdm/Xservers - cp -p $file ${file}.SuSEconfig - if test "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ; then - sed -ri 's/^(:[0-9][[:blank:]]+local[[:blank:]]+)/#\1/g' ${file}.SuSEconfig -@@ -91,8 +91,8 @@ - check_md5_and_move $file - fi - --if test -r $r/etc/X11/xdm/xdm-config -a $r/etc/sysconfig/displaymanager -nt $r/etc/X11/xdm/xdm-config; then -- file=$r/etc/X11/xdm/xdm-config -+if test -r $r/usr/etc/X11/xdm/xdm-config -a $r/etc/sysconfig/displaymanager -nt $r/usr/etc/X11/xdm/xdm-config; then -+ file=$r/usr/etc/X11/xdm/xdm-config - cp -p $file ${file}.SuSEconfig - if test "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ; then - sed -ri 's/^(DisplayManager\.requestPort:[[:blank:]]+0)/!\1/g' ${file}.SuSEconfig 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-05 05:21:10.346350000 +0200 -@@ -9,7 +9,7 @@ - # Author: Werner Fink, ++++ ./etc/X11/xdm/Xreset 2020-09-08 22:53:48.699077000 +0200 +@@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 -- ETCDIR=/etc/X11 -+ ETCDIR=/usr/etc/X11 - XDMDIR=${ETCDIR}/xdm + 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/Xsession ./etc/X11/xdm/Xsession --- ../old/etc/X11/xdm/Xsession 2017-07-25 11:58:00.067080000 +0200 -+++ ./etc/X11/xdm/Xsession 2020-09-05 05:27:05.666149000 +0200 -@@ -33,7 +33,7 @@ ++++ ./etc/X11/xdm/Xsession 2020-09-08 23:02:03.120815000 +0200 +@@ -35,9 +35,17 @@ # - # Some system defaults - # -- XETCDIR=/etc/X11 -+ XETCDIR=/usr/etc/X11 + XETCDIR=/etc/X11 XDMDIR=$XETCDIR/xdm - XINITDIR=$XETCDIR/xinit +- XINITDIR=$XETCDIR/xinit : ${TMPDIR=/tmp} -@@ -187,7 +187,11 @@ + ++# 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 # @@ -107,7 +75,7 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession # # Handle arguments given by xdm/kdm/gdm. -@@ -261,7 +265,11 @@ +@@ -261,7 +273,11 @@ # No window manager? Get system default # if test -z "$WINDOWMANAGER" ; then @@ -120,24 +88,29 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession fi # -@@ -291,7 +299,7 @@ +@@ -291,7 +307,12 @@ # Source common code shared between the # X session and X init scripts # -. /etc/X11/xinit/xinitrc.common -+. /usr/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-05 05:31:57.346409000 +0200 ++++ ./etc/X11/xdm/Xsetup 2020-09-08 23:06:32.524239000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 ETCDIR=/etc/X11 - XDMDIR=${ETCDIR}/xdm -+ XDMDIR=/usr/etc/X11/xdm ++ XDMDIR=/usr/${ETCDIR}/xdm BINDIR=/usr/bin no_exit_on_failed_exec=1 @@ -146,7 +119,7 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup EOF else - $xrdb $cpp -override -retain ${ETCDIR}/Xresources -+ $xrdb $cpp -override -retain /usr/etc/X11/Xresources ++ $xrdb $cpp -override -retain ${XDMDIR}/Xresources fi # @@ -154,8 +127,8 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup cat $sysxkbmap | $xkbcomp - $DISPLAY elif test -r $sysmodmap ; then $xmodmap $sysmodmap -+ elif test -r /usr/etc/X11/Xmodmap ; then -+ $xmodmap /usr/etc/X11/Xmodmap ++ elif test -r /usr/etc/X11/Xmodmap ; then ++ $xmodmap /usr/etc/X11/Xmodmap fi else # TCP/IP connection (remote or local) @@ -163,80 +136,87 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup 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 ++ 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-05 04:59:05.067474000 +0200 -@@ -9,7 +9,7 @@ - # Author: Werner Fink, ++++ ./etc/X11/xdm/Xstartup 2020-09-08 23:13:05.476961000 +0200 +@@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 -- ETCDIR=/etc/X11 -+ ETCDIR=/usr/etc/X11 - XDMDIR=${ETCDIR}/xdm + ETCDIR=/etc/X11 +- XDMDIR=${ETCDIR}/xdm ++ XDMDIR=/usr/${ETCDIR}/xdm BINDIR=/usr/bin xmessage=${BINDIR}/xmessage -diff -u -r ../old/etc/X11/xdm/keytable ./etc/X11/xdm/keytable ---- ../old/etc/X11/xdm/keytable 2017-10-18 16:58:19.074036000 +0200 -+++ ./etc/X11/xdm/keytable 2020-09-05 04:59:05.073490000 +0200 -@@ -6,8 +6,8 @@ - fi - - vconsole_conf_file=/etc/vconsole.conf --previous_x11conf_file=/etc/X11/xorg.conf.d/90-keytable.conf --systemd_x11conf_file=/etc/X11/xorg.conf.d/00-keyboard.conf -+previous_x11conf_file=/usr/etc/X11/xorg.conf.d/90-keytable.conf -+systemd_x11conf_file=/usr/etc/X11/xorg.conf.d/00-keyboard.conf - keyboard_map_systemd=/usr/share/systemd/kbd-model-map - - function setkeyboard { + 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-05 05:35:14.220273000 +0200 -@@ -38,7 +38,7 @@ ++++ ./etc/X11/xdm/sys.xsession 2020-09-08 23:34:31.477856000 +0200 +@@ -38,10 +38,16 @@ argv=("$@") set -- -for script in /etc/X11/xdm/scripts/* -+for script in /usr/etc/X11/xdm/scripts/* ++for script in /usr/etc/X11/xdm/scripts/* \ ++ /etc/X11/xdm/scripts/*; do do test -e $script || continue test -d $script && continue -@@ -63,7 +63,7 @@ ++ # 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 -+XINITRCFILE=/usr/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 +77,7 @@ +@@ -77,7 +92,11 @@ # Source common code shared between the # X session and X init scripts # - . /etc/X11/xinit/xinitrc.common -+ . /usr/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-05 05:35:28.212994000 +0200 ++++ ./etc/X11/xdm/xdm-config 2020-09-08 23:41:18.284830000 +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.servers: /etc/X11/xdm/Xservers ++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.keyFile: /usr/etc/X11/xdm/xdm-keys -+DisplayManager.servers: /usr/etc/X11/xdm/Xservers +DisplayManager.accessFile: /usr/etc/X11/xdm/Xaccess +DisplayManager.willing: su nobody -c /usr/etc/X11/xdm/Xwilling ! @@ -265,9 +245,10 @@ diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config DisplayManager.*.terminateServer: false ! ! SECURITY: do not listen for XDMCP or Chooser requests +Only in ./usr/lib/X11: .nfs0000000004cd295200014457 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-05 05:01:39.171143000 +0200 ++++ ./usr/lib/X11/display-manager 2020-09-09 00:01:56.326807000 +0200 @@ -16,8 +16,11 @@ . /etc/sysconfig/displaymanager . /etc/sysconfig/language @@ -282,7 +263,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager locale_vars=" \ LANG \ -@@ -67,14 +70,14 @@ +@@ -67,14 +70,23 @@ unset DEFAULT_WM export WINDOWMANAGER @@ -295,11 +276,20 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager xdm_reload_files () { - if [ -x /etc/X11/xdm/SuSEconfig.xdm ]; then -+ if [ -x $DMDIR/SuSEconfig.xdm ]; then ++ test -d /etc/X11/xdm || mkdir -p /etc/X11/xdm ++ # SUSEconfig 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 ++ # needed by sddm ++ test -r /etc/X11/xdm/Xsession || ln -snf $DMDIR/Xsession /etc/X11/xdm/Xsession ++ test -r /etc/X11/xdm/Xsetup || ln -snf $DMDIR/Xsetup /etc/X11/xdm/Xsetup ++ # possibly needed by who knows ... ++ test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map ++ 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 @@ +@@ -87,8 +99,8 @@ fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -310,7 +300,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi -@@ -159,8 +162,8 @@ +@@ -159,8 +171,8 @@ start) # use system keyboard as global X keyboard configuration @@ -321,3 +311,17 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager fi [ -n "$STARTPROC" ] && $STARTPROC +diff -u -r ../old/usr/lib/X11/displaymanagers/xdm ./usr/lib/X11/displaymanagers/xdm +--- ../old/usr/lib/X11/displaymanagers/xdm 2014-03-04 13:53:31.000000000 +0100 ++++ ./usr/lib/X11/displaymanagers/xdm 2020-09-08 21:58:22.768049000 +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 diff --git a/xdm.changes b/xdm.changes index 8701953..f699750 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 8 22:02:59 UTC 2020 - Stefan Dirsch + +- 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 diff --git a/xdm.spec b/xdm.spec index 33ce282..8f74f89 100644 --- a/xdm.spec +++ b/xdm.spec @@ -16,7 +16,9 @@ # -%define UsrEtcMove 0 +%if 0%{?suse_version} >= 1550 +%define UsrEtcMove 1 +%endif #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} @@ -105,35 +107,25 @@ autoreconf -fi %configure \ --disable-static \ --with-pam \ -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} - --with-xdmconfigdir=%{_distconfdir}/X11/xdm \ - --with-xdmscriptdir=%{_distconfdir}/X11/xdm \ -%else --with-xdmconfigdir=%{_sysconfdir}/X11/xdm \ --with-xdmscriptdir=%{_sysconfdir}/X11/xdm \ -%endif --with-systemdsystemunitdir=no make %{?_smp_mflags} %install %make_install # Not used anymore by SuSE -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} -rm %{buildroot}%{_distconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} -%else rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0} -%endif pushd %{buildroot} # SuSE default XDM configuration tar xf %{SOURCE1} -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} patch -p0 < %{PATCH2} mkdir -p usr/etc/X11/xdm mv etc/X11/xdm/* usr/etc/X11/xdm mv etc/pam.d usr/etc/ -rmdir etc/X11/xdm -rmdir etc/X11 +rmdir etc/X11/xdm etc/X11 %else patch -p0 < %{PATCH4} %endif @@ -151,7 +143,7 @@ sed -i -e "s+DISPLAYMANAGER_REMOTE_ACCESS=.*+DISPLAYMANAGER_REMOTE_ACCESS=\"yes\ popd # Correct location (FHS-2.1) -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%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 @@ -212,13 +204,13 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_dminitdir}/console /usr/lib/X11/displaymanagers/default-displaymanager %ghost %{_sysconfdir}/alternatives/default-displaymanager -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} %dir %{_distconfdir}/X11 %{_distconfdir}/X11/xdm/ %else %config %{_sysconfdir}/X11/xdm/ %endif -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} %dir %{_distconfdir}/X11/xdm/scripts %else %dir %{_sysconfdir}/X11/xdm/scripts @@ -229,7 +221,7 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_unitdir}/display-manager.service /usr/lib/X11/display-manager %config %{_sysconfdir}/logrotate.d/xdm -%if 0%{?suse_version} >= 1550 && 0%{UsrEtcMove} +%if 0%{?UsrEtcMove} %{_distconfdir}/pam.d/xdm %{_distconfdir}/pam.d/xdm-np %else From 93ca6103bcc18390fbd2e3a1a8314e22d582688fb9247561ee1ede8d0f9d35ff Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 9 Sep 2020 14:03:52 +0000 Subject: [PATCH 09/17] - 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) * 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) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=217 --- xdm-tarball.patch | 45 +++++++++++++++++++++++++++++---------------- xdm.changes | 14 ++++++++++++++ xdm.spec | 14 ++++++++------ 3 files changed, 51 insertions(+), 22 deletions(-) diff --git a/xdm-tarball.patch b/xdm-tarball.patch index 6274537..9242dca 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-08 22:50:45.711986000 +0200 ++++ ./etc/X11/xdm/RunChooser 2020-09-09 14:46:10.144869000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -30,7 +30,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser 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-08 22:53:48.699077000 +0200 ++++ ./etc/X11/xdm/Xreset 2020-09-09 14:46:10.226350000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -40,14 +40,25 @@ diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset BINDIR=/usr/bin xmessage=${BINDIR}/xmessage xconsole=${BINDIR}/xconsole +diff -u -r ../old/etc/X11/xdm/Xresources ./etc/X11/xdm/Xresources +--- ../old/etc/X11/xdm/Xresources 2015-08-04 12:13:36.000000000 +0200 ++++ ./etc/X11/xdm/Xresources 2020-09-09 14:58:23.851125000 +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-08 23:02:03.120815000 +0200 -@@ -35,9 +35,17 @@ ++++ ./etc/X11/xdm/Xsession 2020-09-09 14:54:03.233265000 +0200 +@@ -34,10 +34,18 @@ + # Some system defaults # XETCDIR=/etc/X11 - XDMDIR=$XETCDIR/xdm +- XDMDIR=$XETCDIR/xdm - XINITDIR=$XETCDIR/xinit ++ XDMDIR=/usr/$XETCDIR/xdm : ${TMPDIR=/tmp} +# xinitrc moved to %{_libexecdir}/xinit in xinit package @@ -104,7 +115,7 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession 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-08 23:06:32.524239000 +0200 ++++ ./etc/X11/xdm/Xsetup 2020-09-09 14:46:10.232358000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -143,7 +154,7 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup 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-08 23:13:05.476961000 +0200 ++++ ./etc/X11/xdm/Xstartup 2020-09-09 14:46:10.235360000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -155,14 +166,14 @@ diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup 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-08 23:34:31.477856000 +0200 ++++ ./etc/X11/xdm/sys.xsession 2020-09-09 14:46:48.229301000 +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 ++ /etc/X11/xdm/scripts/* do test -e $script || continue test -d $script && continue @@ -207,7 +218,7 @@ diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession 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-08 23:41:18.284830000 +0200 ++++ ./etc/X11/xdm/xdm-config 2020-09-09 14:46:10.241358000 +0200 @@ -4,10 +4,10 @@ DisplayManager.errorLogFile: /var/log/xdm.errors DisplayManager.pidFile: /run/xdm.pid @@ -245,10 +256,9 @@ diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config DisplayManager.*.terminateServer: false ! ! SECURITY: do not listen for XDMCP or Chooser requests -Only in ./usr/lib/X11: .nfs0000000004cd295200014457 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-09 00:01:56.326807000 +0200 ++++ ./usr/lib/X11/display-manager 2020-09-09 14:57:41.828919000 +0200 @@ -16,8 +16,11 @@ . /etc/sysconfig/displaymanager . /etc/sysconfig/language @@ -263,7 +273,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager locale_vars=" \ LANG \ -@@ -67,14 +70,23 @@ +@@ -67,14 +70,26 @@ unset DEFAULT_WM export WINDOWMANAGER @@ -283,13 +293,16 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager + # needed by sddm + test -r /etc/X11/xdm/Xsession || ln -snf $DMDIR/Xsession /etc/X11/xdm/Xsession + test -r /etc/X11/xdm/Xsetup || ln -snf $DMDIR/Xsetup /etc/X11/xdm/Xsetup ++ # needed by lightdm ++ test -r /etc/X11/xdm/Xstartup || ln -snf $DMDIR/Xstartup /etc/X11/xdm/Xstartup ++ test -r /etc/X11/xdm/Xreset || ln -snf $DMDIR/Xreset /etc/X11/xdm/Xreset + # possibly needed by who knows ... + test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map + 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 +99,8 @@ +@@ -87,8 +102,8 @@ fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -300,7 +313,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi -@@ -159,8 +171,8 @@ +@@ -159,8 +174,8 @@ start) # use system keyboard as global X keyboard configuration @@ -313,7 +326,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager [ -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-08 21:58:22.768049000 +0200 ++++ ./usr/lib/X11/displaymanagers/xdm 2020-09-09 14:46:10.344352000 +0200 @@ -5,8 +5,8 @@ } diff --git a/xdm.changes b/xdm.changes index f699750..e19acce 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Sep 9 13:53:33 UTC 2020 - Stefan Dirsch + +- 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) + * 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 diff --git a/xdm.spec b/xdm.spec index 8f74f89..a5c06da 100644 --- a/xdm.spec +++ b/xdm.spec @@ -124,7 +124,8 @@ tar xf %{SOURCE1} patch -p0 < %{PATCH2} mkdir -p usr/etc/X11/xdm mv etc/X11/xdm/* usr/etc/X11/xdm -mv etc/pam.d usr/etc/ +### authentification error with lightdm when using /usr/etc/pam.d +#mv etc/pam.d usr/etc/ rmdir etc/X11/xdm etc/X11 %else patch -p0 < %{PATCH4} @@ -221,13 +222,14 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_unitdir}/display-manager.service /usr/lib/X11/display-manager %config %{_sysconfdir}/logrotate.d/xdm -%if 0%{?UsrEtcMove} -%{_distconfdir}/pam.d/xdm -%{_distconfdir}/pam.d/xdm-np -%else +### authentification failure with lightdm when using /usr/etc/pam.d +#%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 +#%endif %dir %{_localstatedir}/lib/xdm/ %{_fillupdir}/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ From 8032d18a3f157300b79537ea6e910e2443740f1cebc4886ab8bfb39eb5c9d555 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 9 Sep 2020 14:24:59 +0000 Subject: [PATCH 10/17] improved changelog OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=218 --- xdm.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/xdm.changes b/xdm.changes index e19acce..41cfd97 100644 --- a/xdm.changes +++ b/xdm.changes @@ -8,6 +8,7 @@ Wed Sep 9 13:53:33 UTC 2020 - Stefan Dirsch 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) From ddaddd40c21048d05e034020b51ce4ccc6b92f651b781d4a8695df47dc52c860 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 9 Sep 2020 15:55:14 +0000 Subject: [PATCH 11/17] - fixes in xdm-tarball.patch * symlink also $XDMDIR/xinitrc.common in /etc/X11/xinit; it is still often sourced in old ~/.xinitrc user files ... OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=219 --- xdm-tarball.patch | 28 +++++++++++++++------------- xdm.changes | 7 +++++++ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/xdm-tarball.patch b/xdm-tarball.patch index 9242dca..b971d1d 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-09 14:46:10.144869000 +0200 ++++ ./etc/X11/xdm/RunChooser 2020-09-09 17:49:39.002118000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -30,7 +30,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser 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-09 14:46:10.226350000 +0200 ++++ ./etc/X11/xdm/Xreset 2020-09-09 17:49:39.049133000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -42,7 +42,7 @@ diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset 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-09 14:58:23.851125000 +0200 ++++ ./etc/X11/xdm/Xresources 2020-09-09 17:49:39.053112000 +0200 @@ -100,4 +100,4 @@ ! ! Include system wide Xresources @@ -51,7 +51,7 @@ diff -u -r ../old/etc/X11/xdm/Xresources ./etc/X11/xdm/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-09 14:54:03.233265000 +0200 ++++ ./etc/X11/xdm/Xsession 2020-09-09 17:49:39.056112000 +0200 @@ -34,10 +34,18 @@ # Some system defaults # @@ -115,7 +115,7 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession 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-09 14:46:10.232358000 +0200 ++++ ./etc/X11/xdm/Xsetup 2020-09-09 17:49:39.059117000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -154,7 +154,7 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup 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-09 14:46:10.235360000 +0200 ++++ ./etc/X11/xdm/Xstartup 2020-09-09 17:49:39.063112000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -166,7 +166,7 @@ diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup 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-09 14:46:48.229301000 +0200 ++++ ./etc/X11/xdm/sys.xsession 2020-09-09 17:49:39.066112000 +0200 @@ -38,10 +38,16 @@ argv=("$@") set -- @@ -218,7 +218,7 @@ diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession 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-09 14:46:10.241358000 +0200 ++++ ./etc/X11/xdm/xdm-config 2020-09-09 17:49:39.069123000 +0200 @@ -4,10 +4,10 @@ DisplayManager.errorLogFile: /var/log/xdm.errors DisplayManager.pidFile: /run/xdm.pid @@ -258,7 +258,7 @@ diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config ! 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-09 14:57:41.828919000 +0200 ++++ ./usr/lib/X11/display-manager 2020-09-09 17:50:00.145519000 +0200 @@ -16,8 +16,11 @@ . /etc/sysconfig/displaymanager . /etc/sysconfig/language @@ -273,7 +273,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager locale_vars=" \ LANG \ -@@ -67,14 +70,26 @@ +@@ -67,14 +70,28 @@ unset DEFAULT_WM export WINDOWMANAGER @@ -298,11 +298,13 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager + test -r /etc/X11/xdm/Xreset || ln -snf $DMDIR/Xreset /etc/X11/xdm/Xreset + # possibly needed by who knows ... + test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map ++ # still often sourced by old ~/.xinitrc user files ... ++ test -r /etc/X11/xinit/xinitrc.common || ln -snf /usr/etc/X11/xinit/xinitrc.common /etc/X11/xinit/xinitrc.common + 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 +102,8 @@ +@@ -87,8 +104,8 @@ fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -313,7 +315,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi -@@ -159,8 +174,8 @@ +@@ -159,8 +176,8 @@ start) # use system keyboard as global X keyboard configuration @@ -326,7 +328,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager [ -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-09 14:46:10.344352000 +0200 ++++ ./usr/lib/X11/displaymanagers/xdm 2020-09-09 17:49:39.100110000 +0200 @@ -5,8 +5,8 @@ } diff --git a/xdm.changes b/xdm.changes index 41cfd97..a32e24e 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 9 15:50:51 UTC 2020 - Stefan Dirsch + +- 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 From 336a5f813d333b3140f8376a6646c4e8bc7a4f5c63ff38a701403555877cfa34 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 10 Sep 2020 02:51:32 +0000 Subject: [PATCH 12/17] - 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) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=220 --- xdm-tarball.patch | 59 ++++++++++++++++++++++++++--------------------- xdm.changes | 8 +++++++ 2 files changed, 41 insertions(+), 26 deletions(-) diff --git a/xdm-tarball.patch b/xdm-tarball.patch index b971d1d..de45712 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-09 17:49:39.002118000 +0200 ++++ ./etc/X11/xdm/RunChooser 2020-09-10 04:31:19.817621000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -30,7 +30,7 @@ diff -u -r ../old/etc/X11/xdm/RunChooser ./etc/X11/xdm/RunChooser 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-09 17:49:39.049133000 +0200 ++++ ./etc/X11/xdm/Xreset 2020-09-10 04:31:19.957604000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -42,7 +42,7 @@ diff -u -r ../old/etc/X11/xdm/Xreset ./etc/X11/xdm/Xreset 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-09 17:49:39.053112000 +0200 ++++ ./etc/X11/xdm/Xresources 2020-09-10 04:31:19.961602000 +0200 @@ -100,4 +100,4 @@ ! ! Include system wide Xresources @@ -51,7 +51,7 @@ diff -u -r ../old/etc/X11/xdm/Xresources ./etc/X11/xdm/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-09 17:49:39.056112000 +0200 ++++ ./etc/X11/xdm/Xsession 2020-09-10 04:31:19.964605000 +0200 @@ -34,10 +34,18 @@ # Some system defaults # @@ -115,7 +115,7 @@ diff -u -r ../old/etc/X11/xdm/Xsession ./etc/X11/xdm/Xsession 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-09 17:49:39.059117000 +0200 ++++ ./etc/X11/xdm/Xsetup 2020-09-10 04:31:19.968602000 +0200 @@ -9,7 +9,7 @@ # LIBDIR=/usr/lib/X11 @@ -154,7 +154,7 @@ diff -u -r ../old/etc/X11/xdm/Xsetup ./etc/X11/xdm/Xsetup 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-09 17:49:39.063112000 +0200 ++++ ./etc/X11/xdm/Xstartup 2020-09-10 04:31:19.971608000 +0200 @@ -10,7 +10,7 @@ # LIBDIR=/usr/lib/X11 @@ -166,7 +166,7 @@ diff -u -r ../old/etc/X11/xdm/Xstartup ./etc/X11/xdm/Xstartup 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-09 17:49:39.066112000 +0200 ++++ ./etc/X11/xdm/sys.xsession 2020-09-10 04:31:19.975602000 +0200 @@ -38,10 +38,16 @@ argv=("$@") set -- @@ -218,7 +218,7 @@ diff -u -r ../old/etc/X11/xdm/sys.xsession ./etc/X11/xdm/sys.xsession 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-09 17:49:39.069123000 +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 @@ -258,7 +258,7 @@ diff -u -r ../old/etc/X11/xdm/xdm-config ./etc/X11/xdm/xdm-config ! 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-09 17:50:00.145519000 +0200 ++++ ./usr/lib/X11/display-manager 2020-09-10 04:40:30.456843000 +0200 @@ -16,8 +16,11 @@ . /etc/sysconfig/displaymanager . /etc/sysconfig/language @@ -273,7 +273,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager locale_vars=" \ LANG \ -@@ -67,14 +70,28 @@ +@@ -67,14 +70,14 @@ unset DEFAULT_WM export WINDOWMANAGER @@ -286,25 +286,11 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager xdm_reload_files () { - if [ -x /etc/X11/xdm/SuSEconfig.xdm ]; then -+ test -d /etc/X11/xdm || mkdir -p /etc/X11/xdm -+ # SUSEconfig 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 -+ # needed by sddm -+ test -r /etc/X11/xdm/Xsession || ln -snf $DMDIR/Xsession /etc/X11/xdm/Xsession -+ test -r /etc/X11/xdm/Xsetup || ln -snf $DMDIR/Xsetup /etc/X11/xdm/Xsetup -+ # needed by lightdm -+ test -r /etc/X11/xdm/Xstartup || ln -snf $DMDIR/Xstartup /etc/X11/xdm/Xstartup -+ test -r /etc/X11/xdm/Xreset || ln -snf $DMDIR/Xreset /etc/X11/xdm/Xreset -+ # possibly needed by who knows ... -+ test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map -+ # still often sourced by old ~/.xinitrc user files ... -+ test -r /etc/X11/xinit/xinitrc.common || ln -snf /usr/etc/X11/xinit/xinitrc.common /etc/X11/xinit/xinitrc.common + 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 +104,8 @@ +@@ -87,8 +90,8 @@ fi fi MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -315,6 +301,27 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi +@@ -130,6 +133,20 @@ + exit 0 + ;; + *) ++ test -d /etc/X11/xdm || mkdir -p /etc/X11/xdm ++ # SUSEconfig 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 ++ # needed by sddm ++ test -r /etc/X11/xdm/Xsession || ln -snf $DMDIR/Xsession /etc/X11/xdm/Xsession ++ test -r /etc/X11/xdm/Xsetup || ln -snf $DMDIR/Xsetup /etc/X11/xdm/Xsetup ++ # needed by lightdm ++ test -r /etc/X11/xdm/Xstartup || ln -snf $DMDIR/Xstartup /etc/X11/xdm/Xstartup ++ test -r /etc/X11/xdm/Xreset || ln -snf $DMDIR/Xreset /etc/X11/xdm/Xreset ++ # possibly needed by who knows ... ++ test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map ++ # 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) @@ -328,7 +335,7 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager [ -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-09 17:49:39.100110000 +0200 ++++ ./usr/lib/X11/displaymanagers/xdm 2020-09-10 04:31:20.007599000 +0200 @@ -5,8 +5,8 @@ } diff --git a/xdm.changes b/xdm.changes index a32e24e..17ba16c 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 10 02:42:45 UTC 2020 - Stefan Dirsch + +- 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 From d3e5eee4b48fa324f157414bca222fb36b42daa707255ef1a756559ceb1c4df3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 15 Sep 2020 11:48:48 +0000 Subject: [PATCH 13/17] Accepting request 834572 from home:dimstar:Factory - Switch to /usr/bin/pidof dependency, provided by procps-ng. OBS-URL: https://build.opensuse.org/request/show/834572 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=221 --- xdm.changes | 5 +++++ xdm.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xdm.changes b/xdm.changes index 17ba16c..271aa19 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Sep 15 10:16:41 UTC 2020 - Dominique Leuenberger + +- Switch to /usr/bin/pidof dependency, provided by procps-ng. + ------------------------------------------------------------------- Thu Sep 10 02:42:45 UTC 2020 - Stefan Dirsch diff --git a/xdm.spec b/xdm.spec index a5c06da..d65cb8c 100644 --- a/xdm.spec +++ b/xdm.spec @@ -59,7 +59,7 @@ BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtrans) Requires: %fillup_prereq -Requires: /sbin/pidof +Requires: %{_bindir}/pidof Requires: /sbin/startproc Requires: logrotate Requires: sessreg From eb81bd1588ba37bb91bde1e334e10c34ec7fd0f6c453f0c83b5e824fb3104b47 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 29 Sep 2020 10:03:13 +0000 Subject: [PATCH 14/17] - moved xdm/xdm-np PAM files to /usr/etc/pam.d, since lightdm has been adjusted meanwhile OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=222 --- xdm.changes | 6 ++++++ xdm.spec | 14 ++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xdm.changes b/xdm.changes index 271aa19..b97478f 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 29 09:57:42 UTC 2020 - Stefan Dirsch + +- 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 diff --git a/xdm.spec b/xdm.spec index d65cb8c..2fef02a 100644 --- a/xdm.spec +++ b/xdm.spec @@ -124,8 +124,7 @@ tar xf %{SOURCE1} patch -p0 < %{PATCH2} mkdir -p usr/etc/X11/xdm mv etc/X11/xdm/* usr/etc/X11/xdm -### authentification error with lightdm when using /usr/etc/pam.d -#mv etc/pam.d usr/etc/ +mv etc/pam.d usr/etc/ rmdir etc/X11/xdm etc/X11 %else patch -p0 < %{PATCH4} @@ -222,14 +221,13 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %{_unitdir}/display-manager.service /usr/lib/X11/display-manager %config %{_sysconfdir}/logrotate.d/xdm -### authentification failure with lightdm when using /usr/etc/pam.d -#%if 0%{?UsrEtcMove} -#%{_distconfdir}/pam.d/xdm -#%{_distconfdir}/pam.d/xdm-np -#%else +%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 +%endif %dir %{_localstatedir}/lib/xdm/ %{_fillupdir}/sysconfig.displaymanager %{_localstatedir}/lib/xdm/authdir/ From 06b79285c7ca6c2916f987a24d2fea68563ebd1cb8375ba8ff03c58ebf73595f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 3 Oct 2020 16:54:28 +0000 Subject: [PATCH 15/17] - /etc/X11/xdm/scripts/11-ssh-agent * ssh-askpass now moved to /usr/libexec/ssh (boo#1175991) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=223 --- xdm.changes | 6 ++++++ xdm.tar.bz2 | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xdm.changes b/xdm.changes index b97478f..ddd0c18 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Oct 3 16:52:18 UTC 2020 - Stefan Dirsch + +- /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 diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index b6334fb..32aae18 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:935637652aab80fee6961973845c7c4d2c58fa677c23a5fc8b8967fffc1f4659 -size 22638 +oid sha256:6da4e078011b8a5ee708c33aeb261637d66f9b4b936e42f2feaf31760c9ec4d2 +size 22710 From a9767808278dd74512b64cab7cdb9cf7803cbb491479a0e6456373f3f4702d6f Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 5 Oct 2020 14:55:27 +0000 Subject: [PATCH 16/17] Accepting request 839553 from home:Vogtinator:branches:X11:XOrg Now build tested - Don't create the compat symlinks in /etc on the fly, track them properly as %config OBS-URL: https://build.opensuse.org/request/show/839553 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=224 --- xdm-tarball.patch | 12 ++---------- xdm.changes | 6 ++++++ xdm.spec | 12 +++++++++--- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/xdm-tarball.patch b/xdm-tarball.patch index de45712..c887ec7 100644 --- a/xdm-tarball.patch +++ b/xdm-tarball.patch @@ -301,22 +301,14 @@ diff -u -r ../old/usr/lib/X11/display-manager ./usr/lib/X11/display-manager /bin/logger return 0 fi -@@ -130,6 +133,20 @@ +@@ -130,6 +133,12 @@ exit 0 ;; *) + test -d /etc/X11/xdm || mkdir -p /etc/X11/xdm -+ # SUSEconfig edits these files appropriate to /etc/sysconfig/displaymanager ++ # 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 -+ # needed by sddm -+ test -r /etc/X11/xdm/Xsession || ln -snf $DMDIR/Xsession /etc/X11/xdm/Xsession -+ test -r /etc/X11/xdm/Xsetup || ln -snf $DMDIR/Xsetup /etc/X11/xdm/Xsetup -+ # needed by lightdm -+ test -r /etc/X11/xdm/Xstartup || ln -snf $DMDIR/Xstartup /etc/X11/xdm/Xstartup -+ test -r /etc/X11/xdm/Xreset || ln -snf $DMDIR/Xreset /etc/X11/xdm/Xreset -+ # possibly needed by who knows ... -+ test -r /etc/X11/xdm/Keyboard.map || ln -snf $DMDIR/Keyboard.map /etc/X11/xdm/Keyboard.map + # 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/* diff --git a/xdm.changes b/xdm.changes index ddd0c18..82efd84 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 4 09:40:50 UTC 2020 - Fabian Vogt + +- 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 diff --git a/xdm.spec b/xdm.spec index 2fef02a..dc0d7b3 100644 --- a/xdm.spec +++ b/xdm.spec @@ -124,8 +124,15 @@ tar xf %{SOURCE1} 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 Keyboard.map; 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/ -rmdir etc/X11/xdm etc/X11 %else patch -p0 < %{PATCH4} %endif @@ -207,9 +214,8 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager %if 0%{?UsrEtcMove} %dir %{_distconfdir}/X11 %{_distconfdir}/X11/xdm/ -%else -%config %{_sysconfdir}/X11/xdm/ %endif +%config %{_sysconfdir}/X11/xdm/ %if 0%{?UsrEtcMove} %dir %{_distconfdir}/X11/xdm/scripts %else From 703c9bf9268107952947156941f1f48596527aec5e5695849ca83548071a93f0 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 5 Oct 2020 15:02:27 +0000 Subject: [PATCH 17/17] - removed /etc/X11/xdm/Keyboard.map since it meanwhile has been replaced by /usr/share/systemd/kbd-model-map (used by YaST) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=225 --- xdm.changes | 6 ++++++ xdm.spec | 2 +- xdm.tar.bz2 | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xdm.changes b/xdm.changes index 82efd84..ba811f7 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 5 14:57:23 UTC 2020 - Stefan Dirsch + +- 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 diff --git a/xdm.spec b/xdm.spec index dc0d7b3..fb31083 100644 --- a/xdm.spec +++ b/xdm.spec @@ -125,7 +125,7 @@ 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 Keyboard.map; do +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 diff --git a/xdm.tar.bz2 b/xdm.tar.bz2 index 32aae18..4f26bcc 100644 --- a/xdm.tar.bz2 +++ b/xdm.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6da4e078011b8a5ee708c33aeb261637d66f9b4b936e42f2feaf31760c9ec4d2 -size 22710 +oid sha256:41f36ca335c3a19f7d416af8b11963cdb8deed6d8f35f611aa9ac1eca4198254 +size 21063