Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2015-11-08 11:25: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 2015-10-22 12:57:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-11-08 11:25:16.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Nov 4 12:51:56 UTC 2015 - [email protected] + +- rename SuSEconfig.xdm + * /etc/X11/xdm/SuSEconfig.xdm -> /etc/X11/xdm/SUSEconfig.xdm + * created a symlink for the old file (bsc#953563). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ 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 1970-01-01 01:00:00.000000000 +0100 +++ new/etc/X11/xdm/SUSEconfig.xdm 2014-03-04 13:53:31.000000000 +0100 @@ -0,0 +1,107 @@ +#!/bin/bash +# +# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. +# Copyright (c) 2008 SuSE LINUX Products GmbH, Germany. +# Author: Werner Fink <[email protected]> + +check_md5_and_move() # Usage: check_md5_and_move file_name-without.SuSEconfig +{ + # This function checks the existence of a file (specified without the + # extension .SuSEconfig and without "$r") and a corresponding md5 checksum + # and tests whether the time stamp of the file has changed. + # If it has, nothing further will happen. If not, the "file.SuSEconfig" + # will be moved to "file". + + FILE=$1 + if test -n "$r" ; then + RELPATH=`echo $FILE | sed -e"s:^$r::"` + else + RELPATH=$FILE + fi + MD5FILE=$MD5DIR/$RELPATH + # + # make sure that the directory exists + mkdir -p `dirname $MD5FILE` + NEWMD5SUM="`cat $FILE.SuSEconfig | grep -v "^#" | md5sum`" + if test ! -s $FILE ; then + touch $FILE + rm -f $MD5FILE + fi + if test "$FORCE_REPLACE" = true ; then + cp -p $FILE.SuSEconfig $FILE + fi + USERMD5SUM="`cat $FILE | grep -v "^#" | md5sum`" + test -e $MD5FILE || echo "$USERMD5SUM" > $MD5FILE + OLDMD5SUM="`cat $MD5FILE`" + if test "$USERMD5SUM" != "$OLDMD5SUM" -a \ + "$USERMD5SUM" != "$NEWMD5SUM" ; then + echo + echo "ATTENTION: You have modified $RELPATH. Leaving it untouched..." + echo "You can find my version in $FILE.SuSEconfig..." + echo + else + if test "$USERMD5SUM" != "$NEWMD5SUM" -o "$FORCE_REPLACE" = true ; then + echo "Installing new $RELPATH" + cp -p $FILE.SuSEconfig $FILE + else + test "$VERBOSE" = false || echo "No changes for $RELPATH" + fi + rm -f $FILE.SuSEconfig + fi + rm -f $MD5FILE + echo "$NEWMD5SUM" > $MD5FILE +} + +type -p sed &> /dev/null || { + echo "${0##*/}: No sed in PATH ... skipping" + exit 0 +} + +r=$ROOT +test -f $r/etc/sysconfig/displaymanager || { + echo "${0##*/}: No $r/etc/sysconfig/displaymanager found." + exit 1 +} +. $r/etc/sysconfig/displaymanager + +test -z "$MD5DIR" && { + MD5DIR=/var/adm/SuSEconfig/md5 + 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 + cp -p $file ${file}.SuSEconfig + if test "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ; then + sed -ri 's/^(:[0-9][[:blank:]]+local[[:blank:]]+)/#\1/g' ${file}.SuSEconfig + elif test "$DISPLAYMANAGER_STARTS_XSERVER" = "yes" ; then + 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 + elif test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ; then + sed -ri 's%(.*/usr/bin/X)[[:blank:]]*-nolisten tcp[[:blank:]]*%\1 %g' ${file}.SuSEconfig + fi + check_md5_and_move $file +fi + +if test -n "$DISPLAYMANAGER_XSERVER" -a -x "/usr/bin/$DISPLAYMANAGER_XSERVER" ; then + test -d /var/lib/X11 && ln -snf "/usr/bin/$DISPLAYMANAGER_XSERVER" /var/lib/X11/X +else + test -d /var/lib/X11 && ln -snf /usr/bin/Xorg /var/lib/X11/X +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 + cp -p $file ${file}.SuSEconfig + if test "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ; then + sed -ri 's/^(DisplayManager\.requestPort:[[:blank:]]+0)/!\1/g' ${file}.SuSEconfig + elif test "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ; then + sed -ri 's/^![[:blank:]]*(DisplayManager\.requestPort:[[:blank:]]+0)/\1/g' ${file}.SuSEconfig + fi + check_md5_and_move $file +fi + +# +# end +# 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 2015-11-08 11:25:17.000000000 +0100 @@ -1,107 +1 @@ -#!/bin/bash -# -# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. -# Copyright (c) 2008 SuSE LINUX Products GmbH, Germany. -# Author: Werner Fink <[email protected]> - -check_md5_and_move() # Usage: check_md5_and_move file_name-without.SuSEconfig -{ - # This function checks the existence of a file (specified without the - # extension .SuSEconfig and without "$r") and a corresponding md5 checksum - # and tests whether the time stamp of the file has changed. - # If it has, nothing further will happen. If not, the "file.SuSEconfig" - # will be moved to "file". - - FILE=$1 - if test -n "$r" ; then - RELPATH=`echo $FILE | sed -e"s:^$r::"` - else - RELPATH=$FILE - fi - MD5FILE=$MD5DIR/$RELPATH - # - # make sure that the directory exists - mkdir -p `dirname $MD5FILE` - NEWMD5SUM="`cat $FILE.SuSEconfig | grep -v "^#" | md5sum`" - if test ! -s $FILE ; then - touch $FILE - rm -f $MD5FILE - fi - if test "$FORCE_REPLACE" = true ; then - cp -p $FILE.SuSEconfig $FILE - fi - USERMD5SUM="`cat $FILE | grep -v "^#" | md5sum`" - test -e $MD5FILE || echo "$USERMD5SUM" > $MD5FILE - OLDMD5SUM="`cat $MD5FILE`" - if test "$USERMD5SUM" != "$OLDMD5SUM" -a \ - "$USERMD5SUM" != "$NEWMD5SUM" ; then - echo - echo "ATTENTION: You have modified $RELPATH. Leaving it untouched..." - echo "You can find my version in $FILE.SuSEconfig..." - echo - else - if test "$USERMD5SUM" != "$NEWMD5SUM" -o "$FORCE_REPLACE" = true ; then - echo "Installing new $RELPATH" - cp -p $FILE.SuSEconfig $FILE - else - test "$VERBOSE" = false || echo "No changes for $RELPATH" - fi - rm -f $FILE.SuSEconfig - fi - rm -f $MD5FILE - echo "$NEWMD5SUM" > $MD5FILE -} - -type -p sed &> /dev/null || { - echo "${0##*/}: No sed in PATH ... skipping" - exit 0 -} - -r=$ROOT -test -f $r/etc/sysconfig/displaymanager || { - echo "${0##*/}: No $r/etc/sysconfig/displaymanager found." - exit 1 -} -. $r/etc/sysconfig/displaymanager - -test -z "$MD5DIR" && { - MD5DIR=/var/adm/SuSEconfig/md5 - 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 - cp -p $file ${file}.SuSEconfig - if test "$DISPLAYMANAGER_STARTS_XSERVER" = "no" ; then - sed -ri 's/^(:[0-9][[:blank:]]+local[[:blank:]]+)/#\1/g' ${file}.SuSEconfig - elif test "$DISPLAYMANAGER_STARTS_XSERVER" = "yes" ; then - 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 - elif test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" = "yes" ; then - sed -ri 's%(.*/usr/bin/X)[[:blank:]]*-nolisten tcp[[:blank:]]*%\1 %g' ${file}.SuSEconfig - fi - check_md5_and_move $file -fi - -if test -n "$DISPLAYMANAGER_XSERVER" -a -x "/usr/bin/$DISPLAYMANAGER_XSERVER" ; then - test -d /var/lib/X11 && ln -snf "/usr/bin/$DISPLAYMANAGER_XSERVER" /var/lib/X11/X -else - test -d /var/lib/X11 && ln -snf /usr/bin/Xorg /var/lib/X11/X -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 - cp -p $file ${file}.SuSEconfig - if test "$DISPLAYMANAGER_REMOTE_ACCESS" = "yes" ; then - sed -ri 's/^(DisplayManager\.requestPort:[[:blank:]]+0)/!\1/g' ${file}.SuSEconfig - elif test "$DISPLAYMANAGER_REMOTE_ACCESS" = "no" ; then - sed -ri 's/^![[:blank:]]*(DisplayManager\.requestPort:[[:blank:]]+0)/\1/g' ${file}.SuSEconfig - fi - check_md5_and_move $file -fi - -# -# end -# +symbolic link to SUSEconfig.xdm
