Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2020-08-31 17:14:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm"
Mon Aug 31 17:14:54 2020 rev:83 rq:830260 version:1.1.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2020-07-17 20:48:01.808743190
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new.3399/xdm.changes 2020-08-31
17:14:59.221045259 +0200
@@ -1,0 +2,52 @@
+Fri Aug 28 10:22:12 UTC 2020 - Dominique Leuenberger <dims...@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 <f...@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 <f...@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 <f...@suse.com>
+
+- Replace /var/run with /run as /var/run is obsolete since quite some
+ time now.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.j5Sbiz/_old 2020-08-31 17:14:59.989045651 +0200
+++ /var/tmp/diff_new_pack.j5Sbiz/_new 2020-08-31 17:14:59.993045654 +0200
@@ -72,10 +72,13 @@
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
++++++ display-manager.service ++++++
--- /var/tmp/diff_new_pack.j5Sbiz/_old 2020-08-31 17:15:00.041045678 +0200
+++ /var/tmp/diff_new_pack.j5Sbiz/_new 2020-08-31 17:15:00.045045680 +0200
@@ -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 @@
[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 ++++++
--- /var/tmp/diff_new_pack.j5Sbiz/_old 2020-08-31 17:15:00.069045692 +0200
+++ /var/tmp/diff_new_pack.j5Sbiz/_new 2020-08-31 17:15:00.069045692 +0200
@@ -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.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/README.security
new/etc/X11/xdm/README.security
--- old/etc/X11/xdm/README.security 2020-03-21 13:43:09.840493000 +0100
+++ new/etc/X11/xdm/README.security 2020-08-26 15:36:00.010352457 +0200
@@ -17,7 +17,7 @@
To force a rescan of Xaccess and xdm-config within a running XDM
the signal SIGHUP can be used:
- kill -HUP `cat /var/run/xdm.pid`
+ kill -HUP `cat /run/xdm.pid`
The change of DisplayManager.requestPort requires a restart of XDM.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup
--- old/etc/X11/xdm/Xsetup 2015-07-29 14:43:57.000000000 +0200
+++ new/etc/X11/xdm/Xsetup 2020-08-26 15:35:43.014615021 +0200
@@ -75,7 +75,7 @@
#
# Check if xdm is running
#
- xdmpid=/var/run/xdm.pid
+ xdmpid=/run/xdm.pid
xdmroot=/usr/bin
xdm=no
@@ -85,7 +85,7 @@
#
# Check if kdm is running
#
- kdmpid=/var/run/kdm.pid
+ kdmpid=/run/kdm.pid
kde3root=/opt/kde3/bin
kde4root=/usr/bin
kdm=no
@@ -99,7 +99,7 @@
# Check if gdm is running
#
gnome2root=/usr/sbin
- gdmpid=/var/run/gdm.pid
+ gdmpid=/run/gdm.pid
gdm=no
test -x ${gnome2root}/gdm && \
@@ -125,7 +125,7 @@
# sleep 0.1
# done
# HOME=/root exec $xvkbd $xvkbdargs
-# ) & echo $! > /var/run/xvkbd.pid
+# ) & echo $! > /run/xvkbd.pid
#fi
#
@@ -152,7 +152,7 @@
#
# Enable Numlock if set
#
-if test -r /var/run/numlock-on && type numlockx >/dev/null 2>&1; then
+if test -r /run/numlock-on && type numlockx >/dev/null 2>&1; then
numlockx on
fi
@@ -241,6 +241,6 @@
#
(
exec setsid $xconsole -notify -nostdin -verbose -exitOnFail
-) & echo $! > /var/run/xconsole.pid
+) & echo $! > /run/xconsole.pid
exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup
--- old/etc/X11/xdm/Xstartup 2018-02-08 12:14:16.603677000 +0100
+++ new/etc/X11/xdm/Xstartup 2020-08-26 15:35:26.270871116 +0200
@@ -29,12 +29,12 @@
#
#$halporp --key system.formfactor.subtype --string tabletpc
#if test $? -eq 0 -a -x $xvkbd ; then
-# /sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd
+# /sbin/killproc -p /run/xvkbd.pid -TERM $xvkbd
# # in case it's actually kvkbd
-# /sbin/killproc -p /var/run/xvkbd.pid -TERM $kvkbd
+# /sbin/killproc -p /run/xvkbd.pid -TERM $kvkbd
# # Bug #408736
# # in case xvkbd hasn't been started by the Xsetup subshell yet
-# /sbin/killproc -p /var/run/xvkbd.pid -TERM $xsetup
+# /sbin/killproc -p /run/xvkbd.pid -TERM $xsetup
#fi
#
@@ -98,8 +98,8 @@
*)
esac
-if test -x /sbin/preload && test -s /var/run/preload-session.pid; then
- /sbin/killproc -p /var/run/preload-session.pid /sbin/preload
+if test -x /sbin/preload && test -s /run/preload-session.pid; then
+ /sbin/killproc -p /run/preload-session.pid /sbin/preload
fi
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/xdm-config new/etc/X11/xdm/xdm-config
--- old/etc/X11/xdm/xdm-config 2014-03-04 13:53:31.000000000 +0100
+++ new/etc/X11/xdm/xdm-config 2020-08-26 15:36:22.290004407 +0200
@@ -2,7 +2,7 @@
! xdm-config: Configuration of the xdm
!
DisplayManager.errorLogFile: /var/log/xdm.errors
-DisplayManager.pidFile: /var/run/xdm.pid
+DisplayManager.pidFile: /run/xdm.pid
DisplayManager.authDir: /var/lib/xdm
DisplayManager.keyFile: /etc/X11/xdm/xdm-keys
DisplayManager.servers: /etc/X11/xdm/Xservers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm
--- old/etc/init.d/xdm 2016-02-17 14:10:50.000000000 +0100
+++ new/etc/init.d/xdm 2020-08-26 15:34:47.799449368 +0200
@@ -27,12 +27,12 @@
case "$EARLYXDM" in
start)
# earlyxdm is calling us, remember this
- > /var/run/earlyxdm.start
+ > /run/earlyxdm.start
;;
"")
# earlyxdm was already active, exit now
- if test -e /var/run/earlyxdm.start ; then
- rm -f /var/run/earlyxdm.start
+ if test -e /run/earlyxdm.start ; then
+ rm -f /run/earlyxdm.start
exit 0
fi
esac
@@ -95,7 +95,7 @@
DMDIR=/etc/X11/xdm
RELOADSIGNAL="-HUP"
-PIDFILELNK="/var/run/displaymanager.pid"
+PIDFILELNK="/run/displaymanager.pid"
xdm_reload_files () {
@@ -150,12 +150,12 @@
for i in $DISPLAY_MANAGERS
do
name="${i}_vars"
- PIDFILE=/var/run/$i.pid;
+ PIDFILE=/run/$i.pid;
$name $DM && break;
done
if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
then
- PIDFILE=/var/run/xdm.pid
+ PIDFILE=/run/xdm.pid
xdm_vars xdm # FALLBACK
fi
unset i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/lib/X11/display-manager
new/usr/lib/X11/display-manager
--- old/usr/lib/X11/display-manager 2018-07-26 15:08:16.047304000 +0200
+++ new/usr/lib/X11/display-manager 2020-08-27 12:56:11.936333494 +0200
@@ -13,7 +13,6 @@
# /usr/lib/X11/display-manager
#
-. /etc/rc.status
. /etc/sysconfig/displaymanager
. /etc/sysconfig/language
. /etc/sysconfig/windowmanager
@@ -71,7 +70,7 @@
DMDIR=/etc/X11/xdm
RELOADSIGNAL="-HUP"
-PIDFILELNK="/var/run/displaymanager.pid"
+PIDFILELNK="/run/displaymanager.pid"
xdm_reload_files () {
@@ -139,12 +138,12 @@
for i in $DISPLAY_MANAGERS
do
name="${i}_vars"
- PIDFILE=/var/run/$i.pid;
+ PIDFILE=/run/$i.pid;
$name $DM && break;
done
if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
then
- PIDFILE=/var/run/xdm.pid
+ PIDFILE=/run/xdm.pid
xdm_vars xdm # FALLBACK
fi
unset i
@@ -153,7 +152,6 @@
DM=${DISPLAYMANAGER##*/}
-rc_reset
case "$1" in
start)
@@ -168,8 +166,7 @@
# configured for remote access
if [ ! -x /usr/bin/X -a "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ];
then
- rc_status -u
- rc_exit
+ exit 6
fi
# Graphical failsafe mode (Bug #246158).
#
@@ -182,7 +179,7 @@
if cat /proc/cmdline | grep -q x11failsafe; then
if [ -f /etc/X11/xorg.conf.install ]; then
export XORGCONFIG=xorg.conf.install
- echo
+ echo
echo "Using failsafe X.Org configuration
/etc/X11/xorg.conf.install"
else
echo
@@ -190,15 +187,10 @@
echo "Either move it back (if still available) or remove
\"x11failsafe\" from your"
echo "kernel commandline to use the native graphics driver
instead of the failsafe"
echo "graphics driver. Of course the latter option no longer
can be called failsafe."
- rc_status -u
- rc_exit
+ exit 6
fi
fi
- startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
- if rc_status ; then
- # when started up successfuly, use DMs PID file as ours
- ln -snf $PIDFILE $PIDFILELNK
- else
+ if ! startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS; then
# After a crash or a kill signal we may have
# a wrong ownership of /dev/xconsole
if test -x $DMDIR/TakeDevices ; then
@@ -207,65 +199,18 @@
chown root:tty /dev/xconsole /dev/tty0
chmod 622 /dev/xconsole /dev/tty0
fi
+ exit 1
fi
- rc_status -v
- ;;
- stop)
- # make sure to stop the running one (Bug #306035)
- if test -s $PIDFILELNK; then
- read -t 1 PID < $PIDFILELNK
- if CHECKDM=$(ps ho command= -p $PID) ; then
- DISPLAYMANAGER_BIN=${CHECKDM%%[[:blank:]]*}
- PIDFILE=$(readlink $PIDFILELNK)
- else
- rm -f $PIDFILELNK $(readlink $PIDFILELNK)
- fi
- unset CHECKDM
- else
- rm -f $PIDFILELNK
- fi
-
- if test -n "$DISPLAYMANAGER_BIN"; then
- echo -n "Shutting down service ${DISPLAYMANAGER_BIN##*/}"
- #
- # killproc(8) sleep upto five seconds and sends
- # SIGKILL if xdm does not terminate within
- #
- killproc -p $PIDFILE -TERM $DISPLAYMANAGER_BIN
- fi
- rm -f $PIDFILELNK $PIDFILE
- rc_status -v
- ;;
- restart)
- $0 stop
- $0 start
- rc_status
+ # when started up successfuly, use DMs PID file as ours
+ ln -snf $PIDFILE $PIDFILELNK
;;
reload|force-reload)
echo -n "Reload service $DM"
[ -n "$RELOADPROC" ] && $RELOADPROC
- killproc -p $PIDFILE $RELOADSIGNAL $DISPLAYMANAGER
- rc_status -v
- ;;
- status|check)
- echo -n "Checking for service ${DM}: "
- checkproc -p $PIDFILE $DISPLAYMANAGER
- rc_status -v
- ;;
- probe)
- [ -n "$PROBEPROC" ] && $PROBEPROC
- ;;
- try-restart|condrestart)
- $0 status
- if test $? = 0; then
- $0 restart
- else
- rc_reset
- fi
- rc_status
+ # $MAINPID is exported by systemd
+ kill $RELOADSIGNAL $MAINPID
;;
*)
- echo "Usage: $0
{start|stop|status|restart|reload|force-reload|probe|try-restart}"
+ echo "Usage: $0 {start|reload|force-reload}"
exit 1
esac
-rc_exit
