--- trunk/mage/usr/lib/mage/mage4.functions.sh	2006/07/17 20:48:22	385
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2010/02/19 19:59:22	966
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Magellan Linux Installer Functions (mage.functions.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.20 2006-07-17 20:48:22 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.38 2008-10-05 10:32:24 niro Exp $
 
 mage_setup()
 {
@@ -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
 
@@ -298,19 +311,19 @@
 
 		ln -snf "${link}" "${MROOT}${pathto}"
 
-		# fix mtime and db
-		fix_descriptor ${pkgname}/.symlinks \
-			"${pathto}" \
-			"${posix}" \
-			"${link}" \
-			"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
-				"${MROOT}${pathto}")"
+# 		# fix mtime and db
+# 		fix_descriptor ${pkgname}/.symlinks \
+# 			"${pathto}" \
+# 			"${posix}" \
+# 			"${link}" \
+# 			"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
+# 				"${MROOT}${pathto}")"
 
 	done < ${BUILDDIR}/${pkgname}/.symlinks
 
-	# now copy the fixed file over the old one
-	[ -f ${BUILDDIR}/${pkgname}/.symlinks_fixed ] && \
-		cp -f ${BUILDDIR}/${pkgname}/.symlinks{_fixed,}
+# 	# now copy the fixed file over the old one
+# 	[ -f ${BUILDDIR}/${pkgname}/.symlinks_fixed ] && \
+# 		cp -f ${BUILDDIR}/${pkgname}/.symlinks{_fixed,}
 
 	# very important: unsetting the '§' fieldseperator
 	IFS=$'\n'
@@ -809,10 +822,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 +845,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)
@@ -1106,7 +1132,7 @@
 	local count_current
 	local count_total
 
