--- trunk/mage/usr/lib/mage/mage4.functions.sh	2009/11/20 21:53:33	942
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2011/04/27 08:42:24	1271
@@ -339,6 +339,8 @@
 	local pkgname="$1"
 	local pathto
 	local posix
+	local user
+	local group
 	local IFS
 
 	# sanity checks; abort if not given
@@ -352,12 +354,17 @@
 	# sets fieldseperator to "§" instead of " "
 	IFS=§
 
-	while read pathto posix
+	while read pathto posix major minor user group
 	do
 		[ -z "${pathto}" ] && continue
 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> PIPE: ${MROOT}${pathto}"
 
-		mkfifo -m "${posix}" "${MROOT}$pathto"
+		mknod -m "${posix}" "${MROOT}${pathto}"
+		# make it optional atm !!
+		if [[ ! -z ${user} ]] && [[ ! -z ${group} ]]
+		then
+			chown "${user}:${group}" "${MROOT}${pathto}" b "${major}" "${minor}"
+		fi
 	done < ${BUILDDIR}/${pkgname}/.pipes
 
 	# very important: unsetting the '§' fieldseperator
@@ -376,6 +383,8 @@
 	local posix
 	local major
 	local minor
+	local user
+	local group
 	local IFS
 
 	# sanity checks; abort if not given
@@ -389,23 +398,68 @@
 	# 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}
+		mknod -m ${posix} "${MROOT}${pathto}" b "${major}" "${minor}"
+
+		# make it optional atm !!
+		if [[ ! -z ${user} ]] && [[ ! -z ${group} ]]
+		then
+			chown "${user}:${group}" "${MROOT}${pathto}"
+		fi
 	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."
+
+	# make it optional atm !!
+	#[ ! -f ${BUILDDIR}/${pkgname}/.fifo ] && die "install_fifos() .fifo not found"
+	[ ! -f ${BUILDDIR}/${pkgname}/.fifo ] && return
+
+	# 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()
 {
@@ -428,6 +482,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}"
 }
 
 
@@ -489,7 +544,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
@@ -507,10 +562,13 @@
 
 			# 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}
+				# make .fifo optional atm
+				if [[ -f ${BUILDDIR}/${pkgname}/${i} ]]
+				then
+					install -m 0644 ${BUILDDIR}/${pkgname}/${i} ${dbrecorddir}/${i}
+				fi
 			done
 			;;
 	esac
@@ -785,10 +843,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
@@ -879,6 +937,8 @@
 {
 	local pathto
 	local posix
+	local user
+	local group
 	local IFS
 	local pcat
 	local pname
@@ -902,10 +962,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
@@ -916,7 +976,7 @@
 	# sets fieldseperator to "§" instead of " "
 	IFS=§
 
-	while read pathto posix
+	while read pathto posix user group
 	do
 		[ -z "${pathto}" ] && continue
 
@@ -937,6 +997,8 @@
 {
 	local pathto
 	local posix
+	local user
+	local group
 	local IFS
 	local pcat
 	local pname
@@ -960,10 +1022,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
@@ -974,7 +1036,7 @@
 	# sets fieldseperator to "§" instead of " "
 	IFS=§
 
-	while read pathto posix
+	while read pathto posix user group
 	do
 		[ -z "${pathto}" ] && continue
 
@@ -988,6 +1050,68 @@
 
 
 ###################################################
+# 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."
+
+	# make it optional atm !!
+	#[ ! -f ${MROOT}${INSTALLDB}/${pfull}/.fifo ] && die "remove_fifos() .fifo not found"
+	[ ! -f ${MROOT}${INSTALLDB}/${pfull}/.fifo ] && return
+
+	# 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                #
 ###################################################
@@ -1018,10 +1142,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
@@ -1075,7 +1199,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()
 {
@@ -1109,7 +1233,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}" \
@@ -1179,10 +1303,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 ]]
@@ -1225,15 +1346,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"
@@ -1244,15 +1370,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
@@ -1263,6 +1393,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}"
@@ -1278,9 +1418,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
@@ -1726,7 +1869,8 @@
 
 #deletes pakages from virtual database
 #$1 virtualname; $2 pkgname
-virtuals_del() {
+virtuals_del()
+{
 
 	local virtualname="$1"
 	local pkgname="$2"
@@ -2160,6 +2304,8 @@
 	local SDEPEND
 	local PROVIDE
 	local PKGTYPE
+	local MAGE_TARGETS
+	local SPLIT_PACKAGE_BASE
 	local preinstall
 	local postinstall
 	local preremove
@@ -2280,30 +2426,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 ... "
@@ -2647,7 +2808,8 @@
 	unset -f postremove
 }
 
-show_etc_update_mesg() {
+show_etc_update_mesg()
+{
 	[ ${MAGE_PROTECT_COUNTER} -eq 0 ] && return 0
 
 	echo