Accepting request 830260 from X11:XOrg

OBS-URL: https://build.opensuse.org/request/show/830260
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xdm?expand=0&rev=83

display-manager.service

@@ -1,6 +1,5 @@
 [Unit]
 Description=X Display Manager
-Requires=var-run.mount
 Conflicts=getty@tty7.service plymouth-quit.service
 After=ypbind.service gpm.service time-sync.target winbind.service acpid.service
 Wants=remote-fs.target dbus.socket systemd-user-sessions.service systemd-logind.service
@@ -9,9 +8,8 @@ OnFailure=plymouth-quit.service
 
 [Service]
 Type=forking
-PIDFile=/var/run/displaymanager.pid
+PIDFile=/run/displaymanager.pid
 ExecStart=/usr/lib/X11/display-manager start
-ExecStop=/usr/lib/X11/display-manager stop
 ExecReload=/usr/lib/X11/display-manager reload
 KillMode=process
 

xdm-with-update-alternative.patch

@@ -30,10 +30,10 @@
  	for i in $DISPLAY_MANAGERS
  	do
  	    name="${i}_vars"
--	    PIDFILE=/var/run/$i.pid;
+-	    PIDFILE=/run/$i.pid;
 -	    $name $DM && break;
 +	    type -t $name &> /dev/null || continue
-+	    PIDFILE=/var/run/$i.pid
++	    PIDFILE=/run/$i.pid
 +	    $name $DM && break
  	done
  	if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]

xdm.changes

@@ -1,3 +1,55 @@
+-------------------------------------------------------------------
+Fri Aug 28 10:22:12 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Require /sbin/startproc: with systemd no longer pulling in
+  sysvinit-tools. we are responsible for our own deps. /sbin/pidof
+  and /sbin/startproc both were presented by sysvinit-tools. but
+  the sole presence of the /sbin/pidof dep is not sufficient, as
+  this can be provided by various packages (e.g.
+  busybox-sysvinit-tools, which then does not provide startproc).
+  Spelling the deps out ensures that we get the right package set
+  installed.
+
+-------------------------------------------------------------------
+Thu Aug 27 11:36:48 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Drop insserv-compat dependency when display-manager.service is used
+    
+  insserv-compat is going to be dropped soon or later on systems with
+  systemd as init system.
+    
+  It was only needed by /usr/lib/X11/display-manager script that uses
+  rc_status to pretty print the status of a command.
+    
+  Since this script is intended to be used by display-manager.service
+  and not called directly by users and systemd has already its own
+  mechanism to report status, the use of rc_status doesn't seem to be
+  useful.
+    
+  The exit failure status for each command has been preserved.
+
+-------------------------------------------------------------------
+Wed Aug 26 17:23:18 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Drop commands in /usr/lib/X11/display-manager that are never used by systemd
+    
+  Assuming that this script is only called from
+  display-manager.service unit, some commands of the scripts are
+  either never used or redundant with systemd functionalities.
+
+  More specifically, there's no need to redefine a "stop" command as
+  this is one basic command that systemd implements already.
+    
+  Also convert "reload" to make use of $MAINPID exported by systemd
+  which should be slighly more reliable and hence stop relying on
+  killproc that might be removed in the future.
+
+-------------------------------------------------------------------
+Wed Aug 26 13:39:08 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Replace /var/run with /run as /var/run is obsolete since quite some
+  time now.
+
 -------------------------------------------------------------------
 Thu Jul 16 05:13:42 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 

xdm.spec

@@ -72,10 +72,13 @@ BuildRequires:  pkgconfig(xtrans)
 BuildRequires:  firewall-macros
 %endif
 Requires:       /sbin/pidof
+Requires:       /sbin/startproc
 %if 0%{?with_systemd}
 Requires:       %fillup_prereq
 %endif
+%if 0%{?suse_version} < 1315
 Requires:       insserv-compat
+%endif
 Requires:       logrotate
 Requires:       sessreg
 Requires:       xconsole

xdm.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f73e6057c2caf02e52fa3757d2ac58efc36e59cafe11d465c8f135f3b811a6cd
-size 24172
+oid sha256:3490e1140041d9bf6a9bfafc3f6e4ce0faf8ad04dbd53726ee0335f758882681
+size 23798