-	[ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your /etc/mage.rc."
+	[ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."
 
 	# get count of total packages
 	declare -i count_current=0
@@ -1181,26 +1207,13 @@
 {
 	if [ -z "${RSYNC}" ]
 	then
-		die "You have no rsync-mirrors defined. Please edit your /etc/mage.rc."
+		die "You have no rsync-mirrors defined. Please edit your ${MAGERC}."
 	fi
 
 	local i
 	for i in ${RSYNC}
 	do
-		rsync \
-			--recursive \
-			--links \
-			--perms \
-			--times \
-			--devices \
-			--timeout=600 \
-			--verbose \
-			--compress \
-			--progress \
-			--stats \
-			--delete \
-			--delete-after \
-			${i} ${MAGEDIR}
+		rsync ${RSYNC_FETCH_OPTIONS} ${i} ${MAGEDIR}
 		if [[ $? = 0 ]]
 		then
 			break
@@ -1212,10 +1225,70 @@
 	# 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 temp="$(mktemp -d)"
+	local mirr mymirr
+
+	# try to get the tarball marked as latest on the server
+	latest_tarball="mage-latest.tar.bz2"
+
+	for mirr in ${MIRRORS}
+	do
+		# path without distribution
+		mymirr="${mirr%/*}"
+
+		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+		echo "fetching latest tarball from ${mymirr} ..."
+
+		wget \
+			--passive-ftp \
+			--tries 3 \
+			--continue \
+			--progress bar \
+			--directory-prefix=${temp} \
+			${mymirr}/rsync/tarballs/${latest_tarball}
+		if [[ $? = 0 ]]
+		then
+			break
+		else
+			continue
+		fi
+	done
+
+	if [[ -f ${temp}/${latest_tarball} ]]
+	then
+		if [[ -d ${MAGEDIR} ]]
+		then
+			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+			echo "cleaning old mage-tree ${MAGEDIR}..."
+			rm -rf ${MAGEDIR}
+		fi
+
+		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+		echo "updating mage-tree from tarball ..."
+		# unpack in dirname of MAGEDIR, as the tarball has already the mage
+		tar xjmf ${temp}/${latest_tarball} -C ${MAGEDIR%/*} || die "Unpacking tarball"
+
+		if [[ -d ${temp} ]]
+		then
+			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+			echo "clenaing 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
+}
+
 cleanpkg()
 {
 	if [ -d "${PKGDIR}" ]
@@ -1253,7 +1326,7 @@
 	if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
 	then
 		#cuts ARCH and PBUILD
-		#ARCH comes from /etc/mage.rc
+		#ARCH comes from ${MAGERC}
 		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")
 
 		#cuts version number
@@ -1328,10 +1401,12 @@
 	local PNAME="$2"
 	local magefile
 
-	for magefile in $(ls --format=single-column -v ${MAGEDIR}/${PCAT}/${PNAME}/*)
+	# do not list the content of a directory, only the name (-d)
+	for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/*)
 	do
+		[[ -z ${magefile} ]] && continue
 		# we exclude subdirs (for stuff like a md5sum dir)
-		[ -d ${magefile} ] && continue
+		[[ -d ${magefile} ]] && continue
 		if check_stable_package ${magefile}
 		then
 			HIGHEST_MAGEFILE=${magefile}
@@ -1376,6 +1451,7 @@
 #        1 - error                                #
 #        2 - protected                            #
 #        3 - protected but masked                 #
+#        4 - protected but ignored                # 
 #                                                 #
 ###################################################
 is_config_protected()
@@ -1384,34 +1460,46 @@
 	local TEST
 	local PROTECTED
 	local IFS
+	local i
+	local x
 
 	EXPFILE="${MROOT}$1"
 
 	# file does not exist; it can be written
-	[ ! -e ${EXPFILE} ] && return 0
+	[[ ! -e ${EXPFILE} ]] && return 0
 
 	# 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}" ]
+		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}"
-				if [ "${TEST}" != "${EXPFILE}" ]
+				if [[ ${TEST} != ${EXPFILE} ]]
 				then
 					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
 
@@ -1426,6 +1514,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
@@ -1443,7 +1535,29 @@
 ###################################################
 count_protected_files()
 {
-	${MLIBDIR}/writeprotected "$1"
+	local file="$1"
+	local dirname="${file%/*}"
+	local filename="${file##*/}"
+	local count
+	local output
+	local i
+
+	declare -i count=0
+
+	# check if there are already protected files
+	for oldpretected in $(find ${dirname} -iname "._cfg????_${filename}" |
+		sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |
+		sort -t'%' -k3 -k2 | cut -f1 -d'%')
+	do
+		count=$(echo ${oldpretected} | cut -d_ -f2 | sed -e "s:cfg::")
+	done
+	(( count ++ ))
+
+	# fill output up with zeros
+	for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done
+	output="${output}${count}"
+
+	echo "${output}"
 }
 
 # call with
@@ -1460,6 +1574,7 @@
 	local list
 	local pcatdir
 	local protected
+	local i
 
 	# very basic getops
 	for i in $*
@@ -1721,9 +1836,9 @@
 {
 	local i
 
-	if [ -n "$@" ]
+	if [[ -n $* ]]
 	then
-		for i in $@
+		for i in $*
 		do
 			[[ ${MAGEDEBUG} = on ]] && \
 				echo "--- Including ${MAGEDIR}/include/${i}.minc"
@@ -1737,9 +1852,9 @@
 {
 	local i
 
-	if [ -n "$@" ]
+	if [[ -n $* ]]
 	then
-		for i in $@
+		for i in $*
 		do
 			echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
 			source ${SMAGESCRIPTSDIR}/include/${i}.sminc
@@ -2048,6 +2163,8 @@
 	local SDEPEND
 	local PROVIDE
 	local PKGTYPE
+	local MAGE_TARGETS
+	local SPLIT_PACKAGE_BASE
 	local preinstall
 	local postinstall
 	local preremove
@@ -2094,6 +2211,7 @@
 	local count_current
 	local magefile
 	local src_install
+	local i
 
 	# very basic getops
 	for i in $*
@@ -2167,7 +2285,45 @@
 			echo B:${pbuild}
 		fi
 
-		smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+		if [[ -n ${MAGE_TARGETS} ]]
+		then
+			# basic svn compat
+			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+			then
+				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+				do
+					smage2file="${i}"
+				done
+			else
+				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}/${pname}-${pver}-${pbuild}.smage2
+				do
+					smage2file="${i}"
+				done
+			else
+				smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+			fi
+		fi
+
 		if [ -f "${smage2file}" ]
 		then
 			echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
@@ -2441,9 +2597,9 @@
 	echo -ne "${COLBLUE} <<< ${COLDEFAULT}"
 	echo -n "removing: "
 	echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
-	echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"
+	echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
 
-	magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
+	magefile="${MROOT}${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
 	source ${magefile}
 
 	## preremove scripts
@@ -2541,9 +2697,16 @@
 	local all_installed
 	local ipver
 	local ipbuild
+	local latest_available
+	local depsfull
+	local sdepsfull
+	local deps
+	local sdeps
+	local dep
+	local sign
 
 	# only names no versions
-	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*')"
+	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*'| sed '/profiles/d' | sed '/includes/d')"
 	#result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"
 
 	# nothing found
@@ -2558,40 +2721,76 @@
 		# get highest version available
 		magefile=$(get_highest_magefile ${pcat} ${pname})
 
-		# now get all needed infos to print a nice output
-		pver="$(magename2pver ${magefile})"
-		pbuild="$(magename2pbuild ${magefile})"
-		state="$(get_value_from_magefile STATE ${magefile})"
-		description="$(get_value_from_magefile DESCRIPTION ${magefile})"
-		homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
+		if [[ ! -z ${magefile} ]]
+		then
+			# now get all needed infos to print a nice output
+			pver="$(magename2pver ${magefile})"
+			pbuild="$(magename2pbuild ${magefile})"
+			state="$(get_value_from_magefile STATE ${magefile})"
+			description="$(get_value_from_magefile DESCRIPTION ${magefile})"
+			homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
+	
+			# all installed
+			for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
+			do
+				ipver="$(magename2pver ${i})"
+				ipbuild="$(magename2pbuild ${i})"
+	
+				if [[ -z ${all_installed} ]]
+				then
+					all_installed="${ipver}-${ipbuild}"
+				else
+					all_installed="${all_installed} ${ipver}-${ipbuild}"
+				fi
+			done
+			[[ -z ${all_installed} ]] && all_installed="none"
+	
+			case ${state} in
+				stable) state=${COLGREEN}"[s] ";;
+				testing) state=${COLYELLOW}"[t] ";;
+				unstable) state=${COLRED}"[u] ";;
+				old) state=${COLGRAY}"[o] ";;
+			esac
 
