Attachment 5322 Details for Bug 30547

[patch] univention-debootstrap cleanup

30547_debootstrap.diff (text/plain), 145.91 KB, created by Philipp Hahn on 2013-07-15 09:48 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2013-07-15 09:48 CEST

Size: 145.91 KB

patch

obsolete

>From 7daaf0c9447855a951011afe6c2055678c8a34c3 Mon Sep 17 00:00:00 2001
>Message-Id: <7daaf0c9447855a951011afe6c2055678c8a34c3.1373874469.git.hahn@univention.de>
>From: Philipp Hahn <hahn@univention.de>
>Date: Mon, 15 Jul 2013 09:45:06 +0200
>Subject: [PATCH] Bug #30547: univention-debootstrap-3
>Organization: Univention GmbH, Bremen, Germany
>
>UCS-3.2 version bump (Bug #30547)
>Update copyright to 2013.
>debian/*.dirs: remove unneeded files.
>Re-use debootstrap instead of using custom (unmodified) copy.
>Fix spelling mistakes.
>---
> .../base/univention-debootstrap/debian/changelog   |   16 +-
> .../base/univention-debootstrap/debian/control     |    3 +-
> .../base/univention-debootstrap/debian/copyright   |    2 +-
> .../base/univention-debootstrap/debian/dirs        |    2 -
> .../base/univention-debootstrap/debian/rules       |    3 +-
> .../debian/univention-debootstrap-3.dirs           |    2 -
> .../debian/univention-debootstrap-3.install        |    2 +-
> .../debian/univention-debootstrap-3.links          |    1 +
> .../usr/sbin/debootstrap-ucs3                      |  650 ---------
> .../usr/share/debootstrap-ucs3/devices.tar.gz      |  Bin 766 -> 0 bytes
> .../usr/share/debootstrap-ucs3/functions           | 1462 --------------------
> .../usr/share/debootstrap-ucs3/functions-ucs3      | 1462 --------------------
> .../usr/share/debootstrap-ucs3/scripts/ucs3        |  195 ---
> .../usr/share/debootstrap/functions-ucs3           | 1462 --------------------
> .../usr/share/debootstrap/scripts/ucs3             |  193 +++
> 15 files changed, 209 insertions(+), 5246 deletions(-)
> delete mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/dirs
> delete mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.dirs
> create mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.links
> delete mode 100755 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/sbin/debootstrap-ucs3
> delete mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/devices.tar.gz
> delete mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/functions
> delete mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/functions-ucs3
> delete mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/scripts/ucs3
> delete mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap/functions-ucs3
> create mode 100644 branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap/scripts/ucs3
>
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/changelog b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/changelog
>index 0a5b12f..e6b445d 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/changelog
>+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/changelog
>@@ -1,3 +1,13 @@
>+univention-debootstrap (5.0.0-1) unstable; urgency=low
>+
>+  * UCS-3.2 version bump (Bug #30547)
>+  * Update copyright to 2013.
>+  * debian/*.dirs: remove unneeded files.
>+  * Re-use debootstrap instead of using custom (unmodified) copy.
>+  * Fix spelling mistakes.
>+
>+ -- Philipp Hahn <hahn@univention.de>  Fri, 12 Jul 2013 18:13:58 +0200
>+
> univention-debootstrap (4.0.3-5) unstable; urgency=low
> 
>   * fixed missing /usr/share/debootstrap/functions-ucs3 (Bug #26179)
>@@ -104,7 +114,7 @@ univention-debootstrap (0.1.8) unstable; urgency=low
> 
>   * remove ipchains from powerpc list
> 
>- -- Stefan Gohmann <gohmann@univention.dunivention.de>  Fri, 10 Feb 2006 09:44:27 +0100
>+ -- Stefan Gohmann <gohmann@univention.de>  Fri, 10 Feb 2006 09:44:27 +0100
> 
> univention-debootstrap (0.1.6) unstable; urgency=low
> 
>@@ -129,7 +139,3 @@ univention-debootstrap (0.1.0) unstable; urgency=low
>   * initial release
> 
>  -- Stefan Gohmann <gohmann@univention.de>  Tue, 28 Aug 2003 13:49:40 +0200
>-
>-Local variables:
>-mode: debian-changelog
>-End:
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/control b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/control
>index e465373..75a6521 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/control
>+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/control
>@@ -3,8 +3,7 @@ Section: univention
> Priority: optional
> Maintainer: Univention GmbH <packages@univention.de>
> Standards-Version: 3.5.5
>-Build-Depends: debootstrap,
>- debhelper,
>+Build-Depends: debhelper,
>  ucslint
> 
> Package: univention-debootstrap-3
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/copyright b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/copyright
>index 91b5840..75dfc68 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/copyright
>+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/copyright
>@@ -1,4 +1,4 @@
>-Copyright 2001-2012 Univention GmbH
>+Copyright 2001-2013 Univention GmbH
> 
> http://www.univention.de/
> 
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/dirs b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/dirs
>deleted file mode 100644
>index 9d54394..0000000
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/dirs
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-usr/sbin
>-usr/share/debootstrap/scripts/
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/rules b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/rules
>index 8630af6..c4f5292 100755
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/rules
>+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/rules
>@@ -3,7 +3,7 @@
> # Univention Debootstrap
> #  rules file for the debian package
> #
>-# Copyright 2004-2012 Univention GmbH
>+# Copyright 2004-2013 Univention GmbH
> #
> # http://www.univention.de/
> #
>@@ -36,4 +36,3 @@ override_dh_auto_test:
> 
> %:
> 	dh $@
>-
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.dirs b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.dirs
>deleted file mode 100644
>index 9e5fd58..0000000
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.dirs
>+++ /dev/null
>@@ -1,2 +0,0 @@
>-usr/sbin
>-usr/share/debootstrap-ucs3/scripts/
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.install b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.install
>index 7f4d6a4..73752c9 100644
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.install
>+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.install
>@@ -1 +1 @@
>-usr/* usr
>+usr
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.links b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.links
>new file mode 100644
>index 0000000..e8fb087
>--- /dev/null
>+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/debian/univention-debootstrap-3.links
>@@ -0,0 +1 @@
>+usr/sbin/debootstrap	usr/sbin/debootstrap-ucs3
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/sbin/debootstrap-ucs3 b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/sbin/debootstrap-ucs3
>deleted file mode 100755
>index 77e3386..0000000
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/sbin/debootstrap-ucs3
>+++ /dev/null
>@@ -1,650 +0,0 @@
>-#!/bin/bash -e
>-
>-VERSION='1.0.26.26.201105181428'
>-
>-unset TMP TEMP TMPDIR || true
>-
>-# might not be exported if we're running from init=/bin/sh or similar
>-export PATH
>-
>-###########################################################################
>-
>-if [ -z "$DEBOOTSTRAP_DIR" ]; then
>-	if [ -x /debootstrap/debootstrap ]; then
>-		DEBOOTSTRAP_DIR=/debootstrap
>-	else
>-		DEBOOTSTRAP_DIR=/usr/share/debootstrap-ucs3
>-	fi
>-fi
>-
>-DEVICES_TARGZ=$DEBOOTSTRAP_DIR/devices.tar.gz
>-
>-. $DEBOOTSTRAP_DIR/functions
>-exec 4>&1
>-
>-LANG=C
>-USE_COMPONENTS=main
>-KEYRING=""
>-VARIANT=""
>-
>-DEF_MIRROR="http://ftp.us.debian.org/debian"
>-
>-export LANG USE_COMPONENTS
>-umask 022
>-
>-###########################################################################
>-
>-## phases:
>-##   finddebs dldebs printdebs first_stage second_stage
>-
>-RESOLVE_DEPS=true
>-
>-WHAT_TO_DO="finddebs dldebs first_stage second_stage"
>-am_doing_phase () {
>-	# usage:   if am_doing_phase finddebs; then ...; fi
>-	local x;
>-	for x in "$@"; do
>-		if echo " $WHAT_TO_DO " | grep -q " $x "; then return 0; fi
>-	done
>-	return 1
>-}
>-
>-###########################################################################
>-
>-usage_err()
>-{
>-	info USAGE1 "usage: [OPTION]... <suite> <target> [<mirror> [<script>]]"
>-	info USAGE2 "Try \`${0##*/} --help' for more information."
>-	error "$@"
>-}
>-
>-usage()
>-{
>-	echo "Usage: ${0##*/} [OPTION]... <suite> <target> [<mirror> [<script>]]"
>-	echo "Bootstrap Debian base system."
>-	echo
>-	cat <<EOF
>-      --help                 display this help and exit
>-      --version              display version information and exit
>-      --verbose              don't turn off the output of wget
>-
>-      --download-only        download packages, but don't perform installation
>-      --print-debs           print the packages to be installed, and exit
>-
>-      --arch=A               set the target architecture (use if no dpkg)
>-                               [ --arch=powerpc ]
>-
>-      --include=A,B,C        adds specified names to the list of base packages
>-      --exclude=A,B,C        removes specified packages from the list
>-      --components=A,B,C     use packages from the listed components of the
>-                             archive
>-      --variant=X            use variant X of the bootstrap scripts
>-                             (currently supported variants: buildd, fakechroot,
>-                              scratchbox)
>-      --keyring=K            check Release files against keyring K
>-      --no-resolve-deps      don't try to resolve dependencies automatically
>-
>-      --unpack-tarball=T     acquire .debs from a tarball instead of http
>-      --make-tarball=T       download .debs and create a tarball (tgz format)
>-      --second-stage-target=DIR
>-                             Run second stage in a subdirectory instead of root
>-                               (can be used to create a foreign chroot)
>-                               (requires --second-stage)
>-      --extractor=TYPE       override automatic .deb extractor selection
>-                               (supported: $EXTRACTORS_SUPPORTED)
>-      --boot-floppies        used for internal purposes by boot-floppies
>-      --debian-installer     used for internal purposes by debian-installer
>-      --private-key=file     read the private key from file
>-      --certificate=file     use the client certificate stored in file (PEM)
>-      --no-check-certificate do not check certificate against certificate authorities
>-EOF
>-}
>-
>-###########################################################################
>-
>-if [ -z "$PKGDETAILS" ]; then
>-	error 1 NO_PKGDETAILS "No pkgdetails available; either install perl, or build pkgdetails.c from source"
>-fi
>-
>-###########################################################################
>-
>-if [ $# != 0 ] ; then
>-    while true ; do
>-	case "$1" in
>-	    --help)
>-		usage
>-		exit 0
>-		;;
>-	    --version)
>-		echo "debootstrap $VERSION"
>-		exit 0
>-		;;
>-	    --boot-floppies)
>-		if [ -n "$USE_DEBIANINSTALLER_INTERACTION" ] ; then
>-			error 1 ARG_BFDI "Can only use one of --boot-floppies and --debian-installer"
>-		fi
>-		if ! (echo -n "" >&3) 2>/dev/null; then
>-			error 1 ARG_BFBYHAND "If running debootstrap by hand, don't use --boot-floppies"
>-		fi
>-		USE_BOOTFLOPPIES_INTERACTION=yes
>-		shift
>-		;;
>-	    --debian-installer)
>-		if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
>-			error 1 ARG_BFDI "Can only use one of --boot-floppies and --debian-installer"
>-		fi
>-		if ! (echo -n "" >&3) 2>/dev/null; then
>-			error 1 ARG_DIBYHAND "If running debootstrap by hand, don't use --debian-installer"
>-		fi
>-		USE_DEBIANINSTALLER_INTERACTION=yes
>-		shift
>-		;;
>-	    --foreign)
>-		WHAT_TO_DO="finddebs dldebs first_stage"
>-		shift
>-		;;
>-	    --second-stage)
>-		WHAT_TO_DO="second_stage"
>-		SECOND_STAGE_ONLY=true
>-		shift
>-		;;
>-	    --second-stage-target|--second-stage-target=?*)
>-		if [ "$SECOND_STAGE_ONLY" != "true" ] ; then
>-			error 1 STAGE2ONLY "option %s only applies in the second stage" "$1"
>-		fi
>-		if [ "$1" = "--second-stage-target" -a -n "$2" ] ; then
>-			CHROOTDIR="$2"
>-			shift 2
>-		elif [ "$1" != "${1#--second-stage-target=}" ]; then
>-			CHROOTDIR="${1#--second-stage-target=}"
>-			shift
>-		else
>-			error 1 NEEDARG "option requires an argument: %s" "$1"
>-		fi
>-		;;
>-	    --print-debs)
>-		WHAT_TO_DO="finddebs printdebs kill_target"
>-		shift
>-		;;
>-	    --download-only)
>-		WHAT_TO_DO="finddebs dldebs"
>-		shift
>-		;;
>-	    --make-tarball|--make-tarball=?*)
>-		WHAT_TO_DO="finddebs dldebs maketarball kill_target"
>-		if [ "$1" = "--make-tarball" -a -n "$2" ] ; then
>-			MAKE_TARBALL="$2"
>-			shift 2
>-		elif [ "$1" != "${1#--make-tarball=}" ]; then
>-			MAKE_TARBALL="${1#--make-tarball=}"
>-			shift
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		;;
>-	    --resolve-deps)
>-		# redundant, but avoids breaking compatibility
>-		RESOLVE_DEPS=true
>-		shift
>-		;;
>-	    --no-resolve-deps)
>-		RESOLVE_DEPS=false
>-		shift
>-		;;
>-	    --keep-debootstrap-dir)
>-		KEEP_DEBOOTSTRAP_DIR=true
>-		shift
>-		;;
>-	    --arch|--arch=?*)
>-		if [ "$1" = "--arch" -a -n "$2" ] ; then
>-			ARCH="$2"
>-			shift 2
>-                elif [ "$1" != "${1#--arch=}" ]; then
>-			ARCH="${1#--arch=}"
>-			shift
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		;;
>-	    --extractor|--extractor=?*)
>-		if [ "$1" = "--extractor" -a -n "$2" ] ; then
>-			EXTRACTOR_OVERRIDE="$2"
>-			shift 2
>-		elif [ "$1" != "${1#--extractor=}" ]; then
>-			EXTRACTOR_OVERRIDE="${1#--extractor=}"
>-			shift
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		if valid_extractor "$EXTRACTOR_OVERRIDE"; then
>-			if ! type "$EXTRACTOR_OVERRIDE" >/dev/null 2>&1; then
>-				error 1 MISSINGEXTRACTOR "The selected extractor cannot be found: %s" "$EXTRACTOR_OVERRIDE"
>-			fi
>-		else
>-			error 1 BADEXTRACTOR "%s: unknown extractor" "$EXTRACTOR_OVERRIDE"
>-		fi
>-		;;
>-	    --unpack-tarball|--unpack-tarball=?*)
>-		if [ "$1" = "--unpack-tarball" -a -n "$2" ] ; then
>-			UNPACK_TARBALL="$2"
>-			shift 2
>-		elif [ "$1" != "${1#--unpack-tarball=}" ]; then
>-			UNPACK_TARBALL="${1#--unpack-tarball=}"
>-			shift
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		if [ ! -f "$UNPACK_TARBALL" ] ; then
>-			error 1 NOTARBALL "%s: No such file or directory" "$UNPACK_TARBALL"
>-		fi
>-		;;
>-	    --include|--include=?*)
>-		if [ "$1" = "--include" -a -n "$2" ]; then
>-			additional="$2"
>-			shift 2
>-                elif [ "$1" != "${1#--include=}" ]; then
>-			additional="${1#--include=}"
>-			shift 1
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		additional="$(echo "$additional" | tr , " ")"
>-		;;
>-	    --exclude|--exclude=?*)
>-		if [ "$1" = "--exclude" -a -n "$2" ]; then
>-			exclude="$2"
>-			shift 2
>-                elif [ "$1" != "${1#--exclude=}" ]; then
>-			exclude="${1#--exclude=}"
>-			shift 1
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		exclude="$(echo "$exclude" | tr , " ")"
>-		;;
>-	    --verbose)
>-		verbose=true
>-		export verbose
>-		shift 1
>-		;;
>-	    --components|--components=?*)
>-		if [ "$1" = "--components" -a -n "$2" ]; then
>-			USE_COMPONENTS="$2"
>-			shift 2
>-                elif [ "$1" != "${1#--components=}" ]; then
>-			USE_COMPONENTS="${1#--components=}"
>-			shift 1
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		USE_COMPONENTS="$(echo "$USE_COMPONENTS" | tr , "|")"
>-		;;
>-	    --variant|--variant=?*)
>-		if [ "$1" = "--variant" -a -n "$2" ]; then
>-			VARIANT="$2"
>-			shift 2
>-                elif [ "$1" != "${1#--variant=}" ]; then
>-			VARIANT="${1#--variant=}"
>-			shift 1
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		;;
>-	    --keyring|--keyring=?*)
>-		if ! gpgv --version >/dev/null 2>&1; then
>-			error 1 NEEDGPGV "gpgv not installed, but required for Release verification"
>-		fi
>-		if [ "$1" = "--keyring" -a -n "$2" ]; then
>-			KEYRING="$2"
>-			shift 2
>-                elif [ "$1" != "${1#--keyring=}" ]; then
>-			KEYRING="${1#--keyring=}"
>-			shift 1
>-		else
>-			error 1 NEEDARG "option requires an argument %s" "$1"
>-		fi
>-		;;
>-	    --certificate|--certificate=?*)
>-		if [ "$1" = "--certificate" -a -n "$2" ]; then
>-			CERTIFICATE="--certificate=$2"
>-			shift 2
>-		elif [ "$1" != "${1#--certificate=}" ]; then
>-			CERTIFICATE="--certificate=${1#--certificate=}" 
>-			shift 1
>-		else
>-		       error 1 NEEDARG "option requires an argument %s" "$1" 
>-		fi
>-		;;
>-	    --private-key|--private-key=?*)
>-		if [ "$1" = "--private-key" -a -n "$2" ]; then
>-			PRIVATEKEY="--private-key=$2"
>-			shift 2
>-		elif [ "$1" != "${1#--private-key=}" ]; then
>-			PRIVATEKEY="--private-key=${1#--private-key=}" 
>-			shift 1
>-		else
>-		       error 1 NEEDARG "option requires an argument %s" "$1" 
>-		fi
>-		;;
>-	    --no-check-certificate)
>-		CHECKCERTIF="--no-check-certificate"
>-		shift
>-		;;
>-	    --*)
>-		error 1 BADARG "unrecognized or invalid option %s" "$1"
>-		;;
>-	    *)
>-		break
>-		;;
>-	esac
>-    done
>-fi
>-
>-###########################################################################
>-
>-if [ "$SECOND_STAGE_ONLY" = "true" ]; then
>-	SUITE=$(cat $DEBOOTSTRAP_DIR/suite)
>-	ARCH=$(cat $DEBOOTSTRAP_DIR/arch)
>-	if [ -e $DEBOOTSTRAP_DIR/variant ]; then
>-		VARIANT=$(cat $DEBOOTSTRAP_DIR/variant)
>-		SUPPORTED_VARIANTS="$VARIANT"
>-	fi
>-	if [ -z "$CHROOTDIR" ]; then
>-		TARGET=/
>-	else
>-		TARGET=$CHROOTDIR
>-	fi
>-	SCRIPT=$DEBOOTSTRAP_DIR/suite-script
>-else
>-	if [ -z "$1" ] || [ -z "$2" ]; then
>-		usage_err 1 NEEDSUITETARGET "You must specify a suite and a target."
>-	fi
>-	SUITE="$1"
>-	TARGET="$2"
>-	TARGET="${TARGET%/}"
>-	if [ "${TARGET#/}" = "${TARGET}" ]; then
>-		if [ "${TARGET%/*}" = "$TARGET" ] ; then
>-			TARGET="$(echo "`pwd`/$TARGET")"
>-		else
>-			TARGET="$(cd "${TARGET%/*}"; echo "`pwd`/${TARGET##*/}")"
>-		fi
>-	fi
>-
>-	SCRIPT="$DEBOOTSTRAP_DIR/scripts/$1"
>-	if [ -n "$VARIANT" ] && [ -e "${SCRIPT}.${VARIANT}" ]; then
>-		SCRIPT="${SCRIPT}.${VARIANT}"
>-		SUPPORTED_VARIANTS="$VARIANT"
>-	fi
>-	if [ "$4" != "" ]; then
>-		SCRIPT="$4"
>-	fi
>-fi
>-
>-###########################################################################
>-
>-if [ "$ARCH" != "" ]; then
>-	true
>-elif [ -x /usr/bin/dpkg ] && \
>-     /usr/bin/dpkg --print-architecture >/dev/null 2>&1; then
>-	ARCH=`/usr/bin/dpkg --print-architecture`
>-elif type udpkg >/dev/null 2>&1 && \
>-     udpkg --print-architecture >/dev/null 2>&1; then
>-	ARCH=`/usr/bin/udpkg --print-architecture`
>-elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
>-	ARCH=`cat $DEBOOTSTRAP_DIR/arch`
>-else
>-	error 1 WHATARCH "Couldn't work out current architecture"
>-fi
>-
>-if [ "$TARGET" = "/" ]; then
>-	CHROOT_CMD=""
>-elif doing_variant scratchbox; then
>-	for config in ~/.scratchbox2/*/sb2.config;
>-	do
>-		export `grep ^SBOX_TARGET_ROOT= $config`
>-		if [ "x$SBOX_TARGET_ROOT" = "x$TARGET" ]; then
>-			SB2_TARGET=$(basename $(dirname $config))
>-		fi
>-	done
>-	[ "x$SB2_TARGET" != "x" ] || error 1 SBOXTARGETREQ "No scratchbox target configured for $TARGET"
>-	CHROOT_CMD="sb2 -eR -t $SB2_TARGET"
>-else
>-	CHROOT_CMD="chroot $TARGET"
>-fi
>-
>-export ARCH SUITE TARGET CHROOT_CMD
>-
>-if am_doing_phase first_stage second_stage; then
>-	if [ -x /usr/bin/id ] && [ `id -u` -ne 0 ]; then
>-		error 1 NEEDROOT "debootstrap can only run as root"
>-	fi
>-	# Ensure that we can create working devices and executables on the target.
>-	if ! check_sane_mount "$TARGET"; then
>-		error 1 NOEXEC "Cannot install into target '$TARGET' mounted with noexec or nodev"
>-	fi
>-fi
>-
>-if [ ! -e "$SCRIPT" ]; then
>-	error 1 NOSCRIPT "No such script: %s" "$SCRIPT"
>-fi
>-
>-###########################################################################
>-
>-if [ "$TARGET" != "" ]; then
>-	mkdir -p "$TARGET/debootstrap"
>-fi
>-
>-###########################################################################
>-
>-# Use of fd's by functions/scripts:
>-#
>-#    stdin/stdout/stderr: used normally
>-#    fd 4: I:/W:/etc information
>-#    fd 5,6: spare for functions
>-#    fd 7,8: spare for scripts
>-
>-if [ "$USE_DEBIANINSTALLER_INTERACTION" = yes ]; then
>-	#    stdout=stderr: full log of debootstrap run
>-	#    fd 3: I:/W:/etc information
>-	exec 4>&3
>-elif [ "$USE_BOOTFLOPPIES_INTERACTION" = yes ]; then
>-	#    stdout=stderr: full log of debootstrap run
>-	#    fd 3: I:/W:/etc information
>-	exec 4>&3
>-elif am_doing_phase printdebs; then
>-	#    stderr: I:/W:/etc information
>-	#    stdout: debs needed
>-	exec 4>&2
>-else
>-	#    stderr: used in exceptional circumstances only
>-	#    stdout: I:/W:/etc information
>-	#    $TARGET/debootstrap/debootstrap.log: full log of debootstrap run
>-	exec 4>&1
>-	exec >>"$TARGET/debootstrap/debootstrap.log"
>-	exec 2>&1
>-fi
>-
>-###########################################################################
>-
>-if [ "$UNPACK_TARBALL" ]; then
>-	if [ "${UNPACK_TARBALL#/}" = "$UNPACK_TARBALL" ]; then
>-		error 1 TARPATH "Tarball must be given a complete path"
>-	fi
>-	if [ "${UNPACK_TARBALL%.tar}" != "$UNPACK_TARBALL" ]; then
>-		(cd "$TARGET" && tar -xf "$UNPACK_TARBALL")
>-	elif [ "${UNPACK_TARBALL%.tgz}" != "$UNPACK_TARBALL" ]; then
>-		(cd "$TARGET" && zcat "$UNPACK_TARBALL" | tar -xf -)
>-	else
>-		error 1 NOTTAR "Unknown tarball: must be either .tar or .tgz"
>-	fi
>-fi
>-
>-###########################################################################
>-
>-. "$SCRIPT"
>-
>-if [ "$SECOND_STAGE_ONLY" = "true" ]; then
>-	MIRRORS=null:
>-else
>-	MIRRORS="$DEF_MIRROR"
>-	if [ "$3" != "" ]; then
>-		MIRRORS="$3"
>-		MIRRORS="${MIRRORS%/}"
>-	fi
>-fi
>-
>-export MIRRORS
>-
>-ok=false
>-for v in $SUPPORTED_VARIANTS; do
>-	if doing_variant $v; then ok=true; fi
>-done
>-if ! $ok; then
>-	error 1 UNSUPPVARIANT "unsupported variant"
>-fi
>-
>-###########################################################################
>-
>-if am_doing_phase finddebs; then
>-	if [ "$FINDDEBS_NEEDS_INDICES" = "true" ] || \
>-	   [ "$RESOLVE_DEPS" = "true" ]; then
>-		download_indices
>-		GOT_INDICES=true
>-	fi
>-
>-	work_out_debs
>-
>-	base=$(without "$base $additional" "$exclude")
>-
>-	if [ "$RESOLVE_DEPS" = true ]; then
>-		requiredX=$(echo $(echo $required | tr ' ' '\n' | sort | uniq))
>-		baseX=$(echo $(echo $base | tr ' ' '\n' | sort | uniq))
>-
>-		baseN=$(without "$baseX" "$requiredX")
>-		baseU=$(without "$baseX" "$baseN")
>-
>-		if [ "$baseU" != "" ]; then
>-			info REDUNDANTBASE "Found packages in base already in required: %s" "$baseU"
>-			sleep 5
>-		fi
>-
>-		info RESOLVEREQ "Resolving dependencies of required packages..."
>-		required=$(resolve_deps $requiredX)
>-		info RESOLVEBASE "Resolving dependencies of base packages..."
>-		base=$(resolve_deps $baseX)
>-		base=$(without "$base" "$required")
>-
>-		requiredX=$(without "$required" "$requiredX")
>-		baseX=$(without "$base" "$baseX")
>-		if [ "$requiredX" != "" ]; then
>-			info NEWREQUIRED "Found additional required dependencies: %s" "$requiredX"
>-			sleep 5
>-		fi
>-		if [ "$baseX" != "" ]; then
>-			info NEWBASE "Found additional base dependencies: %s" "$baseX"
>-			sleep 5
>-		fi
>-	fi
>-
>-	all_debs="$required $base"
>-fi
>-
>-if am_doing_phase printdebs; then
>-	echo "$all_debs"
>-fi
>-
>-if am_doing_phase dldebs; then
>-	if [ "$GOT_INDICES" != "true" ]; then
>-		download_indices
>-	fi
>-	download $all_debs
>-fi
>-
>-if am_doing_phase maketarball; then
>-	(cd $TARGET;
>-	 tar czf - var/lib/apt var/cache/apt) >$MAKE_TARBALL
>-fi
>-
>-if am_doing_phase first_stage; then
>-	choose_extractor
>-
>-	# first stage sets up the chroot -- no calls should be made to
>-	# "chroot $TARGET" here; but they should be possible by the time it's
>-	# finished
>-	first_stage_install
>-
>-	if ! am_doing_phase second_stage; then
>-		cp "$0"				 "$TARGET/debootstrap/debootstrap"
>-		cp $DEBOOTSTRAP_DIR/functions	 "$TARGET/debootstrap/functions"
>-		cp $SCRIPT			 "$TARGET/debootstrap/suite-script"
>-		echo "$ARCH"			>"$TARGET/debootstrap/arch"
>-		echo "$SUITE"			>"$TARGET/debootstrap/suite"
>-		[ "" = "$VARIANT" ] ||
>-		echo "$VARIANT"			>"$TARGET/debootstrap/variant"
>-		echo "$required"		>"$TARGET/debootstrap/required"
>-		echo "$base"			>"$TARGET/debootstrap/base"
>-
>-		chmod 755 "$TARGET/debootstrap/debootstrap"
>-	fi
>-fi
>-
>-if am_doing_phase second_stage; then
>-	if [ "$SECOND_STAGE_ONLY" = true ]; then
>-		required="$(cat $DEBOOTSTRAP_DIR/required)"
>-		base="$(cat $DEBOOTSTRAP_DIR/base)"
>-		all_debs="$required $base"
>-	fi
>-
>-	# second stage uses the chroot to clean itself up -- has to be able to
>-	# work from entirely within the chroot (in case we've booted into it,
>-	# possibly over NFS eg)
>-
>-	second_stage_install
>-
>-	# create sources.list
>-	# first, kill debootstrap.invalid sources.list
>-	if [ -e "$TARGET/etc/apt/sources.list" ]; then
>-		rm -f "$TARGET/etc/apt/sources.list"
>-	fi
>-	if [ "${MIRRORS#http*://}" != "$MIRRORS" ]; then
>-		setup_apt_sources "${MIRRORS%% *}"
>-		mv_invalid_to "${MIRRORS%% *}"
>-	else
>-		setup_apt_sources "$DEF_MIRROR"
>-		mv_invalid_to "$DEF_MIRROR"
>-	fi
>-
>-	if [ -e "$TARGET/debootstrap/debootstrap.log" ]; then
>-		if [ "$KEEP_DEBOOTSTRAP_DIR" = true ]; then
>-			cp "$TARGET/debootstrap/debootstrap.log" "$TARGET/var/log/bootstrap.log"
>-		else
>-			# debootstrap.log is still open as stdout/stderr and needs
>-			# to remain so, but after unlinking it some NFS servers
>-			# implement this by a temporary file in the same directory,
>-			# which makes it impossible to rmdir that directory.
>-			# Moving it instead works around the problem.
>-			mv "$TARGET/debootstrap/debootstrap.log" "$TARGET/var/log/bootstrap.log"
>-		fi
>-	fi
>-	sync
>-
>-	if [ "$KEEP_DEBOOTSTRAP_DIR" = true ]; then
>-		if [ -x "$TARGET/debootstrap/debootstrap" ]; then
>-			chmod 644 "$TARGET/debootstrap/debootstrap"
>-		fi
>-	else
>-		rm -rf "$TARGET/debootstrap"
>-	fi
>-fi
>-
>-if am_doing_phase kill_target; then
>-	if [ "$KEEP_DEBOOTSTRAP_DIR" != true ]; then
>-		info KILLTARGET "Deleting target directory"
>-		rm -rf "$TARGET"
>-	fi
>-fi
>-
>-if [ -n "$USE_BOOTFLOPPIES_INTERACTION" ] ; then
>-	echo "I: debootstrap: Successfully completed" # goes to /dev/tty4
>-	sleep 1 || true # give the user a second to see the success notice.
>-fi
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/devices.tar.gz b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/devices.tar.gz
>deleted file mode 100644
>index f195b6b08bf26291aaa511877b776c217b0b7a31..0000000000000000000000000000000000000000
>GIT binary patch
>literal 0
>HcmV?d00001
>
>literal 766
>zcmV<a0s;LWiwFQAywgnr1MQrBj@mE~#d8#HfX5!&?QswZ(h7o+6RK`cUx(GUDwUEZ
>zs?j`Y-alChqz(M??D_D}cHj0*WtpPr{o`8ne0}^)<O4?+3{zvsxN_O~<^{SB<00>M
>zO-^Z?d*9OQplS>MeCSPW{vkYb4>SC&bA>-k;@`dv=cNy64E_3$K>V-w%cVa5u)_bA
>zV{CQ~$^U=ycS!s%Dczhb|9cl9{T~te-%=i{`=6iqQ=IjGd0b@q|J--|zx$uj{O^VN
>zpB=RSJsSTYjlYNHACUN$_`mA&x+VSx^*<r{zwrMej=x3bPf+>aIKJ1<|NqMS{2c$1
>z00@i!%9qqE^Jm2Tf7<_zEdP7Z`cFjUpAXkI^^)p8Zpxs6>puj>zqiu%f9Ij&KMTg6
>ztStU)q3izyRsZ?X<y7DQtLp#0JRZpPf4KUOF#mgpUH^ev|8Hae{q_Ez&Hr4mkoliS
>z-T#I4|JXv;{|K%AM?o5Y==z^U%m2tr;~$~@ACdSEW1H?{UH&n~HSxdog}*(udqRo-
>zLG>B`vn>C6#;*S|nE&6djVS*c??3!+)c>#8|Er!?*wp{UuKz-v|2U@WkS<+a{;T@G
>zZi=9g^M69(Kkfffmj69tpZ|r5|I7Mc^{d{r{$tO7Fc^Q5#@}I||06K|O>O?`;(rQL
>z{nyrhFg5=F<nP4!AG-dBHUD!=xs&C8XG7Wl?f#b2aeuCQf9n6q|6j$$e+*s!N8A6a
>z-td<G4`KIzpw|C|$;SV~f8G42<p@3h3FZHj#QA^d^WRwYpL68}V9Wfsb<qBYI{!6{
>zZI`p8_`j_G^wIybDE`Ne|4CT?pDlF%kD&U0_sRoc8|J?#67>8RR{Yo2{U00ZKg7T5
>zKSOsp)w@Ss{~!HdVfnvz*uVb*<^QFl4RzN4`T2h`(C0tk&VLJ=|7XIE|Ip@tVk3*c
>wW9<GPO#MftQmIrbl}e>jsZ=VJN~Kb%R4SE9rBbO>Diywd0=-8WmH>DF0Cn5W*8l(j
>
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/functions b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/functions
>deleted file mode 100644
>index f0adc5c..0000000
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/functions
>+++ /dev/null
>@@ -1,1462 +0,0 @@
>-############################################################### smallutils
>-
>-smallyes() {
>-	YES="${1-y}"
>-	while echo "$YES" 2>/dev/null ; do : ; done
>-}
>-
>-############################################################### interaction
>-
>-error () {
>-	# <error code> <name> <string> <args>
>-	local err="$1"
>-	local name="$2"
>-	local fmt="$3"
>-	shift; shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "E: $name"
>-		for x in "$@"; do echo "EA: $x"; done
>-		echo "EF: $fmt") >&4
>-	else
>-		(printf "E: $fmt\n" "$@") >&4
>-	fi
>-	exit $err
>-}
>-
>-warning () {
>-	# <name> <string> <args>
>-	local name="$1"
>-	local fmt="$2"
>-	shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "W: $name"
>-		for x in "$@"; do echo "WA: $x"; done
>-		echo "WF: $fmt") >&4
>-	else
>-		printf "W: $fmt\n" "$@" >&4
>-	fi
>-}
>-
>-info () {
>-	# <name> <string> <args>
>-	local name="$1"
>-	local fmt="$2"
>-	shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "I: $name"
>-		for x in "$@"; do echo "IA: $x"; done
>-		echo "IF: $fmt") >&4
>-	else
>-		printf "I: $fmt\n" "$@" >&4
>-	fi
>-}
>-
>-PROGRESS_NOW=0
>-PROGRESS_END=0
>-PROGRESS_NEXT=""
>-PROGRESS_WHAT=""
>-
>-progress_next () {
>-	PROGRESS_NEXT="$1"
>-}
>-
>-wgetprogress () {
>-	[ ! "$verbose" ] && QSWITCH="-q"
>-	local ret=0
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
>-		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3
>-		ret=$?
>-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
>-		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3
>-		ret=$?
>-	else
>-		wget $QSWITCH "$@" 
>-		ret=$?
>-	fi
>-	return $ret
>-}
>-
>-progress () {
>-	# <now> <end> <name> <string> <args>
>-	local now="$1"
>-	local end="$2"
>-	local name="$3"
>-	local fmt="$4"
>-	shift; shift; shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		PROGRESS_NOW="$now"
>-		PROGRESS_END="$end"
>-		PROGRESS_NEXT=""
>-		(echo "P: $now $end $name"
>-		for x in "$@"; do echo "PA: $x"; done
>-		echo "PF: $fmt") >&3
>-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ]; then
>-		PROGRESS_NOW="$now"
>-		PROGRESS_END="$end"
>-		PROGRESS_WHAT="`printf "$fmt" "$@"`"
>-		PROGRESS_NEXT=""
>-		printf "P: %s %s %s\n" $now $end "$PROGRESS_WHAT" >&3
>-	fi
>-}
>-
>-dpkg_progress () {
>-	# <now> <end> <name> <desc> UNPACKING|CONFIGURING
>-	local now="$1"
>-	local end="$2"
>-	local name="$3"
>-	local desc="$4"
>-	local action="$5"
>-	local expect=
>-
>-	if [ "$action" = UNPACKING ]; then
>-		expect=half-installed
>-	elif [ "$action" = CONFIGURING ]; then
>-		expect=half-configured
>-	fi
>-
>-	dp () {
>-		now="$(($now + ${1:-1}))"
>-	}
>-
>-	exitcode=0
>-	while read status pkg qstate; do
>-		if [ "$status" = "EXITCODE" ]; then
>-			exitcode="$pkg"
>-			continue
>-		fi
>-		[ "$qstate" = "$expect" ] || continue
>-		case $qstate in
>-		    half-installed)
>-			dp; progress "$now" "$end" "$name" "$desc"
>-			info "$action" "Unpacking %s..." "${pkg%:}"
>-			expect=unpacked
>-			;;
>-		    unpacked)
>-			expect=half-installed
>-			;;
>-		    half-configured)
>-			dp; progress "$now" "$end" "$name" "$desc"
>-			info "$action" "Configuring %s..." "${pkg%:}"
>-			expect=installed
>-			;;
>-		    installed)
>-			expect=half-configured
>-			;;
>-		esac
>-	done
>-	return $exitcode
>-}
>-
>-############################################################# set variables
>-
>-default_mirror () {
>-	DEF_MIRROR="$1"
>-}
>-
>-FINDDEBS_NEEDS_INDICES=false
>-finddebs_style () {
>-	case "$1" in
>-	    hardcoded)
>-		;;
>-	    from-indices)
>-		FINDDEBS_NEEDS_INDICES=true
>-		;;
>-	    *)
>-		error 1 BADFINDDEBS "unknown finddebs style"
>-		;;
>-	 esac
>-}
>-
>-mk_download_dirs () {
>-	if [ $DLDEST = "apt_dest" ]; then
>-		mkdir -p "$TARGET/$APTSTATE/lists/partial"
>-		mkdir -p "$TARGET/var/cache/apt/archives/partial"
>-	fi
>-}
>-
>-download_style () {
>-	case "$1" in
>-	    apt)
>-		if [ "$2" = "var-state" ]; then
>-			APTSTATE=var/state/apt
>-		else
>-			APTSTATE=var/lib/apt
>-		fi
>-		DLDEST=apt_dest
>-		export APTSTATE DLDEST DEBFOR
>-		;;
>-	    *)
>-		error 1 BADDLOAD "unknown download style"
>-		;;
>-	esac
>-}
>-
>-########################################################## variant handling
>-
>-doing_variant () {
>-	if [ "$1" = "$VARIANT" ]; then return 0; fi
>-	if [ "$1" = "-" ] && [ "$VARIANT" = "" ]; then return 0; fi
>-	return 1
>-}
>-
>-SUPPORTED_VARIANTS="-"
>-variants () {
>-	SUPPORTED_VARIANTS="$*"
>-	for v in $*; do
>-		if doing_variant "$v"; then return 0; fi
>-	done
>-	error 1 UNSUPPVARIANT "unsupported variant"
>-}
>-
>-################################################# work out names for things
>-
>-mirror_style () {
>-	case "$1" in
>-	    release)
>-		DOWNLOAD_INDICES=download_release_indices
>-		DOWNLOAD_DEBS=download_release
>-		;;
>-	    main)
>-		DOWNLOAD_INDICES=download_main_indices
>-		DOWNLOAD_DEBS=download_main
>-		;;
>-	    *)
>-		error 1 BADMIRROR "unknown mirror style"
>-		;;
>-	esac
>-	export DOWNLOAD_INDICES
>-	export DOWNLOAD_DEBS
>-}
>-
>-check_md5 () {
>-	# args: dest md5 size
>-	local expmd5="$2"
>-	local expsize="$3"
>-	relmd5=`md5sum < "$1" | sed 's/ .*$//'`
>-	relsize=`wc -c < "$1"`
>-	if [ "$expsize" -ne "$relsize" ] || [ "$expmd5" != "$relmd5" ]; then
>-		return 1
>-	fi
>-	return 0
>-}
>-
>-get () {
>-	# args: from dest 'nocache'
>-	# args: from dest [md5sum size] [alt {md5sum size type}]
>-	local displayname
>-	if [ "${2%.deb}" != "$2" ]; then
>-		displayname="$(echo "$2" | sed 's,^.*/,,;s,_.*$,,')"
>-	else
>-		displayname="$(echo "$1" | sed 's,^.*/,,')"
>-	fi
>-
>-	if [ -e "$2" ]; then
>-		if [ -z "$3" ]; then
>-			return 0
>-		elif [ "$3" = nocache ]; then
>-			rm -f "$2"
>-		else
>-			info VALIDATING "Validating %s" "$displayname"
>-			if check_md5 "$2" "$3" "$4"; then
>-				return 0
>-			else
>-				rm -f "$2"
>-			fi
>-		fi
>-	fi
>-	# Drop 'nocache' option
>-	if [ "$3" = nocache ]; then
>-		set "$1" "$2"
>-	fi
>-
>-	if [ "$#" -gt 5 ]; then
>-		local st=3
>-		if [ "$5" = "-" ]; then st=6; fi
>-		local order="$(a=$st; while [ "$a" -le $# ]; do eval echo \"\${$(($a+1))}\" $a;
>-		a=$(($a + 3)); done | sort -n | sed 's/.* //')"
>-	else
>-		local order=3
>-	fi
>-	for a in $order; do
>-		local md5="$(eval echo \${$a})"
>-		local siz="$(eval echo \${$(( $a+1 ))})"
>-		local typ="$(eval echo \${$(( $a+2 ))})"
>-		local from
>-		local dest
>-
>-		case "$typ" in
>-		    bz2) from="$1.bz2"; dest="$2.bz2" ;;
>-		    gz)  from="$1.gz"; dest="$2.gz" ;;
>-		    *)   from="$1"; dest="$2" ;;
>-		esac
>-
>-		if [ "${dest#/}" = "$dest" ]; then
>-			dest="./$dest"
>-		fi
>-		local dest2="$dest"
>-		if [ -d "${dest2%/*}/partial" ]; then
>-			dest2="${dest2%/*}/partial/${dest2##*/}"
>-		fi
>-
>-		info RETRIEVING "Retrieving %s" "$displayname"
>-		if ! just_get "$from" "$dest2"; then continue; fi
>-		if [ "$md5" != "" ]; then
>-			info VALIDATING "Validating %s" "$displayname"
>-			if check_md5 "$dest2" "$md5" "$siz"; then
>-				md5=""
>-			fi
>-		fi
>-		if [ -z "$md5" ]; then
>-			[ "$dest2" = "$dest" ] || mv "$dest2" "$dest"
>-			case "$typ" in
>-			    gz)  gunzip "$dest" ;;
>-			    bz2) bunzip2 "$dest" ;;
>-			esac
>-			return 0
>-		else
>-			warning CORRUPTFILE "%s was corrupt" "$from"
>-		fi
>-	done
>-	return 1
>-}
>-
>-just_get () {
>-	# args: from dest
>-	local from="$1"
>-	local dest="$2"
>-	mkdir -p "${dest%/*}"
>-	if [ "${from#null:}" != "$from" ]; then
>-		error 1 NOTPREDL "%s was not pre-downloaded" "${from#null:}"
>-	elif [ "${from#http://}" != "$from" ] || [ "${from#ftp://}" != "$from" ]; then
>-		# http/ftp mirror
>-		if wgetprogress -O "$dest" "$from"; then
>-			return 0
>-		elif [ -s "$dest" ]; then
>-			local iters=0
>-			while [ "$iters" -lt 3 ]; do
>-				warning RETRYING "Retrying failed download of %s" "$from"
>-				if wgetprogress -c -O "$dest" "$from"; then break; fi
>-				iters="$(($iters + 1))"
>-			done
>-		else
>-			rm -f "$dest"
>-			return 1
>-		fi
>-	elif [ "${from#https://}" != "$from" ] ; then
>-		# http/ftp mirror
>-		if wgetprogress $CHECKCERTIF $CERTIFICATE $PRIVATEKEY -O "$dest" "$from"; then
>-			return 0
>-		elif [ -s "$dest" ]; then
>-			local iters=0
>-			while [ "$iters" -lt 3 ]; do
>-				warning RETRYING "Retrying failed download of %s" "$from"
>-				if wgetprogress $CHECKCERTIF $CERTIFICATE $PRIVATEKEY -c -O "$dest" "$from"; then break; fi
>-				iters="$(($iters + 1))"
>-			done
>-		else
>-			rm -f "$dest"
>-			return 1
>-		fi
>-	elif [ "${from#file:}" != "$from" ]; then
>-		local base="${from#file:}"
>-		if [ "${base#//}" != "$base" ]; then
>-			base="/${from#file://*/}"
>-		fi
>-		if [ -e "$base" ]; then
>-			cp "$base" "$dest"
>-			return 0
>-		else
>-			return 1
>-		fi
>-	elif [ "${from#ssh:}" != "$from" ]; then
>-		local ssh_dest="$(echo $from | sed -e 's#ssh://##' -e 's#/#:/#')"
>-		if [ -n "$ssh_dest" ]; then
>-			scp "$ssh_dest" "$dest"
>-			return 0
>-		else
>-			return 1
>-		fi
>-	else
>-		error 1 UNKNOWNLOC "unknown location %s" "$from"
>-	fi
>-}
>-
>-download () {
>-	mk_download_dirs
>-	"$DOWNLOAD_DEBS" $(echo "$@" | tr ' ' '\n' | sort)
>-}
>-
>-download_indices () {
>-	mk_download_dirs
>-	"$DOWNLOAD_INDICES" $(echo "$@" | tr ' ' '\n' | sort)
>-}
>-
>-debfor () {
>-	(while read pkg path; do
>-		for p in "$@"; do
>-			[ "$p" = "$pkg" ] || continue;
>-			echo "$path"
>-		done
>-	 done <"$TARGET/debootstrap/debpaths"
>-	)
>-}
>-
>-apt_dest () {
>-	# args:
>-	#   deb package version arch mirror path
>-	#   pkg suite component arch mirror path
>-	#   rel suite mirror path
>-	case "$1" in
>-	    deb)
>-		echo "/var/cache/apt/archives/${2}_${3}_${4}.deb" | sed 's/:/%3a/'
>-		;;
>-	    pkg)
>-		local m="$5"
>-		m="debootstrap.invalid"
>-		#if [ "${m#http://}" != "$m" ]; then
>-		#	m="${m#http://}"
>-		#elif [ "${m#file://}" != "$m" ]; then
>-		#	m="file_localhost_${m#file://*/}"
>-		#elif [ "${m#file:/}" != "$m" ]; then
>-		#	m="file_localhost_${m#file:/}"
>-		#fi
>-
>-		printf "%s" "$APTSTATE/lists/"
>-		echo "${m}_$6" | sed 's/\//_/g'
>-		;;
>-	    rel)
>-		local m="$3"
>-		m="debootstrap.invalid"
>-		#if [ "${m#http://}" != "$m" ]; then
>-		#	m="${m#http://}"
>-		#elif [ "${m#file://}" != "$m" ]; then
>-		#	m="file_localhost_${m#file://*/}"
>-		#elif [ "${m#file:/}" != "$m" ]; then
>-		#	m="file_localhost_${m#file:/}"
>-		#fi
>-		printf "%s" "$APTSTATE/lists/"
>-		echo "${m}_$4" | sed 's/\//_/g'
>-		;;
>-	esac
>-}
>-
>-################################################################## download
>-
>-get_release_md5 () {
>-	local reldest="$1"
>-	local path="$2"
>-	sed -n '/^[Mm][Dd]5[Ss][Uu][Mm]/,/^[^ ]/p' < "$reldest" | \
>-		while read a b c; do
>-			if [ "$c" = "$path" ]; then echo "$a $b"; fi
>-		done | head -n 1
>-}
>-
>-download_release_sig () {
>-	local m1="$1"
>-	local reldest="$2"
>-	local relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release.gpg")"
>-
>-	if [ -n "$KEYRING" ]; then
>-		progress 0 100 DOWNRELSIG "Downloading Release file signature"
>-		progress_next 50
>-		get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache ||
>-			error 1 NOGETRELSIG "Failed getting release signature file %s" \
>-			"$m1/dists/$SUITE/Release.gpg"
>-		progress 50 100 DOWNRELSIG "Downloading Release file signature"
>-
>-		info RELEASESIG "Checking Release signature"
>-		# Don't worry about the exit status from gpgv; parsing the output will
>-		# take care of that.
>-		(gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
>-		 "$relsigdest" "$reldest" || true) | read_gpg_status
>-		progress 100 100 DOWNRELSIG "Downloading Release file signature"
>-	fi
>-}
>-
>-download_release_indices () {
>-	local m1="${MIRRORS%% *}"
>-	local reldest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release")"
>-	progress 0 100 DOWNREL "Downloading Release file"
>-	progress_next 100
>-	get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
>-		error 1 NOGETREL "Failed getting release file %s" "$m1/dists/$SUITE/Release"
>-
>-	TMPCOMPONENTS="$(sed -n 's/Components: *//p' "$reldest")"
>-	for c in $TMPCOMPONENTS ; do
>-		eval "
>-		case \"\$c\" in
>-		    $USE_COMPONENTS)
>-			COMPONENTS=\"\$COMPONENTS \$c\"
>-			;;
>-		esac
>-		"
>-	done
>-	COMPONENTS="$(echo $COMPONENTS)"
>-
>-	if [ -z "$COMPONENTS" ]; then
>-		mv "$reldest" "$reldest.malformed"
>-		error 1 INVALIDREL "Invalid Release file, no valid components"
>-	fi
>-	progress 100 100 DOWNREL "Downloading Release file"
>-
>-	download_release_sig "$m1" "$reldest"
>-
>-	local totalpkgs=0
>-	for c in $COMPONENTS; do
>-		local subpath="$c/binary-$ARCH/Packages"
>-		local bz2md="`get_release_md5 "$reldest" "$subpath.bz2"`"
>-		local gzmd="`get_release_md5 "$reldest" "$subpath.gz"`"
>-		local normmd="`get_release_md5 "$reldest" "$subpath"`"
>-		local md=
>-		if [ "$normmd" != "" ]; then
>-			md="$normmd"
>-		elif [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then
>-			md="$bz2md"
>-		elif [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then
>-			md="$gzmd"
>-		fi
>-		if [ "$md" != "" ]; then
>-			totalpkgs="$(( $totalpkgs + ${md#* } ))"
>-		else
>-			mv "$reldest" "$reldest.malformed"
>-			error 1 MISSINGRELENTRY "Invalid Release file, no entry for %s" "$subpath"
>-		fi
>-	done
>-
>-	local donepkgs=0
>-	local pkgdest
>-	progress 0 $totalpkgs DOWNPKGS "Downloading Packages files"
>-	for c in $COMPONENTS; do
>-		local subpath="$c/binary-$ARCH/Packages"
>-		local path="dists/$SUITE/$subpath"
>-		local bz2md="`get_release_md5 "$reldest" "$subpath.bz2"`"
>-		local gzmd="`get_release_md5 "$reldest" "$subpath.gz"`"
>-		local normmd="`get_release_md5 "$reldest" "$subpath"`"
>-		local ext=
>-		local md=
>-		if [ "$normmd" != "" ]; then
>-			ext="$ext $normmd ."
>-			md="$normmd"
>-		fi
>-		if [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then
>-			ext="$ext $bz2md bz2"
>-			md="${md:-$bz2md}"
>-		fi
>-		if [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then
>-			ext="$ext $gzmd gz"
>-			md="${md:-$gzmd}"
>-		fi
>-		progress_next "$(($donepkgs + ${md#* }))"
>-		for m in $MIRRORS; do
>-			pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if get "$m/$path" "$pkgdest" $ext; then break; fi
>-		done
>-		if [ ! -f "$pkgdest" ]; then
>-			error 1 COULDNTDL "Couldn't download %s" "$path"
>-		fi
>-		donepkgs="$(($donepkgs + ${md#* }))"
>-		progress $donepkgs $totalpkgs DOWNPKGS "Downloading Packages files"
>-	done
>-}
>-
>-get_package_sizes () {
>-	# mirror pkgdest debs..
>-	local m="$1"; shift
>-	local pkgdest="$1"; shift
>-	$PKGDETAILS PKGS "$m" "$pkgdest" "$@" | (
>-		newleft=""
>-		totaldebs=0
>-		countdebs=0
>-		while read p details; do
>-			if [ "$details" = "-" ]; then
>-				newleft="$newleft $p"
>-			else
>-				size="${details##* }";
>-				totaldebs="$(($totaldebs + $size))"
>-				countdebs="$(($countdebs + 1))"
>-			fi
>-		done
>-		echo "$countdebs $totaldebs$newleft"
>-	)
>-}
>-
>-# note, leftovers come back on fd5 !!
>-download_debs () {
>-	local m="$1"
>-	local pkgdest="$2"
>-	shift; shift
>-
>-	$PKGDETAILS PKGS "$m" "$pkgdest" "$@" | (
>-		leftover=""
>-		while read p ver arc mdup fil md5 size; do
>-			if [ "$ver" = "-" ]; then
>-				leftover="$leftover $p"
>-			else
>-				progress_next "$(($dloaddebs + $size))"
>-				local debdest="$($DLDEST deb "$p" "$ver" "$arc" "$m" "$fil")"
>-				if get "$m/$fil" "$TARGET/$debdest" "$md5" "$size"; then
>-					dloaddebs="$(($dloaddebs + $size))"
>-					echo >>$TARGET/debootstrap/debpaths "$p $debdest"
>-				else
>-					warning COULDNTDL "Couldn't download package %s" "$p"
>-				fi
>-			fi
>-		done
>-		echo >&5 ${leftover# }
>-	)
>-}
>-
>-download_release () {
>-	local m1="${MIRRORS%% *}"
>-
>-	local numdebs="$#"
>-
>-	local countdebs=0
>-	progress $countdebs $numdebs SIZEDEBS "Finding package sizes"
>-
>-	local totaldebs=0
>-	local leftoverdebs="$*"
>-	for c in $COMPONENTS; do
>-		if [ "$countdebs" -ge "$numdebs" ]; then break; fi
>-
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-		if [ ! -e "$pkgdest" ]; then continue; fi
>-
>-		info CHECKINGSIZES "Checking component %s on %s..." "$c" "$m1"
>-
>-		leftoverdebs="$(get_package_sizes "$m1" "$pkgdest" $leftoverdebs)"
>-
>-		countdebs=$(($countdebs + ${leftoverdebs%% *}))
>-		leftoverdebs=${leftoverdebs#* }
>-
>-		totaldebs=${leftoverdebs%% *}
>-		leftoverdebs=${leftoverdebs#* }
>-
>-		progress $countdebs $numdebs SIZEDEBS "Finding package sizes"
>-	done
>-
>-	if [ "$countdebs" -ne "$numdebs" ]; then
>-		error 1 LEFTOVERDEBS "Couldn't find these debs: %s" "$leftoverdebs"
>-	fi
>-
>-	local dloaddebs=0
>-
>-	progress $dloaddebs $totaldebs DOWNDEBS "Downloading packages"
>-	:>$TARGET/debootstrap/debpaths
>-
>-	pkgs_to_get="$*"
>-	for c in $COMPONENTS; do
>-	    local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-	    for m in $MIRRORS; do
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-		if [ ! -e "$pkgdest" ]; then continue; fi
>-		pkgs_to_get="$(download_debs "$m" "$pkgdest" $pkgs_to_get 5>&1 1>&6)"
>-		if [ -z "$pkgs_to_get" ]; then break; fi
>-	    done 6>&1
>-	    if [ -z "$pkgs_to_get" ]; then break; fi
>-	done
>-	progress $dloaddebs $totaldebs DOWNDEBS "Downloading packages"
>-	if [ "$pkgs_to_get" != "" ]; then
>-		error 1 COULDNTDLPKGS "Couldn't download packages: %s" "$pkgs_to_get"
>-	fi
>-}
>-
>-download_main_indices () {
>-	local m1="${MIRRORS%% *}"
>-	local comp="${USE_COMPONENTS}"
>-	progress 0 100 DOWNMAINPKGS "Downloading Packages file"
>-	progress_next 100
>-
>-	if [ -z "$comp" ]; then comp=main; fi
>-	COMPONENTS="$(echo $comp | tr '|' ' ')"
>-
>-	export COMPONENTS
>-	for m in $MIRRORS; do
>-	    for c in $COMPONENTS; do
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-		if [ -x /bin/gunzip ] && get "$m/${path}.gz" "${pkgdest}.gz"; then
>-			rm -f "$pkgdest"
>-			gunzip "$pkgdest.gz"
>-		elif get "$m/$path" "$pkgdest"; then
>-			true
>-		fi
>-	    done
>-	done
>-	progress 100 100 DOWNMAINPKGS "Downloading Packages file"
>-}
>-
>-download_main () {
>-	local m1="${MIRRORS%% *}"
>-
>-	:>$TARGET/debootstrap/debpaths
>-	for p in "$@"; do
>-	    for c in $COMPONENTS; do
>-		local details=""
>-		for m in $MIRRORS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if [ ! -e "$pkgdest" ]; then continue; fi
>-			details="$($PKGDETAILS PKGS "$m" "$pkgdest" "$p")"
>-			if [ "$details" = "$p -" ]; then
>-				details=""
>-				continue
>-			fi
>-			size="${details##* }"; details="${details% *}"
>-			md5="${details##* }"; details="${details% *}"
>-			local debdest="$($DLDEST deb $details)"
>-			if get "$m/${details##* }" "$TARGET/$debdest" "$md5" "$size"; then
>-				echo >>$TARGET/debootstrap/debpaths "$p $debdest"
>-				details="done"
>-				break
>-			fi
>-		done
>-		if [ "$details" != "" ]; then
>-			break
>-		fi
>-	    done
>-	    if [ "$details" != "done" ]; then
>-		error 1 COULDNTDL "Couldn't download %s" "$p"
>-	    fi
>-	done
>-}
>-
>-###################################################### deb choosing support
>-
>-get_debs () {
>-	local field="$1"
>-	shift
>-	local m1 c
>-	for m1 in $MIRRORS; do
>-		for c in $COMPONENTS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-			echo $("$PKGDETAILS" FIELD "$field" "$m1" "$pkgdest" "$@" | sed 's/ .*//')
>-		done
>-	done
>-}
>-
>-################################################################ extraction
>-
>-EXTRACTORS_SUPPORTED="dpkg-deb ar"
>-
>-# Native dpkg-deb based extractors
>-extract_dpkg_deb_field () {
>-	local pkg="$1"
>-	local field="$2"
>-
>-	dpkg-deb -f "$pkg" "$field"
>-}
>-
>-extract_dpkg_deb_data () {
>-	local pkg="$1"
>-
>-	dpkg-deb --fsys-tarfile "$pkg" | tar -xf -
>-}
>-
>-# Raw .deb extractors
>-extract_ar_deb_field () {
>-	local pkg="$1"
>-	local field="$2"
>-
>-	ar -p "$pkg" control.tar.gz | zcat |
>-	    tar -O -xf - control ./control 2>/dev/null |
>-	    grep -i "^$field:" | sed -e 's/[^:]*: *//' | head -n 1
>-}
>-
>-extract_ar_deb_data () {
>-	local pkg="$1"
>-	local tarball=$(ar -t "$pkg" | grep "^data.tar.[bgx]z")
>-
>-	case "$tarball" in
>-		data.tar.gz) cat_cmd=zcat ;;
>-		data.tar.bz2) cat_cmd=bzcat ;;
>-		data.tar.xz) cat_cmd=xzcat ;;
>-		*) error 1 UNKNOWNDATACOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;;
>-	esac
>-
>-	if type $cat_cmd >/dev/null 2>&1; then
>-		ar -p "$pkg" "$tarball" | $cat_cmd | tar -xf -
>-	else
>-		error 1 UNPACKCMDUNVL "The $cat_cmd is not available on the system"
>-	fi
>-}
>-
>-valid_extractor () {
>-	local extractor="$1"
>-
>-	for E in $EXTRACTORS_SUPPORTED; do
>-		if [ "$extractor" = "$E" ]; then
>-			return 0
>-		fi
>-	done
>-
>-	return 1
>-}
>-
>-choose_extractor () {
>-	local extractor
>-
>-	if [ -n "$EXTRACTOR_OVERRIDE" ]; then
>-		extractor="$EXTRACTOR_OVERRIDE"
>-	elif type dpkg-deb >/dev/null 2>&1; then
>-		extractor="dpkg-deb"
>-	else
>-		extractor="ar"
>-	fi
>-
>-	info CHOSENEXTRACTOR "Chosen extractor for .deb packages: %s" "$extractor"
>-	case "$extractor" in
>-	dpkg-deb)
>-		extract_deb_field () { extract_dpkg_deb_field "$@"; }
>-		extract_deb_data () { extract_dpkg_deb_data "$@"; }
>-		;;
>-	ar)
>-		extract_deb_field () { extract_ar_deb_field "$@"; }
>-		extract_deb_data () { extract_ar_deb_data "$@"; }
>-		;;
>-	esac
>-}
>-
>-extract () { (
>-	cd "$TARGET"
>-	local p=0 cat_cmd
>-	for pkg in $(debfor "$@"); do
>-		p="$(($p + 1))"
>-		progress "$p" "$#" EXTRACTPKGS "Extracting packages"
>-		packagename="$(echo "$pkg" | sed 's,^.*/,,;s,_.*$,,')"
>-		info EXTRACTING "Extracting %s..." "$packagename"
>-		extract_deb_data "./$pkg"
>-	done
>-); }
>-
>-in_target_nofail () {
>-	if ! $CHROOT_CMD "$@" 2>/dev/null; then
>-		true
>-	fi
>-	return 0
>-}
>-
>-in_target_failmsg () {
>-	local code="$1"
>-	local msg="$2"
>-	local arg="$3"
>-	shift; shift; shift
>-	if ! $CHROOT_CMD "$@"; then
>-		warning "$code" "$msg" "$arg"
>-		return 1
>-	fi
>-	return 0
>-}
>-
>-in_target () {
>-	in_target_failmsg IN_TARGET_FAIL "Failure trying to run: %s" "$CHROOT_CMD $*" "$@"
>-}
>-
>-###################################################### standard setup stuff
>-
>-conditional_cp () {
>-	if [ ! -e "$2/$1" ]; then
>-		if [ -L "$1" ] && [ -e "$1" ]; then
>-			cat "$1" >"$2/$1"
>-		elif [ -e "$1" ]; then
>-			cp -a "$1" "$2/$1"
>-		fi
>-	fi
>-}
>-
>-mv_invalid_to () {
>-	local m="$1"
>-	m="$(echo "${m#http://}" | tr '/' '_' | sed 's/_*//')"
>-	(cd "$TARGET/$APTSTATE/lists"
>-	 for a in debootstrap.invalid_*; do
>-		 mv "$a" "${m}_${a#*_}"
>-	 done
>-	)
>-}
>-
>-setup_apt_sources () {
>-	mkdir -p "$TARGET/etc/apt"
>-	for m in "$@"; do
>-		local cs=""
>-		for c in $COMPONENTS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if [ -e "$pkgdest" ]; then cs="$cs $c"; fi
>-		done
>-		if [ "$cs" != "" ]; then echo "deb $m $SUITE$cs"; fi
>-	done > "$TARGET/etc/apt/sources.list"
>-}
>-
>-setup_etc () {
>-	mkdir -p "$TARGET/etc"
>-
>-	conditional_cp /etc/resolv.conf "$TARGET"
>-	conditional_cp /etc/hostname "$TARGET"
>-
>-	if [ "$DLDEST" = apt_dest ] && [ ! -e "$TARGET/etc/apt/sources.list" ]; then
>-		setup_apt_sources "http://debootstrap.invalid/"
>-	fi
>-}
>-
>-UMOUNT_DIRS=
>-
>-umount_exit_function () {
>-	for dir in $UMOUNT_DIRS; do
>-		umount "$TARGET/${dir#/}" || true
>-	done
>-}
>-
>-umount_on_exit () {
>-	if [ "$UMOUNT_DIRS" ]; then
>-		UMOUNT_DIRS="$UMOUNT_DIRS $1"
>-	else
>-		UMOUNT_DIRS="$1"
>-		on_exit umount_exit_function
>-	fi
>-}
>-
>-clear_mtab () {
>-	if [ -f "$TARGET/etc/mtab" ] && [ ! -h "$TARGET/etc/mtab" ]; then
>-		rm -f "$TARGET/etc/mtab"
>-	fi
>-}
>-
>-setup_proc () {
>-	case "$ARCH" in
>-	    kfreebsd-*)
>-		umount_on_exit /dev
>-		umount_on_exit /proc
>-		umount "$TARGET/proc" 2>/dev/null || true
>-		in_target mount -t linprocfs proc /proc
>-		;;
>-	    hurd-*)
>-		;;
>-	    *)
>-		umount_on_exit /dev/pts
>-		umount_on_exit /dev/shm
>-		umount_on_exit /proc/bus/usb
>-		umount_on_exit /proc
>-		umount "$TARGET/proc" 2>/dev/null || true
>-		in_target mount -t proc proc /proc
>-		if [ -d "$TARGET/sys" ] && \
>-		   grep -q '[[:space:]]sysfs' /proc/filesystems 2>/dev/null; then
>-			umount_on_exit /sys
>-			umount "$TARGET/sys" 2>/dev/null || true
>-			in_target mount -t sysfs sysfs /sys
>-		fi
>-		on_exit clear_mtab
>-		;;
>-	esac
>-	umount_on_exit /lib/init/rw
>-}
>-
>-setup_proc_fakechroot () {
>-	rm -rf "$TARGET/proc"
>-	ln -s /proc "$TARGET"
>-}
>-
>-setup_devices () {
>-	case "$ARCH" in
>-	    kfreebsd-*)
>-		in_target mount -t devfs devfs /dev ;;
>-	    hurd-*)
>-		setup_devices_hurd ;;
>-	    *)
>-		if [ -e "$DEVICES_TARGZ" ]; then
>-			zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -)
>-		else
>-			if [ -e /dev/.devfsd ] ; then
>-				in_target mount -t devfs devfs /dev
>-			else
>-				error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"
>-			fi
>-		fi
>-		;;
>-	esac
>-}
>-
>-setup_devices_hurd () {
>-	mkdir -p "$TARGET/servers/socket"
>-	/bin/settrans -cfk "$TARGET/servers/socket/1" /hurd/pflocal
>-	/bin/settrans -cf "$TARGET/servers/socket/2" /hurd/pfinet
>-	/bin/settrans -cfk "$TARGET/servers/exec" /hurd/exec
>-	/bin/settrans -cf "$TARGET/servers/crash-suspend" /hurd/crash --suspend
>-	/bin/settrans -cf "$TARGET/servers/crash-kill" /hurd/crash --kill
>-	/bin/settrans -cf "$TARGET/servers/crash-dump-core" /hurd/crash --dump-core
>-	/bin/settrans -cf "$TARGET/servers/password" /hurd/password
>-	/bin/settrans -cf "$TARGET/servers/default-pager" /hurd/proxy-defpager
>-	ln -fs crash-kill "$TARGET/servers/crash"
>-	ln -fs 1 "$TARGET/servers/socket/local"
>-	ln -fs 2 "$TARGET/servers/socket/inet"
>-	(cd "$TARGET/dev"; /sbin/MAKEDEV fd std ptyp ptyq vcs tty1 tty2 tty3 tty4 tty5 tty6)
>-}
>-
>-setup_devices_fakechroot () {
>-	rm -rf "$TARGET/dev"
>-	ln -s /dev "$TARGET"
>-}
>-
>-setup_dselect_method () {
>-	case "$1" in
>-	    apt)
>-		mkdir -p "$TARGET/var/lib/dpkg"
>-		echo "apt apt" > "$TARGET/var/lib/dpkg/cmethopt"
>-		chmod 644 "$TARGET/var/lib/dpkg/cmethopt"
>-		;;
>-	    *)
>-		error 1 UNKNOWNDSELECT "unknown dselect method"
>-		;;
>-	esac
>-}
>-
>-################################################################ pkgdetails
>-
>-# NOTE
>-# For the debootstrap udeb, pkgdetails is provided by the bootstrap-base
>-# udeb, so the pkgdetails API needs to be kept in sync with that.
>-
>-if [ -x /usr/bin/perl ]; then
>-	PKGDETAILS=pkgdetails_perl
>-
>-	pkgdetails_field () {
>-		# uniq field mirror Packages values...
>-		perl -le '
>-$unique = shift @ARGV; $field = lc(shift @ARGV); $mirror = shift @ARGV;
>-$cnt = length(@ARGV);
>-%fields = map { $_, 0 } @ARGV;
>-while (<STDIN>) {
>-	chomp;
>-	next if (/^ /);
>-	if (/^([^:]*:)\s*(.*)$/) {
>-		$f = lc($1); $v = $2;
>-		$pkg = $v if ($f eq "package:");
>-		$ver = $v if ($f eq "version:");
>-		$arc = $v if ($f eq "architecture:");
>-		$fil = $v if ($f eq "filename:");
>-		$md5 = $v if ($f eq "md5sum:");
>-		$siz = $v if ($f eq "size:");
>-		$val = $v if ($f eq $field);
>-	} elsif (/^$/) {
>-		if (defined $val && defined $fields{$val}) {
>-			$cnt++;
>-			printf "%s %s %s %s %s %s %s\n",
>-			 $pkg, $ver, $arc, $mirror, $fil, $md5, $siz;
>-			if ($unique) {
>-				delete $fields{$val};
>-				last if (--$cnt <= 0);
>-			}
>-		}
>-		undef $val;
>-	}
>-}
>-for $v (keys %fields) {
>-	printf ("%s -\n", $v) if ($unique);
>-}
>-' "$@"
>-	}
>-
>-	pkgdetails_perl () {
>-		if [ "$1" = "WGET%" ]; then
>-			shift;
>-			perl -e '
>-$v = 0;
>-while (read STDIN, $x, 1) {
>-	if ($x =~ m/\d/) {
>-		$v *= 10;
>-		$v += $x;
>-	} elsif ($x eq "%") {
>-		printf "P: %d %d%s\n", int($v / 100.0 * ($ARGV[1] - $ARGV[0]) + $ARGV[0]), $ARGV[2], ($#ARGV == 3 ? " $ARGV[3]" : "");
>-		$v = 0;
>-	} else {
>-		$v = 0;
>-	}
>-}' "$@"
>-		elif [ "$1" = "GETDEPS" ]; then
>-			local pkgdest="$2"; shift; shift
>-			perl -e '
>-while (<STDIN>) {
>-	chomp;
>-	$in = 1 if (/^Package: (.*)$/ && grep {$_ eq $1} @ARGV);
>-	$in = 0 if (/^$/);
>-	if ($in and (/^Depends: (.*)$/ or /^Pre-Depends: (.*)$/)) {
>-		for $d (split /\s*,\s*/, $1) {
>-			$d =~ s/\s*[|].*$//;
>-			$d =~ s/\s*[(].*[)]\s*//;
>-			print "$d\n";
>-		}
>-	}
>-}' <"$pkgdest" "$@" | sort | uniq
>-		elif [ "$1" = "PKGS" ]; then
>-			local m="$2"
>-			local p="$3"
>-			shift; shift; shift
>-			pkgdetails_field 1 Package: "$m" "$@" < "$p"
>-		elif [ "$1" = "FIELD" ]; then
>-			local f="$2"
>-			local m="$3"
>-			local p="$4"
>-			shift; shift; shift; shift
>-			pkgdetails_field 0 "$f" "$m" "$@" < "$p"
>-		elif [ "$1" = "STANZAS" ]; then
>-			local pkgdest="$2"; shift; shift
>-			perl -e '
>-my $accum = "";
>-while (<STDIN>) {
>-	$accum .= $_;
>-	$in = 1 if (/^Package: (.*)$/ && grep {$_ eq $1} @ARGV);
>-	if ($in and /^$/) {
>-		print $accum;
>-		if (substr($accum, -1) != "\n") {
>-			print "\n\n";
>-		} elsif (substr($accum, -2, 1) != "\n") {
>-			print "\n";
>-		}
>-		$in = 0;
>-	}
>-	$accum = "" if /^$/;
>-}' <"$pkgdest" "$@"
>-		fi
>-	}
>-elif [ -e "/usr/lib/debootstrap/pkgdetails" ]; then
>-	PKGDETAILS="/usr/lib/debootstrap/pkgdetails"
>-elif [ -e "$DEBOOTSTRAP_DIR/pkgdetails" ]; then
>-	PKGDETAILS="$DEBOOTSTRAP_DIR/pkgdetails"
>-else
>-	PKGDETAILS=""
>-fi
>-
>-##################################################### dependency resolution
>-
>-resolve_deps () {
>-	local m1="${MIRRORS%% *}"
>-
>-	# XXX: I can't think how to deal well with dependency resolution and
>-	#      lots of Packages files. -- aj 2005/06/12
>-
>-	c="${COMPONENTS%% *}"
>-	local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-	local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-
>-	local PKGS="$*"
>-	local ALLPKGS="$PKGS";
>-	local ALLPKGS2="";
>-	while [ "$PKGS" != "" ]; do
>-		PKGS=$("$PKGDETAILS" GETDEPS "$pkgdest" $PKGS)
>-		PKGS=$("$PKGDETAILS" PKGS REAL "$pkgdest" $PKGS | sed -n 's/ .*REAL.*$//p')
>-		ALLPKGS2=$(echo "$PKGS $ALLPKGS" | tr ' ' '\n' | sort | uniq)
>-		PKGS=$(without "$ALLPKGS2" "$ALLPKGS")
>-		ALLPKGS="$ALLPKGS2"
>-	done
>-	echo $ALLPKGS
>-}
>-
>-setup_available () {
>-	local m1="${MIRRORS%% *}"
>-
>-	for c in $COMPONENTS; do
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-		# XXX: What if a package is in more than one component?
>-		# -- cjwatson 2009-07-29
>-		"$PKGDETAILS" STANZAS "$pkgdest" "$@"
>-	done >"$TARGET/var/lib/dpkg/available"
>-
>-	for pkg; do
>-		echo "$pkg install"
>-	done | in_target dpkg --set-selections
>-}
>-
>-get_next_predep () {
>-	local stanza="$(in_target_nofail dpkg --predep-package)"
>-	[ "$stanza" ] || return 1
>-	echo "$stanza" | grep '^Package:' | sed 's/^Package://; s/^ *//'
>-}
>-
>-################################################################### helpers
>-
>-# Return zero if it is possible to create devices and execute programs in
>-# this directory. (Both may be forbidden by mount options, e.g. nodev and
>-# noexec respectively.)
>-check_sane_mount () {
>-	mkdir -p "$1"
>-
>-	case "$ARCH" in
>-	    kfreebsd-*|hurd-*)
>-		;;
>-	    *)
>-		mknod "$1/test-dev-null" c 1 3 || return 1
>-		if ! echo test > "$1/test-dev-null"; then
>-			rm -f "$1/test-dev-null"
>-			return 1
>-		fi
>-		rm -f "$1/test-dev-null"
>-		;;
>-	esac
>-
>-	cat > "$1/test-exec" <<EOF
>-#! /bin/sh
>-:
>-EOF
>-	chmod +x "$1/test-exec"
>-	if ! "$1/test-exec"; then
>-		rm -f "$1/test-exec"
>-		return 1
>-	fi
>-	rm -f "$1/test-exec"
>-
>-	return 0
>-}
>-
>-read_gpg_status () {
>-	badsig=
>-	unkkey=
>-	validsig=
>-	while read prefix keyword keyid rest; do
>-		[ "$prefix" = '[GNUPG:]' ] || continue
>-		case $keyword in
>-		    BADSIG)	badsig="$keyid" ;;
>-		    NO_PUBKEY)	unkkey="$keyid" ;;
>-		    VALIDSIG)	validsig="$keyid" ;;
>-		esac
>-	done
>-	if [ "$validsig" ]; then
>-		info VALIDRELSIG "Valid Release signature (key id %s)" "$validsig"
>-	elif [ "$badsig" ]; then
>-		error 1 BADRELSIG "Invalid Release signature (key id %s)" "$badsig"
>-	elif [ "$unkkey" ]; then
>-		error 1 UNKNOWNRELSIG "Release signed by unknown key (key id %s)" "$unkkey"
>-	else
>-		error 1 SIGCHECK "Error executing gpgv to check Release signature"
>-	fi
>-}
>-
>-without () {
>-	# usage:  without "a b c" "a d" -> "b" "c"
>-	(echo $1 | tr ' ' '\n' | sort | uniq;
>-	 echo $2 $2 | tr ' ' '\n') | sort | uniq -u | tr '\n' ' '
>-	echo
>-}
>-
>-# Formerly called 'repeat', but that's a reserved word in zsh.
>-repeatn () {
>-	local n="$1"
>-	shift
>-	while [ "$n" -gt 0 ]; do
>-		if "$@"; then
>-			break
>-		else
>-			n="$(( $n - 1 ))"
>-			sleep 1
>-		fi
>-	done
>-	if [ "$n" -eq 0 ]; then return 1; fi
>-	return 0
>-}
>-
>-N_EXIT_THINGS=0
>-exit_function () {
>-	local n=0
>-	while [ "$n" -lt "$N_EXIT_THINGS" ]; do
>-		(eval $(eval echo \${EXIT_THING_$n}) 2>/dev/null || true)
>-		n="$(( $n + 1 ))"
>-	done
>-	N_EXIT_THINGS=0
>-}
>-
>-trap "exit_function" 0
>-trap "exit 129" 1
>-trap "error 130 INTERRUPTED \"Interrupt caught ... exiting\"" 2
>-trap "exit 131" 3
>-trap "exit 143" 15
>-
>-on_exit () {
>-	eval `echo EXIT_THING_${N_EXIT_THINGS}=\"$1\"`
>-	N_EXIT_THINGS="$(( $N_EXIT_THINGS + 1 ))"
>-}
>-
>-############################################################## fakechroot tools
>-
>-install_fakechroot_tools () {
>-	mv "$TARGET/sbin/ldconfig" "$TARGET/sbin/ldconfig.REAL"
>-	echo \
>-"#!/bin/sh
>-echo
>-echo \"Warning: Fake ldconfig called, doing nothing\"" > "$TARGET/sbin/ldconfig"
>-	chmod 755 "$TARGET/sbin/ldconfig"
>-
>-	echo \
>-"/sbin/ldconfig
>-/sbin/ldconfig.REAL
>-fakechroot" >> "$TARGET/var/lib/dpkg/diversions"
>-
>-	mv "$TARGET/usr/bin/ldd" "$TARGET/usr/bin/ldd.REAL"
>-	cat << 'END' > "$TARGET/usr/bin/ldd"
>-#!/usr/bin/perl
>-
>-# fakeldd
>-#
>-# Replacement for ldd with usage of objdump
>-#
>-# (c) 2003-2005 Piotr Roszatycki <dexter@debian.org>, BSD
>-
>-
>-my %libs = ();
>-
>-my $status = 0;
>-my $dynamic = 0;
>-my $biarch = 0;
>-
>-my $ldlinuxsodir = "/lib";
>-my @ld_library_path = qw(/usr/lib /lib);
>-
>-
>-sub ldso($) {
>-	my ($lib) = @_;
>-	my @files = ();
>-
>-	if ($lib =~ /^\//) {
>-	    $libs{$lib} = $lib;
>-	    push @files, $lib;
>-	} else {
>-	    foreach my $ld_path (@ld_library_path) {
>-		next unless -f "$ld_path/$lib";
>-		my $badformat = 0;
>-		open OBJDUMP, "objdump -p $ld_path/$lib 2>/dev/null |";
>-	 	while (my $line = <OBJDUMP>) {
>-		    if ($line =~ /file format (\S*)$/) {
>-				$badformat = 1 unless $format eq $1;
>-				last;
>-		    }
>-		}
>-		close OBJDUMP;
>-		next if $badformat;
>-		$libs{$lib} = "$ld_path/$lib";
>-		push @files, "$ld_path/$lib";
>-	    }
>-	    objdump(@files);
>-	}
>-}
>-
>-
>-sub objdump(@) {
>-	my (@files) = @_;
>-	my @libs = ();
>-
>-	foreach my $file (@files) {
>-	    open OBJDUMP, "objdump -p $file 2>/dev/null |";
>-	    while (my $line = <OBJDUMP>) {
>-		$line =~ s/^\s+//;
>-		my @f = split (/\s+/, $line);
>-		if ($line =~ /file format (\S*)$/) {
>-		    if (not $format) {
>-			$format = $1;
>-			if ($unamearch eq "x86_64" and $format eq "elf32-i386") {
>-			    my $link = readlink "/lib/ld-linux.so.2";
>-			    if ($link =~ /^\/emul\/ia32-linux\//) {
>-				$ld_library_path[-2] = "/emul/ia32-linux/usr/lib";
>-				$ld_library_path[-1] = "/emul/ia32-linux/lib";
>-			    }
>-			} elsif ($unamearch =~ /^(sparc|sparc64)$/ and $format eq "elf64-sparc") {
>-			    $ldlinuxsodir = "/lib64";
>-			    $ld_library_path[-2] = "/usr/lib64";
>-			    $ld_library_path[-1] = "/lib64";
>-			}
>-		    } else {
>-			next unless $format eq $1;
>-		    }
>-		}
>-		if (not $dynamic and $f[0] eq "Dynamic") {
>-		    $dynamic = 1;
>-		}
>-		next unless $f[0] eq "NEEDED";
>-		if ($f[1] =~ /^ld-linux(\.|-)/) {
>-		    $f[1] = "$ldlinuxsodir/" . $f[1];
>-		}
>-		if (not defined $libs{$f[1]}) {
>-		    $libs{$f[1]} = undef;
>-		    push @libs, $f[1];
>-		}
>-	    }
>-	    close OBJDUMP;
>-	}
>-
>-	foreach my $lib (@libs) {
>-	    ldso($lib);
>-	}
>-}
>-
>-
>-if ($#ARGV < 0) {
>-	print STDERR "fakeldd: missing file arguments\n";
>-	exit 1;
>-}
>-
>-while ($ARGV[0] =~ /^-/) {
>-	my $arg = $ARGV[0];
>-	shift @ARGV;
>-	last if $arg eq "--";
>-}
>-
>-open LD_SO_CONF, "/etc/ld.so.conf";
>-while ($line = <LD_SO_CONF>) {
>-	chomp $line;
>-	unshift @ld_library_path, $line;
>-}
>-close LD_SO_CONF;
>-
>-unshift @ld_library_path, split(/:/, $ENV{LD_LIBRARY_PATH});
>-
>-$unamearch = `/bin/uname -m`;
>-chomp $unamearch;
>-
>-foreach my $file (@ARGV) {
>-	my $address;
>-	%libs = ();
>-	$dynamic = 0;
>-
>-	if ($#ARGV > 0) {
>-		print "$file:\n";
>-	}
>-
>-	if (not -f $file) {
>-		print STDERR "ldd: $file: No such file or directory\n";
>-		$status = 1;
>-		next;
>-	}
>-
>-	objdump($file);
>-
>-	if ($dynamic == 0) {
>-		print "\tnot a dynamic executable\n";
>-		$status = 1;
>-	} elsif (scalar %libs eq "0") {
>-		print "\tstatically linked\n";
>-	}
>-
>-	if ($format =~ /^elf64-/) {
>-		$address = "0x0000000000000000";
>-	} else {
>-		$address = "0x00000000";
>-	}
>-
>-	foreach $lib (keys %libs) {
>-		if ($libs{$lib}) {
>-			printf "\t%s => %s (%s)\n", $lib, $libs{$lib}, $address;
>-		} else {
>-			printf "\t%s => not found\n", $lib;
>-		}
>-	}
>-}
>-
>-exit $status;
>-END
>-	chmod 755 "$TARGET/usr/bin/ldd"
>-
>-	echo \
>-"/usr/bin/ldd
>-/usr/bin/ldd.REAL
>-fakechroot" >> "$TARGET/var/lib/dpkg/diversions"
>-
>-}
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/functions-ucs3 b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/functions-ucs3
>deleted file mode 100644
>index f0adc5c..0000000
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/functions-ucs3
>+++ /dev/null
>@@ -1,1462 +0,0 @@
>-############################################################### smallutils
>-
>-smallyes() {
>-	YES="${1-y}"
>-	while echo "$YES" 2>/dev/null ; do : ; done
>-}
>-
>-############################################################### interaction
>-
>-error () {
>-	# <error code> <name> <string> <args>
>-	local err="$1"
>-	local name="$2"
>-	local fmt="$3"
>-	shift; shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "E: $name"
>-		for x in "$@"; do echo "EA: $x"; done
>-		echo "EF: $fmt") >&4
>-	else
>-		(printf "E: $fmt\n" "$@") >&4
>-	fi
>-	exit $err
>-}
>-
>-warning () {
>-	# <name> <string> <args>
>-	local name="$1"
>-	local fmt="$2"
>-	shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "W: $name"
>-		for x in "$@"; do echo "WA: $x"; done
>-		echo "WF: $fmt") >&4
>-	else
>-		printf "W: $fmt\n" "$@" >&4
>-	fi
>-}
>-
>-info () {
>-	# <name> <string> <args>
>-	local name="$1"
>-	local fmt="$2"
>-	shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "I: $name"
>-		for x in "$@"; do echo "IA: $x"; done
>-		echo "IF: $fmt") >&4
>-	else
>-		printf "I: $fmt\n" "$@" >&4
>-	fi
>-}
>-
>-PROGRESS_NOW=0
>-PROGRESS_END=0
>-PROGRESS_NEXT=""
>-PROGRESS_WHAT=""
>-
>-progress_next () {
>-	PROGRESS_NEXT="$1"
>-}
>-
>-wgetprogress () {
>-	[ ! "$verbose" ] && QSWITCH="-q"
>-	local ret=0
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
>-		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3
>-		ret=$?
>-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
>-		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3
>-		ret=$?
>-	else
>-		wget $QSWITCH "$@" 
>-		ret=$?
>-	fi
>-	return $ret
>-}
>-
>-progress () {
>-	# <now> <end> <name> <string> <args>
>-	local now="$1"
>-	local end="$2"
>-	local name="$3"
>-	local fmt="$4"
>-	shift; shift; shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		PROGRESS_NOW="$now"
>-		PROGRESS_END="$end"
>-		PROGRESS_NEXT=""
>-		(echo "P: $now $end $name"
>-		for x in "$@"; do echo "PA: $x"; done
>-		echo "PF: $fmt") >&3
>-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ]; then
>-		PROGRESS_NOW="$now"
>-		PROGRESS_END="$end"
>-		PROGRESS_WHAT="`printf "$fmt" "$@"`"
>-		PROGRESS_NEXT=""
>-		printf "P: %s %s %s\n" $now $end "$PROGRESS_WHAT" >&3
>-	fi
>-}
>-
>-dpkg_progress () {
>-	# <now> <end> <name> <desc> UNPACKING|CONFIGURING
>-	local now="$1"
>-	local end="$2"
>-	local name="$3"
>-	local desc="$4"
>-	local action="$5"
>-	local expect=
>-
>-	if [ "$action" = UNPACKING ]; then
>-		expect=half-installed
>-	elif [ "$action" = CONFIGURING ]; then
>-		expect=half-configured
>-	fi
>-
>-	dp () {
>-		now="$(($now + ${1:-1}))"
>-	}
>-
>-	exitcode=0
>-	while read status pkg qstate; do
>-		if [ "$status" = "EXITCODE" ]; then
>-			exitcode="$pkg"
>-			continue
>-		fi
>-		[ "$qstate" = "$expect" ] || continue
>-		case $qstate in
>-		    half-installed)
>-			dp; progress "$now" "$end" "$name" "$desc"
>-			info "$action" "Unpacking %s..." "${pkg%:}"
>-			expect=unpacked
>-			;;
>-		    unpacked)
>-			expect=half-installed
>-			;;
>-		    half-configured)
>-			dp; progress "$now" "$end" "$name" "$desc"
>-			info "$action" "Configuring %s..." "${pkg%:}"
>-			expect=installed
>-			;;
>-		    installed)
>-			expect=half-configured
>-			;;
>-		esac
>-	done
>-	return $exitcode
>-}
>-
>-############################################################# set variables
>-
>-default_mirror () {
>-	DEF_MIRROR="$1"
>-}
>-
>-FINDDEBS_NEEDS_INDICES=false
>-finddebs_style () {
>-	case "$1" in
>-	    hardcoded)
>-		;;
>-	    from-indices)
>-		FINDDEBS_NEEDS_INDICES=true
>-		;;
>-	    *)
>-		error 1 BADFINDDEBS "unknown finddebs style"
>-		;;
>-	 esac
>-}
>-
>-mk_download_dirs () {
>-	if [ $DLDEST = "apt_dest" ]; then
>-		mkdir -p "$TARGET/$APTSTATE/lists/partial"
>-		mkdir -p "$TARGET/var/cache/apt/archives/partial"
>-	fi
>-}
>-
>-download_style () {
>-	case "$1" in
>-	    apt)
>-		if [ "$2" = "var-state" ]; then
>-			APTSTATE=var/state/apt
>-		else
>-			APTSTATE=var/lib/apt
>-		fi
>-		DLDEST=apt_dest
>-		export APTSTATE DLDEST DEBFOR
>-		;;
>-	    *)
>-		error 1 BADDLOAD "unknown download style"
>-		;;
>-	esac
>-}
>-
>-########################################################## variant handling
>-
>-doing_variant () {
>-	if [ "$1" = "$VARIANT" ]; then return 0; fi
>-	if [ "$1" = "-" ] && [ "$VARIANT" = "" ]; then return 0; fi
>-	return 1
>-}
>-
>-SUPPORTED_VARIANTS="-"
>-variants () {
>-	SUPPORTED_VARIANTS="$*"
>-	for v in $*; do
>-		if doing_variant "$v"; then return 0; fi
>-	done
>-	error 1 UNSUPPVARIANT "unsupported variant"
>-}
>-
>-################################################# work out names for things
>-
>-mirror_style () {
>-	case "$1" in
>-	    release)
>-		DOWNLOAD_INDICES=download_release_indices
>-		DOWNLOAD_DEBS=download_release
>-		;;
>-	    main)
>-		DOWNLOAD_INDICES=download_main_indices
>-		DOWNLOAD_DEBS=download_main
>-		;;
>-	    *)
>-		error 1 BADMIRROR "unknown mirror style"
>-		;;
>-	esac
>-	export DOWNLOAD_INDICES
>-	export DOWNLOAD_DEBS
>-}
>-
>-check_md5 () {
>-	# args: dest md5 size
>-	local expmd5="$2"
>-	local expsize="$3"
>-	relmd5=`md5sum < "$1" | sed 's/ .*$//'`
>-	relsize=`wc -c < "$1"`
>-	if [ "$expsize" -ne "$relsize" ] || [ "$expmd5" != "$relmd5" ]; then
>-		return 1
>-	fi
>-	return 0
>-}
>-
>-get () {
>-	# args: from dest 'nocache'
>-	# args: from dest [md5sum size] [alt {md5sum size type}]
>-	local displayname
>-	if [ "${2%.deb}" != "$2" ]; then
>-		displayname="$(echo "$2" | sed 's,^.*/,,;s,_.*$,,')"
>-	else
>-		displayname="$(echo "$1" | sed 's,^.*/,,')"
>-	fi
>-
>-	if [ -e "$2" ]; then
>-		if [ -z "$3" ]; then
>-			return 0
>-		elif [ "$3" = nocache ]; then
>-			rm -f "$2"
>-		else
>-			info VALIDATING "Validating %s" "$displayname"
>-			if check_md5 "$2" "$3" "$4"; then
>-				return 0
>-			else
>-				rm -f "$2"
>-			fi
>-		fi
>-	fi
>-	# Drop 'nocache' option
>-	if [ "$3" = nocache ]; then
>-		set "$1" "$2"
>-	fi
>-
>-	if [ "$#" -gt 5 ]; then
>-		local st=3
>-		if [ "$5" = "-" ]; then st=6; fi
>-		local order="$(a=$st; while [ "$a" -le $# ]; do eval echo \"\${$(($a+1))}\" $a;
>-		a=$(($a + 3)); done | sort -n | sed 's/.* //')"
>-	else
>-		local order=3
>-	fi
>-	for a in $order; do
>-		local md5="$(eval echo \${$a})"
>-		local siz="$(eval echo \${$(( $a+1 ))})"
>-		local typ="$(eval echo \${$(( $a+2 ))})"
>-		local from
>-		local dest
>-
>-		case "$typ" in
>-		    bz2) from="$1.bz2"; dest="$2.bz2" ;;
>-		    gz)  from="$1.gz"; dest="$2.gz" ;;
>-		    *)   from="$1"; dest="$2" ;;
>-		esac
>-
>-		if [ "${dest#/}" = "$dest" ]; then
>-			dest="./$dest"
>-		fi
>-		local dest2="$dest"
>-		if [ -d "${dest2%/*}/partial" ]; then
>-			dest2="${dest2%/*}/partial/${dest2##*/}"
>-		fi
>-
>-		info RETRIEVING "Retrieving %s" "$displayname"
>-		if ! just_get "$from" "$dest2"; then continue; fi
>-		if [ "$md5" != "" ]; then
>-			info VALIDATING "Validating %s" "$displayname"
>-			if check_md5 "$dest2" "$md5" "$siz"; then
>-				md5=""
>-			fi
>-		fi
>-		if [ -z "$md5" ]; then
>-			[ "$dest2" = "$dest" ] || mv "$dest2" "$dest"
>-			case "$typ" in
>-			    gz)  gunzip "$dest" ;;
>-			    bz2) bunzip2 "$dest" ;;
>-			esac
>-			return 0
>-		else
>-			warning CORRUPTFILE "%s was corrupt" "$from"
>-		fi
>-	done
>-	return 1
>-}
>-
>-just_get () {
>-	# args: from dest
>-	local from="$1"
>-	local dest="$2"
>-	mkdir -p "${dest%/*}"
>-	if [ "${from#null:}" != "$from" ]; then
>-		error 1 NOTPREDL "%s was not pre-downloaded" "${from#null:}"
>-	elif [ "${from#http://}" != "$from" ] || [ "${from#ftp://}" != "$from" ]; then
>-		# http/ftp mirror
>-		if wgetprogress -O "$dest" "$from"; then
>-			return 0
>-		elif [ -s "$dest" ]; then
>-			local iters=0
>-			while [ "$iters" -lt 3 ]; do
>-				warning RETRYING "Retrying failed download of %s" "$from"
>-				if wgetprogress -c -O "$dest" "$from"; then break; fi
>-				iters="$(($iters + 1))"
>-			done
>-		else
>-			rm -f "$dest"
>-			return 1
>-		fi
>-	elif [ "${from#https://}" != "$from" ] ; then
>-		# http/ftp mirror
>-		if wgetprogress $CHECKCERTIF $CERTIFICATE $PRIVATEKEY -O "$dest" "$from"; then
>-			return 0
>-		elif [ -s "$dest" ]; then
>-			local iters=0
>-			while [ "$iters" -lt 3 ]; do
>-				warning RETRYING "Retrying failed download of %s" "$from"
>-				if wgetprogress $CHECKCERTIF $CERTIFICATE $PRIVATEKEY -c -O "$dest" "$from"; then break; fi
>-				iters="$(($iters + 1))"
>-			done
>-		else
>-			rm -f "$dest"
>-			return 1
>-		fi
>-	elif [ "${from#file:}" != "$from" ]; then
>-		local base="${from#file:}"
>-		if [ "${base#//}" != "$base" ]; then
>-			base="/${from#file://*/}"
>-		fi
>-		if [ -e "$base" ]; then
>-			cp "$base" "$dest"
>-			return 0
>-		else
>-			return 1
>-		fi
>-	elif [ "${from#ssh:}" != "$from" ]; then
>-		local ssh_dest="$(echo $from | sed -e 's#ssh://##' -e 's#/#:/#')"
>-		if [ -n "$ssh_dest" ]; then
>-			scp "$ssh_dest" "$dest"
>-			return 0
>-		else
>-			return 1
>-		fi
>-	else
>-		error 1 UNKNOWNLOC "unknown location %s" "$from"
>-	fi
>-}
>-
>-download () {
>-	mk_download_dirs
>-	"$DOWNLOAD_DEBS" $(echo "$@" | tr ' ' '\n' | sort)
>-}
>-
>-download_indices () {
>-	mk_download_dirs
>-	"$DOWNLOAD_INDICES" $(echo "$@" | tr ' ' '\n' | sort)
>-}
>-
>-debfor () {
>-	(while read pkg path; do
>-		for p in "$@"; do
>-			[ "$p" = "$pkg" ] || continue;
>-			echo "$path"
>-		done
>-	 done <"$TARGET/debootstrap/debpaths"
>-	)
>-}
>-
>-apt_dest () {
>-	# args:
>-	#   deb package version arch mirror path
>-	#   pkg suite component arch mirror path
>-	#   rel suite mirror path
>-	case "$1" in
>-	    deb)
>-		echo "/var/cache/apt/archives/${2}_${3}_${4}.deb" | sed 's/:/%3a/'
>-		;;
>-	    pkg)
>-		local m="$5"
>-		m="debootstrap.invalid"
>-		#if [ "${m#http://}" != "$m" ]; then
>-		#	m="${m#http://}"
>-		#elif [ "${m#file://}" != "$m" ]; then
>-		#	m="file_localhost_${m#file://*/}"
>-		#elif [ "${m#file:/}" != "$m" ]; then
>-		#	m="file_localhost_${m#file:/}"
>-		#fi
>-
>-		printf "%s" "$APTSTATE/lists/"
>-		echo "${m}_$6" | sed 's/\//_/g'
>-		;;
>-	    rel)
>-		local m="$3"
>-		m="debootstrap.invalid"
>-		#if [ "${m#http://}" != "$m" ]; then
>-		#	m="${m#http://}"
>-		#elif [ "${m#file://}" != "$m" ]; then
>-		#	m="file_localhost_${m#file://*/}"
>-		#elif [ "${m#file:/}" != "$m" ]; then
>-		#	m="file_localhost_${m#file:/}"
>-		#fi
>-		printf "%s" "$APTSTATE/lists/"
>-		echo "${m}_$4" | sed 's/\//_/g'
>-		;;
>-	esac
>-}
>-
>-################################################################## download
>-
>-get_release_md5 () {
>-	local reldest="$1"
>-	local path="$2"
>-	sed -n '/^[Mm][Dd]5[Ss][Uu][Mm]/,/^[^ ]/p' < "$reldest" | \
>-		while read a b c; do
>-			if [ "$c" = "$path" ]; then echo "$a $b"; fi
>-		done | head -n 1
>-}
>-
>-download_release_sig () {
>-	local m1="$1"
>-	local reldest="$2"
>-	local relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release.gpg")"
>-
>-	if [ -n "$KEYRING" ]; then
>-		progress 0 100 DOWNRELSIG "Downloading Release file signature"
>-		progress_next 50
>-		get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache ||
>-			error 1 NOGETRELSIG "Failed getting release signature file %s" \
>-			"$m1/dists/$SUITE/Release.gpg"
>-		progress 50 100 DOWNRELSIG "Downloading Release file signature"
>-
>-		info RELEASESIG "Checking Release signature"
>-		# Don't worry about the exit status from gpgv; parsing the output will
>-		# take care of that.
>-		(gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
>-		 "$relsigdest" "$reldest" || true) | read_gpg_status
>-		progress 100 100 DOWNRELSIG "Downloading Release file signature"
>-	fi
>-}
>-
>-download_release_indices () {
>-	local m1="${MIRRORS%% *}"
>-	local reldest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release")"
>-	progress 0 100 DOWNREL "Downloading Release file"
>-	progress_next 100
>-	get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
>-		error 1 NOGETREL "Failed getting release file %s" "$m1/dists/$SUITE/Release"
>-
>-	TMPCOMPONENTS="$(sed -n 's/Components: *//p' "$reldest")"
>-	for c in $TMPCOMPONENTS ; do
>-		eval "
>-		case \"\$c\" in
>-		    $USE_COMPONENTS)
>-			COMPONENTS=\"\$COMPONENTS \$c\"
>-			;;
>-		esac
>-		"
>-	done
>-	COMPONENTS="$(echo $COMPONENTS)"
>-
>-	if [ -z "$COMPONENTS" ]; then
>-		mv "$reldest" "$reldest.malformed"
>-		error 1 INVALIDREL "Invalid Release file, no valid components"
>-	fi
>-	progress 100 100 DOWNREL "Downloading Release file"
>-
>-	download_release_sig "$m1" "$reldest"
>-
>-	local totalpkgs=0
>-	for c in $COMPONENTS; do
>-		local subpath="$c/binary-$ARCH/Packages"
>-		local bz2md="`get_release_md5 "$reldest" "$subpath.bz2"`"
>-		local gzmd="`get_release_md5 "$reldest" "$subpath.gz"`"
>-		local normmd="`get_release_md5 "$reldest" "$subpath"`"
>-		local md=
>-		if [ "$normmd" != "" ]; then
>-			md="$normmd"
>-		elif [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then
>-			md="$bz2md"
>-		elif [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then
>-			md="$gzmd"
>-		fi
>-		if [ "$md" != "" ]; then
>-			totalpkgs="$(( $totalpkgs + ${md#* } ))"
>-		else
>-			mv "$reldest" "$reldest.malformed"
>-			error 1 MISSINGRELENTRY "Invalid Release file, no entry for %s" "$subpath"
>-		fi
>-	done
>-
>-	local donepkgs=0
>-	local pkgdest
>-	progress 0 $totalpkgs DOWNPKGS "Downloading Packages files"
>-	for c in $COMPONENTS; do
>-		local subpath="$c/binary-$ARCH/Packages"
>-		local path="dists/$SUITE/$subpath"
>-		local bz2md="`get_release_md5 "$reldest" "$subpath.bz2"`"
>-		local gzmd="`get_release_md5 "$reldest" "$subpath.gz"`"
>-		local normmd="`get_release_md5 "$reldest" "$subpath"`"
>-		local ext=
>-		local md=
>-		if [ "$normmd" != "" ]; then
>-			ext="$ext $normmd ."
>-			md="$normmd"
>-		fi
>-		if [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then
>-			ext="$ext $bz2md bz2"
>-			md="${md:-$bz2md}"
>-		fi
>-		if [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then
>-			ext="$ext $gzmd gz"
>-			md="${md:-$gzmd}"
>-		fi
>-		progress_next "$(($donepkgs + ${md#* }))"
>-		for m in $MIRRORS; do
>-			pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if get "$m/$path" "$pkgdest" $ext; then break; fi
>-		done
>-		if [ ! -f "$pkgdest" ]; then
>-			error 1 COULDNTDL "Couldn't download %s" "$path"
>-		fi
>-		donepkgs="$(($donepkgs + ${md#* }))"
>-		progress $donepkgs $totalpkgs DOWNPKGS "Downloading Packages files"
>-	done
>-}
>-
>-get_package_sizes () {
>-	# mirror pkgdest debs..
>-	local m="$1"; shift
>-	local pkgdest="$1"; shift
>-	$PKGDETAILS PKGS "$m" "$pkgdest" "$@" | (
>-		newleft=""
>-		totaldebs=0
>-		countdebs=0
>-		while read p details; do
>-			if [ "$details" = "-" ]; then
>-				newleft="$newleft $p"
>-			else
>-				size="${details##* }";
>-				totaldebs="$(($totaldebs + $size))"
>-				countdebs="$(($countdebs + 1))"
>-			fi
>-		done
>-		echo "$countdebs $totaldebs$newleft"
>-	)
>-}
>-
>-# note, leftovers come back on fd5 !!
>-download_debs () {
>-	local m="$1"
>-	local pkgdest="$2"
>-	shift; shift
>-
>-	$PKGDETAILS PKGS "$m" "$pkgdest" "$@" | (
>-		leftover=""
>-		while read p ver arc mdup fil md5 size; do
>-			if [ "$ver" = "-" ]; then
>-				leftover="$leftover $p"
>-			else
>-				progress_next "$(($dloaddebs + $size))"
>-				local debdest="$($DLDEST deb "$p" "$ver" "$arc" "$m" "$fil")"
>-				if get "$m/$fil" "$TARGET/$debdest" "$md5" "$size"; then
>-					dloaddebs="$(($dloaddebs + $size))"
>-					echo >>$TARGET/debootstrap/debpaths "$p $debdest"
>-				else
>-					warning COULDNTDL "Couldn't download package %s" "$p"
>-				fi
>-			fi
>-		done
>-		echo >&5 ${leftover# }
>-	)
>-}
>-
>-download_release () {
>-	local m1="${MIRRORS%% *}"
>-
>-	local numdebs="$#"
>-
>-	local countdebs=0
>-	progress $countdebs $numdebs SIZEDEBS "Finding package sizes"
>-
>-	local totaldebs=0
>-	local leftoverdebs="$*"
>-	for c in $COMPONENTS; do
>-		if [ "$countdebs" -ge "$numdebs" ]; then break; fi
>-
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-		if [ ! -e "$pkgdest" ]; then continue; fi
>-
>-		info CHECKINGSIZES "Checking component %s on %s..." "$c" "$m1"
>-
>-		leftoverdebs="$(get_package_sizes "$m1" "$pkgdest" $leftoverdebs)"
>-
>-		countdebs=$(($countdebs + ${leftoverdebs%% *}))
>-		leftoverdebs=${leftoverdebs#* }
>-
>-		totaldebs=${leftoverdebs%% *}
>-		leftoverdebs=${leftoverdebs#* }
>-
>-		progress $countdebs $numdebs SIZEDEBS "Finding package sizes"
>-	done
>-
>-	if [ "$countdebs" -ne "$numdebs" ]; then
>-		error 1 LEFTOVERDEBS "Couldn't find these debs: %s" "$leftoverdebs"
>-	fi
>-
>-	local dloaddebs=0
>-
>-	progress $dloaddebs $totaldebs DOWNDEBS "Downloading packages"
>-	:>$TARGET/debootstrap/debpaths
>-
>-	pkgs_to_get="$*"
>-	for c in $COMPONENTS; do
>-	    local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-	    for m in $MIRRORS; do
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-		if [ ! -e "$pkgdest" ]; then continue; fi
>-		pkgs_to_get="$(download_debs "$m" "$pkgdest" $pkgs_to_get 5>&1 1>&6)"
>-		if [ -z "$pkgs_to_get" ]; then break; fi
>-	    done 6>&1
>-	    if [ -z "$pkgs_to_get" ]; then break; fi
>-	done
>-	progress $dloaddebs $totaldebs DOWNDEBS "Downloading packages"
>-	if [ "$pkgs_to_get" != "" ]; then
>-		error 1 COULDNTDLPKGS "Couldn't download packages: %s" "$pkgs_to_get"
>-	fi
>-}
>-
>-download_main_indices () {
>-	local m1="${MIRRORS%% *}"
>-	local comp="${USE_COMPONENTS}"
>-	progress 0 100 DOWNMAINPKGS "Downloading Packages file"
>-	progress_next 100
>-
>-	if [ -z "$comp" ]; then comp=main; fi
>-	COMPONENTS="$(echo $comp | tr '|' ' ')"
>-
>-	export COMPONENTS
>-	for m in $MIRRORS; do
>-	    for c in $COMPONENTS; do
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-		if [ -x /bin/gunzip ] && get "$m/${path}.gz" "${pkgdest}.gz"; then
>-			rm -f "$pkgdest"
>-			gunzip "$pkgdest.gz"
>-		elif get "$m/$path" "$pkgdest"; then
>-			true
>-		fi
>-	    done
>-	done
>-	progress 100 100 DOWNMAINPKGS "Downloading Packages file"
>-}
>-
>-download_main () {
>-	local m1="${MIRRORS%% *}"
>-
>-	:>$TARGET/debootstrap/debpaths
>-	for p in "$@"; do
>-	    for c in $COMPONENTS; do
>-		local details=""
>-		for m in $MIRRORS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if [ ! -e "$pkgdest" ]; then continue; fi
>-			details="$($PKGDETAILS PKGS "$m" "$pkgdest" "$p")"
>-			if [ "$details" = "$p -" ]; then
>-				details=""
>-				continue
>-			fi
>-			size="${details##* }"; details="${details% *}"
>-			md5="${details##* }"; details="${details% *}"
>-			local debdest="$($DLDEST deb $details)"
>-			if get "$m/${details##* }" "$TARGET/$debdest" "$md5" "$size"; then
>-				echo >>$TARGET/debootstrap/debpaths "$p $debdest"
>-				details="done"
>-				break
>-			fi
>-		done
>-		if [ "$details" != "" ]; then
>-			break
>-		fi
>-	    done
>-	    if [ "$details" != "done" ]; then
>-		error 1 COULDNTDL "Couldn't download %s" "$p"
>-	    fi
>-	done
>-}
>-
>-###################################################### deb choosing support
>-
>-get_debs () {
>-	local field="$1"
>-	shift
>-	local m1 c
>-	for m1 in $MIRRORS; do
>-		for c in $COMPONENTS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-			echo $("$PKGDETAILS" FIELD "$field" "$m1" "$pkgdest" "$@" | sed 's/ .*//')
>-		done
>-	done
>-}
>-
>-################################################################ extraction
>-
>-EXTRACTORS_SUPPORTED="dpkg-deb ar"
>-
>-# Native dpkg-deb based extractors
>-extract_dpkg_deb_field () {
>-	local pkg="$1"
>-	local field="$2"
>-
>-	dpkg-deb -f "$pkg" "$field"
>-}
>-
>-extract_dpkg_deb_data () {
>-	local pkg="$1"
>-
>-	dpkg-deb --fsys-tarfile "$pkg" | tar -xf -
>-}
>-
>-# Raw .deb extractors
>-extract_ar_deb_field () {
>-	local pkg="$1"
>-	local field="$2"
>-
>-	ar -p "$pkg" control.tar.gz | zcat |
>-	    tar -O -xf - control ./control 2>/dev/null |
>-	    grep -i "^$field:" | sed -e 's/[^:]*: *//' | head -n 1
>-}
>-
>-extract_ar_deb_data () {
>-	local pkg="$1"
>-	local tarball=$(ar -t "$pkg" | grep "^data.tar.[bgx]z")
>-
>-	case "$tarball" in
>-		data.tar.gz) cat_cmd=zcat ;;
>-		data.tar.bz2) cat_cmd=bzcat ;;
>-		data.tar.xz) cat_cmd=xzcat ;;
>-		*) error 1 UNKNOWNDATACOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;;
>-	esac
>-
>-	if type $cat_cmd >/dev/null 2>&1; then
>-		ar -p "$pkg" "$tarball" | $cat_cmd | tar -xf -
>-	else
>-		error 1 UNPACKCMDUNVL "The $cat_cmd is not available on the system"
>-	fi
>-}
>-
>-valid_extractor () {
>-	local extractor="$1"
>-
>-	for E in $EXTRACTORS_SUPPORTED; do
>-		if [ "$extractor" = "$E" ]; then
>-			return 0
>-		fi
>-	done
>-
>-	return 1
>-}
>-
>-choose_extractor () {
>-	local extractor
>-
>-	if [ -n "$EXTRACTOR_OVERRIDE" ]; then
>-		extractor="$EXTRACTOR_OVERRIDE"
>-	elif type dpkg-deb >/dev/null 2>&1; then
>-		extractor="dpkg-deb"
>-	else
>-		extractor="ar"
>-	fi
>-
>-	info CHOSENEXTRACTOR "Chosen extractor for .deb packages: %s" "$extractor"
>-	case "$extractor" in
>-	dpkg-deb)
>-		extract_deb_field () { extract_dpkg_deb_field "$@"; }
>-		extract_deb_data () { extract_dpkg_deb_data "$@"; }
>-		;;
>-	ar)
>-		extract_deb_field () { extract_ar_deb_field "$@"; }
>-		extract_deb_data () { extract_ar_deb_data "$@"; }
>-		;;
>-	esac
>-}
>-
>-extract () { (
>-	cd "$TARGET"
>-	local p=0 cat_cmd
>-	for pkg in $(debfor "$@"); do
>-		p="$(($p + 1))"
>-		progress "$p" "$#" EXTRACTPKGS "Extracting packages"
>-		packagename="$(echo "$pkg" | sed 's,^.*/,,;s,_.*$,,')"
>-		info EXTRACTING "Extracting %s..." "$packagename"
>-		extract_deb_data "./$pkg"
>-	done
>-); }
>-
>-in_target_nofail () {
>-	if ! $CHROOT_CMD "$@" 2>/dev/null; then
>-		true
>-	fi
>-	return 0
>-}
>-
>-in_target_failmsg () {
>-	local code="$1"
>-	local msg="$2"
>-	local arg="$3"
>-	shift; shift; shift
>-	if ! $CHROOT_CMD "$@"; then
>-		warning "$code" "$msg" "$arg"
>-		return 1
>-	fi
>-	return 0
>-}
>-
>-in_target () {
>-	in_target_failmsg IN_TARGET_FAIL "Failure trying to run: %s" "$CHROOT_CMD $*" "$@"
>-}
>-
>-###################################################### standard setup stuff
>-
>-conditional_cp () {
>-	if [ ! -e "$2/$1" ]; then
>-		if [ -L "$1" ] && [ -e "$1" ]; then
>-			cat "$1" >"$2/$1"
>-		elif [ -e "$1" ]; then
>-			cp -a "$1" "$2/$1"
>-		fi
>-	fi
>-}
>-
>-mv_invalid_to () {
>-	local m="$1"
>-	m="$(echo "${m#http://}" | tr '/' '_' | sed 's/_*//')"
>-	(cd "$TARGET/$APTSTATE/lists"
>-	 for a in debootstrap.invalid_*; do
>-		 mv "$a" "${m}_${a#*_}"
>-	 done
>-	)
>-}
>-
>-setup_apt_sources () {
>-	mkdir -p "$TARGET/etc/apt"
>-	for m in "$@"; do
>-		local cs=""
>-		for c in $COMPONENTS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if [ -e "$pkgdest" ]; then cs="$cs $c"; fi
>-		done
>-		if [ "$cs" != "" ]; then echo "deb $m $SUITE$cs"; fi
>-	done > "$TARGET/etc/apt/sources.list"
>-}
>-
>-setup_etc () {
>-	mkdir -p "$TARGET/etc"
>-
>-	conditional_cp /etc/resolv.conf "$TARGET"
>-	conditional_cp /etc/hostname "$TARGET"
>-
>-	if [ "$DLDEST" = apt_dest ] && [ ! -e "$TARGET/etc/apt/sources.list" ]; then
>-		setup_apt_sources "http://debootstrap.invalid/"
>-	fi
>-}
>-
>-UMOUNT_DIRS=
>-
>-umount_exit_function () {
>-	for dir in $UMOUNT_DIRS; do
>-		umount "$TARGET/${dir#/}" || true
>-	done
>-}
>-
>-umount_on_exit () {
>-	if [ "$UMOUNT_DIRS" ]; then
>-		UMOUNT_DIRS="$UMOUNT_DIRS $1"
>-	else
>-		UMOUNT_DIRS="$1"
>-		on_exit umount_exit_function
>-	fi
>-}
>-
>-clear_mtab () {
>-	if [ -f "$TARGET/etc/mtab" ] && [ ! -h "$TARGET/etc/mtab" ]; then
>-		rm -f "$TARGET/etc/mtab"
>-	fi
>-}
>-
>-setup_proc () {
>-	case "$ARCH" in
>-	    kfreebsd-*)
>-		umount_on_exit /dev
>-		umount_on_exit /proc
>-		umount "$TARGET/proc" 2>/dev/null || true
>-		in_target mount -t linprocfs proc /proc
>-		;;
>-	    hurd-*)
>-		;;
>-	    *)
>-		umount_on_exit /dev/pts
>-		umount_on_exit /dev/shm
>-		umount_on_exit /proc/bus/usb
>-		umount_on_exit /proc
>-		umount "$TARGET/proc" 2>/dev/null || true
>-		in_target mount -t proc proc /proc
>-		if [ -d "$TARGET/sys" ] && \
>-		   grep -q '[[:space:]]sysfs' /proc/filesystems 2>/dev/null; then
>-			umount_on_exit /sys
>-			umount "$TARGET/sys" 2>/dev/null || true
>-			in_target mount -t sysfs sysfs /sys
>-		fi
>-		on_exit clear_mtab
>-		;;
>-	esac
>-	umount_on_exit /lib/init/rw
>-}
>-
>-setup_proc_fakechroot () {
>-	rm -rf "$TARGET/proc"
>-	ln -s /proc "$TARGET"
>-}
>-
>-setup_devices () {
>-	case "$ARCH" in
>-	    kfreebsd-*)
>-		in_target mount -t devfs devfs /dev ;;
>-	    hurd-*)
>-		setup_devices_hurd ;;
>-	    *)
>-		if [ -e "$DEVICES_TARGZ" ]; then
>-			zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -)
>-		else
>-			if [ -e /dev/.devfsd ] ; then
>-				in_target mount -t devfs devfs /dev
>-			else
>-				error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"
>-			fi
>-		fi
>-		;;
>-	esac
>-}
>-
>-setup_devices_hurd () {
>-	mkdir -p "$TARGET/servers/socket"
>-	/bin/settrans -cfk "$TARGET/servers/socket/1" /hurd/pflocal
>-	/bin/settrans -cf "$TARGET/servers/socket/2" /hurd/pfinet
>-	/bin/settrans -cfk "$TARGET/servers/exec" /hurd/exec
>-	/bin/settrans -cf "$TARGET/servers/crash-suspend" /hurd/crash --suspend
>-	/bin/settrans -cf "$TARGET/servers/crash-kill" /hurd/crash --kill
>-	/bin/settrans -cf "$TARGET/servers/crash-dump-core" /hurd/crash --dump-core
>-	/bin/settrans -cf "$TARGET/servers/password" /hurd/password
>-	/bin/settrans -cf "$TARGET/servers/default-pager" /hurd/proxy-defpager
>-	ln -fs crash-kill "$TARGET/servers/crash"
>-	ln -fs 1 "$TARGET/servers/socket/local"
>-	ln -fs 2 "$TARGET/servers/socket/inet"
>-	(cd "$TARGET/dev"; /sbin/MAKEDEV fd std ptyp ptyq vcs tty1 tty2 tty3 tty4 tty5 tty6)
>-}
>-
>-setup_devices_fakechroot () {
>-	rm -rf "$TARGET/dev"
>-	ln -s /dev "$TARGET"
>-}
>-
>-setup_dselect_method () {
>-	case "$1" in
>-	    apt)
>-		mkdir -p "$TARGET/var/lib/dpkg"
>-		echo "apt apt" > "$TARGET/var/lib/dpkg/cmethopt"
>-		chmod 644 "$TARGET/var/lib/dpkg/cmethopt"
>-		;;
>-	    *)
>-		error 1 UNKNOWNDSELECT "unknown dselect method"
>-		;;
>-	esac
>-}
>-
>-################################################################ pkgdetails
>-
>-# NOTE
>-# For the debootstrap udeb, pkgdetails is provided by the bootstrap-base
>-# udeb, so the pkgdetails API needs to be kept in sync with that.
>-
>-if [ -x /usr/bin/perl ]; then
>-	PKGDETAILS=pkgdetails_perl
>-
>-	pkgdetails_field () {
>-		# uniq field mirror Packages values...
>-		perl -le '
>-$unique = shift @ARGV; $field = lc(shift @ARGV); $mirror = shift @ARGV;
>-$cnt = length(@ARGV);
>-%fields = map { $_, 0 } @ARGV;
>-while (<STDIN>) {
>-	chomp;
>-	next if (/^ /);
>-	if (/^([^:]*:)\s*(.*)$/) {
>-		$f = lc($1); $v = $2;
>-		$pkg = $v if ($f eq "package:");
>-		$ver = $v if ($f eq "version:");
>-		$arc = $v if ($f eq "architecture:");
>-		$fil = $v if ($f eq "filename:");
>-		$md5 = $v if ($f eq "md5sum:");
>-		$siz = $v if ($f eq "size:");
>-		$val = $v if ($f eq $field);
>-	} elsif (/^$/) {
>-		if (defined $val && defined $fields{$val}) {
>-			$cnt++;
>-			printf "%s %s %s %s %s %s %s\n",
>-			 $pkg, $ver, $arc, $mirror, $fil, $md5, $siz;
>-			if ($unique) {
>-				delete $fields{$val};
>-				last if (--$cnt <= 0);
>-			}
>-		}
>-		undef $val;
>-	}
>-}
>-for $v (keys %fields) {
>-	printf ("%s -\n", $v) if ($unique);
>-}
>-' "$@"
>-	}
>-
>-	pkgdetails_perl () {
>-		if [ "$1" = "WGET%" ]; then
>-			shift;
>-			perl -e '
>-$v = 0;
>-while (read STDIN, $x, 1) {
>-	if ($x =~ m/\d/) {
>-		$v *= 10;
>-		$v += $x;
>-	} elsif ($x eq "%") {
>-		printf "P: %d %d%s\n", int($v / 100.0 * ($ARGV[1] - $ARGV[0]) + $ARGV[0]), $ARGV[2], ($#ARGV == 3 ? " $ARGV[3]" : "");
>-		$v = 0;
>-	} else {
>-		$v = 0;
>-	}
>-}' "$@"
>-		elif [ "$1" = "GETDEPS" ]; then
>-			local pkgdest="$2"; shift; shift
>-			perl -e '
>-while (<STDIN>) {
>-	chomp;
>-	$in = 1 if (/^Package: (.*)$/ && grep {$_ eq $1} @ARGV);
>-	$in = 0 if (/^$/);
>-	if ($in and (/^Depends: (.*)$/ or /^Pre-Depends: (.*)$/)) {
>-		for $d (split /\s*,\s*/, $1) {
>-			$d =~ s/\s*[|].*$//;
>-			$d =~ s/\s*[(].*[)]\s*//;
>-			print "$d\n";
>-		}
>-	}
>-}' <"$pkgdest" "$@" | sort | uniq
>-		elif [ "$1" = "PKGS" ]; then
>-			local m="$2"
>-			local p="$3"
>-			shift; shift; shift
>-			pkgdetails_field 1 Package: "$m" "$@" < "$p"
>-		elif [ "$1" = "FIELD" ]; then
>-			local f="$2"
>-			local m="$3"
>-			local p="$4"
>-			shift; shift; shift; shift
>-			pkgdetails_field 0 "$f" "$m" "$@" < "$p"
>-		elif [ "$1" = "STANZAS" ]; then
>-			local pkgdest="$2"; shift; shift
>-			perl -e '
>-my $accum = "";
>-while (<STDIN>) {
>-	$accum .= $_;
>-	$in = 1 if (/^Package: (.*)$/ && grep {$_ eq $1} @ARGV);
>-	if ($in and /^$/) {
>-		print $accum;
>-		if (substr($accum, -1) != "\n") {
>-			print "\n\n";
>-		} elsif (substr($accum, -2, 1) != "\n") {
>-			print "\n";
>-		}
>-		$in = 0;
>-	}
>-	$accum = "" if /^$/;
>-}' <"$pkgdest" "$@"
>-		fi
>-	}
>-elif [ -e "/usr/lib/debootstrap/pkgdetails" ]; then
>-	PKGDETAILS="/usr/lib/debootstrap/pkgdetails"
>-elif [ -e "$DEBOOTSTRAP_DIR/pkgdetails" ]; then
>-	PKGDETAILS="$DEBOOTSTRAP_DIR/pkgdetails"
>-else
>-	PKGDETAILS=""
>-fi
>-
>-##################################################### dependency resolution
>-
>-resolve_deps () {
>-	local m1="${MIRRORS%% *}"
>-
>-	# XXX: I can't think how to deal well with dependency resolution and
>-	#      lots of Packages files. -- aj 2005/06/12
>-
>-	c="${COMPONENTS%% *}"
>-	local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-	local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-
>-	local PKGS="$*"
>-	local ALLPKGS="$PKGS";
>-	local ALLPKGS2="";
>-	while [ "$PKGS" != "" ]; do
>-		PKGS=$("$PKGDETAILS" GETDEPS "$pkgdest" $PKGS)
>-		PKGS=$("$PKGDETAILS" PKGS REAL "$pkgdest" $PKGS | sed -n 's/ .*REAL.*$//p')
>-		ALLPKGS2=$(echo "$PKGS $ALLPKGS" | tr ' ' '\n' | sort | uniq)
>-		PKGS=$(without "$ALLPKGS2" "$ALLPKGS")
>-		ALLPKGS="$ALLPKGS2"
>-	done
>-	echo $ALLPKGS
>-}
>-
>-setup_available () {
>-	local m1="${MIRRORS%% *}"
>-
>-	for c in $COMPONENTS; do
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-		# XXX: What if a package is in more than one component?
>-		# -- cjwatson 2009-07-29
>-		"$PKGDETAILS" STANZAS "$pkgdest" "$@"
>-	done >"$TARGET/var/lib/dpkg/available"
>-
>-	for pkg; do
>-		echo "$pkg install"
>-	done | in_target dpkg --set-selections
>-}
>-
>-get_next_predep () {
>-	local stanza="$(in_target_nofail dpkg --predep-package)"
>-	[ "$stanza" ] || return 1
>-	echo "$stanza" | grep '^Package:' | sed 's/^Package://; s/^ *//'
>-}
>-
>-################################################################### helpers
>-
>-# Return zero if it is possible to create devices and execute programs in
>-# this directory. (Both may be forbidden by mount options, e.g. nodev and
>-# noexec respectively.)
>-check_sane_mount () {
>-	mkdir -p "$1"
>-
>-	case "$ARCH" in
>-	    kfreebsd-*|hurd-*)
>-		;;
>-	    *)
>-		mknod "$1/test-dev-null" c 1 3 || return 1
>-		if ! echo test > "$1/test-dev-null"; then
>-			rm -f "$1/test-dev-null"
>-			return 1
>-		fi
>-		rm -f "$1/test-dev-null"
>-		;;
>-	esac
>-
>-	cat > "$1/test-exec" <<EOF
>-#! /bin/sh
>-:
>-EOF
>-	chmod +x "$1/test-exec"
>-	if ! "$1/test-exec"; then
>-		rm -f "$1/test-exec"
>-		return 1
>-	fi
>-	rm -f "$1/test-exec"
>-
>-	return 0
>-}
>-
>-read_gpg_status () {
>-	badsig=
>-	unkkey=
>-	validsig=
>-	while read prefix keyword keyid rest; do
>-		[ "$prefix" = '[GNUPG:]' ] || continue
>-		case $keyword in
>-		    BADSIG)	badsig="$keyid" ;;
>-		    NO_PUBKEY)	unkkey="$keyid" ;;
>-		    VALIDSIG)	validsig="$keyid" ;;
>-		esac
>-	done
>-	if [ "$validsig" ]; then
>-		info VALIDRELSIG "Valid Release signature (key id %s)" "$validsig"
>-	elif [ "$badsig" ]; then
>-		error 1 BADRELSIG "Invalid Release signature (key id %s)" "$badsig"
>-	elif [ "$unkkey" ]; then
>-		error 1 UNKNOWNRELSIG "Release signed by unknown key (key id %s)" "$unkkey"
>-	else
>-		error 1 SIGCHECK "Error executing gpgv to check Release signature"
>-	fi
>-}
>-
>-without () {
>-	# usage:  without "a b c" "a d" -> "b" "c"
>-	(echo $1 | tr ' ' '\n' | sort | uniq;
>-	 echo $2 $2 | tr ' ' '\n') | sort | uniq -u | tr '\n' ' '
>-	echo
>-}
>-
>-# Formerly called 'repeat', but that's a reserved word in zsh.
>-repeatn () {
>-	local n="$1"
>-	shift
>-	while [ "$n" -gt 0 ]; do
>-		if "$@"; then
>-			break
>-		else
>-			n="$(( $n - 1 ))"
>-			sleep 1
>-		fi
>-	done
>-	if [ "$n" -eq 0 ]; then return 1; fi
>-	return 0
>-}
>-
>-N_EXIT_THINGS=0
>-exit_function () {
>-	local n=0
>-	while [ "$n" -lt "$N_EXIT_THINGS" ]; do
>-		(eval $(eval echo \${EXIT_THING_$n}) 2>/dev/null || true)
>-		n="$(( $n + 1 ))"
>-	done
>-	N_EXIT_THINGS=0
>-}
>-
>-trap "exit_function" 0
>-trap "exit 129" 1
>-trap "error 130 INTERRUPTED \"Interrupt caught ... exiting\"" 2
>-trap "exit 131" 3
>-trap "exit 143" 15
>-
>-on_exit () {
>-	eval `echo EXIT_THING_${N_EXIT_THINGS}=\"$1\"`
>-	N_EXIT_THINGS="$(( $N_EXIT_THINGS + 1 ))"
>-}
>-
>-############################################################## fakechroot tools
>-
>-install_fakechroot_tools () {
>-	mv "$TARGET/sbin/ldconfig" "$TARGET/sbin/ldconfig.REAL"
>-	echo \
>-"#!/bin/sh
>-echo
>-echo \"Warning: Fake ldconfig called, doing nothing\"" > "$TARGET/sbin/ldconfig"
>-	chmod 755 "$TARGET/sbin/ldconfig"
>-
>-	echo \
>-"/sbin/ldconfig
>-/sbin/ldconfig.REAL
>-fakechroot" >> "$TARGET/var/lib/dpkg/diversions"
>-
>-	mv "$TARGET/usr/bin/ldd" "$TARGET/usr/bin/ldd.REAL"
>-	cat << 'END' > "$TARGET/usr/bin/ldd"
>-#!/usr/bin/perl
>-
>-# fakeldd
>-#
>-# Replacement for ldd with usage of objdump
>-#
>-# (c) 2003-2005 Piotr Roszatycki <dexter@debian.org>, BSD
>-
>-
>-my %libs = ();
>-
>-my $status = 0;
>-my $dynamic = 0;
>-my $biarch = 0;
>-
>-my $ldlinuxsodir = "/lib";
>-my @ld_library_path = qw(/usr/lib /lib);
>-
>-
>-sub ldso($) {
>-	my ($lib) = @_;
>-	my @files = ();
>-
>-	if ($lib =~ /^\//) {
>-	    $libs{$lib} = $lib;
>-	    push @files, $lib;
>-	} else {
>-	    foreach my $ld_path (@ld_library_path) {
>-		next unless -f "$ld_path/$lib";
>-		my $badformat = 0;
>-		open OBJDUMP, "objdump -p $ld_path/$lib 2>/dev/null |";
>-	 	while (my $line = <OBJDUMP>) {
>-		    if ($line =~ /file format (\S*)$/) {
>-				$badformat = 1 unless $format eq $1;
>-				last;
>-		    }
>-		}
>-		close OBJDUMP;
>-		next if $badformat;
>-		$libs{$lib} = "$ld_path/$lib";
>-		push @files, "$ld_path/$lib";
>-	    }
>-	    objdump(@files);
>-	}
>-}
>-
>-
>-sub objdump(@) {
>-	my (@files) = @_;
>-	my @libs = ();
>-
>-	foreach my $file (@files) {
>-	    open OBJDUMP, "objdump -p $file 2>/dev/null |";
>-	    while (my $line = <OBJDUMP>) {
>-		$line =~ s/^\s+//;
>-		my @f = split (/\s+/, $line);
>-		if ($line =~ /file format (\S*)$/) {
>-		    if (not $format) {
>-			$format = $1;
>-			if ($unamearch eq "x86_64" and $format eq "elf32-i386") {
>-			    my $link = readlink "/lib/ld-linux.so.2";
>-			    if ($link =~ /^\/emul\/ia32-linux\//) {
>-				$ld_library_path[-2] = "/emul/ia32-linux/usr/lib";
>-				$ld_library_path[-1] = "/emul/ia32-linux/lib";
>-			    }
>-			} elsif ($unamearch =~ /^(sparc|sparc64)$/ and $format eq "elf64-sparc") {
>-			    $ldlinuxsodir = "/lib64";
>-			    $ld_library_path[-2] = "/usr/lib64";
>-			    $ld_library_path[-1] = "/lib64";
>-			}
>-		    } else {
>-			next unless $format eq $1;
>-		    }
>-		}
>-		if (not $dynamic and $f[0] eq "Dynamic") {
>-		    $dynamic = 1;
>-		}
>-		next unless $f[0] eq "NEEDED";
>-		if ($f[1] =~ /^ld-linux(\.|-)/) {
>-		    $f[1] = "$ldlinuxsodir/" . $f[1];
>-		}
>-		if (not defined $libs{$f[1]}) {
>-		    $libs{$f[1]} = undef;
>-		    push @libs, $f[1];
>-		}
>-	    }
>-	    close OBJDUMP;
>-	}
>-
>-	foreach my $lib (@libs) {
>-	    ldso($lib);
>-	}
>-}
>-
>-
>-if ($#ARGV < 0) {
>-	print STDERR "fakeldd: missing file arguments\n";
>-	exit 1;
>-}
>-
>-while ($ARGV[0] =~ /^-/) {
>-	my $arg = $ARGV[0];
>-	shift @ARGV;
>-	last if $arg eq "--";
>-}
>-
>-open LD_SO_CONF, "/etc/ld.so.conf";
>-while ($line = <LD_SO_CONF>) {
>-	chomp $line;
>-	unshift @ld_library_path, $line;
>-}
>-close LD_SO_CONF;
>-
>-unshift @ld_library_path, split(/:/, $ENV{LD_LIBRARY_PATH});
>-
>-$unamearch = `/bin/uname -m`;
>-chomp $unamearch;
>-
>-foreach my $file (@ARGV) {
>-	my $address;
>-	%libs = ();
>-	$dynamic = 0;
>-
>-	if ($#ARGV > 0) {
>-		print "$file:\n";
>-	}
>-
>-	if (not -f $file) {
>-		print STDERR "ldd: $file: No such file or directory\n";
>-		$status = 1;
>-		next;
>-	}
>-
>-	objdump($file);
>-
>-	if ($dynamic == 0) {
>-		print "\tnot a dynamic executable\n";
>-		$status = 1;
>-	} elsif (scalar %libs eq "0") {
>-		print "\tstatically linked\n";
>-	}
>-
>-	if ($format =~ /^elf64-/) {
>-		$address = "0x0000000000000000";
>-	} else {
>-		$address = "0x00000000";
>-	}
>-
>-	foreach $lib (keys %libs) {
>-		if ($libs{$lib}) {
>-			printf "\t%s => %s (%s)\n", $lib, $libs{$lib}, $address;
>-		} else {
>-			printf "\t%s => not found\n", $lib;
>-		}
>-	}
>-}
>-
>-exit $status;
>-END
>-	chmod 755 "$TARGET/usr/bin/ldd"
>-
>-	echo \
>-"/usr/bin/ldd
>-/usr/bin/ldd.REAL
>-fakechroot" >> "$TARGET/var/lib/dpkg/diversions"
>-
>-}
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/scripts/ucs3 b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/scripts/ucs3
>deleted file mode 100644
>index 3cb92d2..0000000
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap-ucs3/scripts/ucs3
>+++ /dev/null
>@@ -1,195 +0,0 @@
>-. /usr/share/debootstrap/functions-ucs3
>-
>-mirror_style main
>-download_style apt
>-finddebs_style from-indices
>-variants - buildd fakechroot minbase scratchbox
>-
>-if doing_variant fakechroot; then
>-	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
>-fi
>-
>-case $ARCH in
>-	alpha|ia64) LIBC="libc6.1" ;;
>-	kfreebsd-*) LIBC="libc0.1" ;;
>-	hurd-*)     LIBC="libc0.3" ;;
>-	*)          LIBC="libc6" ;;
>-esac
>-
>-work_out_debs () {
>-	required="$(get_debs Priority: required)"
>-
>-	if doing_variant - || doing_variant fakechroot; then
>-		#required="$required $(get_debs Priority: important)"
>-		#  ^^ should be getting debconf here somehow maybe
>-		base="$(get_debs Priority: important)"
>-	elif doing_variant buildd || doing_variant scratchbox; then
>-		base="apt $(get_debs Build-Essential: yes)"
>-	elif doing_variant minbase; then
>-		base="apt"
>-	fi
>-
>-	if doing_variant fakechroot; then
>-		# ldd.fake needs binutils
>-		required="$required binutils"
>-	fi
>-}
>-
>-first_stage_install () {
>-	extract $required
>-
>-	mkdir -p "$TARGET/var/lib/dpkg"
>-	: >"$TARGET/var/lib/dpkg/status"
>-	: >"$TARGET/var/lib/dpkg/available"
>-
>-	setup_etc
>-	if [ ! -e "$TARGET/etc/fstab" ]; then
>-		echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
>-		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
>-	fi
>-
>-	if doing_variant fakechroot; then
>-		setup_devices_fakechroot
>-	else
>-		setup_devices
>-	fi
>-
>-	x_feign_install () {
>-		local pkg="$1"
>-		local deb="$(debfor $pkg)"
>-		local ver="$(extract_deb_field "$TARGET/$deb" Version)"
>-
>-		mkdir -p "$TARGET/var/lib/dpkg/info"
>-
>-		echo \
>-"Package: $pkg
>-Version: $ver
>-Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
>-
>-		touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
>-	}
>-
>-	x_feign_install dpkg
>-}
>-
>-second_stage_install () {
>-	x_core_install () {
>-		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
>-	}
>-
>-	p () {
>-		baseprog="$(($baseprog + ${1:-1}))"
>-	}
>-
>-	if doing_variant fakechroot; then
>-		setup_proc_fakechroot
>-	elif doing_variant scratchbox; then
>-		true
>-	else
>-		setup_proc
>-		in_target /sbin/ldconfig
>-	fi
>-
>-	DEBIAN_FRONTEND=noninteractive
>-	DEBCONF_NONINTERACTIVE_SEEN=true
>-	export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
>-
>-	baseprog=0
>-	bases=7
>-
>-	p; progress $baseprog $bases INSTCORE "Installing core packages" #1
>-	info INSTCORE "Installing core packages..."
>-
>-	p; progress $baseprog $bases INSTCORE "Installing core packages" #2
>-	ln -sf mawk "$TARGET/usr/bin/awk"
>-	x_core_install base-files base-passwd
>-	p; progress $baseprog $bases INSTCORE "Installing core packages" #3
>-	x_core_install dpkg
>-
>-	if [ ! -e "$TARGET/etc/localtime" ]; then
>-		ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
>-	fi
>-
>-	if doing_variant fakechroot; then
>-		install_fakechroot_tools
>-	fi
>-
>-	p; progress $baseprog $bases INSTCORE "Installing core packages" #4
>-	x_core_install $LIBC
>-
>-	p; progress $baseprog $bases INSTCORE "Installing core packages" #5
>-	x_core_install perl-base
>-
>-	p; progress $baseprog $bases INSTCORE "Installing core packages" #6
>-	rm "$TARGET/usr/bin/awk"
>-	x_core_install mawk
>-
>-	p; progress $baseprog $bases INSTCORE "Installing core packages" #7
>-	if doing_variant -; then
>-		x_core_install debconf
>-	fi
>-
>-	baseprog=0
>-	bases=$(set -- $required; echo $#)
>-
>-	info UNPACKREQ "Unpacking required packages..."
>-
>-	exec 7>&1
>-
>-	smallyes '' |
>-		(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
>-		dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
>-		dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
>-
>-	info CONFREQ "Configuring required packages..."
>-
>-	mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
>-	echo \
>-"#!/bin/sh
>-echo
>-echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
>-	chmod 755 "$TARGET/sbin/start-stop-daemon"
>-
>-	setup_dselect_method apt
>-
>-	smallyes '' |
>-		(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
>-		dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) |
>-		dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING
>-
>-	baseprog=0
>-	bases="$(set -- $base; echo $#)"
>-
>-	info UNPACKBASE "Unpacking the base system..."
>-
>-	setup_available $required $base
>-	done_predeps=
>-	while predep=$(get_next_predep); do
>-		# We have to resolve dependencies of pre-dependencies manually because
>-		# dpkg --predep-package doesn't handle this.
>-		predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
>-		# XXX: progress is tricky due to how dpkg_progress works
>-		# -- cjwatson 2009-07-29
>-		p; smallyes '' |
>-		in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
>-		base=$(without "$base" "$predep")
>-		done_predeps="$done_predeps $predep"
>-	done
>-
>-	smallyes '' |
>-		(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
>-		dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
>-		dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
>-
>-	info CONFBASE "Configuring the base system..."
>-
>-	smallyes '' |
>-		(repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be re-attempted up to five times." "" \
>-		dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
>-		dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
>-
>-	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
>-
>-	progress $bases $bases CONFBASE "Configuring base system"
>-	info BASESUCCESS "Base system installed successfully."
>-}
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap/functions-ucs3 b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap/functions-ucs3
>deleted file mode 100644
>index f0adc5c..0000000
>--- a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap/functions-ucs3
>+++ /dev/null
>@@ -1,1462 +0,0 @@
>-############################################################### smallutils
>-
>-smallyes() {
>-	YES="${1-y}"
>-	while echo "$YES" 2>/dev/null ; do : ; done
>-}
>-
>-############################################################### interaction
>-
>-error () {
>-	# <error code> <name> <string> <args>
>-	local err="$1"
>-	local name="$2"
>-	local fmt="$3"
>-	shift; shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "E: $name"
>-		for x in "$@"; do echo "EA: $x"; done
>-		echo "EF: $fmt") >&4
>-	else
>-		(printf "E: $fmt\n" "$@") >&4
>-	fi
>-	exit $err
>-}
>-
>-warning () {
>-	# <name> <string> <args>
>-	local name="$1"
>-	local fmt="$2"
>-	shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "W: $name"
>-		for x in "$@"; do echo "WA: $x"; done
>-		echo "WF: $fmt") >&4
>-	else
>-		printf "W: $fmt\n" "$@" >&4
>-	fi
>-}
>-
>-info () {
>-	# <name> <string> <args>
>-	local name="$1"
>-	local fmt="$2"
>-	shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		(echo "I: $name"
>-		for x in "$@"; do echo "IA: $x"; done
>-		echo "IF: $fmt") >&4
>-	else
>-		printf "I: $fmt\n" "$@" >&4
>-	fi
>-}
>-
>-PROGRESS_NOW=0
>-PROGRESS_END=0
>-PROGRESS_NEXT=""
>-PROGRESS_WHAT=""
>-
>-progress_next () {
>-	PROGRESS_NEXT="$1"
>-}
>-
>-wgetprogress () {
>-	[ ! "$verbose" ] && QSWITCH="-q"
>-	local ret=0
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
>-		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3
>-		ret=$?
>-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
>-		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3
>-		ret=$?
>-	else
>-		wget $QSWITCH "$@" 
>-		ret=$?
>-	fi
>-	return $ret
>-}
>-
>-progress () {
>-	# <now> <end> <name> <string> <args>
>-	local now="$1"
>-	local end="$2"
>-	local name="$3"
>-	local fmt="$4"
>-	shift; shift; shift; shift
>-	if [ "$USE_DEBIANINSTALLER_INTERACTION" ]; then
>-		PROGRESS_NOW="$now"
>-		PROGRESS_END="$end"
>-		PROGRESS_NEXT=""
>-		(echo "P: $now $end $name"
>-		for x in "$@"; do echo "PA: $x"; done
>-		echo "PF: $fmt") >&3
>-	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ]; then
>-		PROGRESS_NOW="$now"
>-		PROGRESS_END="$end"
>-		PROGRESS_WHAT="`printf "$fmt" "$@"`"
>-		PROGRESS_NEXT=""
>-		printf "P: %s %s %s\n" $now $end "$PROGRESS_WHAT" >&3
>-	fi
>-}
>-
>-dpkg_progress () {
>-	# <now> <end> <name> <desc> UNPACKING|CONFIGURING
>-	local now="$1"
>-	local end="$2"
>-	local name="$3"
>-	local desc="$4"
>-	local action="$5"
>-	local expect=
>-
>-	if [ "$action" = UNPACKING ]; then
>-		expect=half-installed
>-	elif [ "$action" = CONFIGURING ]; then
>-		expect=half-configured
>-	fi
>-
>-	dp () {
>-		now="$(($now + ${1:-1}))"
>-	}
>-
>-	exitcode=0
>-	while read status pkg qstate; do
>-		if [ "$status" = "EXITCODE" ]; then
>-			exitcode="$pkg"
>-			continue
>-		fi
>-		[ "$qstate" = "$expect" ] || continue
>-		case $qstate in
>-		    half-installed)
>-			dp; progress "$now" "$end" "$name" "$desc"
>-			info "$action" "Unpacking %s..." "${pkg%:}"
>-			expect=unpacked
>-			;;
>-		    unpacked)
>-			expect=half-installed
>-			;;
>-		    half-configured)
>-			dp; progress "$now" "$end" "$name" "$desc"
>-			info "$action" "Configuring %s..." "${pkg%:}"
>-			expect=installed
>-			;;
>-		    installed)
>-			expect=half-configured
>-			;;
>-		esac
>-	done
>-	return $exitcode
>-}
>-
>-############################################################# set variables
>-
>-default_mirror () {
>-	DEF_MIRROR="$1"
>-}
>-
>-FINDDEBS_NEEDS_INDICES=false
>-finddebs_style () {
>-	case "$1" in
>-	    hardcoded)
>-		;;
>-	    from-indices)
>-		FINDDEBS_NEEDS_INDICES=true
>-		;;
>-	    *)
>-		error 1 BADFINDDEBS "unknown finddebs style"
>-		;;
>-	 esac
>-}
>-
>-mk_download_dirs () {
>-	if [ $DLDEST = "apt_dest" ]; then
>-		mkdir -p "$TARGET/$APTSTATE/lists/partial"
>-		mkdir -p "$TARGET/var/cache/apt/archives/partial"
>-	fi
>-}
>-
>-download_style () {
>-	case "$1" in
>-	    apt)
>-		if [ "$2" = "var-state" ]; then
>-			APTSTATE=var/state/apt
>-		else
>-			APTSTATE=var/lib/apt
>-		fi
>-		DLDEST=apt_dest
>-		export APTSTATE DLDEST DEBFOR
>-		;;
>-	    *)
>-		error 1 BADDLOAD "unknown download style"
>-		;;
>-	esac
>-}
>-
>-########################################################## variant handling
>-
>-doing_variant () {
>-	if [ "$1" = "$VARIANT" ]; then return 0; fi
>-	if [ "$1" = "-" ] && [ "$VARIANT" = "" ]; then return 0; fi
>-	return 1
>-}
>-
>-SUPPORTED_VARIANTS="-"
>-variants () {
>-	SUPPORTED_VARIANTS="$*"
>-	for v in $*; do
>-		if doing_variant "$v"; then return 0; fi
>-	done
>-	error 1 UNSUPPVARIANT "unsupported variant"
>-}
>-
>-################################################# work out names for things
>-
>-mirror_style () {
>-	case "$1" in
>-	    release)
>-		DOWNLOAD_INDICES=download_release_indices
>-		DOWNLOAD_DEBS=download_release
>-		;;
>-	    main)
>-		DOWNLOAD_INDICES=download_main_indices
>-		DOWNLOAD_DEBS=download_main
>-		;;
>-	    *)
>-		error 1 BADMIRROR "unknown mirror style"
>-		;;
>-	esac
>-	export DOWNLOAD_INDICES
>-	export DOWNLOAD_DEBS
>-}
>-
>-check_md5 () {
>-	# args: dest md5 size
>-	local expmd5="$2"
>-	local expsize="$3"
>-	relmd5=`md5sum < "$1" | sed 's/ .*$//'`
>-	relsize=`wc -c < "$1"`
>-	if [ "$expsize" -ne "$relsize" ] || [ "$expmd5" != "$relmd5" ]; then
>-		return 1
>-	fi
>-	return 0
>-}
>-
>-get () {
>-	# args: from dest 'nocache'
>-	# args: from dest [md5sum size] [alt {md5sum size type}]
>-	local displayname
>-	if [ "${2%.deb}" != "$2" ]; then
>-		displayname="$(echo "$2" | sed 's,^.*/,,;s,_.*$,,')"
>-	else
>-		displayname="$(echo "$1" | sed 's,^.*/,,')"
>-	fi
>-
>-	if [ -e "$2" ]; then
>-		if [ -z "$3" ]; then
>-			return 0
>-		elif [ "$3" = nocache ]; then
>-			rm -f "$2"
>-		else
>-			info VALIDATING "Validating %s" "$displayname"
>-			if check_md5 "$2" "$3" "$4"; then
>-				return 0
>-			else
>-				rm -f "$2"
>-			fi
>-		fi
>-	fi
>-	# Drop 'nocache' option
>-	if [ "$3" = nocache ]; then
>-		set "$1" "$2"
>-	fi
>-
>-	if [ "$#" -gt 5 ]; then
>-		local st=3
>-		if [ "$5" = "-" ]; then st=6; fi
>-		local order="$(a=$st; while [ "$a" -le $# ]; do eval echo \"\${$(($a+1))}\" $a;
>-		a=$(($a + 3)); done | sort -n | sed 's/.* //')"
>-	else
>-		local order=3
>-	fi
>-	for a in $order; do
>-		local md5="$(eval echo \${$a})"
>-		local siz="$(eval echo \${$(( $a+1 ))})"
>-		local typ="$(eval echo \${$(( $a+2 ))})"
>-		local from
>-		local dest
>-
>-		case "$typ" in
>-		    bz2) from="$1.bz2"; dest="$2.bz2" ;;
>-		    gz)  from="$1.gz"; dest="$2.gz" ;;
>-		    *)   from="$1"; dest="$2" ;;
>-		esac
>-
>-		if [ "${dest#/}" = "$dest" ]; then
>-			dest="./$dest"
>-		fi
>-		local dest2="$dest"
>-		if [ -d "${dest2%/*}/partial" ]; then
>-			dest2="${dest2%/*}/partial/${dest2##*/}"
>-		fi
>-
>-		info RETRIEVING "Retrieving %s" "$displayname"
>-		if ! just_get "$from" "$dest2"; then continue; fi
>-		if [ "$md5" != "" ]; then
>-			info VALIDATING "Validating %s" "$displayname"
>-			if check_md5 "$dest2" "$md5" "$siz"; then
>-				md5=""
>-			fi
>-		fi
>-		if [ -z "$md5" ]; then
>-			[ "$dest2" = "$dest" ] || mv "$dest2" "$dest"
>-			case "$typ" in
>-			    gz)  gunzip "$dest" ;;
>-			    bz2) bunzip2 "$dest" ;;
>-			esac
>-			return 0
>-		else
>-			warning CORRUPTFILE "%s was corrupt" "$from"
>-		fi
>-	done
>-	return 1
>-}
>-
>-just_get () {
>-	# args: from dest
>-	local from="$1"
>-	local dest="$2"
>-	mkdir -p "${dest%/*}"
>-	if [ "${from#null:}" != "$from" ]; then
>-		error 1 NOTPREDL "%s was not pre-downloaded" "${from#null:}"
>-	elif [ "${from#http://}" != "$from" ] || [ "${from#ftp://}" != "$from" ]; then
>-		# http/ftp mirror
>-		if wgetprogress -O "$dest" "$from"; then
>-			return 0
>-		elif [ -s "$dest" ]; then
>-			local iters=0
>-			while [ "$iters" -lt 3 ]; do
>-				warning RETRYING "Retrying failed download of %s" "$from"
>-				if wgetprogress -c -O "$dest" "$from"; then break; fi
>-				iters="$(($iters + 1))"
>-			done
>-		else
>-			rm -f "$dest"
>-			return 1
>-		fi
>-	elif [ "${from#https://}" != "$from" ] ; then
>-		# http/ftp mirror
>-		if wgetprogress $CHECKCERTIF $CERTIFICATE $PRIVATEKEY -O "$dest" "$from"; then
>-			return 0
>-		elif [ -s "$dest" ]; then
>-			local iters=0
>-			while [ "$iters" -lt 3 ]; do
>-				warning RETRYING "Retrying failed download of %s" "$from"
>-				if wgetprogress $CHECKCERTIF $CERTIFICATE $PRIVATEKEY -c -O "$dest" "$from"; then break; fi
>-				iters="$(($iters + 1))"
>-			done
>-		else
>-			rm -f "$dest"
>-			return 1
>-		fi
>-	elif [ "${from#file:}" != "$from" ]; then
>-		local base="${from#file:}"
>-		if [ "${base#//}" != "$base" ]; then
>-			base="/${from#file://*/}"
>-		fi
>-		if [ -e "$base" ]; then
>-			cp "$base" "$dest"
>-			return 0
>-		else
>-			return 1
>-		fi
>-	elif [ "${from#ssh:}" != "$from" ]; then
>-		local ssh_dest="$(echo $from | sed -e 's#ssh://##' -e 's#/#:/#')"
>-		if [ -n "$ssh_dest" ]; then
>-			scp "$ssh_dest" "$dest"
>-			return 0
>-		else
>-			return 1
>-		fi
>-	else
>-		error 1 UNKNOWNLOC "unknown location %s" "$from"
>-	fi
>-}
>-
>-download () {
>-	mk_download_dirs
>-	"$DOWNLOAD_DEBS" $(echo "$@" | tr ' ' '\n' | sort)
>-}
>-
>-download_indices () {
>-	mk_download_dirs
>-	"$DOWNLOAD_INDICES" $(echo "$@" | tr ' ' '\n' | sort)
>-}
>-
>-debfor () {
>-	(while read pkg path; do
>-		for p in "$@"; do
>-			[ "$p" = "$pkg" ] || continue;
>-			echo "$path"
>-		done
>-	 done <"$TARGET/debootstrap/debpaths"
>-	)
>-}
>-
>-apt_dest () {
>-	# args:
>-	#   deb package version arch mirror path
>-	#   pkg suite component arch mirror path
>-	#   rel suite mirror path
>-	case "$1" in
>-	    deb)
>-		echo "/var/cache/apt/archives/${2}_${3}_${4}.deb" | sed 's/:/%3a/'
>-		;;
>-	    pkg)
>-		local m="$5"
>-		m="debootstrap.invalid"
>-		#if [ "${m#http://}" != "$m" ]; then
>-		#	m="${m#http://}"
>-		#elif [ "${m#file://}" != "$m" ]; then
>-		#	m="file_localhost_${m#file://*/}"
>-		#elif [ "${m#file:/}" != "$m" ]; then
>-		#	m="file_localhost_${m#file:/}"
>-		#fi
>-
>-		printf "%s" "$APTSTATE/lists/"
>-		echo "${m}_$6" | sed 's/\//_/g'
>-		;;
>-	    rel)
>-		local m="$3"
>-		m="debootstrap.invalid"
>-		#if [ "${m#http://}" != "$m" ]; then
>-		#	m="${m#http://}"
>-		#elif [ "${m#file://}" != "$m" ]; then
>-		#	m="file_localhost_${m#file://*/}"
>-		#elif [ "${m#file:/}" != "$m" ]; then
>-		#	m="file_localhost_${m#file:/}"
>-		#fi
>-		printf "%s" "$APTSTATE/lists/"
>-		echo "${m}_$4" | sed 's/\//_/g'
>-		;;
>-	esac
>-}
>-
>-################################################################## download
>-
>-get_release_md5 () {
>-	local reldest="$1"
>-	local path="$2"
>-	sed -n '/^[Mm][Dd]5[Ss][Uu][Mm]/,/^[^ ]/p' < "$reldest" | \
>-		while read a b c; do
>-			if [ "$c" = "$path" ]; then echo "$a $b"; fi
>-		done | head -n 1
>-}
>-
>-download_release_sig () {
>-	local m1="$1"
>-	local reldest="$2"
>-	local relsigdest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release.gpg")"
>-
>-	if [ -n "$KEYRING" ]; then
>-		progress 0 100 DOWNRELSIG "Downloading Release file signature"
>-		progress_next 50
>-		get "$m1/dists/$SUITE/Release.gpg" "$relsigdest" nocache ||
>-			error 1 NOGETRELSIG "Failed getting release signature file %s" \
>-			"$m1/dists/$SUITE/Release.gpg"
>-		progress 50 100 DOWNRELSIG "Downloading Release file signature"
>-
>-		info RELEASESIG "Checking Release signature"
>-		# Don't worry about the exit status from gpgv; parsing the output will
>-		# take care of that.
>-		(gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \
>-		 "$relsigdest" "$reldest" || true) | read_gpg_status
>-		progress 100 100 DOWNRELSIG "Downloading Release file signature"
>-	fi
>-}
>-
>-download_release_indices () {
>-	local m1="${MIRRORS%% *}"
>-	local reldest="$TARGET/$($DLDEST rel "$SUITE" "$m1" "dists/$SUITE/Release")"
>-	progress 0 100 DOWNREL "Downloading Release file"
>-	progress_next 100
>-	get "$m1/dists/$SUITE/Release" "$reldest" nocache ||
>-		error 1 NOGETREL "Failed getting release file %s" "$m1/dists/$SUITE/Release"
>-
>-	TMPCOMPONENTS="$(sed -n 's/Components: *//p' "$reldest")"
>-	for c in $TMPCOMPONENTS ; do
>-		eval "
>-		case \"\$c\" in
>-		    $USE_COMPONENTS)
>-			COMPONENTS=\"\$COMPONENTS \$c\"
>-			;;
>-		esac
>-		"
>-	done
>-	COMPONENTS="$(echo $COMPONENTS)"
>-
>-	if [ -z "$COMPONENTS" ]; then
>-		mv "$reldest" "$reldest.malformed"
>-		error 1 INVALIDREL "Invalid Release file, no valid components"
>-	fi
>-	progress 100 100 DOWNREL "Downloading Release file"
>-
>-	download_release_sig "$m1" "$reldest"
>-
>-	local totalpkgs=0
>-	for c in $COMPONENTS; do
>-		local subpath="$c/binary-$ARCH/Packages"
>-		local bz2md="`get_release_md5 "$reldest" "$subpath.bz2"`"
>-		local gzmd="`get_release_md5 "$reldest" "$subpath.gz"`"
>-		local normmd="`get_release_md5 "$reldest" "$subpath"`"
>-		local md=
>-		if [ "$normmd" != "" ]; then
>-			md="$normmd"
>-		elif [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then
>-			md="$bz2md"
>-		elif [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then
>-			md="$gzmd"
>-		fi
>-		if [ "$md" != "" ]; then
>-			totalpkgs="$(( $totalpkgs + ${md#* } ))"
>-		else
>-			mv "$reldest" "$reldest.malformed"
>-			error 1 MISSINGRELENTRY "Invalid Release file, no entry for %s" "$subpath"
>-		fi
>-	done
>-
>-	local donepkgs=0
>-	local pkgdest
>-	progress 0 $totalpkgs DOWNPKGS "Downloading Packages files"
>-	for c in $COMPONENTS; do
>-		local subpath="$c/binary-$ARCH/Packages"
>-		local path="dists/$SUITE/$subpath"
>-		local bz2md="`get_release_md5 "$reldest" "$subpath.bz2"`"
>-		local gzmd="`get_release_md5 "$reldest" "$subpath.gz"`"
>-		local normmd="`get_release_md5 "$reldest" "$subpath"`"
>-		local ext=
>-		local md=
>-		if [ "$normmd" != "" ]; then
>-			ext="$ext $normmd ."
>-			md="$normmd"
>-		fi
>-		if [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then
>-			ext="$ext $bz2md bz2"
>-			md="${md:-$bz2md}"
>-		fi
>-		if [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then
>-			ext="$ext $gzmd gz"
>-			md="${md:-$gzmd}"
>-		fi
>-		progress_next "$(($donepkgs + ${md#* }))"
>-		for m in $MIRRORS; do
>-			pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if get "$m/$path" "$pkgdest" $ext; then break; fi
>-		done
>-		if [ ! -f "$pkgdest" ]; then
>-			error 1 COULDNTDL "Couldn't download %s" "$path"
>-		fi
>-		donepkgs="$(($donepkgs + ${md#* }))"
>-		progress $donepkgs $totalpkgs DOWNPKGS "Downloading Packages files"
>-	done
>-}
>-
>-get_package_sizes () {
>-	# mirror pkgdest debs..
>-	local m="$1"; shift
>-	local pkgdest="$1"; shift
>-	$PKGDETAILS PKGS "$m" "$pkgdest" "$@" | (
>-		newleft=""
>-		totaldebs=0
>-		countdebs=0
>-		while read p details; do
>-			if [ "$details" = "-" ]; then
>-				newleft="$newleft $p"
>-			else
>-				size="${details##* }";
>-				totaldebs="$(($totaldebs + $size))"
>-				countdebs="$(($countdebs + 1))"
>-			fi
>-		done
>-		echo "$countdebs $totaldebs$newleft"
>-	)
>-}
>-
>-# note, leftovers come back on fd5 !!
>-download_debs () {
>-	local m="$1"
>-	local pkgdest="$2"
>-	shift; shift
>-
>-	$PKGDETAILS PKGS "$m" "$pkgdest" "$@" | (
>-		leftover=""
>-		while read p ver arc mdup fil md5 size; do
>-			if [ "$ver" = "-" ]; then
>-				leftover="$leftover $p"
>-			else
>-				progress_next "$(($dloaddebs + $size))"
>-				local debdest="$($DLDEST deb "$p" "$ver" "$arc" "$m" "$fil")"
>-				if get "$m/$fil" "$TARGET/$debdest" "$md5" "$size"; then
>-					dloaddebs="$(($dloaddebs + $size))"
>-					echo >>$TARGET/debootstrap/debpaths "$p $debdest"
>-				else
>-					warning COULDNTDL "Couldn't download package %s" "$p"
>-				fi
>-			fi
>-		done
>-		echo >&5 ${leftover# }
>-	)
>-}
>-
>-download_release () {
>-	local m1="${MIRRORS%% *}"
>-
>-	local numdebs="$#"
>-
>-	local countdebs=0
>-	progress $countdebs $numdebs SIZEDEBS "Finding package sizes"
>-
>-	local totaldebs=0
>-	local leftoverdebs="$*"
>-	for c in $COMPONENTS; do
>-		if [ "$countdebs" -ge "$numdebs" ]; then break; fi
>-
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-		if [ ! -e "$pkgdest" ]; then continue; fi
>-
>-		info CHECKINGSIZES "Checking component %s on %s..." "$c" "$m1"
>-
>-		leftoverdebs="$(get_package_sizes "$m1" "$pkgdest" $leftoverdebs)"
>-
>-		countdebs=$(($countdebs + ${leftoverdebs%% *}))
>-		leftoverdebs=${leftoverdebs#* }
>-
>-		totaldebs=${leftoverdebs%% *}
>-		leftoverdebs=${leftoverdebs#* }
>-
>-		progress $countdebs $numdebs SIZEDEBS "Finding package sizes"
>-	done
>-
>-	if [ "$countdebs" -ne "$numdebs" ]; then
>-		error 1 LEFTOVERDEBS "Couldn't find these debs: %s" "$leftoverdebs"
>-	fi
>-
>-	local dloaddebs=0
>-
>-	progress $dloaddebs $totaldebs DOWNDEBS "Downloading packages"
>-	:>$TARGET/debootstrap/debpaths
>-
>-	pkgs_to_get="$*"
>-	for c in $COMPONENTS; do
>-	    local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-	    for m in $MIRRORS; do
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-		if [ ! -e "$pkgdest" ]; then continue; fi
>-		pkgs_to_get="$(download_debs "$m" "$pkgdest" $pkgs_to_get 5>&1 1>&6)"
>-		if [ -z "$pkgs_to_get" ]; then break; fi
>-	    done 6>&1
>-	    if [ -z "$pkgs_to_get" ]; then break; fi
>-	done
>-	progress $dloaddebs $totaldebs DOWNDEBS "Downloading packages"
>-	if [ "$pkgs_to_get" != "" ]; then
>-		error 1 COULDNTDLPKGS "Couldn't download packages: %s" "$pkgs_to_get"
>-	fi
>-}
>-
>-download_main_indices () {
>-	local m1="${MIRRORS%% *}"
>-	local comp="${USE_COMPONENTS}"
>-	progress 0 100 DOWNMAINPKGS "Downloading Packages file"
>-	progress_next 100
>-
>-	if [ -z "$comp" ]; then comp=main; fi
>-	COMPONENTS="$(echo $comp | tr '|' ' ')"
>-
>-	export COMPONENTS
>-	for m in $MIRRORS; do
>-	    for c in $COMPONENTS; do
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-		if [ -x /bin/gunzip ] && get "$m/${path}.gz" "${pkgdest}.gz"; then
>-			rm -f "$pkgdest"
>-			gunzip "$pkgdest.gz"
>-		elif get "$m/$path" "$pkgdest"; then
>-			true
>-		fi
>-	    done
>-	done
>-	progress 100 100 DOWNMAINPKGS "Downloading Packages file"
>-}
>-
>-download_main () {
>-	local m1="${MIRRORS%% *}"
>-
>-	:>$TARGET/debootstrap/debpaths
>-	for p in "$@"; do
>-	    for c in $COMPONENTS; do
>-		local details=""
>-		for m in $MIRRORS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if [ ! -e "$pkgdest" ]; then continue; fi
>-			details="$($PKGDETAILS PKGS "$m" "$pkgdest" "$p")"
>-			if [ "$details" = "$p -" ]; then
>-				details=""
>-				continue
>-			fi
>-			size="${details##* }"; details="${details% *}"
>-			md5="${details##* }"; details="${details% *}"
>-			local debdest="$($DLDEST deb $details)"
>-			if get "$m/${details##* }" "$TARGET/$debdest" "$md5" "$size"; then
>-				echo >>$TARGET/debootstrap/debpaths "$p $debdest"
>-				details="done"
>-				break
>-			fi
>-		done
>-		if [ "$details" != "" ]; then
>-			break
>-		fi
>-	    done
>-	    if [ "$details" != "done" ]; then
>-		error 1 COULDNTDL "Couldn't download %s" "$p"
>-	    fi
>-	done
>-}
>-
>-###################################################### deb choosing support
>-
>-get_debs () {
>-	local field="$1"
>-	shift
>-	local m1 c
>-	for m1 in $MIRRORS; do
>-		for c in $COMPONENTS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-			echo $("$PKGDETAILS" FIELD "$field" "$m1" "$pkgdest" "$@" | sed 's/ .*//')
>-		done
>-	done
>-}
>-
>-################################################################ extraction
>-
>-EXTRACTORS_SUPPORTED="dpkg-deb ar"
>-
>-# Native dpkg-deb based extractors
>-extract_dpkg_deb_field () {
>-	local pkg="$1"
>-	local field="$2"
>-
>-	dpkg-deb -f "$pkg" "$field"
>-}
>-
>-extract_dpkg_deb_data () {
>-	local pkg="$1"
>-
>-	dpkg-deb --fsys-tarfile "$pkg" | tar -xf -
>-}
>-
>-# Raw .deb extractors
>-extract_ar_deb_field () {
>-	local pkg="$1"
>-	local field="$2"
>-
>-	ar -p "$pkg" control.tar.gz | zcat |
>-	    tar -O -xf - control ./control 2>/dev/null |
>-	    grep -i "^$field:" | sed -e 's/[^:]*: *//' | head -n 1
>-}
>-
>-extract_ar_deb_data () {
>-	local pkg="$1"
>-	local tarball=$(ar -t "$pkg" | grep "^data.tar.[bgx]z")
>-
>-	case "$tarball" in
>-		data.tar.gz) cat_cmd=zcat ;;
>-		data.tar.bz2) cat_cmd=bzcat ;;
>-		data.tar.xz) cat_cmd=xzcat ;;
>-		*) error 1 UNKNOWNDATACOMP "Unknown compression type for %s in %s" "$tarball" "$pkg" ;;
>-	esac
>-
>-	if type $cat_cmd >/dev/null 2>&1; then
>-		ar -p "$pkg" "$tarball" | $cat_cmd | tar -xf -
>-	else
>-		error 1 UNPACKCMDUNVL "The $cat_cmd is not available on the system"
>-	fi
>-}
>-
>-valid_extractor () {
>-	local extractor="$1"
>-
>-	for E in $EXTRACTORS_SUPPORTED; do
>-		if [ "$extractor" = "$E" ]; then
>-			return 0
>-		fi
>-	done
>-
>-	return 1
>-}
>-
>-choose_extractor () {
>-	local extractor
>-
>-	if [ -n "$EXTRACTOR_OVERRIDE" ]; then
>-		extractor="$EXTRACTOR_OVERRIDE"
>-	elif type dpkg-deb >/dev/null 2>&1; then
>-		extractor="dpkg-deb"
>-	else
>-		extractor="ar"
>-	fi
>-
>-	info CHOSENEXTRACTOR "Chosen extractor for .deb packages: %s" "$extractor"
>-	case "$extractor" in
>-	dpkg-deb)
>-		extract_deb_field () { extract_dpkg_deb_field "$@"; }
>-		extract_deb_data () { extract_dpkg_deb_data "$@"; }
>-		;;
>-	ar)
>-		extract_deb_field () { extract_ar_deb_field "$@"; }
>-		extract_deb_data () { extract_ar_deb_data "$@"; }
>-		;;
>-	esac
>-}
>-
>-extract () { (
>-	cd "$TARGET"
>-	local p=0 cat_cmd
>-	for pkg in $(debfor "$@"); do
>-		p="$(($p + 1))"
>-		progress "$p" "$#" EXTRACTPKGS "Extracting packages"
>-		packagename="$(echo "$pkg" | sed 's,^.*/,,;s,_.*$,,')"
>-		info EXTRACTING "Extracting %s..." "$packagename"
>-		extract_deb_data "./$pkg"
>-	done
>-); }
>-
>-in_target_nofail () {
>-	if ! $CHROOT_CMD "$@" 2>/dev/null; then
>-		true
>-	fi
>-	return 0
>-}
>-
>-in_target_failmsg () {
>-	local code="$1"
>-	local msg="$2"
>-	local arg="$3"
>-	shift; shift; shift
>-	if ! $CHROOT_CMD "$@"; then
>-		warning "$code" "$msg" "$arg"
>-		return 1
>-	fi
>-	return 0
>-}
>-
>-in_target () {
>-	in_target_failmsg IN_TARGET_FAIL "Failure trying to run: %s" "$CHROOT_CMD $*" "$@"
>-}
>-
>-###################################################### standard setup stuff
>-
>-conditional_cp () {
>-	if [ ! -e "$2/$1" ]; then
>-		if [ -L "$1" ] && [ -e "$1" ]; then
>-			cat "$1" >"$2/$1"
>-		elif [ -e "$1" ]; then
>-			cp -a "$1" "$2/$1"
>-		fi
>-	fi
>-}
>-
>-mv_invalid_to () {
>-	local m="$1"
>-	m="$(echo "${m#http://}" | tr '/' '_' | sed 's/_*//')"
>-	(cd "$TARGET/$APTSTATE/lists"
>-	 for a in debootstrap.invalid_*; do
>-		 mv "$a" "${m}_${a#*_}"
>-	 done
>-	)
>-}
>-
>-setup_apt_sources () {
>-	mkdir -p "$TARGET/etc/apt"
>-	for m in "$@"; do
>-		local cs=""
>-		for c in $COMPONENTS; do
>-			local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-			local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
>-			if [ -e "$pkgdest" ]; then cs="$cs $c"; fi
>-		done
>-		if [ "$cs" != "" ]; then echo "deb $m $SUITE$cs"; fi
>-	done > "$TARGET/etc/apt/sources.list"
>-}
>-
>-setup_etc () {
>-	mkdir -p "$TARGET/etc"
>-
>-	conditional_cp /etc/resolv.conf "$TARGET"
>-	conditional_cp /etc/hostname "$TARGET"
>-
>-	if [ "$DLDEST" = apt_dest ] && [ ! -e "$TARGET/etc/apt/sources.list" ]; then
>-		setup_apt_sources "http://debootstrap.invalid/"
>-	fi
>-}
>-
>-UMOUNT_DIRS=
>-
>-umount_exit_function () {
>-	for dir in $UMOUNT_DIRS; do
>-		umount "$TARGET/${dir#/}" || true
>-	done
>-}
>-
>-umount_on_exit () {
>-	if [ "$UMOUNT_DIRS" ]; then
>-		UMOUNT_DIRS="$UMOUNT_DIRS $1"
>-	else
>-		UMOUNT_DIRS="$1"
>-		on_exit umount_exit_function
>-	fi
>-}
>-
>-clear_mtab () {
>-	if [ -f "$TARGET/etc/mtab" ] && [ ! -h "$TARGET/etc/mtab" ]; then
>-		rm -f "$TARGET/etc/mtab"
>-	fi
>-}
>-
>-setup_proc () {
>-	case "$ARCH" in
>-	    kfreebsd-*)
>-		umount_on_exit /dev
>-		umount_on_exit /proc
>-		umount "$TARGET/proc" 2>/dev/null || true
>-		in_target mount -t linprocfs proc /proc
>-		;;
>-	    hurd-*)
>-		;;
>-	    *)
>-		umount_on_exit /dev/pts
>-		umount_on_exit /dev/shm
>-		umount_on_exit /proc/bus/usb
>-		umount_on_exit /proc
>-		umount "$TARGET/proc" 2>/dev/null || true
>-		in_target mount -t proc proc /proc
>-		if [ -d "$TARGET/sys" ] && \
>-		   grep -q '[[:space:]]sysfs' /proc/filesystems 2>/dev/null; then
>-			umount_on_exit /sys
>-			umount "$TARGET/sys" 2>/dev/null || true
>-			in_target mount -t sysfs sysfs /sys
>-		fi
>-		on_exit clear_mtab
>-		;;
>-	esac
>-	umount_on_exit /lib/init/rw
>-}
>-
>-setup_proc_fakechroot () {
>-	rm -rf "$TARGET/proc"
>-	ln -s /proc "$TARGET"
>-}
>-
>-setup_devices () {
>-	case "$ARCH" in
>-	    kfreebsd-*)
>-		in_target mount -t devfs devfs /dev ;;
>-	    hurd-*)
>-		setup_devices_hurd ;;
>-	    *)
>-		if [ -e "$DEVICES_TARGZ" ]; then
>-			zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -)
>-		else
>-			if [ -e /dev/.devfsd ] ; then
>-				in_target mount -t devfs devfs /dev
>-			else
>-				error 1 NODEVTGZ "no %s. cannot create devices" "$DEVICES_TARGZ"
>-			fi
>-		fi
>-		;;
>-	esac
>-}
>-
>-setup_devices_hurd () {
>-	mkdir -p "$TARGET/servers/socket"
>-	/bin/settrans -cfk "$TARGET/servers/socket/1" /hurd/pflocal
>-	/bin/settrans -cf "$TARGET/servers/socket/2" /hurd/pfinet
>-	/bin/settrans -cfk "$TARGET/servers/exec" /hurd/exec
>-	/bin/settrans -cf "$TARGET/servers/crash-suspend" /hurd/crash --suspend
>-	/bin/settrans -cf "$TARGET/servers/crash-kill" /hurd/crash --kill
>-	/bin/settrans -cf "$TARGET/servers/crash-dump-core" /hurd/crash --dump-core
>-	/bin/settrans -cf "$TARGET/servers/password" /hurd/password
>-	/bin/settrans -cf "$TARGET/servers/default-pager" /hurd/proxy-defpager
>-	ln -fs crash-kill "$TARGET/servers/crash"
>-	ln -fs 1 "$TARGET/servers/socket/local"
>-	ln -fs 2 "$TARGET/servers/socket/inet"
>-	(cd "$TARGET/dev"; /sbin/MAKEDEV fd std ptyp ptyq vcs tty1 tty2 tty3 tty4 tty5 tty6)
>-}
>-
>-setup_devices_fakechroot () {
>-	rm -rf "$TARGET/dev"
>-	ln -s /dev "$TARGET"
>-}
>-
>-setup_dselect_method () {
>-	case "$1" in
>-	    apt)
>-		mkdir -p "$TARGET/var/lib/dpkg"
>-		echo "apt apt" > "$TARGET/var/lib/dpkg/cmethopt"
>-		chmod 644 "$TARGET/var/lib/dpkg/cmethopt"
>-		;;
>-	    *)
>-		error 1 UNKNOWNDSELECT "unknown dselect method"
>-		;;
>-	esac
>-}
>-
>-################################################################ pkgdetails
>-
>-# NOTE
>-# For the debootstrap udeb, pkgdetails is provided by the bootstrap-base
>-# udeb, so the pkgdetails API needs to be kept in sync with that.
>-
>-if [ -x /usr/bin/perl ]; then
>-	PKGDETAILS=pkgdetails_perl
>-
>-	pkgdetails_field () {
>-		# uniq field mirror Packages values...
>-		perl -le '
>-$unique = shift @ARGV; $field = lc(shift @ARGV); $mirror = shift @ARGV;
>-$cnt = length(@ARGV);
>-%fields = map { $_, 0 } @ARGV;
>-while (<STDIN>) {
>-	chomp;
>-	next if (/^ /);
>-	if (/^([^:]*:)\s*(.*)$/) {
>-		$f = lc($1); $v = $2;
>-		$pkg = $v if ($f eq "package:");
>-		$ver = $v if ($f eq "version:");
>-		$arc = $v if ($f eq "architecture:");
>-		$fil = $v if ($f eq "filename:");
>-		$md5 = $v if ($f eq "md5sum:");
>-		$siz = $v if ($f eq "size:");
>-		$val = $v if ($f eq $field);
>-	} elsif (/^$/) {
>-		if (defined $val && defined $fields{$val}) {
>-			$cnt++;
>-			printf "%s %s %s %s %s %s %s\n",
>-			 $pkg, $ver, $arc, $mirror, $fil, $md5, $siz;
>-			if ($unique) {
>-				delete $fields{$val};
>-				last if (--$cnt <= 0);
>-			}
>-		}
>-		undef $val;
>-	}
>-}
>-for $v (keys %fields) {
>-	printf ("%s -\n", $v) if ($unique);
>-}
>-' "$@"
>-	}
>-
>-	pkgdetails_perl () {
>-		if [ "$1" = "WGET%" ]; then
>-			shift;
>-			perl -e '
>-$v = 0;
>-while (read STDIN, $x, 1) {
>-	if ($x =~ m/\d/) {
>-		$v *= 10;
>-		$v += $x;
>-	} elsif ($x eq "%") {
>-		printf "P: %d %d%s\n", int($v / 100.0 * ($ARGV[1] - $ARGV[0]) + $ARGV[0]), $ARGV[2], ($#ARGV == 3 ? " $ARGV[3]" : "");
>-		$v = 0;
>-	} else {
>-		$v = 0;
>-	}
>-}' "$@"
>-		elif [ "$1" = "GETDEPS" ]; then
>-			local pkgdest="$2"; shift; shift
>-			perl -e '
>-while (<STDIN>) {
>-	chomp;
>-	$in = 1 if (/^Package: (.*)$/ && grep {$_ eq $1} @ARGV);
>-	$in = 0 if (/^$/);
>-	if ($in and (/^Depends: (.*)$/ or /^Pre-Depends: (.*)$/)) {
>-		for $d (split /\s*,\s*/, $1) {
>-			$d =~ s/\s*[|].*$//;
>-			$d =~ s/\s*[(].*[)]\s*//;
>-			print "$d\n";
>-		}
>-	}
>-}' <"$pkgdest" "$@" | sort | uniq
>-		elif [ "$1" = "PKGS" ]; then
>-			local m="$2"
>-			local p="$3"
>-			shift; shift; shift
>-			pkgdetails_field 1 Package: "$m" "$@" < "$p"
>-		elif [ "$1" = "FIELD" ]; then
>-			local f="$2"
>-			local m="$3"
>-			local p="$4"
>-			shift; shift; shift; shift
>-			pkgdetails_field 0 "$f" "$m" "$@" < "$p"
>-		elif [ "$1" = "STANZAS" ]; then
>-			local pkgdest="$2"; shift; shift
>-			perl -e '
>-my $accum = "";
>-while (<STDIN>) {
>-	$accum .= $_;
>-	$in = 1 if (/^Package: (.*)$/ && grep {$_ eq $1} @ARGV);
>-	if ($in and /^$/) {
>-		print $accum;
>-		if (substr($accum, -1) != "\n") {
>-			print "\n\n";
>-		} elsif (substr($accum, -2, 1) != "\n") {
>-			print "\n";
>-		}
>-		$in = 0;
>-	}
>-	$accum = "" if /^$/;
>-}' <"$pkgdest" "$@"
>-		fi
>-	}
>-elif [ -e "/usr/lib/debootstrap/pkgdetails" ]; then
>-	PKGDETAILS="/usr/lib/debootstrap/pkgdetails"
>-elif [ -e "$DEBOOTSTRAP_DIR/pkgdetails" ]; then
>-	PKGDETAILS="$DEBOOTSTRAP_DIR/pkgdetails"
>-else
>-	PKGDETAILS=""
>-fi
>-
>-##################################################### dependency resolution
>-
>-resolve_deps () {
>-	local m1="${MIRRORS%% *}"
>-
>-	# XXX: I can't think how to deal well with dependency resolution and
>-	#      lots of Packages files. -- aj 2005/06/12
>-
>-	c="${COMPONENTS%% *}"
>-	local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-	local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-
>-	local PKGS="$*"
>-	local ALLPKGS="$PKGS";
>-	local ALLPKGS2="";
>-	while [ "$PKGS" != "" ]; do
>-		PKGS=$("$PKGDETAILS" GETDEPS "$pkgdest" $PKGS)
>-		PKGS=$("$PKGDETAILS" PKGS REAL "$pkgdest" $PKGS | sed -n 's/ .*REAL.*$//p')
>-		ALLPKGS2=$(echo "$PKGS $ALLPKGS" | tr ' ' '\n' | sort | uniq)
>-		PKGS=$(without "$ALLPKGS2" "$ALLPKGS")
>-		ALLPKGS="$ALLPKGS2"
>-	done
>-	echo $ALLPKGS
>-}
>-
>-setup_available () {
>-	local m1="${MIRRORS%% *}"
>-
>-	for c in $COMPONENTS; do
>-		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
>-		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m1" "$path")"
>-		# XXX: What if a package is in more than one component?
>-		# -- cjwatson 2009-07-29
>-		"$PKGDETAILS" STANZAS "$pkgdest" "$@"
>-	done >"$TARGET/var/lib/dpkg/available"
>-
>-	for pkg; do
>-		echo "$pkg install"
>-	done | in_target dpkg --set-selections
>-}
>-
>-get_next_predep () {
>-	local stanza="$(in_target_nofail dpkg --predep-package)"
>-	[ "$stanza" ] || return 1
>-	echo "$stanza" | grep '^Package:' | sed 's/^Package://; s/^ *//'
>-}
>-
>-################################################################### helpers
>-
>-# Return zero if it is possible to create devices and execute programs in
>-# this directory. (Both may be forbidden by mount options, e.g. nodev and
>-# noexec respectively.)
>-check_sane_mount () {
>-	mkdir -p "$1"
>-
>-	case "$ARCH" in
>-	    kfreebsd-*|hurd-*)
>-		;;
>-	    *)
>-		mknod "$1/test-dev-null" c 1 3 || return 1
>-		if ! echo test > "$1/test-dev-null"; then
>-			rm -f "$1/test-dev-null"
>-			return 1
>-		fi
>-		rm -f "$1/test-dev-null"
>-		;;
>-	esac
>-
>-	cat > "$1/test-exec" <<EOF
>-#! /bin/sh
>-:
>-EOF
>-	chmod +x "$1/test-exec"
>-	if ! "$1/test-exec"; then
>-		rm -f "$1/test-exec"
>-		return 1
>-	fi
>-	rm -f "$1/test-exec"
>-
>-	return 0
>-}
>-
>-read_gpg_status () {
>-	badsig=
>-	unkkey=
>-	validsig=
>-	while read prefix keyword keyid rest; do
>-		[ "$prefix" = '[GNUPG:]' ] || continue
>-		case $keyword in
>-		    BADSIG)	badsig="$keyid" ;;
>-		    NO_PUBKEY)	unkkey="$keyid" ;;
>-		    VALIDSIG)	validsig="$keyid" ;;
>-		esac
>-	done
>-	if [ "$validsig" ]; then
>-		info VALIDRELSIG "Valid Release signature (key id %s)" "$validsig"
>-	elif [ "$badsig" ]; then
>-		error 1 BADRELSIG "Invalid Release signature (key id %s)" "$badsig"
>-	elif [ "$unkkey" ]; then
>-		error 1 UNKNOWNRELSIG "Release signed by unknown key (key id %s)" "$unkkey"
>-	else
>-		error 1 SIGCHECK "Error executing gpgv to check Release signature"
>-	fi
>-}
>-
>-without () {
>-	# usage:  without "a b c" "a d" -> "b" "c"
>-	(echo $1 | tr ' ' '\n' | sort | uniq;
>-	 echo $2 $2 | tr ' ' '\n') | sort | uniq -u | tr '\n' ' '
>-	echo
>-}
>-
>-# Formerly called 'repeat', but that's a reserved word in zsh.
>-repeatn () {
>-	local n="$1"
>-	shift
>-	while [ "$n" -gt 0 ]; do
>-		if "$@"; then
>-			break
>-		else
>-			n="$(( $n - 1 ))"
>-			sleep 1
>-		fi
>-	done
>-	if [ "$n" -eq 0 ]; then return 1; fi
>-	return 0
>-}
>-
>-N_EXIT_THINGS=0
>-exit_function () {
>-	local n=0
>-	while [ "$n" -lt "$N_EXIT_THINGS" ]; do
>-		(eval $(eval echo \${EXIT_THING_$n}) 2>/dev/null || true)
>-		n="$(( $n + 1 ))"
>-	done
>-	N_EXIT_THINGS=0
>-}
>-
>-trap "exit_function" 0
>-trap "exit 129" 1
>-trap "error 130 INTERRUPTED \"Interrupt caught ... exiting\"" 2
>-trap "exit 131" 3
>-trap "exit 143" 15
>-
>-on_exit () {
>-	eval `echo EXIT_THING_${N_EXIT_THINGS}=\"$1\"`
>-	N_EXIT_THINGS="$(( $N_EXIT_THINGS + 1 ))"
>-}
>-
>-############################################################## fakechroot tools
>-
>-install_fakechroot_tools () {
>-	mv "$TARGET/sbin/ldconfig" "$TARGET/sbin/ldconfig.REAL"
>-	echo \
>-"#!/bin/sh
>-echo
>-echo \"Warning: Fake ldconfig called, doing nothing\"" > "$TARGET/sbin/ldconfig"
>-	chmod 755 "$TARGET/sbin/ldconfig"
>-
>-	echo \
>-"/sbin/ldconfig
>-/sbin/ldconfig.REAL
>-fakechroot" >> "$TARGET/var/lib/dpkg/diversions"
>-
>-	mv "$TARGET/usr/bin/ldd" "$TARGET/usr/bin/ldd.REAL"
>-	cat << 'END' > "$TARGET/usr/bin/ldd"
>-#!/usr/bin/perl
>-
>-# fakeldd
>-#
>-# Replacement for ldd with usage of objdump
>-#
>-# (c) 2003-2005 Piotr Roszatycki <dexter@debian.org>, BSD
>-
>-
>-my %libs = ();
>-
>-my $status = 0;
>-my $dynamic = 0;
>-my $biarch = 0;
>-
>-my $ldlinuxsodir = "/lib";
>-my @ld_library_path = qw(/usr/lib /lib);
>-
>-
>-sub ldso($) {
>-	my ($lib) = @_;
>-	my @files = ();
>-
>-	if ($lib =~ /^\//) {
>-	    $libs{$lib} = $lib;
>-	    push @files, $lib;
>-	} else {
>-	    foreach my $ld_path (@ld_library_path) {
>-		next unless -f "$ld_path/$lib";
>-		my $badformat = 0;
>-		open OBJDUMP, "objdump -p $ld_path/$lib 2>/dev/null |";
>-	 	while (my $line = <OBJDUMP>) {
>-		    if ($line =~ /file format (\S*)$/) {
>-				$badformat = 1 unless $format eq $1;
>-				last;
>-		    }
>-		}
>-		close OBJDUMP;
>-		next if $badformat;
>-		$libs{$lib} = "$ld_path/$lib";
>-		push @files, "$ld_path/$lib";
>-	    }
>-	    objdump(@files);
>-	}
>-}
>-
>-
>-sub objdump(@) {
>-	my (@files) = @_;
>-	my @libs = ();
>-
>-	foreach my $file (@files) {
>-	    open OBJDUMP, "objdump -p $file 2>/dev/null |";
>-	    while (my $line = <OBJDUMP>) {
>-		$line =~ s/^\s+//;
>-		my @f = split (/\s+/, $line);
>-		if ($line =~ /file format (\S*)$/) {
>-		    if (not $format) {
>-			$format = $1;
>-			if ($unamearch eq "x86_64" and $format eq "elf32-i386") {
>-			    my $link = readlink "/lib/ld-linux.so.2";
>-			    if ($link =~ /^\/emul\/ia32-linux\//) {
>-				$ld_library_path[-2] = "/emul/ia32-linux/usr/lib";
>-				$ld_library_path[-1] = "/emul/ia32-linux/lib";
>-			    }
>-			} elsif ($unamearch =~ /^(sparc|sparc64)$/ and $format eq "elf64-sparc") {
>-			    $ldlinuxsodir = "/lib64";
>-			    $ld_library_path[-2] = "/usr/lib64";
>-			    $ld_library_path[-1] = "/lib64";
>-			}
>-		    } else {
>-			next unless $format eq $1;
>-		    }
>-		}
>-		if (not $dynamic and $f[0] eq "Dynamic") {
>-		    $dynamic = 1;
>-		}
>-		next unless $f[0] eq "NEEDED";
>-		if ($f[1] =~ /^ld-linux(\.|-)/) {
>-		    $f[1] = "$ldlinuxsodir/" . $f[1];
>-		}
>-		if (not defined $libs{$f[1]}) {
>-		    $libs{$f[1]} = undef;
>-		    push @libs, $f[1];
>-		}
>-	    }
>-	    close OBJDUMP;
>-	}
>-
>-	foreach my $lib (@libs) {
>-	    ldso($lib);
>-	}
>-}
>-
>-
>-if ($#ARGV < 0) {
>-	print STDERR "fakeldd: missing file arguments\n";
>-	exit 1;
>-}
>-
>-while ($ARGV[0] =~ /^-/) {
>-	my $arg = $ARGV[0];
>-	shift @ARGV;
>-	last if $arg eq "--";
>-}
>-
>-open LD_SO_CONF, "/etc/ld.so.conf";
>-while ($line = <LD_SO_CONF>) {
>-	chomp $line;
>-	unshift @ld_library_path, $line;
>-}
>-close LD_SO_CONF;
>-
>-unshift @ld_library_path, split(/:/, $ENV{LD_LIBRARY_PATH});
>-
>-$unamearch = `/bin/uname -m`;
>-chomp $unamearch;
>-
>-foreach my $file (@ARGV) {
>-	my $address;
>-	%libs = ();
>-	$dynamic = 0;
>-
>-	if ($#ARGV > 0) {
>-		print "$file:\n";
>-	}
>-
>-	if (not -f $file) {
>-		print STDERR "ldd: $file: No such file or directory\n";
>-		$status = 1;
>-		next;
>-	}
>-
>-	objdump($file);
>-
>-	if ($dynamic == 0) {
>-		print "\tnot a dynamic executable\n";
>-		$status = 1;
>-	} elsif (scalar %libs eq "0") {
>-		print "\tstatically linked\n";
>-	}
>-
>-	if ($format =~ /^elf64-/) {
>-		$address = "0x0000000000000000";
>-	} else {
>-		$address = "0x00000000";
>-	}
>-
>-	foreach $lib (keys %libs) {
>-		if ($libs{$lib}) {
>-			printf "\t%s => %s (%s)\n", $lib, $libs{$lib}, $address;
>-		} else {
>-			printf "\t%s => not found\n", $lib;
>-		}
>-	}
>-}
>-
>-exit $status;
>-END
>-	chmod 755 "$TARGET/usr/bin/ldd"
>-
>-	echo \
>-"/usr/bin/ldd
>-/usr/bin/ldd.REAL
>-fakechroot" >> "$TARGET/var/lib/dpkg/diversions"
>-
>-}
>diff --git a/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap/scripts/ucs3 b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap/scripts/ucs3
>new file mode 100644
>index 0000000..feb2736
>--- /dev/null
>+++ b/branches/ucs-3.2/ucs-3.2-0/base/univention-debootstrap/usr/share/debootstrap/scripts/ucs3
>@@ -0,0 +1,193 @@
>+mirror_style main
>+download_style apt
>+finddebs_style from-indices
>+variants - buildd fakechroot minbase scratchbox
>+
>+if doing_variant fakechroot; then
>+	test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
>+fi
>+
>+case $ARCH in
>+	alpha|ia64) LIBC="libc6.1" ;;
>+	kfreebsd-*) LIBC="libc0.1" ;;
>+	hurd-*)     LIBC="libc0.3" ;;
>+	*)          LIBC="libc6" ;;
>+esac
>+
>+work_out_debs () {
>+	required="$(get_debs Priority: required)"
>+
>+	if doing_variant - || doing_variant fakechroot; then
>+		#required="$required $(get_debs Priority: important)"
>+		#  ^^ should be getting debconf here somehow maybe
>+		base="$(get_debs Priority: important)"
>+	elif doing_variant buildd || doing_variant scratchbox; then
>+		base="apt $(get_debs Build-Essential: yes)"
>+	elif doing_variant minbase; then
>+		base="apt"
>+	fi
>+
>+	if doing_variant fakechroot; then
>+		# ldd.fake needs binutils
>+		required="$required binutils"
>+	fi
>+}
>+
>+first_stage_install () {
>+	extract $required
>+
>+	mkdir -p "$TARGET/var/lib/dpkg"
>+	: >"$TARGET/var/lib/dpkg/status"
>+	: >"$TARGET/var/lib/dpkg/available"
>+
>+	setup_etc
>+	if [ ! -e "$TARGET/etc/fstab" ]; then
>+		echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab"
>+		chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab"
>+	fi
>+
>+	if doing_variant fakechroot; then
>+		setup_devices_fakechroot
>+	else
>+		setup_devices
>+	fi
>+
>+	x_feign_install () {
>+		local pkg="$1"
>+		local deb="$(debfor $pkg)"
>+		local ver="$(extract_deb_field "$TARGET/$deb" Version)"
>+
>+		mkdir -p "$TARGET/var/lib/dpkg/info"
>+
>+		echo \
>+"Package: $pkg
>+Version: $ver
>+Status: install ok installed" >> "$TARGET/var/lib/dpkg/status"
>+
>+		touch "$TARGET/var/lib/dpkg/info/${pkg}.list"
>+	}
>+
>+	x_feign_install dpkg
>+}
>+
>+second_stage_install () {
>+	x_core_install () {
>+		smallyes '' | in_target dpkg --force-depends --install $(debfor "$@")
>+	}
>+
>+	p () {
>+		baseprog="$(($baseprog + ${1:-1}))"
>+	}
>+
>+	if doing_variant fakechroot; then
>+		setup_proc_fakechroot
>+	elif doing_variant scratchbox; then
>+		true
>+	else
>+		setup_proc
>+		in_target /sbin/ldconfig
>+	fi
>+
>+	DEBIAN_FRONTEND=noninteractive
>+	DEBCONF_NONINTERACTIVE_SEEN=true
>+	export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
>+
>+	baseprog=0
>+	bases=7
>+
>+	p; progress $baseprog $bases INSTCORE "Installing core packages" #1
>+	info INSTCORE "Installing core packages..."
>+
>+	p; progress $baseprog $bases INSTCORE "Installing core packages" #2
>+	ln -sf mawk "$TARGET/usr/bin/awk"
>+	x_core_install base-files base-passwd
>+	p; progress $baseprog $bases INSTCORE "Installing core packages" #3
>+	x_core_install dpkg
>+
>+	if [ ! -e "$TARGET/etc/localtime" ]; then
>+		ln -sf /usr/share/zoneinfo/UTC "$TARGET/etc/localtime"
>+	fi
>+
>+	if doing_variant fakechroot; then
>+		install_fakechroot_tools
>+	fi
>+
>+	p; progress $baseprog $bases INSTCORE "Installing core packages" #4
>+	x_core_install $LIBC
>+
>+	p; progress $baseprog $bases INSTCORE "Installing core packages" #5
>+	x_core_install perl-base
>+
>+	p; progress $baseprog $bases INSTCORE "Installing core packages" #6
>+	rm "$TARGET/usr/bin/awk"
>+	x_core_install mawk
>+
>+	p; progress $baseprog $bases INSTCORE "Installing core packages" #7
>+	if doing_variant -; then
>+		x_core_install debconf
>+	fi
>+
>+	baseprog=0
>+	bases=$(set -- $required; echo $#)
>+
>+	info UNPACKREQ "Unpacking required packages..."
>+
>+	exec 7>&1
>+
>+	smallyes '' |
>+		(repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages.  This will be attempted up to five times." "" \
>+		dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 || echo EXITCODE $?) |
>+		dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING
>+
>+	info CONFREQ "Configuring required packages..."
>+
>+	mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL"
>+	echo \
>+"#!/bin/sh
>+echo
>+echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon"
>+	chmod 755 "$TARGET/sbin/start-stop-daemon"
>+
>+	setup_dselect_method apt
>+
>+	smallyes '' |
>+		(in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \
>+		dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 || echo EXITCODE $?) |
>+		dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING
>+
>+	baseprog=0
>+	bases="$(set -- $base; echo $#)"
>+
>+	info UNPACKBASE "Unpacking the base system..."
>+
>+	setup_available $required $base
>+	done_predeps=
>+	while predep=$(get_next_predep); do
>+		# We have to resolve dependencies of pre-dependencies manually because
>+		# dpkg --predep-package doesn't handle this.
>+		predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps")
>+		# XXX: progress is tricky due to how dpkg_progress works
>+		# -- cjwatson 2009-07-29
>+		p; smallyes '' |
>+		in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep)
>+		base=$(without "$base" "$predep")
>+		done_predeps="$done_predeps $predep"
>+	done
>+
>+	smallyes '' |
>+		(repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages.  This will be re-attempted up to five times." "" \
>+		dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 || echo EXITCODE $?) |
>+		dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING
>+
>+	info CONFBASE "Configuring the base system..."
>+
>+	smallyes '' |
>+		(repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages.  This will be re-attempted up to five times." "" \
>+		dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 || echo EXITCODE $?) |
>+		dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING
>+
>+	mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon"
>+
>+	progress $bases $bases CONFBASE "Configuring base system"
>+	info BASESUCCESS "Base system installed successfully."
>+}
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 30547: 5144 | 5322