Hello community, here is the log from the commit of package bind for openSUSE:Factory checked in at 2013-12-13 13:01:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bind (Old) and /work/SRC/openSUSE:Factory/.bind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bind" Changes: -------- --- /work/SRC/openSUSE:Factory/bind/bind.changes 2013-08-10 18:28:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2013-12-13 13:01:43.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Dec 9 12:16:42 UTC 2013 - [email protected] + +- Fix generation of /etc/named.conf.include + (bnc#828678, bnc#848777, bnc#814978). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/createNamedConfInclude new/vendor-files/tools/createNamedConfInclude --- old/vendor-files/tools/createNamedConfInclude 2010-01-04 14:28:14.000000000 +0100 +++ new/vendor-files/tools/createNamedConfInclude 2013-12-09 12:29:30.000000000 +0100 @@ -35,15 +35,55 @@ echo -e $1 } -# -# load special SuSEconfig functions -# -if [ ! -f "/lib/YaST/SuSEconfig.functions" ]; then - errorMessage 'Can not find /lib/YaST/SuSEconfig.functions!\nThis should not happen. Exiting.' - exit 1 -fi -MD5DIR="/var/adm/SuSEconfig/md5" -. /lib/YaST/SuSEconfig.functions +MD5DIR="/var/adm/bind/md5" +check_md5_and_move() # Usage: check_md5_and_move file_name-without.BINDconfig +{ + # This function checks the existence of a file (specified without the + # extension .BINDconfig 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.BINDconfig" + # will be moved to "file". + + FILE=$1 + MD5DIR=/var/adm/bind + 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.BINDconfig | grep -v "^#" | md5sum`" + if test ! -s $FILE ; then + touch $FILE + rm -f $MD5FILE + fi + if test "$FORCE_REPLACE" = true ; then + cp -p $FILE.BINDconfig $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.BINDconfig..." + echo + else + if test "$USERMD5SUM" != "$NEWMD5SUM" -o "$FORCE_REPLACE" = true ; then + echo "Installing new $RELPATH" + cp -p $FILE.BINDconfig $FILE + else + test "$VERBOSE" = false || echo "No changes for $RELPATH" + fi + rm -f $FILE.BINDconfig + fi + rm -f $MD5FILE + echo "$NEWMD5SUM" > $MD5FILE +} # # check for named settings @@ -68,7 +108,7 @@ test -z "${NAMED_CONF_META_INCLUDE_FILE}" && exit 0 fi -NEW_NAMEDCONFINCLUDE_FILE="${NAMED_CONF_META_INCLUDE_FILE}.SuSEconfig" +NEW_NAMEDCONFINCLUDE_FILE="${NAMED_CONF_META_INCLUDE_FILE}.BINDconfig" if [ -f "${NAMED_CONF_META_INCLUDE_FILE}" -a \ ! -f "${NEW_NAMEDCONFINCLUDE_FILE}" ]; then touch "${NEW_NAMEDCONFINCLUDE_FILE}" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