-		# all installed
-		for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
-		do
-			ipver="$(magename2pver ${i})"
-			ipbuild="$(magename2pbuild ${i})"
+			latest_available="${pver}-${pbuild}"
+		else
+			# package is masked
+			state="${COLRED}[m] "
+			latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"
+		fi
 
-			if [[ -z ${all_installed} ]]
-			then
-				all_installed="${ipver}-${ipbuild}"
-			else
-				all_installed="${all_installed} ${ipver}-${ipbuild}"
-			fi
-		done
-		[[ -z ${all_installed} ]] && all_installed="none"
+		depsfull="$(get_value_from_magefile DEPEND ${magefile})"
+		sdepsfull="$(get_value_from_magefile SDEPEND ${magefile})"
 
-		case ${state} in
-			stable) state=${COLGREEN}"[s] ";;
-			testing) state=${COLYELLOW}"[t] ";;
-			unstable) state=${COLRED}"[u] ";;
-			old) state=${COLGRAY}"[o] ";;
-		esac
+		while read sign dep
+		do
+			case ${dep} in
+				"") continue;;
+			esac
+
+			deps="${deps} $(basename ${dep%-*})"
+		done << EOF
+${depsfull}
+EOF
+
+		while read sign dep
+		do
+			case ${dep} in
+				"") continue;;
+			esac
+
+			sdeps="${sdeps} $(basename ${dep%-*})"
+		done << EOF
+${sdepsfull}
+EOF
 
 		echo -e "${state}${pcat}/${pname}"${COLDEFAULT}
-		echo "      Latest available:   ${pver}-${pbuild}"
+		echo -e "      Latest available:   ${latest_available}"
 		echo "      Installed versions: ${all_installed}"
 		echo "      Description: ${description}"
 		echo "      Homepage: ${homepage}"
+		echo "      Depends: ${deps}"
+		echo "      SDepends: ${sdeps}"
 		echo
 
 		unset pcat
@@ -2605,6 +2804,12 @@
 		unset all_installed
 		unset ipver
 		unset ipbuild
+		unset depsfull
+		unset sdepsfull
+		unset deps
+		unset sdeps
+		unset dep
+		unset sign
 	done
 }
 
@@ -2647,7 +2852,13 @@
 	[[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable
 	[[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing
 
-	local EXCLUDED="${MROOT}/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
+	# support both types for the moment
+	if [[ -f /etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION} ]]
+	then
+		local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
+	else
+		local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}"
+	fi
 
 	# return 0 if the list not exist; nothin is masked
 	[[ ! -f ${EXCLUDED} ]] && return 0