Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2016-05-13 09:21:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2016-04-05 10:41:34.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-05-13
09:21:42.000000000 +0200
@@ -1,0 +2,13 @@
+Fri May 6 21:14:31 UTC 2016 - e...@suse.com
+
+- Make SUSEconfig handler for DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN
+ robust against changes to the default setting of -listen/-nolisten tcp
+ (boo#978262).
+
+-------------------------------------------------------------------
+Wed May 4 12:55:38 UTC 2016 - e...@suse.com
+
+- Prevent xdm.service from being built. We've got display-manager.service
+ instead (bsc#978458).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.NM2khi/_old 2016-05-13 09:21:43.000000000 +0200
+++ /var/tmp/diff_new_pack.NM2khi/_new 2016-05-13 09:21:43.000000000 +0200
@@ -129,7 +129,8 @@
--disable-static \
--with-pam \
--with-xdmconfigdir=%{_sysconfdir}/X11/xdm \
- --with-xdmscriptdir=%{_sysconfdir}/X11/xdm
+ --with-xdmscriptdir=%{_sysconfdir}/X11/xdm \
+ --with-systemdsystemunitdir=no
make %{?_smp_mflags}
%install
++++++ xdm.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/SUSEconfig.xdm
new/etc/X11/xdm/SUSEconfig.xdm
--- old/etc/X11/xdm/SUSEconfig.xdm 2014-03-04 13:53:31.000000000 +0100
+++ new/etc/X11/xdm/SUSEconfig.xdm 2016-05-07 07:53:41.000000000 +0200
@@ -78,9 +78,15 @@
sed -ri 's/^#[[:blank:]]*(:[0-9][[:blank:]]+local[[:blank:]]+)/\1/g'
${file}.SuSEconfig
fi
if test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "no" ; then
- sed -ri
's%(.*/usr/bin/X)[[:blank:]]*(-nolisten[[:blank:]]*tcp[[:blank:]]*|)%\1
-nolisten tcp %g' ${file}.SuSEconfig
+ sed -ri
's%(.*/usr/bin/X)[[:blank:]]*(-(no|)listen[[:blank:]]*tcp[[:blank:]]*|)%\1
-nolisten tcp %g' ${file}.SuSEconfig
elif test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ; then
- sed -ri 's%(.*/usr/bin/X)[[:blank:]]*-nolisten tcp[[:blank:]]*%\1 %g'
${file}.SuSEconfig
+ eval $(/usr/bin/Xorg -version 2>&1| grep "^X.Org" | sed -e 's%.*
\([0-9]\+\)\.\([0-9]\+\).*%{ max=\1; min=\2; }%')
+ if [ -n "$max" -a -n "$min" ] && [ $max -gt 1 -o $min -ge 17 ]
+ then
+ sed -ri
's%(.*/usr/bin/X)[[:blank:]]*(-(no|)listen[[:blank:]]*tcp[[:blank:]]*|)%\1
-listen tcp %g' ${file}.SuSEconfig
+ else
+ sed -ri
's%(.*/usr/bin/X)[[:blank:]]*(-(no|)listen[[:blank:]]*tcp[[:blank:]]*|)%\1 %g'
${file}.SuSEconfig
+ fi
fi
check_md5_and_move $file
fi
