Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2014-03-22 19:46:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2014-03-15 17:35:57.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2014-03-22
19:46:17.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Mar 21 10:50:02 UTC 2014 - wer...@suse.de
+
+- Move forward to systemd, that is use a real service unit file (bnc#869260)
+
+-------------------------------------------------------------------
New:
----
display-manager.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.Akn094/_old 2014-03-22 19:46:18.000000000 +0100
+++ /var/tmp/diff_new_pack.Akn094/_new 2014-03-22 19:46:18.000000000 +0100
@@ -41,6 +41,7 @@
Source1: xdm.tar.bz2
Source2: HOWTO.xdm
Source3: xdm-fallbacks.tar.bz2
+Source4: display-manager.service
%if !%with_systemd
Patch0: xdm-consolekit.diff
%endif
@@ -48,7 +49,7 @@
Patch2:
U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
Patch3:
U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch
-%if 0%{?suse_version} >= 01140
+%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320
# Needed to create the man page symlink to init.d
BuildRequires: aaa_base-extras
%endif
@@ -71,6 +72,9 @@
%if !%with_systemd
BuildRequires: ConsoleKit-devel
Requires: ConsoleKit
+%else
+BuildRequires: systemd-rpm-macros
+%{?systemd_requires}
%endif
Requires: /sbin/pidof
Requires: logrotate
@@ -82,6 +86,10 @@
Conflicts: xorg-x11 <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if !%with_systemd
+%define _unitdir /usr/lib/systemd/system
+%endif
+
%description
Xdm manages a collection of X displays, which may be on the local host
or remote servers.
@@ -133,9 +141,21 @@
mv %{buildroot}%{_libdir}/X11/xdm/chooser %{buildroot}%{_bindir}
# fdo#35868 (closed INVALID, but because of above fix, we want it)
ln -s xdm.1%{?ext_man} %{buildroot}%{_mandir}/man1/chooser.1%{?ext_man}
+%if 0%{?suse_version} < 1320
# 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 %{S:4} -m 0644 %{buildroot}%{_unitdir}/display-manager.service
+ln -sf service %{buildroot}%{_sbindir}/rcdisplay-manager
+cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF'
+ #!/bin/bash
+ exec -a rcdisplay-manager %{_sbindir}/rcdisplay-manager ${1+"$@"}
+ EOF
+chmod 0755 %{buildroot}%{_sbindir}/rcxdm
+%endif
# Note:
# no %%stop_on_removal in %%preun
@@ -143,11 +163,19 @@
# => we don't want to end an existing session
%post
+%if 0%{?suse_version} < 1320
%{fillup_and_insserv -Y xdm}
+%else
+%service_add_post display-manager.service
+%endif
%{fillup_only -n displaymanager}
%postun
+%if 0%{?suse_version} < 1320
%{insserv_cleanup}
+%else
+%service_del_postun display-manager.service
+%endif
%files
%defattr(-,root,root)
@@ -165,7 +193,14 @@
%endif
%config %{_sysconfdir}/X11/xdm/
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
+%if 0%{?suse_version} < 1320
%{_sysconfdir}/init.d/xdm
+%exclude %{_libexecdir}/X11/display-manager
+%else
+%exclude %{_sysconfdir}/init.d/xdm
+%{_unitdir}/display-manager.service
+%{_libexecdir}/X11/display-manager
+%endif
%config %{_sysconfdir}/logrotate.d/xdm
%config %{_sysconfdir}/pam.d/xdm
%config %{_sysconfdir}/pam.d/xdm-np
@@ -178,12 +213,17 @@
%{_bindir}/xdm
%{_bindir}/xdmshell
%{_sbindir}/rcxdm
+%if 0%{?suse_version} >= 1320
+%{_sbindir}/rcdisplay-manager
+%endif
%{_libdir}/X11/xdm/
%dir %{_datadir}/X11/app-defaults
%{_datadir}/X11/app-defaults/Chooser
%{_mandir}/man1/chooser.1%{?ext_man}
%{_mandir}/man1/xdm.1%{?ext_man}
+%if 0%{?suse_version} < 1320
%{_mandir}/man8/rcxdm.8%{?ext_man}
+%endif
%ifnarch %ix86
%dir %{_libdir}/X11
%endif
++++++ display-manager.service ++++++
[Unit]
Description=X Display Manager
Requires=var-run.mount
After=ypbind.service gpm.service time-sync.target winbind.service acpid.service
Wants=remote-fs.target dbus.socket systemd-user-sessions.service
After=remote-fs.target dbus.socket systemd-user-sessions.service
[Service]
Type=forking
PIDFile=/var/run/displaymanager.pid
ExecStart=/usr/lib/X11/display-manager start
ExecStop=/usr/lib/X11/display-manager stop
ExecReload=/usr/lib/X11/display-manager reload
[Install]
WantedBy=graphical.target
++++++ xdm.tar.bz2 ++++++
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 1970-01-01 01:00:00.000000000 +0100
+++ new/usr/lib/X11/display-manager 2014-03-21 10:44:27.000000000 +0100
@@ -0,0 +1,258 @@
+#! /bin/bash
+# Copyright (c) 1996-2002 SuSE Linux AG, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# All rights reserved.
+#
+# Author: Florian La Roche, 1996
+# Werner Fink <wer...@suse.de>, 1996,98,99,2014
+# Martin Scherbaum, 1997
+# Reinhard Max <m...@suse.de>, 1997
+#
+# Please send feedback to http://www.suse.de/feedback
+#
+# /usr/lib/X11/display-manager
+#
+
+. /etc/rc.status
+. /etc/sysconfig/displaymanager
+. /etc/sysconfig/language
+. /etc/sysconfig/windowmanager
+test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile
+test -r /etc/profile.d/desktop-data.sh && . /etc/profile.d/desktop-data.sh
+
+locale_vars=" \
+LANG \
+LC_CTYPE \
+LC_NUMERIC \
+LC_TIME \
+LC_COLLATE \
+LC_MONETARY \
+LC_MESSAGES \
+LC_PAPER \
+LC_NAME \
+LC_ADDRESS \
+LC_TELEPHONE \
+LC_MEASUREMENT \
+LC_IDENTIFICATION \
+LC_ALL"
+
+unset LC_ALL
+for lc in $locale_vars
+do
+ eval val="\$RC_$lc"
+ if test -n "$val"; then
+ eval $lc="\$RC_$lc"
+ export $lc
+ fi
+done
+unset lc val
+
+if test -z "$WINDOWMANAGER" -a -n "$DEFAULT_WM" ; then
+ SAVEPATH=$PATH
+ PATH=$PATH:/usr/X11R6/bin:/usr/openwin/bin
+ desktop=/usr/share/xsessions/${DEFAULT_WM}.desktop
+ if test -s "$desktop" ; then
+ while read -r line; do
+ case ${line} in
+ Exec=*) WINDOWMANAGER="$(command -v ${line#Exec=})"
+ break
+ esac
+ done < $desktop
+ fi
+ if test -n "$DEFAULT_WM" -a -z "$WINDOWMANAGER" ; then
+ WINDOWMANAGER="$(command -v ${DEFAULT_WM##*/})"
+ fi
+ PATH=$SAVEPATH
+ unset SAVEPATH desktop
+fi
+unset DEFAULT_WM
+export WINDOWMANAGER
+
+DMDIR=/etc/X11/xdm
+RELOADSIGNAL="-HUP"
+
+PIDFILELNK="/var/run/displaymanager.pid"
+
+
+xdm_reload_files () {
+ test -x /etc/X11/xdm/SuSEconfig.xdm && \
+ MD5DIR="/var/adm/SuSEconfig/md5" \
+ /etc/X11/xdm/SuSEconfig.xdm | \
+ sed 's+\(.*\)+/etc/init.d/xdm: \1+g' | \
+ /bin/logger
+ return 0
+}
+
+splashcopy()
+{
+ local from=$1
+ local to=$2
+ if [ "$SPLASH" = yes ]
+ then
+ ver=$(sed "s/.*v\([[:digit:]]\)\.\([[:digit:]]\).*/\\1\\2/"
/proc/splash)
+ if [ $ver -gt 31 ]
+ then
+ echo "copy $from $to" > /proc/splash
+ echo "@$to silent" > /proc/splash
+ echo "@$to show -1" > /proc/splash
+ fi
+ fi
+}
+
+plymouth_quit()
+{
+ if [ -x /usr/bin/plymouth ]; then
+ plymouth quit
+ plymouth --wait
+ fi
+}
+
+#set -x
+
+DM=${DISPLAYMANAGER##*/}
+
+case "$DM" in
+ console)
+ exit 0
+ ;;
+ *)
+ for i in /usr/lib/X11/displaymanagers/*
+ do
+ tmp=${i%.fallback}
+ test "$tmp" != "$i" -a -e $tmp && continue # pick foodm over
foodm.fallback
+ DISPLAY_MANAGERS="$DISPLAY_MANAGERS ${tmp##*/}"
+ . $i
+ done
+ for i in $DISPLAY_MANAGERS
+ do
+ name="${i}_vars"
+ PIDFILE=/var/run/$i.pid;
+ $name $DM && break;
+ done
+ if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
+ then
+ PIDFILE=/var/run/xdm.pid
+ xdm_vars xdm # FALLBACK
+ fi
+ unset i
+ ;;
+esac
+
+DM=${DISPLAYMANAGER##*/}
+
+rc_reset
+case "$1" in
+ start)
+
+ # use system keyboard as global X keyboard configuration
+ if [ -x /etc/X11/xdm/keytable ]; then
+ /etc/X11/xdm/keytable
+ fi
+
+ [ -n "$STARTPROC" ] && $STARTPROC
+ echo -n "Starting service $DM"
+ # Don't start xdm if no Xserver is configured and xdm is not
+ # configured for remote access
+ if [ ! -x /usr/bin/X -a "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ];
+ then
+ rc_status -u
+ rc_exit
+ fi
+ # Graphical failsafe mode (Bug #246158).
+ #
+ # Needs changes in kernel commandline of "Failsafe" entry in
+ # /boot/grub/menu.lst.
+ #
+ # * use the same "vga" option value as in the non-"Failsafe" entry
+ # * remove "3" option (runlevel)
+ # * add "x11failsafe" option
+ if cat /proc/cmdline | grep -q x11failsafe; then
+ if [ -f /etc/X11/xorg.conf.install ]; then
+ export XORGCONFIG=xorg.conf.install
+ echo
+ echo "Using failsafe X.Org configuration
/etc/X11/xorg.conf.install"
+ else
+ echo
+ echo "The failsafe X.Org configuration
/etc/X11/xorg.conf.install no longer exists."
+ echo "Either move it back (if still available) or copy
/etc/X11/xorg.conf to"
+ echo "/etc/X11/xorg.conf.install to use the native graphics
driver instead of the"
+ echo "failsafe graphics driver. Of course the latter option no
longer can be called"
+ echo "failsafe."
+ rc_status -u
+ rc_exit
+ fi
+ fi
+ startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed
+ # After a crash or a kill signal we may have
+ # a wrong ownership of /dev/xconsole
+ if rc_status ; then
+ if test -x $DMDIR/TakeDevices ; then
+ $DMDIR/TakeDevices
+ else
+ chown root:tty /dev/xconsole /dev/tty0
+ chmod 622 /dev/xconsole /dev/tty0
+ fi
+ ln -snf $PIDFILE $PIDFILELNK
+ fi
+ rc_status -v
+ ;;
+ stop)
+ # make sure to stop the running one (Bug #306035)
+ if test -s $PIDFILELNK; then
+ read -t 1 PID < $PIDFILELNK
+ if CHECKDM=$(ps ho command= -p $PID) ; then
+ DISPLAYMANAGER_BIN=${CHECKDM%%[[:blank:]]*}
+ PIDFILE=$(readlink $PIDFILELNK)
+ else
+ rm -f $PIDFILELNK $(readlink $PIDFILELNK)
+ fi
+ unset CHECKDM
+ else
+ rm -f $PIDFILELNK
+ fi
+
+ test -n "$DISPLAYMANAGER_BIN" && \
+ echo -n "Shutting down service ${DISPLAYMANAGER_BIN##*/}"
+
+ #
+ # killproc(8) sleep upto five seconds and sends
+ # SIGKILL if xdm does not terminate within
+ #
+
+ killproc -p $PIDFILE -TERM $DISPLAYMANAGER_BIN
+ rm -f $PIDFILELNK $PIDFILE
+ rc_status -v
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ rc_status
+ ;;
+ reload|force-reload)
+ echo -n "Reload service $DM"
+ [ -n "$RELOADPROC" ] && $RELOADPROC
+ killproc -p $PIDFILE $RELOADSIGNAL $DISPLAYMANAGER
+ rc_status -v
+ ;;
+ status|check)
+ echo -n "Checking for service ${DM}: "
+ checkproc -p $PIDFILE $DISPLAYMANAGER
+ rc_status -v
+ ;;
+ probe)
+ [ -n "$PROBEPROC" ] && $PROBEPROC
+ ;;
+ try-restart|condrestart)
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset
+ fi
+ rc_status
+ ;;
+ *)
+ echo "Usage: $0
{start|stop|status|restart|reload|force-reload|probe|try-restart}"
+ exit 1
+esac
+rc_exit
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
