Hello community, here is the log from the commit of package xdm for openSUSE:12.3 checked in at 2013-03-01 14:02:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/xdm (Old) and /work/SRC/openSUSE:12.3/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.3/xdm/xdm.changes 2013-01-31 01:45:20.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.xdm.new/xdm.changes 2013-03-01 14:02:40.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Mar 1 11:31:52 UTC 2013 - [email protected] + +- /etc/X11/xdm/SuSEconfig.xdm: copied required function from old + /lib/YaST/SuSEconfig.functions, which no longer exists since + openSUSE 12.3 (bnc#806738) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2009-02-16 08:53:46.000000000 +0100 +++ new/etc/X11/xdm/SuSEconfig.xdm 2013-03-01 12:30:36.000000000 +0100 @@ -4,6 +4,54 @@ # 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 @@ -16,12 +64,10 @@ } . $r/etc/sysconfig/displaymanager -test -f $r/lib/YaST/SuSEconfig.functions || { - echo "${0##*/}: ERROR - can not find $r"'/lib/YaST/SuSEconfig.functions!!' - echo "${0##*/}: This should not happen. Exit..." - exit 1 +test -z "$MD5DIR" && { + MD5DIR=/var/adm/SuSEconfig/md5 + echo "Using MD5DIR=\"$MD5DIR\"..." } -. $r/lib/YaST/SuSEconfig.functions 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
