--- trunk/mage/usr/lib/mage/mage4.functions.sh 2009/08/04 19:52:16 892 +++ trunk/mage/usr/lib/mage/mage4.functions.sh 2011/01/28 20:37:27 1209 @@ -198,10 +198,11 @@ is_config_protected "${pathto}" retval="$?" - # 0 - not protected # - # 1 - error # - # 2 - protected # - # 3 - protected but masked # + # 0 - not protected # + # 1 - error # + # 2 - protected # + # 3 - protected but masked # + # 4 - protected but ignored # case ${retval} in # file is not protected - (over)write it @@ -252,6 +253,18 @@ (( MAGE_PROTECT_COUNTER++ )) export MAGE_PROTECT_COUNTER ;; + + # file is protected but ignored, delete the update/do nothing + 4) + if [[ ${VERBOSE} = on ]] + then + echo -en "${COLRED}" + echo -n "! ignr " + echo -en "${COLDEFAULT}" + echo " === FILE: ${MROOT}${pathto}" + fi + # simply do nothing here + ;; esac done < ${BUILDDIR}/${pkgname}/.files @@ -326,6 +339,8 @@ local pkgname="$1" local pathto local posix + local user + local group local IFS # sanity checks; abort if not given @@ -339,12 +354,13 @@ # sets fieldseperator to "§" instead of " " IFS=§ - while read pathto posix + while read pathto posix user group do [ -z "${pathto}" ] && continue [[ ${VERBOSE} = on ]] && echo -e "\t>>> PIPE: ${MROOT}${pathto}" - mkfifo -m "${posix}" "${MROOT}$pathto" + mkfifo -m "${posix}" "${MROOT}${pathto}" + chown "${user}:${group}" "${MROOT}${pathto}" done < ${BUILDDIR}/${pkgname}/.pipes # very important: unsetting the '§' fieldseperator @@ -363,6 +379,8 @@ local posix local major local minor + local user + local group local IFS # sanity checks; abort if not given @@ -376,23 +394,61 @@ # sets fieldseperator to "§" instead of " " IFS=§ - while read pathto posix major minor + while read pathto posix major minor user group do [ -z "${pathto}" ] && continue [[ ${VERBOSE} = on ]] && echo -e "\t>>> CHAR: ${MROOT}${pathto}" mknod -m ${posix} "${MROOT}${pathto}" c ${major} ${minor} + chown "${user}:${group}" "${MROOT}${pathto}" done < ${BUILDDIR}/${pkgname}/.char # very important: unsetting the '§' fieldseperator IFS=$'\n' } +################################################### +# function install_fifos # +# install_fifos $PKGNAME # +################################################### +install_fifos() +{ + local pkgname="$1" + local pathto + local posix + local user + local group + local IFS + + # sanity checks; abort if not given + [ -z "${pkgname}" ] && die "install_fifos() \$pkgname not given." + + # check needed global vars + [ -z "${BUILDDIR}" ] && die "install_fifos() \$BUILDDIR not set." + + [ ! -f ${BUILDDIR}/${pkgname}/.fifo ] && die "install_fifos() .fifo not found" + + # sets fieldseperator to "§" instead of " " + IFS=§ + + while read pathto posix user group + do + [ -z "${pathto}" ] && continue + [[ ${VERBOSE} = on ]] && echo -e "\t>>> FIFO: ${MROOT}${pathto}" + + mkfifo -m "${posix}" "${MROOT}${pathto}" + chown "${user}:${group}" "${MROOT}${pathto}" + done < ${BUILDDIR}/${pkgname}/.fifo + + # very important: unsetting the '§' fieldseperator + IFS=$'\n' +} + ################################################### # function build_doinstall # # build_doinstall $PKGNAME # -# NOTE: this is an wrapper do install packages # +# NOTE: this is an wrapper to install packages # ################################################### build_doinstall() { @@ -415,6 +471,7 @@ install_symlinks ${pkgname} || die "install symlinks ${pkgname}" install_blockdevices ${pkgname} || die "install blockdevices ${pkgname}" install_characterdevices ${pkgname} || die "install chardevices ${pkgname}" + install_fifos ${pkgname} || die "install fifos ${pkgname}" } @@ -476,7 +533,7 @@ # create fake file descriptors # used by virtual and source packages - for i in .dirs .symlinks .files .pipes .char + for i in .dirs .symlinks .files .pipes .char .fifo do touch ${dbrecorddir}/${i} done @@ -494,7 +551,7 @@ # normal packages needs these files local i - for i in .char .dirs .files .pipes .symlinks + for i in .char .dirs .files .pipes .symlinks .fifo do install -m 0644 ${BUILDDIR}/${pkgname}/${i} \ ${dbrecorddir}/${i} @@ -772,10 +829,10 @@ done # sanity checks; abort if not given - [ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given." - [ -z "${pname}" ] && die "remove_symlinks() \$pname not given." - [ -z "${pver}" ] && die "remove_symlinks() \$pver not given." - [ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given." + [ -z "${pcat}" ] && die "remove_files() \$pcat not given." + [ -z "${pname}" ] && die "remove_files() \$pname not given." + [ -z "${pver}" ] && die "remove_files() \$pver not given." + [ -z "${pbuild}" ] && die "remove_files() \$pbuild not given." pfull="${pcat}/${pname}-${pver}-${pbuild}" # check needed global vars @@ -809,10 +866,11 @@ is_config_protected "${pathto}" retval="$?" - # 0 - not protected # - # 1 - error # - # 2 - protected # - # 3 - protected but masked # + # 0 - not protected # + # 1 - error # + # 2 - protected # + # 3 - protected but masked # + # 4 - protected but ignored # case ${retval} in # file is not protected - delete it @@ -831,6 +889,18 @@ echo " === FILE: ${MROOT}${pathto}" fi ;; + + # file is protected but ignored, delete the update/do nothing + 4) + if [[ ${VERBOSE} = on ]] + then + echo -en "${COLRED}" + echo -n "! ignr " + echo -en "${COLDEFAULT}" + echo " === FILE: ${MROOT}${pathto}" + fi + # simply do nothing here + ;; esac ;; 1) @@ -853,6 +923,8 @@ { local pathto local posix + local user + local group local IFS local pcat local pname @@ -876,10 +948,10 @@ done # sanity checks; abort if not given - [ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given." - [ -z "${pname}" ] && die "remove_symlinks() \$pname not given." - [ -z "${pver}" ] && die "remove_symlinks() \$pver not given." - [ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given." + [ -z "${pcat}" ] && die "remove_blockdevices() \$pcat not given." + [ -z "${pname}" ] && die "remove_blockdevices() \$pname not given." + [ -z "${pver}" ] && die "remove_blockdevices() \$pver not given." + [ -z "${pbuild}" ] && die "remove_blockdevices() \$pbuild not given." pfull="${pcat}/${pname}-${pver}-${pbuild}" # check needed global vars @@ -890,7 +962,7 @@ # sets fieldseperator to "§" instead of " " IFS=§ - while read pathto posix + while read pathto posix user group do [ -z "${pathto}" ] && continue @@ -911,6 +983,8 @@ { local pathto local posix + local user + local group local IFS local pcat local pname @@ -934,10 +1008,10 @@ done # sanity checks; abort if not given - [ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given." - [ -z "${pname}" ] && die "remove_symlinks() \$pname not given." - [ -z "${pver}" ] && die "remove_symlinks() \$pver not given." - [ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given." + [ -z "${pcat}" ] && die "remove_characterdevices() \$pcat not given." + [ -z "${pname}" ] && die "remove_characterdevices() \$pname not given." + [ -z "${pver}" ] && die "remove_characterdevices() \$pver not given." + [ -z "${pbuild}" ] && die "remove_characterdevices() \$pbuild not given." pfull="${pcat}/${pname}-${pver}-${pbuild}" # check needed global vars @@ -948,7 +1022,7 @@ # sets fieldseperator to "§" instead of " " IFS=§ - while read pathto posix + while read pathto posix user group do [ -z "${pathto}" ] && continue @@ -962,6 +1036,66 @@ ################################################### +# function remove_fifos # +# remove_fifos $PKGNAME # +################################################### +remove_fifos() +{ + local pathto + local posix + local user + local group + local IFS + local pcat + local pname + local pver + local pbuild + local i + local pfull + + IFS=$'\n' + + # very basic getops + for i in $* + do + case $1 in + --pcat|-c) shift; pcat="$1" ;; + --pname|-n) shift; pname="$1" ;; + --pver|-v) shift; pver="$1" ;; + --pbuild|-b) shift; pbuild="$1" ;; + esac + shift + done + + # sanity checks; abort if not given + [ -z "${pcat}" ] && die "remove_fifos() \$pcat not given." + [ -z "${pname}" ] && die "remove_fifos() \$pname not given." + [ -z "${pver}" ] && die "remove_fifos() \$pver not given." + [ -z "${pbuild}" ] && die "remove_fifos() \$pbuild not given." + pfull="${pcat}/${pname}-${pver}-${pbuild}" + + # check needed global vars + [ -z "${BUILDDIR}" ] && die "remove_fifos() \$BUILDDIR not set." + + [ ! -f ${MROOT}${INSTALLDB}/${pfull}/.fifo ] && die "remove_fifos() .fifo not found" + + # sets fieldseperator to "§" instead of " " + IFS=§ + + while read pathto posix user group + do + [ -z "${pathto}" ] && continue + + [[ ${VERBOSE} = on ]] && echo -e "\t<<< FIFO: ${MROOT}${pathto}" + rm "${MROOT}${pathto}" + done < ${MROOT}${INSTALLDB}/${pfull}/.fifo + + # very important: unsetting the '§' fieldseperator + IFS=$'\n' +} + + +################################################### # function remove_direcories # # remove_direcories $PKGNAME # ################################################### @@ -992,10 +1126,10 @@ done # sanity checks; abort if not given - [ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given." - [ -z "${pname}" ] && die "remove_symlinks() \$pname not given." - [ -z "${pver}" ] && die "remove_symlinks() \$pver not given." - [ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given." + [ -z "${pcat}" ] && die "remove_directories() \$pcat not given." + [ -z "${pname}" ] && die "remove_directories() \$pname not given." + [ -z "${pver}" ] && die "remove_directories() \$pver not given." + [ -z "${pbuild}" ] && die "remove_directories() \$pbuild not given." pfull="${pcat}/${pname}-${pver}-${pbuild}" # check needed global vars @@ -1049,7 +1183,7 @@ ################################################### # function build_douninstall # # build_douninstall $PKGNAME # -# NOTE: this is an wrapper do remove packages # +# NOTE: this is an wrapper to remove packages # ################################################### build_douninstall() { @@ -1083,7 +1217,7 @@ # !! we use § as field seperator !! # doing so prevent us to get errors by filenames with spaces - for i in symlinks files blockdevices characterdevices directories + for i in symlinks files blockdevices characterdevices directories fifos do remove_${i} \ --pcat "${pcat}" \ @@ -1153,10 +1287,7 @@ echo -e " fetching (${count_current}/${count_total}): ${pkg} ... " [[ ${VERBOSE} = off ]] && opt="--quiet" wget \ - --passive-ftp \ - --tries 3 \ - --continue \ - --progress bar \ + ${WGET_FETCH_OPTIONS} \ --directory-prefix=${PKGDIR} \ ${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg} if [[ $? = 0 ]] @@ -1199,15 +1330,20 @@ # clean up backup files (foo~) find ${MAGEDIR} -name *~ -exec rm '{}' ';' - # check if an newer mage version is available + # check if a newer mage version is available is_newer_mage_version_available } syncmage_tarball() { local latest_tarball + local latest_md5 local temp="$(mktemp -d)" local mirr mymirr + local opt + + # try to get the md5 marked as latest on the server + latest_md5="mage-latest.md5" # try to get the tarball marked as latest on the server latest_tarball="mage-latest.tar.bz2" @@ -1218,15 +1354,19 @@ mymirr="${mirr%/*}" echo -ne "${COLBLUE} --- ${COLDEFAULT}" - echo "fetching latest tarball from ${mymirr} ..." + echo "fetching latest md5 from ${mymirr} ..." + [[ ${VERBOSE} = off ]] && opt="--quiet" + wget \ + ${WGET_FETCH_OPTIONS} \ + --directory-prefix=${temp} \ + ${opt} ${mymirr}/rsync/tarballs/${latest_md5} + echo -ne "${COLBLUE} --- ${COLDEFAULT}" + echo "fetching latest tarball from ${mymirr} ..." wget \ - --passive-ftp \ - --tries 3 \ - --continue \ - --progress bar \ + ${WGET_FETCH_OPTIONS} \ --directory-prefix=${temp} \ - ${mymirr}/rsync/tarballs/${latest_tarball} + ${opt} ${mymirr}/rsync/tarballs/${latest_tarball} if [[ $? = 0 ]] then break @@ -1237,6 +1377,16 @@ if [[ -f ${temp}/${latest_tarball} ]] then + # check md5 + if [[ ! -f ${temp}/${latest_md5} ]] + then + die "md5 is missing ... aborting" + else + echo -ne "${COLBLUE} --- ${COLDEFAULT}" + echo -n "checking md5sum... " + ( cd ${temp}; md5sum --check ${latest_md5} ) || die "md5 for ${latest_tarball} failed" + fi + if [[ -d ${MAGEDIR} ]] then echo -ne "${COLBLUE} --- ${COLDEFAULT}" @@ -1252,9 +1402,12 @@ if [[ -d ${temp} ]] then echo -ne "${COLBLUE} --- ${COLDEFAULT}" - echo "clenaing temp-files ..." + echo "cleaning temp-files ..." rm -rf ${temp} fi + + # check if a newer mage version is available + is_newer_mage_version_available else die "Could not fetch the latest tarball ... aborting" fi @@ -1422,6 +1575,7 @@ # 1 - error # # 2 - protected # # 3 - protected but masked # +# 4 - protected but ignored # # # ################################################### is_config_protected() @@ -1430,6 +1584,8 @@ local TEST local PROTECTED local IFS + local i + local x EXPFILE="${MROOT}$1" @@ -1439,17 +1595,17 @@ # to be safe; it may be '§' IFS=' ' - # check ob in config protect + # check if config protected for i in ${CONFIG_PROTECT} do - # ersetzen von $i nur wenn am anfang der variable + # only replace $i in the beginning of the variable TEST="${EXPFILE/#${MROOT}${i}/Protected}" if [[ ${TEST} != ${EXPFILE} ]] then - # setzen das es protected ist + # file is config proteced PROTECTED=TRUE - # check ob nicht doch maskiert + # check if not masked for x in ${CONFIG_PROTECT_MASK} do TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}" @@ -1458,6 +1614,16 @@ PROTECTED=MASKED fi done + + # check if not ignored + for x in ${CONFIG_PROTECT_IGNORE} + do + TEST="${EXPFILE/#${MROOT}${x}/Protect_Ignored}" + if [[ ${TEST} != ${EXPFILE} ]] + then + PROTECTED=IGNORED + fi + done fi done @@ -1472,6 +1638,10 @@ #echo "I'm protected, but masked - delete me" return 3 ;; + IGNORED) + #echo "I'm protected, but ignored - keep me, del update" + return 4 + ;; *) #echo "delete me" return 0 @@ -1683,7 +1853,8 @@ #deletes pakages from virtual database #$1 virtualname; $2 pkgname -virtuals_del() { +virtuals_del() +{ local virtualname="$1" local pkgname="$2" @@ -2117,6 +2288,8 @@ local SDEPEND local PROVIDE local PKGTYPE + local MAGE_TARGETS + local SPLIT_PACKAGE_BASE local preinstall local postinstall local preremove @@ -2237,30 +2410,45 @@ echo B:${pbuild} fi - if [[ -z ${MAGE_TARGETS} ]] + if [[ -n ${MAGE_TARGETS} ]] then # basic svn compat if [[ -d ${SMAGESCRIPTSDIR}/trunk ]] then - for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2 + for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2 do smage2file="${i}" done else - smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2 + smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2 fi + + elif [[ -n ${SPLIT_PACKAGE_BASE} ]] + then + # basic svn compat + if [[ -d ${SMAGESCRIPTSDIR}/trunk ]] + then + for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2 + do + smage2file="${i}" + done + else + smage2file=${SMAGESCRIPTSDIR}/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2 + fi + else # basic svn compat if [[ -d ${SMAGESCRIPTSDIR}/trunk ]] then - for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2 + for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2 do smage2file="${i}" done else - smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2 + smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2 fi fi + if [ -f "${smage2file}" ] then echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... " @@ -2604,7 +2792,8 @@ unset -f postremove } -show_etc_update_mesg() { +show_etc_update_mesg() +{ [ ${MAGE_PROTECT_COUNTER} -eq 0 ] && return 0 echo