support setting empty values (sanely) & removing support for

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 18bfec7edf0496eb6c7e48312fd1d5cc7296b1b7..49525cbd091c1d9b6110ee83ad20a20fbe5399bc 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -9,6 +9,14 @@ while [ -n "$1" ]; do
                export MSGLEVEL=4
        elif [ "$1" = '--color=no' ]; then
                export MSGCOLOR='NO'
                export MSGLEVEL=4
        elif [ "$1" = '--color=no' ]; then
                export MSGCOLOR='NO'

+       elif [ "$1" = '--color=yes' ]; then
+               export MSGCOLOR='YES'
+       elif [ "$1" = '--color' ]; then
+               export MSGCOLOR="$(echo "$2" | tr 'a-z' 'A-Z')"
+               shift
+       elif [ "$1" = '--level' ]; then
+               export MSGLEVEL=$2
+               shift

        else
                echo >&2 "WARNING: Unknown parameter »$1« will be ignored"
        fi
        else
                echo >&2 "WARNING: Unknown parameter »$1« will be ignored"
        fi


@@ -17,7 +25,7 @@ done
 export MSGLEVEL="${MSGLEVEL:-3}"
 
 # we all like colorful messages
 export MSGLEVEL="${MSGLEVEL:-3}"
 
 # we all like colorful messages

-if [ "$MSGCOLOR" != 'NO' ] && [ "$MSGCOLOR" != 'ALWAYS' ]; then
+if [ "${MSGCOLOR:-YES}" = 'YES' ]; then

        if [ ! -t 1 ]; then # but check that we output to a terminal
                export MSGCOLOR='NO'
        fi
        if [ ! -t 1 ]; then # but check that we output to a terminal
                export MSGCOLOR='NO'
        fi


@@ -64,25 +72,26 @@ msgninfo() { msgprintf "${CINFO}I: %s" '%s' "${CNORMAL}" "$@"; }
 msgndebug() { msgprintf "${CDEBUG}D: %s" '%s' "${CNORMAL}" "$@"; }
 msgtest() { msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@"; }
 msgpass() { printf "${CPASS}PASS${CNORMAL}\n"; }
 msgndebug() { msgprintf "${CDEBUG}D: %s" '%s' "${CNORMAL}" "$@"; }
 msgtest() { msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@"; }
 msgpass() { printf "${CPASS}PASS${CNORMAL}\n"; }

-msgskip() {
+msgreportheader() {

        if [ -n "$MSGTEST_MSG" ]; then
        if [ -n "$MSGTEST_MSG" ]; then

+               test "$1" != 'msgfailoutput' || echo
+               if [ -n "$MSGTEST_MSGMSG" ]; then
+                       echo "$MSGTEST_MSGMSG"
+               fi

                if [ -n "$MSGTEST_GRP" ] && [ "$MSGTEST_GRP" != 'NEXT' ] && [ "$MSGTEST_GRP" != "$MSGTEST_MSG" ]; then
                if [ -n "$MSGTEST_GRP" ] && [ "$MSGTEST_GRP" != 'NEXT' ] && [ "$MSGTEST_GRP" != "$MSGTEST_MSG" ]; then

-                       echo "Part of the test group: $MSGTEST_GRP"
+                       echo "${CFAIL}Part of the test group: $MSGTEST_GRP"

                fi
                echo -n "$MSGTEST_MSG"
                unset MSGTEST_MSG
        fi
                fi
                echo -n "$MSGTEST_MSG"
                unset MSGTEST_MSG
        fi

+}
+msgskip() {
+       msgreportheader 'msgskip'

        if [ $# -gt 0 ]; then printf "${CWARNING}SKIP: $*${CNORMAL}\n" >&2;
        else printf "${CWARNING}SKIP${CNORMAL}\n" >&2; fi
 }
 msgfail() {
        if [ $# -gt 0 ]; then printf "${CWARNING}SKIP: $*${CNORMAL}\n" >&2;
        else printf "${CWARNING}SKIP${CNORMAL}\n" >&2; fi
 }
 msgfail() {

-       if [ -n "$MSGTEST_MSG" ]; then
-               if [ -n "$MSGTEST_GRP" ] && [ "$MSGTEST_GRP" != 'NEXT' ] && [ "$MSGTEST_GRP" != "$MSGTEST_MSG" ]; then
-                       echo "Part of the test group: $MSGTEST_GRP"
-               fi
-               echo -n "$MSGTEST_MSG"
-               unset MSGTEST_MSG
-       fi
+       msgreportheader 'msgfail'

        if [ $# -gt 0 ] && [ -n "$1" ]; then printf "${CFAIL}FAIL: $*${CNORMAL}\n" >&2;
        else printf "${CFAIL}FAIL${CNORMAL}\n" >&2; fi
        if [ -n "$APT_DEBUG_TESTS" ]; then
        if [ $# -gt 0 ] && [ -n "$1" ]; then printf "${CFAIL}FAIL: $*${CNORMAL}\n" >&2;
        else printf "${CFAIL}FAIL${CNORMAL}\n" >&2; fi
        if [ -n "$APT_DEBUG_TESTS" ]; then


@@ -114,7 +123,9 @@ if [ $MSGLEVEL -le 1 ]; then
        msgnwarn() { true; }
 fi
 if [ $MSGLEVEL -le 2 ]; then
        msgnwarn() { true; }
 fi
 if [ $MSGLEVEL -le 2 ]; then

-       msgmsg() { true; }
+       msgmsg() {
+               MSGTEST_MSGMSG="$(msgprintf "${CMSG}%s" '%s' "${CNORMAL}" "$@")"
+       }

        msgnmsg() { true; }
        msgtest() {
                MSGTEST_MSG="$(msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@")"
        msgnmsg() { true; }
        msgtest() {
                MSGTEST_MSG="$(msgprintf "${CINFO}%s" "${CCMD}%s${CINFO}" "…${CNORMAL} " "$@")"


@@ -184,7 +195,7 @@ dpkg() {
        "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "$@"
 }
 dpkgcheckbuilddeps() {
        "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "$@"
 }
 dpkgcheckbuilddeps() {

-       command dpkg-checkbuilddeps --admindir=${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg "$@"
+       command dpkg-checkbuilddeps --admindir="${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg" "$@"

 }
 gdb() {
        local CMD
 }
 gdb() {
        local CMD


@@ -196,10 +207,14 @@ gdb() {
        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptftparchive) CMD="apt-ftparchive";;
        aptmark) CMD="apt-mark";;
        apthelper) CMD="apt-helper";;
        aptftparchive) CMD="apt-ftparchive";;

+       dpkg) shift; runapt "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg" "$@"; return;;

        *) CMD="$1";;
        esac
        shift
        *) CMD="$1";;
        esac
        shift

-       runapt command gdb --quiet -ex run "${BUILDDIRECTORY}/$CMD" --args "${BUILDDIRECTORY}/$CMD" "$@"
+       if [ "${CMD##*/}" = "$CMD" ]; then
+               CMD="${BUILDDIRECTORY}/${CMD}"
+       fi
+       runapt command gdb --quiet -ex run "$CMD" --args "$CMD" "$@"

 }
 
 exitwithstatus() {
 }
 
 exitwithstatus() {


@@ -235,9 +250,9 @@ setupenvironment() {
        if [ -n "$TMPDIR" ] && [ "$(id -u)" = '0' ] && [ "$(stat --format '%a' "$TMPDIR")" != '1777' ]; then
                unset TMPDIR
        fi
        if [ -n "$TMPDIR" ] && [ "$(id -u)" = '0' ] && [ "$(stat --format '%a' "$TMPDIR")" != '1777' ]; then
                unset TMPDIR
        fi

-       TMPWORKINGDIRECTORY=$(mktemp -d)
-       addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY;"
-       msgninfo "Preparing environment for $(basename $0) in ${TMPWORKINGDIRECTORY}…"
+       TMPWORKINGDIRECTORY="$(mktemp -d)"
+       addtrap "cd /; rm -rf \"$TMPWORKINGDIRECTORY\";"
+       msgninfo "Preparing environment for ${0##*/} in ${TMPWORKINGDIRECTORY}…"

 
        mkdir -m 700 "${TMPWORKINGDIRECTORY}/downloaded"
        if [ "$(id -u)" = '0' ]; then
 
        mkdir -m 700 "${TMPWORKINGDIRECTORY}/downloaded"
        if [ "$(id -u)" = '0' ]; then


@@ -247,20 +262,20 @@ setupenvironment() {
                chown _apt:root "${TMPWORKINGDIRECTORY}/downloaded"
        fi
 
                chown _apt:root "${TMPWORKINGDIRECTORY}/downloaded"
        fi
 

-       TESTDIRECTORY=$(readlink -f $(dirname $0))
+       TESTDIRECTORY="$(readlink -f "$(dirname $0)")"

         # allow overriding the default BUILDDIR location
         # allow overriding the default BUILDDIR location

-       SOURCEDIRECTORY=${APT_INTEGRATION_TESTS_SOURCE_DIR:-"${TESTDIRECTORY}/../../"}
-       BUILDDIRECTORY=${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"}
-       LIBRARYPATH=${APT_INTEGRATION_TESTS_LIBRARY_PATH:-"${BUILDDIRECTORY}"}
-        METHODSDIR=${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"}
-        APTHELPERBINDIR=${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"}
-        APTWEBSERVERBINDIR=${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"}
-        APTINTERNALSOLVER=${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/apt-internal-solver"}
-       APTDUMPSOLVER=${APT_INTEGRATION_TESTS_DUMP_SOLVER:-"${BUILDDIRECTORY}/apt-dump-solver"}
+       SOURCEDIRECTORY="${APT_INTEGRATION_TESTS_SOURCE_DIR:-"${TESTDIRECTORY}/../../"}"
+       BUILDDIRECTORY="${APT_INTEGRATION_TESTS_BUILD_DIR:-"${TESTDIRECTORY}/../../build/bin"}"
+       LIBRARYPATH="${APT_INTEGRATION_TESTS_LIBRARY_PATH:-"${BUILDDIRECTORY}"}"
+        METHODSDIR="${APT_INTEGRATION_TESTS_METHODS_DIR:-"${BUILDDIRECTORY}/methods"}"
+        APTHELPERBINDIR="${APT_INTEGRATION_TESTS_LIBEXEC_DIR:-"${BUILDDIRECTORY}"}"
+        APTWEBSERVERBINDIR="${APT_INTEGRATION_TESTS_WEBSERVER_BIN_DIR:-"${BUILDDIRECTORY}"}"
+        APTINTERNALSOLVER="${APT_INTEGRATION_TESTS_INTERNAL_SOLVER:-"${BUILDDIRECTORY}/apt-internal-solver"}"
+       APTDUMPSOLVER="${APT_INTEGRATION_TESTS_DUMP_SOLVER:-"${BUILDDIRECTORY}/apt-dump-solver"}"

        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
         # -----
 
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
         # -----
 

-       cd $TMPWORKINGDIRECTORY
+       cd "$TMPWORKINGDIRECTORY"

        mkdir rootdir aptarchive keys
        cd rootdir
        mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
        mkdir rootdir aptarchive keys
        cd rootdir
        mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d


@@ -268,7 +283,7 @@ setupenvironment() {
        mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
        touch var/lib/dpkg/available
        mkdir -p usr/lib/apt
        mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
        touch var/lib/dpkg/available
        mkdir -p usr/lib/apt

-       ln -s ${METHODSDIR} usr/lib/apt/methods
+       ln -s "${METHODSDIR}" usr/lib/apt/methods

        if [ "$BUILDDIRECTORY" = "$LIBRARYPATH" ]; then
                mkdir -p usr/lib/apt/solvers
                ln -s "${BUILDDIRECTORY}/apt-dump-solver" usr/lib/apt/solvers/dump
        if [ "$BUILDDIRECTORY" = "$LIBRARYPATH" ]; then
                mkdir -p usr/lib/apt/solvers
                ln -s "${BUILDDIRECTORY}/apt-dump-solver" usr/lib/apt/solvers/dump


@@ -277,53 +292,69 @@ setupenvironment() {
        fi
         # use the autoremove from the BUILDDIRECTORY if its there, otherwise
         # system
        fi
         # use the autoremove from the BUILDDIRECTORY if its there, otherwise
         # system

-        if [ -e ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove ]; then
-           ln -s ${BUILDDIRECTORY}/../../debian/apt.conf.autoremove etc/apt/apt.conf.d/01autoremove
+        if [ -e "${BUILDDIRECTORY}/../../debian/apt.conf.autoremove" ]; then
+           ln -s "${BUILDDIRECTORY}/../../debian/apt.conf.autoremove" etc/apt/apt.conf.d/01autoremove

         else
            ln -s /etc/apt/apt.conf.d/01autoremove etc/apt/apt.conf.d/01autoremove
         fi
        cd ..
         else
            ln -s /etc/apt/apt.conf.d/01autoremove etc/apt/apt.conf.d/01autoremove
         fi
        cd ..

-       local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
+       local BASENAME="${0##*/}"
+       local PACKAGESFILE="Packages-${BASENAME#*-}"

        if [ -f "${TESTDIRECTORY}/${PACKAGESFILE}" ]; then
                cp "${TESTDIRECTORY}/${PACKAGESFILE}" aptarchive/Packages
        fi
        if [ -f "${TESTDIRECTORY}/${PACKAGESFILE}" ]; then
                cp "${TESTDIRECTORY}/${PACKAGESFILE}" aptarchive/Packages
        fi

-       local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
+       local SOURCESSFILE="Sources-${BASENAME#*-}"

        if [ -f "${TESTDIRECTORY}/${SOURCESSFILE}" ]; then
                cp "${TESTDIRECTORY}/${SOURCESSFILE}" aptarchive/Sources
        fi
        if [ -f "${TESTDIRECTORY}/${SOURCESSFILE}" ]; then
                cp "${TESTDIRECTORY}/${SOURCESSFILE}" aptarchive/Sources
        fi

-       cp $(find $TESTDIRECTORY -name '*.pub' -o -name '*.sec') keys/
-       chmod 644 $(find keys -name '*.pub' -o -name '*.sec')
-       ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       for key in $(find "$TESTDIRECTORY" -name '*.pub' -o -name '*.sec'); do
+               cp "$key" keys/
+               chmod 644 "$key"
+       done
+       ln -s "${TMPWORKINGDIRECTORY}/keys/joesixpack.pub" rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg

 
        echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
        echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
        echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
        echo "Dir::Bin::Methods \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/methods\";" >> aptconfig.conf
 
        echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
        echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf
        echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
        echo "Dir::Bin::Methods \"${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/methods\";" >> aptconfig.conf

-       # store apt-key were we can access it, even if we run it as a different user
-       # destroys coverage reporting though, so just do it for root for now
+       # either store apt-key were we can access it, even if we run it as a different user
+       #cp "${BUILDDIRECTORY}/apt-key" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/"
+       #chmod o+rx "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key"
+       #echo "Dir::Bin::apt-key \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key\";" >> aptconfig.conf
+       # destroys coverage reporting though, so we disable changing user for the calling gpgv
+       echo "Dir::Bin::apt-key \"${BUILDDIRECTORY}/apt-key\";" >> aptconfig.conf

        if [ "$(id -u)" = '0' ]; then
        if [ "$(id -u)" = '0' ]; then

-               cp "${BUILDDIRECTORY}/apt-key" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/"
-               chmod o+rx "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key"
-               echo "Dir::Bin::apt-key \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/apt-key\";" >> aptconfig.conf
-       else
-               echo "Dir::Bin::apt-key \"${BUILDDIRECTORY}/apt-key\";" >> aptconfig.conf
+               echo 'Binary::gpgv::Debug::NoDropPrivs "true";' >>aptconfig.conf

        fi
 
        fi
 

-       cat << EOF > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
+       cat > "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF

 #!/bin/sh
 set -e
 if [ -r "${TMPWORKINGDIRECTORY}/noopchroot.so" ]; then
 #!/bin/sh
 set -e
 if [ -r "${TMPWORKINGDIRECTORY}/noopchroot.so" ]; then

+       if [ -n "\$LD_LIBRARY_PATH" ]; then
+               export LD_LIBRARY_PATH="${TMPWORKINGDIRECTORY}:${LD_LIBRARY_PATH}"
+       else
+               export LD_LIBRARY_PATH="${TMPWORKINGDIRECTORY}"
+       fi

        if [ -n "\$LD_PRELOAD" ]; then
        if [ -n "\$LD_PRELOAD" ]; then

-               export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so \${LD_PRELOAD}"
+               export LD_PRELOAD="noopchroot.so \${LD_PRELOAD}"

        else
        else

-               export LD_PRELOAD="${TMPWORKINGDIRECTORY}/noopchroot.so"
+               export LD_PRELOAD="noopchroot.so"

        fi
 fi
        fi
 fi

-exec fakeroot dpkg --root="${TMPWORKINGDIRECTORY}/rootdir" \\
-       --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log \\
+EOF
+       cp "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg"
+       cat >> "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" <<EOF
+exec fakeroot "${DPKG:-dpkg}" --root="${TMPWORKINGDIRECTORY}/rootdir" \\
+       --log="${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log" \\
+       --force-not-root --force-bad-path "\$@"
+EOF
+       cat >> "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg" <<EOF
+exec fakeroot gdb --quiet -ex run "${DPKG:-dpkg}" --args "${DPKG:-dpkg}" --root="${TMPWORKINGDIRECTORY}/rootdir" \\
+       --log="${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log" \\

        --force-not-root --force-bad-path "\$@"
 EOF
        --force-not-root --force-bad-path "\$@"
 EOF

-       chmod +x "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg"
+       chmod +x "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg" "${TMPWORKINGDIRECTORY}/rootdir/usr/bin/gdb-dpkg"

        echo "Dir::Bin::dpkg \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg\";" > rootdir/etc/apt/apt.conf.d/99dpkg
 
        {
        echo "Dir::Bin::dpkg \"${TMPWORKINGDIRECTORY}/rootdir/usr/bin/dpkg\";" > rootdir/etc/apt/apt.conf.d/99dpkg
 
        {


@@ -346,7 +377,9 @@ EOF
        fi
        echo "Acquire::https::CaInfo \"${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem\";" > rootdir/etc/apt/apt.conf.d/99https
        echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary
        fi
        echo "Acquire::https::CaInfo \"${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem\";" > rootdir/etc/apt/apt.conf.d/99https
        echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary

+       echo 'Acquire::Connect::AddrConfig "false";' > rootdir/etc/apt/apt.conf.d/connect-addrconfig

        configcompression '.' 'gz' #'bz2' 'lzma' 'xz'
        configcompression '.' 'gz' #'bz2' 'lzma' 'xz'

+       confighashes 'SHA1' # these are tests, not security best-practices

 
        # create some files in /tmp and look at user/group to get what this means
        TEST_DEFAULT_USER="$USER"
 
        # create some files in /tmp and look at user/group to get what this means
        TEST_DEFAULT_USER="$USER"


@@ -356,12 +389,8 @@ EOF
                TEST_DEFAULT_GROUP="$USER"
        fi
 
                TEST_DEFAULT_GROUP="$USER"
        fi
 

-        # Acquire::AllowInsecureRepositories=false is not yet the default
-        # but we want it to be the default soon
-        configallowinsecurerepositories "false";
-

        # cleanup the environment a bit
        # cleanup the environment a bit

-        # prefer our apt binaries over the system apt binaries
+       # prefer our apt binaries over the system apt binaries

        export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
        export LC_ALL=C.UTF-8
        unset LANGUAGE APT_CONFIG
        export PATH="${BUILDDIRECTORY}:${PATH}:/usr/local/sbin:/usr/sbin:/sbin"
        export LC_ALL=C.UTF-8
        unset LANGUAGE APT_CONFIG


@@ -403,7 +432,8 @@ configarchitecture() {
 
 configdpkg() {
        if [ ! -e rootdir/var/lib/dpkg/status ]; then
 
 configdpkg() {
        if [ ! -e rootdir/var/lib/dpkg/status ]; then

-               local STATUSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/status-/' -e 's/^skip-/status-/')
+               local BASENAME="${0##*/}"
+               local STATUSFILE="status-${BASENAME#*-}"

                if [ -f "${TESTDIRECTORY}/${STATUSFILE}" ]; then
                        cp "${TESTDIRECTORY}/${STATUSFILE}" rootdir/var/lib/dpkg/status
                else
                if [ -f "${TESTDIRECTORY}/${STATUSFILE}" ]; then
                        cp "${TESTDIRECTORY}/${STATUSFILE}" rootdir/var/lib/dpkg/status
                else


@@ -438,7 +468,7 @@ configdpkgnoopchroot() {
        # via execvp() as used by dpkg as we don't want our rootdir to be a fullblown
        # chroot directory dpkg could chroot into to execute the maintainer scripts
        msgtest 'Building library to preload to make maintainerscript work in' 'dpkg'
        # via execvp() as used by dpkg as we don't want our rootdir to be a fullblown
        # chroot directory dpkg could chroot into to execute the maintainer scripts
        msgtest 'Building library to preload to make maintainerscript work in' 'dpkg'

-       cat << EOF > noopchroot.c
+       cat > noopchroot.c << EOF

 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>


@@ -473,12 +503,6 @@ int execvp(const char *file, char *const argv[]) {
 EOF
        testsuccess --nomsg gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl
 }
 EOF
        testsuccess --nomsg gcc -fPIC -shared -o noopchroot.so noopchroot.c -ldl
 }

-
-configallowinsecurerepositories() {
-    echo "Acquire::AllowInsecureRepositories \"$1\";" >  rootdir/etc/apt/apt.conf.d/allow-insecure-repositories.conf
-
-}
-

 configcompression() {
        while [ -n "$1" ]; do
                case "$1" in
 configcompression() {
        while [ -n "$1" ]; do
                case "$1" in


@@ -490,9 +514,24 @@ configcompression() {
                *) printf "$1\t$1\t$1\n";;
                esac
                shift
                *) printf "$1\t$1\t$1\n";;
                esac
                shift

-       done > ${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf
+       done > "${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf"
+}
+confighashes() {
+       {
+               echo 'APT::FTPArchive {'
+               {
+                       while [ -n "$1" ]; do
+                               printf "$1" | tr 'a-z' 'A-Z'
+                               printf "\t\"true\";\n"
+                               shift
+                       done
+                       for h in 'MD5' 'SHA1' 'SHA256' 'SHA512'; do
+                               printf "$h\t\"false\";\n"
+                       done
+               } | awk '!x[$1]++'
+               echo '};'
+       } >> "${TMPWORKINGDIRECTORY}/rootdir/etc/apt/apt.conf.d/ftparchive-hashes.conf"

 }
 }

-

 forcecompressor() {
        COMPRESSOR="$1"
        COMPRESSOR_CMD="$1"
 forcecompressor() {
        COMPRESSOR="$1"
        COMPRESSOR_CMD="$1"


@@ -536,10 +575,10 @@ setupsimplenativepackage() {
 
        local SECTION="${7:-others}"
        local DISTSECTION
 
        local SECTION="${7:-others}"
        local DISTSECTION

-       if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
+       if [ "$SECTION" = "${SECTION#*/}" ]; then

                DISTSECTION="main"
        else
                DISTSECTION="main"
        else

-               DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
+               DISTSECTION="${SECTION%/*}"

        fi
        local BUILDDIR=incoming/${NAME}-${VERSION}
        mkdir -p ${BUILDDIR}/debian/source
        fi
        local BUILDDIR=incoming/${NAME}-${VERSION}
        mkdir -p ${BUILDDIR}/debian/source


@@ -592,56 +631,58 @@ buildsimplenativepackage() {
 
        local SECTION="${7:-others}"
        local PRIORITY="${8:-optional}"
 
        local SECTION="${7:-others}"
        local PRIORITY="${8:-optional}"

-        local FILE_TREE="$9"
-        local COMPRESS_TYPE="${10:-gzip}"
+       local FILE_TREE="$9"
+       local COMPRESS_TYPE="${10:-gzip}"

        local DISTSECTION
        local DISTSECTION

-       if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
+       if [ "$SECTION" = "${SECTION#*/}" ]; then

                DISTSECTION="main"
        else
                DISTSECTION="main"
        else

-               DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
+               DISTSECTION="${SECTION%/*}"

        fi
        fi

-       local BUILDDIR=${TMPWORKINGDIRECTORY}/incoming/${NAME}-${VERSION}
+       local BUILDDIR="${TMPWORKINGDIRECTORY}/incoming/${NAME}-${VERSION}"

 
        msgtest "Build source package in version ${VERSION} for ${RELEASE} in ${DISTSECTION}" "$NAME"
 
        msgtest "Build source package in version ${VERSION} for ${RELEASE} in ${DISTSECTION}" "$NAME"

-       mkdir -p $BUILDDIR/debian/source
-       echo "* most suckless software product ever" > ${BUILDDIR}/FEATURES
+       mkdir -p "$BUILDDIR/debian/source"
+       echo "* most suckless software product ever" > "${BUILDDIR}/FEATURES"

        echo "#!/bin/sh
        echo "#!/bin/sh

-echo '$NAME says \"Hello!\"'" > ${BUILDDIR}/${NAME}
+echo '$NAME says \"Hello!\"'" > "${BUILDDIR}/${NAME}"

 
 

-       echo "Copyleft by Joe Sixpack $(date +%Y)" > ${BUILDDIR}/debian/copyright
+       echo "Copyleft by Joe Sixpack $(date +%Y)" > "${BUILDDIR}/debian/copyright"

        echo "$NAME ($VERSION) $RELEASE; urgency=low
 
   * Initial release
 
        echo "$NAME ($VERSION) $RELEASE; urgency=low
 
   * Initial release
 

- -- Joe Sixpack <joe@example.org>  $(date -R)" > ${BUILDDIR}/debian/changelog
-       echo "Source: $NAME
+ -- Joe Sixpack <joe@example.org>  $(date -R)" > "${BUILDDIR}/debian/changelog"
+       {
+               echo "Source: $NAME

 Priority: $PRIORITY
 Maintainer: Joe Sixpack <joe@example.org>
 Priority: $PRIORITY
 Maintainer: Joe Sixpack <joe@example.org>

-Standards-Version: 3.9.3" > ${BUILDDIR}/debian/control
-       if [ "$SECTION" != '<none>' ]; then
-               echo "Section: $SECTION" >> ${BUILDDIR}/debian/control
-       fi
-       local BUILDDEPS="$(echo "$DEPENDENCIES" | grep '^Build-')"
-       test -z "$BUILDDEPS" || echo "$BUILDDEPS" >> ${BUILDDIR}/debian/control
-       echo "
-Package: $NAME" >> ${BUILDDIR}/debian/control
+Standards-Version: 3.9.3"
+               if [ "$SECTION" != '<none>' ]; then
+                       echo "Section: $SECTION"
+               fi
+               local BUILDDEPS="$(echo "$DEPENDENCIES" | grep '^Build-')"
+               test -z "$BUILDDEPS" || echo "$BUILDDEPS"
+               echo "
+Package: $NAME"

 
 

-       if [ "$ARCH" = 'all' ]; then
-               echo "Architecture: all" >> ${BUILDDIR}/debian/control
-       else
-               echo "Architecture: any" >> ${BUILDDIR}/debian/control
-       fi
-       local DEPS="$(echo "$DEPENDENCIES" | grep -v '^Build-')"
-       test -z "$DEPS" || echo "$DEPS" >> ${BUILDDIR}/debian/control
-       echo "Description: $DESCRIPTION" >> ${BUILDDIR}/debian/control
+               if [ "$ARCH" = 'all' ]; then
+                       echo "Architecture: all"
+               else
+                       echo "Architecture: any"
+               fi
+               local DEPS="$(echo "$DEPENDENCIES" | grep -v '^Build-')"
+               test -z "$DEPS" || echo "$DEPS"
+               echo "Description: $DESCRIPTION"
+       } > "${BUILDDIR}/debian/control"

 
 

-       echo '3.0 (native)' > ${BUILDDIR}/debian/source/format
-       cd ${BUILDDIR}/..
+       echo '3.0 (native)' > "${BUILDDIR}/debian/source/format"
+       cd "${BUILDDIR}/.."

        testsuccess --nomsg dpkg-source -b ${NAME}-${VERSION}
        cd - >/dev/null
        testsuccess --nomsg dpkg-source -b ${NAME}-${VERSION}
        cd - >/dev/null

-       sed -n 's#^dpkg-source: info: building [^ ]\+ in ##p' ${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output \
+       sed -n 's#^dpkg-source: info: building [^ ]\+ in ##p' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" \

                | while read SRC; do
                | while read SRC; do

-               echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
+               echo "pool/${SRC}" >> "${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist"

 #              if expr match "${SRC}" '.*\.dsc' >/dev/null 2>&1; then
 #                      aptkey --keyring ./keys/joesixpack.pub --secret-keyring ./keys/joesixpack.sec --quiet --readonly \
 #                              adv --yes --default-key 'Joe Sixpack' \
 #              if expr match "${SRC}" '.*\.dsc' >/dev/null 2>&1; then
 #                      aptkey --keyring ./keys/joesixpack.pub --secret-keyring ./keys/joesixpack.sec --quiet --readonly \
 #                              adv --yes --default-key 'Joe Sixpack' \


@@ -652,26 +693,26 @@ Package: $NAME" >> ${BUILDDIR}/debian/control
 
        for arch in $(getarchitecturesfromcommalist "$ARCH"); do
                msgtest "Build binary package for ${RELEASE} in ${SECTION}" "$NAME"
 
        for arch in $(getarchitecturesfromcommalist "$ARCH"); do
                msgtest "Build binary package for ${RELEASE} in ${SECTION}" "$NAME"

-               rm -rf ${BUILDDIR}/debian/tmp
-               mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
-               cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
-               cp ${BUILDDIR}/${NAME} ${BUILDDIR}/debian/tmp/usr/bin/${NAME}-${arch}
+               rm -rf "${BUILDDIR}/debian/tmp"
+               mkdir -p "${BUILDDIR}/debian/tmp/DEBIAN" "${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}" "${BUILDDIR}/debian/tmp/usr/bin"
+               cp "${BUILDDIR}/debian/copyright" "${BUILDDIR}/debian/changelog" "${BUILDDIR}/FEATURES" "${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}"
+               cp "${BUILDDIR}/${NAME}" "${BUILDDIR}/debian/tmp/usr/bin/${NAME}-${arch}"

                 if [ -n "$FILE_TREE" ]; then
                 if [ -n "$FILE_TREE" ]; then

-                    cp -ar "$FILE_TREE" ${BUILDDIR}/debian/tmp
+                    cp -ar "$FILE_TREE" "${BUILDDIR}/debian/tmp"

                 fi
 
                 fi
 

-               (cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$arch)
-               (cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
+               (cd "${BUILDDIR}"; dpkg-gencontrol -DArchitecture=$arch)
+               (cd "${BUILDDIR}/debian/tmp"; md5sum $(find usr/ -type f) > DEBIAN/md5sums)

                local LOG="${BUILDDIR}/../${NAME}_${VERSION}_${arch}.dpkg-deb.log"
                # ensure the right permissions as dpkg-deb insists
                local LOG="${BUILDDIR}/../${NAME}_${VERSION}_${arch}.dpkg-deb.log"
                # ensure the right permissions as dpkg-deb insists

-               chmod 755 ${BUILDDIR}/debian/tmp/DEBIAN
-               testsuccess --nomsg dpkg-deb -Z${COMPRESS_TYPE} --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/..
-               echo "pool/${NAME}_${VERSION}_${arch}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist
+               chmod 755 "${BUILDDIR}/debian/tmp/DEBIAN"
+               testsuccess --nomsg dpkg-deb -Z${COMPRESS_TYPE} --build "${BUILDDIR}/debian/tmp" "${BUILDDIR}/.."
+               echo "pool/${NAME}_${VERSION}_${arch}.deb" >> "${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist"

        done
 
        local CHANGEPATH="${BUILDDIR}/../${DISTSECTION}/${NM}/${NAME}/${NAME}_${VERSION}"
        done
 
        local CHANGEPATH="${BUILDDIR}/../${DISTSECTION}/${NM}/${NAME}/${NAME}_${VERSION}"

-       mkdir -p $CHANGEPATH
-       cp ${BUILDDIR}/debian/changelog $CHANGEPATH
+       mkdir -p "$CHANGEPATH"
+       cp "${BUILDDIR}/debian/changelog" "$CHANGEPATH"

        rm -rf "${BUILDDIR}"
        msgdone "info"
 }
        rm -rf "${BUILDDIR}"
        msgdone "info"
 }


@@ -684,20 +725,20 @@ buildpackage() {
        local PKGNAME="$(echo "$BUILDDIR" | grep -o '[^/]*$')"
        local BUILDLOG="$(readlink -f "${BUILDDIR}/../${PKGNAME}_${RELEASE}_${SECTION}.dpkg-bp.log")"
        msgtest "Build package for ${RELEASE} in ${SECTION}" "$PKGNAME"
        local PKGNAME="$(echo "$BUILDDIR" | grep -o '[^/]*$')"
        local BUILDLOG="$(readlink -f "${BUILDDIR}/../${PKGNAME}_${RELEASE}_${SECTION}.dpkg-bp.log")"
        msgtest "Build package for ${RELEASE} in ${SECTION}" "$PKGNAME"

-       cd $BUILDDIR
+       cd "$BUILDDIR"

        if [ "$ARCH" = "all" ]; then
                ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)"
        fi
        testsuccess --nomsg dpkg-buildpackage -uc -us -a$ARCH
        if [ "$ARCH" = "all" ]; then
                ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)"
        fi
        testsuccess --nomsg dpkg-buildpackage -uc -us -a$ARCH

-       cp ${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output $BUILDLOG
-       local PKGS="$(grep '^dpkg-deb: building package' $BUILDLOG | cut -d'/' -f 2 | sed -e "s#'\.##")"
-       local SRCS="$(grep '^dpkg-source: info: building' $BUILDLOG | grep -o '[a-z0-9._+~-]*$')"
+       cp "${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" "$BUILDLOG"
+       local PKGS="$(grep '^dpkg-deb: building package' "$BUILDLOG" | cut -d'/' -f 2 | sed -e "s#'\.##")"
+       local SRCS="$(grep '^dpkg-source: info: building' "$BUILDLOG" | grep -o '[a-z0-9._+~-]*$')"

        cd - > /dev/null
        for PKG in $PKGS; do
        cd - > /dev/null
        for PKG in $PKGS; do

-               echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist
+               echo "pool/${PKG}" >> "${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist"

        done
        for SRC in $SRCS; do
        done
        for SRC in $SRCS; do

-               echo "pool/${SRC}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.srclist
+               echo "pool/${SRC}" >> "${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.srclist"

        done
 }
 
        done
 }
 


@@ -710,62 +751,37 @@ buildaptarchive() {
 }
 
 createaptftparchiveconfig() {
 }
 
 createaptftparchiveconfig() {

-       local COMPRESSORS="$(cut -d'    ' -f 1 ${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf | tr '\n' ' ')"
+       local COMPRESSORS="$(cut -d'    ' -f 1 "${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf" | tr '\n' ' ')"

        local COMPRESSORS="${COMPRESSORS%* }"
        local ARCHS="$(getarchitectures)"
        local COMPRESSORS="${COMPRESSORS%* }"
        local ARCHS="$(getarchitectures)"

-       echo -n 'Dir {
-       ArchiveDir "' >> ftparchive.conf
-       echo -n $(readlink -f .) >> ftparchive.conf
-       echo -n '";
-       CacheDir "' >> ftparchive.conf
-       echo -n $(readlink -f ..) >> ftparchive.conf
-       echo -n '";
-       FileListDir "' >> ftparchive.conf
-       echo -n $(readlink -f pool/) >> ftparchive.conf
-       echo -n '";
+       cat > ftparchive.conf <<EOF
+Dir {
+       ArchiveDir "$(readlink -f .)";
+       CacheDir "$(readlink -f ..)";
+       FileListDir "$(readlink -f pool/)";

 };
 Default {
 };
 Default {

-       Packages::Compress "'"$COMPRESSORS"'";
-       Sources::Compress "'"$COMPRESSORS"'";
-       Contents::Compress "'"$COMPRESSORS"'";
-       Translation::Compress "'"$COMPRESSORS"'";
+       Packages::Compress "$COMPRESSORS";
+       Sources::Compress "$COMPRESSORS";
+       Contents::Compress "$COMPRESSORS";
+       Translation::Compress "$COMPRESSORS";

        LongDescription "false";
 };
 TreeDefault {
        Directory "pool/";
        SrcDirectory "pool/";
 };
        LongDescription "false";
 };
 TreeDefault {
        Directory "pool/";
        SrcDirectory "pool/";
 };

-APT {
-       FTPArchive {
-               Release {
-                       Origin "joesixpack";
-                       Label "apttestcases";
-                       Suite "unstable";
-                       Description "repository with dummy packages";
-                       Architectures "' >> ftparchive.conf
-       echo -n "$ARCHS" >> ftparchive.conf
-       echo 'source";
-               };
-       };
-};' >> ftparchive.conf
+EOF

        for DIST in $(find ./pool/ -maxdepth 1 -name '*.pkglist' -type f | cut -d'/' -f 3 | cut -d'.' -f 1 | sort | uniq); do
        for DIST in $(find ./pool/ -maxdepth 1 -name '*.pkglist' -type f | cut -d'/' -f 3 | cut -d'.' -f 1 | sort | uniq); do

-               echo -n 'tree "dists/' >> ftparchive.conf
-               echo -n "$DIST" >> ftparchive.conf
-               echo -n '" {
-       Architectures "' >> ftparchive.conf
-               echo -n "$ARCHS" >> ftparchive.conf
-               echo -n 'source";
-       FileList "' >> ftparchive.conf
-               echo -n "${DIST}.\$(SECTION).pkglist" >> ftparchive.conf
-               echo -n '";
-       SourceFileList "' >> ftparchive.conf
-               echo -n "${DIST}.\$(SECTION).srclist" >> ftparchive.conf
-               echo -n '";
-       Sections "' >> ftparchive.conf
-               echo -n "$(find ./pool/ -maxdepth 1 -name "${DIST}.*.pkglist" -type f | cut -d'/' -f 3 | cut -d'.' -f 2 | sort | uniq | tr '\n' ' ')" >> ftparchive.conf
-               echo '";
-};' >> ftparchive.conf
-       done
+               cat <<EOF
+tree "dists/$DIST" {
+       Architectures "$ARCHS all source";
+       FileList "${DIST}.\$(SECTION).pkglist";
+       SourceFileList "${DIST}.\$(SECTION).srclist";
+       Sections "$(find ./pool/ -maxdepth 1 -name "${DIST}.*.pkglist" -type f | cut -d'/' -f 3 | cut -d'.' -f 2 | sort | uniq | tr '\n' ' ')";
+};
+EOF
+       done >> ftparchive.conf

 }
 
 buildaptftparchivedirectorystructure() {
 }
 
 buildaptftparchivedirectorystructure() {


@@ -775,10 +791,10 @@ buildaptftparchivedirectorystructure() {
                for SECTION in $SECTIONS; do
                        local ARCHS="$(grep -A 5 "dists/$DIST" ftparchive.conf | grep Architectures | cut -d'"' -f 2 | sed -e 's#source##')"
                        for ARCH in $ARCHS; do
                for SECTION in $SECTIONS; do
                        local ARCHS="$(grep -A 5 "dists/$DIST" ftparchive.conf | grep Architectures | cut -d'"' -f 2 | sed -e 's#source##')"
                        for ARCH in $ARCHS; do

-                               mkdir -p dists/${DIST}/${SECTION}/binary-${ARCH}
+                               mkdir -p "dists/${DIST}/${SECTION}/binary-${ARCH}"

                        done
                        done

-                       mkdir -p dists/${DIST}/${SECTION}/source
-                       mkdir -p dists/${DIST}/${SECTION}/i18n
+                       mkdir -p "dists/${DIST}/${SECTION}/source"
+                       mkdir -p "dists/${DIST}/${SECTION}/i18n"

                done
        done
 }
                done
        done
 }


@@ -801,35 +817,36 @@ insertpackage() {
                        continue
                fi
                for arch in $(getarchitecturesfromcommalist "$ARCH"); do
                        continue
                fi
                for arch in $(getarchitecturesfromcommalist "$ARCH"); do

-                       if [ "$arch" = 'all' -o "$arch" = 'none' ]; then
+                       if [ "$arch" = 'none' ]; then

                                ARCHS="$(getarchitectures)"
                        else
                                ARCHS="$arch"
                        fi
                        for BUILDARCH in $ARCHS; do
                                local PPATH="aptarchive/dists/${RELEASE}/main/binary-${BUILDARCH}"
                                ARCHS="$(getarchitectures)"
                        else
                                ARCHS="$arch"
                        fi
                        for BUILDARCH in $ARCHS; do
                                local PPATH="aptarchive/dists/${RELEASE}/main/binary-${BUILDARCH}"

-                               mkdir -p $PPATH
-                               local FILE="${PPATH}/Packages"
-                               echo "Package: $NAME
+                               mkdir -p "$PPATH"
+                               {
+                                       echo "Package: $NAME

 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42

-Maintainer: Joe Sixpack <joe@example.org>" >> $FILE
-                               test "$arch" = 'none' || echo "Architecture: $arch" >> $FILE
-                               echo "Version: $VERSION
-Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
-                               test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
-                               echo "Description: $(printf '%s' "$DESCRIPTION" | head -n 1)" >> $FILE
-                               echo "Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1)" >> $FILE
-                               echo >> $FILE
+Maintainer: Joe Sixpack <joe@example.org>"
+                                       test "$arch" = 'none' || echo "Architecture: $arch"
+                                       echo "Version: $VERSION
+Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb"
+                                       test -z "$DEPENDENCIES" || echo "$DEPENDENCIES"
+                                       echo "Description: $(printf '%s' "$DESCRIPTION" | head -n 1)"
+                                       echo "Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1)"
+                                       echo
+                               } >> "${PPATH}/Packages"

                        done
                done
                        done
                done

-               mkdir -p aptarchive/dists/${RELEASE}/main/source aptarchive/dists/${RELEASE}/main/i18n
-               touch aptarchive/dists/${RELEASE}/main/source/Sources
+               mkdir -p "aptarchive/dists/${RELEASE}/main/source" "aptarchive/dists/${RELEASE}/main/i18n"
+               touch "aptarchive/dists/${RELEASE}/main/source/Sources"

                echo "Package: $NAME
 Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1)
 Description-en: $DESCRIPTION
                echo "Package: $NAME
 Description-md5: $(printf '%s' "$DESCRIPTION" | md5sum | cut -d' ' -f 1)
 Description-en: $DESCRIPTION

-" >> aptarchive/dists/${RELEASE}/main/i18n/Translation-en
+" >> "aptarchive/dists/${RELEASE}/main/i18n/Translation-en"

        done
 }
 
        done
 }
 


@@ -851,14 +868,14 @@ Binary: $BINARY
 Version: $VERSION
 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH" >> $FILE
 Version: $VERSION
 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH" >> $FILE

-       test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
+       test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> "$FILE"

        echo "Files:
        echo "Files:

- $(echo -n "$DSCFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) $DSCFILE
- $(echo -n "$TARFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) $TARFILE
+ $(echo -n "$DSCFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) "$DSCFILE"
+ $(echo -n "$TARFILE" | md5sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) "$TARFILE"

 Checksums-Sha256:
 Checksums-Sha256:

- $(echo -n "$DSCFILE" | sha256sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) $DSCFILE
- $(echo -n "$TARFILE" | sha256sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) $TARFILE
-" >> $FILE
+ $(echo -n "$DSCFILE" | sha256sum | cut -d' ' -f 1) $(echo -n "$DSCFILE" | wc -c) "$DSCFILE"
+ $(echo -n "$TARFILE" | sha256sum | cut -d' ' -f 1) $(echo -n "$TARFILE" | wc -c) "$TARFILE"
+" >> "$FILE"

 }
 
 insertinstalledpackage() {
 }
 
 insertinstalledpackage() {


@@ -882,22 +899,22 @@ Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>

-Version: $VERSION" >> $FILE
-               test "$arch" = 'none' || echo "Architecture: $arch" >> $FILE
-               test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
-               echo "Description: $DESCRIPTION" >> $FILE
-               echo >> $FILE
+Version: $VERSION" >> "$FILE"
+               test "$arch" = 'none' || echo "Architecture: $arch" >> "$FILE"
+               test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> "$FILE"
+               echo "Description: $DESCRIPTION" >> "$FILE"
+               echo >> "$FILE"

                if [ "$(dpkg-query -W --showformat='${Multi-Arch}')" = 'same' ]; then
                if [ "$(dpkg-query -W --showformat='${Multi-Arch}')" = 'same' ]; then

-                       echo -n > ${INFO}/${NAME}:${arch}.list
+                       echo -n > "${INFO}/${NAME}:${arch}.list"

                else
                else

-                       echo -n > ${INFO}/${NAME}.list
+                       echo -n > "${INFO}/${NAME}.list"

                fi
        done
 }
 
 
 buildaptarchivefromincoming() {
                fi
        done
 }
 
 
 buildaptarchivefromincoming() {

-       msginfo "Build APT archive for ${CCMD}$(basename $0)${CINFO} based on incoming packages…"
+       msginfo "Build APT archive for ${CCMD}${0##*/}${CINFO} based on incoming packages…"

        cd aptarchive
        [ -e pool ] || ln -s ../incoming pool
        [ -e ftparchive.conf ] || createaptftparchiveconfig
        cd aptarchive
        [ -e pool ] || ln -s ../incoming pool
        [ -e ftparchive.conf ] || createaptftparchiveconfig


@@ -910,7 +927,7 @@ buildaptarchivefromincoming() {
 }
 
 buildaptarchivefromfiles() {
 }
 
 buildaptarchivefromfiles() {

-       msginfo "Build APT archive for ${CCMD}$(basename $0)${CINFO} based on prebuild files…"
+       msginfo "Build APT archive for ${CCMD}${0##*/}${CINFO} based on prebuild files…"

        local DIR='aptarchive'
        if [ -d "${DIR}/dists" ]; then DIR="${DIR}/dists"; fi
        find "$DIR" -name 'Packages' -o -name 'Sources' -o -name 'Translation-*' | while read line; do
        local DIR='aptarchive'
        if [ -d "${DIR}/dists" ]; then DIR="${DIR}/dists"; fi
        find "$DIR" -name 'Packages' -o -name 'Sources' -o -name 'Translation-*' | while read line; do


@@ -922,7 +939,7 @@ buildaptarchivefromfiles() {
 }
 
 compressfile() {
 }
 
 compressfile() {

-       cat ${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf | while read compressor extension command; do
+       cat "${TMPWORKINGDIRECTORY}/rootdir/etc/testcase-compressor.conf" | while read compressor extension command; do

                if [ "$compressor" = '.' ]; then
                        if [ -n "$2" ]; then
                                touch -d "$2" "$1"
                if [ "$compressor" = '.' ]; then
                        if [ -n "$2" ]; then
                                touch -d "$2" "$1"


@@ -946,85 +963,83 @@ getcodenamefromsuite() {
 getreleaseversionfromsuite() { true; }
 getlabelfromsuite() { true; }
 getoriginfromsuite() { true; }
 getreleaseversionfromsuite() { true; }
 getlabelfromsuite() { true; }
 getoriginfromsuite() { true; }

+getarchitecturesfromreleasefile() { echo "all $(getarchitectures)"; }

 
 

+aptftparchiverelease() {
+       aptftparchive -qq release "$@" | sed -e '/0 Release$/ d' # remove the self reference
+}

 generatereleasefiles() {
        # $1 is the Date header and $2 is the ValidUntil header to be set
        # both should be given in notation date/touch can understand
 generatereleasefiles() {
        # $1 is the Date header and $2 is the ValidUntil header to be set
        # both should be given in notation date/touch can understand

+       local DATE="$1"
+       local VALIDUNTIL="$2"

        msgninfo "\tGenerate Release files… "
        if [ -e aptarchive/dists ]; then
                for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
        msgninfo "\tGenerate Release files… "
        if [ -e aptarchive/dists ]; then
                for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do

+                       local ARCHITECTURES="$(getarchitecturesfromreleasefile "$dir")"

                        local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
                        local CODENAME="$(getcodenamefromsuite $SUITE)"
                        local VERSION="$(getreleaseversionfromsuite $SUITE)"
                        local LABEL="$(getlabelfromsuite $SUITE)"
                        local ORIGIN="$(getoriginfromsuite $SUITE)"
                        local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
                        local CODENAME="$(getcodenamefromsuite $SUITE)"
                        local VERSION="$(getreleaseversionfromsuite $SUITE)"
                        local LABEL="$(getlabelfromsuite $SUITE)"
                        local ORIGIN="$(getoriginfromsuite $SUITE)"

-                       if [ -n "$VERSION" ]; then
-                               VERSION="-o APT::FTPArchive::Release::Version=${VERSION}"
-                       fi
-                       if [ -n "$LABEL" ]; then
-                               LABEL="-o APT::FTPArchive::Release::Label=${LABEL}"
-                       fi
-                       if [ -n "$ORIGIN" ]; then
-                               ORIGIN="-o APT::FTPArchive::Release::Origin=${ORIGIN}"
-                       fi
-                       aptftparchive -qq release $dir \
+                       aptftparchiverelease "$dir" \

                                -o APT::FTPArchive::Release::Suite="${SUITE}" \
                                -o APT::FTPArchive::Release::Codename="${CODENAME}" \
                                -o APT::FTPArchive::Release::Suite="${SUITE}" \
                                -o APT::FTPArchive::Release::Codename="${CODENAME}" \

-                               ${LABEL} \
-                               ${ORIGIN} \
-                               ${VERSION} \
-                                       | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
+                               -o APT::FTPArchive::Release::Architectures="${ARCHITECTURES}" \
+                               -o APT::FTPArchive::Release::Label="${LABEL}" \
+                               -o APT::FTPArchive::Release::Origin="${ORIGIN}" \
+                               -o APT::FTPArchive::Release::Version="${VERSION}" \
+                               > "$dir/Release"

                        if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
                                sed -i '/^Date: / a\
                        if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
                                sed -i '/^Date: / a\

-NotAutomatic: yes' $dir/Release
-                       fi
-                       if [ -n "$1" -a "$1" != "now" ]; then
-                               sed -i "s/^Date: .*$/Date: $(date -d "$1" '+%a, %d %b %Y %H:%M:%S %Z')/" $dir/Release
-                       fi
-                       if [ -n "$2" ]; then
-                               sed -i "/^Date: / a\
-Valid-Until: $(date -d "$2" '+%a, %d %b %Y %H:%M:%S %Z')" $dir/Release
+NotAutomatic: yes' "$dir/Release"

                        fi
                done
        else
                        fi
                done
        else

-               aptftparchive -qq release ./aptarchive | sed -e '/0 Release$/ d' > aptarchive/Release # remove the self reference
+               aptftparchiverelease ./aptarchive > aptarchive/Release

        fi
        fi

-       if [ -n "$1" -a "$1" != "now" ]; then
+       if [ -n "$DATE" -a "$DATE" != "now" ]; then

                for release in $(find ./aptarchive -name 'Release'); do
                for release in $(find ./aptarchive -name 'Release'); do

-                       touch -d "$1" $release
+                       sed -i "s/^Date: .*$/Date: $(date -d "$DATE" '+%a, %d %b %Y %H:%M:%S %Z')/" "$release"
+                       touch -d "$DATE" "$release"

                done
        fi
                done
        fi

+       if [ -n "$VALIDUNTIL" ]; then
+               sed -i "/^Date: / a\
+Valid-Until: $(date -d "$VALIDUNTIL" '+%a, %d %b %Y %H:%M:%S %Z')" $(find ./aptarchive -name 'Release')
+       fi

        msgdone "info"
 }
 
 setupdistsaptarchive() {
        msgdone "info"
 }
 
 setupdistsaptarchive() {

-       local APTARCHIVE=$(readlink -f ./aptarchive)
+       local APTARCHIVE="$(readlink -f ./aptarchive | sed 's# #%20#g')"

        rm -f root/etc/apt/sources.list.d/apt-test-*-deb.list
        rm -f root/etc/apt/sources.list.d/apt-test-*-deb-src.list
        for DISTS in $(find ./aptarchive/dists/ -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 4); do
        rm -f root/etc/apt/sources.list.d/apt-test-*-deb.list
        rm -f root/etc/apt/sources.list.d/apt-test-*-deb-src.list
        for DISTS in $(find ./aptarchive/dists/ -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 4); do

-               SECTIONS=$(find ./aptarchive/dists/${DISTS}/ -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 5 | tr '\n' ' ')
+               SECTIONS=$(find "./aptarchive/dists/${DISTS}/" -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 5 | tr '\n' ' ')

                msgninfo "\tadd deb and deb-src sources.list lines for ${CCMD}${DISTS} ${SECTIONS}${CINFO}… "
                msgninfo "\tadd deb and deb-src sources.list lines for ${CCMD}${DISTS} ${SECTIONS}${CINFO}… "

-               echo "deb file://$APTARCHIVE $DISTS $SECTIONS" > rootdir/etc/apt/sources.list.d/apt-test-${DISTS}-deb.list
-               echo "deb-src file://$APTARCHIVE $DISTS $SECTIONS" > rootdir/etc/apt/sources.list.d/apt-test-${DISTS}-deb-src.list
+               echo "deb file://$APTARCHIVE $DISTS $SECTIONS" > "rootdir/etc/apt/sources.list.d/apt-test-${DISTS}-deb.list"
+               echo "deb-src file://$APTARCHIVE $DISTS $SECTIONS" > "rootdir/etc/apt/sources.list.d/apt-test-${DISTS}-deb-src.list"

                msgdone "info"
        done
 }
 
 setupflataptarchive() {
                msgdone "info"
        done
 }
 
 setupflataptarchive() {

-       local APTARCHIVE=$(readlink -f ./aptarchive)
-       if [ -f ${APTARCHIVE}/Packages ]; then
+       local APTARCHIVE="$(readlink -f ./aptarchive)"
+       local APTARCHIVEURI="$(readlink -f ./aptarchive | sed 's# #%20#g')"
+       if [ -f "${APTARCHIVE}/Packages" ]; then

                msgninfo "\tadd deb sources.list line… "
                msgninfo "\tadd deb sources.list line… "

-               echo "deb file://$APTARCHIVE /" > rootdir/etc/apt/sources.list.d/apt-test-archive-deb.list
-               msgdone "info"
+               echo "deb file://$APTARCHIVEURI /" > 'rootdir/etc/apt/sources.list.d/apt-test-archive-deb.list'
+               msgdone 'info'

        else
        else

-               rm -f rootdir/etc/apt/sources.list.d/apt-test-archive-deb.list
+               rm -f 'rootdir/etc/apt/sources.list.d/apt-test-archive-deb.list'

        fi
        fi

-       if [ -f ${APTARCHIVE}/Sources ]; then
+       if [ -f "${APTARCHIVE}/Sources" ]; then

                msgninfo "\tadd deb-src sources.list line… "
                msgninfo "\tadd deb-src sources.list line… "

-               echo "deb-src file://$APTARCHIVE /" > rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list
-               msgdone "info"
+               echo "deb-src file://$APTARCHIVEURI /" > 'rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list'
+               msgdone 'info'

        else
        else

-               rm -f rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list
+               rm -f 'rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list'

        fi
 }
 
        fi
 }
 


@@ -1059,47 +1074,47 @@ signreleasefiles() {
                # the key is expired, so gpg doesn't allow to sign with and the --faked-system-time
                # option doesn't exist anymore (and using faketime would add a new obscure dependency)
                # therefore we 'temporary' make the key not expired and restore a backup after signing
                # the key is expired, so gpg doesn't allow to sign with and the --faked-system-time
                # option doesn't exist anymore (and using faketime would add a new obscure dependency)
                # therefore we 'temporary' make the key not expired and restore a backup after signing

-               cp ${REXKEY}.sec $SECEXPIREBAK
-               cp ${REXKEY}.pub $PUBEXPIREBAK
+               cp "${REXKEY}.sec" "$SECEXPIREBAK"
+               cp "${REXKEY}.pub" "$PUBEXPIREBAK"

                local SECUNEXPIRED="${REXKEY}.sec.unexpired"
                local PUBUNEXPIRED="${REXKEY}.pub.unexpired"
                if [ -f "$SECUNEXPIRED" ] && [ -f "$PUBUNEXPIRED" ]; then
                local SECUNEXPIRED="${REXKEY}.sec.unexpired"
                local PUBUNEXPIRED="${REXKEY}.pub.unexpired"
                if [ -f "$SECUNEXPIRED" ] && [ -f "$PUBUNEXPIRED" ]; then

-                       cp $SECUNEXPIRED ${REXKEY}.sec
-                       cp $PUBUNEXPIRED ${REXKEY}.pub
+                       cp "$SECUNEXPIRED" "${REXKEY}.sec"
+                       cp "$PUBUNEXPIRED" "${REXKEY}.pub"

                else
                        if ! printf "expire\n1w\nsave\n" | $GPG --default-key "$SIGNER" --command-fd 0 --edit-key "${SIGNER}" >setexpire.gpg 2>&1; then
                                cat setexpire.gpg
                                exit 1
                        fi
                else
                        if ! printf "expire\n1w\nsave\n" | $GPG --default-key "$SIGNER" --command-fd 0 --edit-key "${SIGNER}" >setexpire.gpg 2>&1; then
                                cat setexpire.gpg
                                exit 1
                        fi

-                       cp ${REXKEY}.sec $SECUNEXPIRED
-                       cp ${REXKEY}.pub $PUBUNEXPIRED
+                       cp "${REXKEY}.sec" "$SECUNEXPIRED"
+                       cp "${REXKEY}.pub" "$PUBUNEXPIRED"

                fi
        fi
                fi
        fi

-       for RELEASE in $(find ${REPODIR}/ -name Release); do
-               $GPG --default-key "$SIGNER" --armor --detach-sign --sign --output ${RELEASE}.gpg ${RELEASE}
+       for RELEASE in $(find "${REPODIR}/" -name Release); do
+               $GPG --default-key "$SIGNER" --armor --detach-sign --sign --output "${RELEASE}.gpg" "${RELEASE}"

                local INRELEASE="$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')"
                local INRELEASE="$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')"

-               $GPG --default-key "$SIGNER" --clearsign --output $INRELEASE $RELEASE
+               $GPG --default-key "$SIGNER" --clearsign --output "$INRELEASE" "$RELEASE"

                # we might have set a specific date for the Release file, so copy it
                # we might have set a specific date for the Release file, so copy it

-               touch -d "$(stat --format "%y" ${RELEASE})" ${RELEASE}.gpg ${INRELEASE}
+               touch -d "$(stat --format "%y" ${RELEASE})" "${RELEASE}.gpg" "${INRELEASE}"

        done
        if [ -f "$SECEXPIREBAK" ] && [ -f "$PUBEXPIREBAK" ]; then
        done
        if [ -f "$SECEXPIREBAK" ] && [ -f "$PUBEXPIREBAK" ]; then

-               mv -f $SECEXPIREBAK ${REXKEY}.sec
-               mv -f $PUBEXPIREBAK ${REXKEY}.pub
+               mv -f "$SECEXPIREBAK" "${REXKEY}.sec"
+               mv -f "$PUBEXPIREBAK" "${REXKEY}.pub"

        fi
        fi

-       msgdone "info"
+       msgdone 'info'

 }
 
 redatereleasefiles() {
        local DATE="$(date -d "$1" '+%a, %d %b %Y %H:%M:%S %Z')"
        for release in $(find aptarchive/ -name 'Release'); do
 }
 
 redatereleasefiles() {
        local DATE="$(date -d "$1" '+%a, %d %b %Y %H:%M:%S %Z')"
        for release in $(find aptarchive/ -name 'Release'); do

-               sed -i "s/^Date: .*$/Date: ${DATE}/" $release
-               touch -d "$DATE" $release
+               sed -i "s/^Date: .*$/Date: ${DATE}/" "$release"
+               touch -d "$DATE" "$release"

        done
        signreleasefiles "${2:-Joe Sixpack}"
 }
 
 webserverconfig() {
        done
        signreleasefiles "${2:-Joe Sixpack}"
 }
 
 webserverconfig() {

-       local WEBSERVER="${3:-http://localhost:8080}"
+       local WEBSERVER="${3:-http://localhost:${APTHTTPPORT}}"

        local NOCHECK=false
        if [ "$1" = '--no-check' ]; then
                NOCHECK=true
        local NOCHECK=false
        if [ "$1" = '--no-check' ]; then
                NOCHECK=true


@@ -1108,13 +1123,14 @@ webserverconfig() {
        local DOWNLOG='rootdir/tmp/download-testfile.log'
        local STATUS='downloaded/webserverconfig.status'
        rm -f "$STATUS" "$DOWNLOG"
        local DOWNLOG='rootdir/tmp/download-testfile.log'
        local STATUS='downloaded/webserverconfig.status'
        rm -f "$STATUS" "$DOWNLOG"

+       # very very basic URI encoding

        local URI
        if [ -n "$2" ]; then
                msgtest "Set webserver config option '${1}' to" "$2"
        local URI
        if [ -n "$2" ]; then
                msgtest "Set webserver config option '${1}' to" "$2"

-               URI="${WEBSERVER}/_config/set/${1}/${2}"
+               URI="${WEBSERVER}/_config/set/$(echo "${1}" | sed -e 's/\//%2f/g')/$(echo "${2}" | sed -e 's/\//%2f/g')"

        else
                msgtest 'Clear webserver config option' "${1}"
        else
                msgtest 'Clear webserver config option' "${1}"

-               URI="${WEBSERVER}/_config/clear/${1}"
+               URI="${WEBSERVER}/_config/clear/$(echo "${1}" | sed -e 's/\//%2f/g')"

        fi
        if downloadfile "$URI" "$STATUS" > "$DOWNLOG"; then
                msgpass
        fi
        if downloadfile "$URI" "$STATUS" > "$DOWNLOG"; then
                msgpass


@@ -1127,9 +1143,12 @@ webserverconfig() {
 }
 
 rewritesourceslist() {
 }
 
 rewritesourceslist() {

-       local APTARCHIVE="file://$(readlink -f "${TMPWORKINGDIRECTORY}/aptarchive")"
+       local APTARCHIVE="file://$(readlink -f "${TMPWORKINGDIRECTORY}/aptarchive" | sed 's# #%20#g')"
+       local APTARCHIVE2="copy://$(readlink -f "${TMPWORKINGDIRECTORY}/aptarchive" | sed 's# #%20#g')"

        for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
        for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do

-               sed -i $LIST -e "s#$APTARCHIVE#${1}#" -e "s#http://localhost:8080/#${1}#" -e "s#https://localhost:4433/#${1}#"
+               sed -i $LIST -e "s#$APTARCHIVE#${1}#" -e "s#$APTARCHIVE2#${1}#" \
+                       -e "s#http://localhost:${APTHTTPPORT}/#${1}#" \
+                       -e "s#https://localhost:${APTHTTPSPORT}/#${1}#"

        done
 }
 
        done
 }
 


@@ -1148,28 +1167,37 @@ waitforpidfile() {
 }
 
 changetowebserver() {
 }
 
 changetowebserver() {

+       local REWRITE='no'

        if [ "$1" != '--no-rewrite' ]; then
        if [ "$1" != '--no-rewrite' ]; then

-               rewritesourceslist 'http://localhost:8080/'
+               REWRITE='yes'

        else
                shift
        fi
        else
                shift
        fi

-       if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then
+       if test -x "${APTWEBSERVERBINDIR}/aptwebserver"; then

                cd aptarchive
                local LOG="webserver.log"
                cd aptarchive
                local LOG="webserver.log"

-               if ! aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 ; then
+               if ! aptwebserver --port 0 -o aptwebserver::fork=1 -o aptwebserver::portfile='aptwebserver.port' "$@" >$LOG 2>&1 ; then

                        cat $LOG
                        false
                fi
                        cat $LOG
                        false
                fi

-                waitforpidfile aptwebserver.pid
+               waitforpidfile aptwebserver.pid

                local PID="$(cat aptwebserver.pid)"
                if [ -z "$PID" ]; then
                        msgdie 'Could not fork aptwebserver successfully'
                fi
                addtrap "kill $PID;"
                local PID="$(cat aptwebserver.pid)"
                if [ -z "$PID" ]; then
                        msgdie 'Could not fork aptwebserver successfully'
                fi
                addtrap "kill $PID;"

+               waitforpidfile aptwebserver.port
+               APTHTTPPORT="$(cat aptwebserver.port)"
+               if [ -z "$APTHTTPPORT" ]; then
+                       msgdie 'Could not get port for aptwebserver successfully'
+               fi

                cd - > /dev/null
        else
                msgdie 'You have to build aptwerbserver or install a webserver'
        fi
                cd - > /dev/null
        else
                msgdie 'You have to build aptwerbserver or install a webserver'
        fi

+       if [ "$REWRTE" != 'yes' ]; then
+               rewritesourceslist "http://localhost:${APTHTTPPORT}/"
+       fi

 }
 
 changetohttpswebserver() {
 }
 
 changetohttpswebserver() {


@@ -1184,38 +1212,42 @@ cert = ${TMPWORKINGDIRECTORY}/rootdir/etc/webserver.pem
 output = /dev/null
 
 [https]
 output = /dev/null
 
 [https]

-accept = 4433
-connect = 8080
-" > ${TMPWORKINGDIRECTORY}/stunnel.conf
+accept = 0
+connect = $APTHTTPPORT
+" > "${TMPWORKINGDIRECTORY}/stunnel.conf"

        stunnel4 "${TMPWORKINGDIRECTORY}/stunnel.conf"
         waitforpidfile "${TMPWORKINGDIRECTORY}/aptarchive/stunnel.pid"
        stunnel4 "${TMPWORKINGDIRECTORY}/stunnel.conf"
         waitforpidfile "${TMPWORKINGDIRECTORY}/aptarchive/stunnel.pid"

-       local PID="$(cat ${TMPWORKINGDIRECTORY}/aptarchive/stunnel.pid)"
+       local PID="$(cat "${TMPWORKINGDIRECTORY}/aptarchive/stunnel.pid")"

         if [ -z "$PID" ]; then
                msgdie 'Could not fork stunnel4 successfully'
        fi
        addtrap 'prefix' "kill ${PID};"
         if [ -z "$PID" ]; then
                msgdie 'Could not fork stunnel4 successfully'
        fi
        addtrap 'prefix' "kill ${PID};"

-       rewritesourceslist 'https://localhost:4433/'
+       APTHTTPSPORT="$(lsof -i | awk "/^stunnel4 / && \$2 == \"${PID}\" {print \$9; exit; }" | cut -d':' -f 2)"
+       webserverconfig 'aptwebserver::port::https' "$APTHTTPSPORT" "https://localhost:${APTHTTPSPORT}"
+       rewritesourceslist "https://localhost:${APTHTTPSPORT}/"

 }
 
 changetocdrom() {
        mkdir -p rootdir/media/cdrom/.disk
        local CD="$(readlink -f rootdir/media/cdrom)"
 }
 
 changetocdrom() {
        mkdir -p rootdir/media/cdrom/.disk
        local CD="$(readlink -f rootdir/media/cdrom)"

-       echo "acquire::cdrom::mount \"${CD}\";
-acquire::cdrom::${CD}/::mount \"mv ${CD}-unmounted ${CD}\";
-acquire::cdrom::${CD}/::umount \"mv ${CD} ${CD}-unmounted\";
-acquire::cdrom::autodetect 0;" > rootdir/etc/apt/apt.conf.d/00cdrom
-       echo -n "$1" > ${CD}/.disk/info
+       cat > rootdir/etc/apt/apt.conf.d/00cdrom <<EOF
+acquire::cdrom::mount "${CD}";
+acquire::cdrom::"${CD}/"::mount "mv ${CD}-unmounted ${CD}";
+acquire::cdrom::"${CD}/"::umount "mv ${CD} ${CD}-unmounted";
+acquire::cdrom::autodetect 0;
+EOF
+       echo -n "$1" > "${CD}/.disk/info"

        if [ ! -d aptarchive/dists ]; then
                msgdie 'Flat file archive cdroms can not be created currently'
                return 1
        fi
        mv aptarchive/dists "$CD"
        if [ ! -d aptarchive/dists ]; then
                msgdie 'Flat file archive cdroms can not be created currently'
                return 1
        fi
        mv aptarchive/dists "$CD"

-       ln -s "$(readlink -f ./incoming)" $CD/pool
+       ln -s "$(readlink -f ./incoming)" "$CD/pool"

        find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list' -delete
        # start with an unmounted disk
        mv "${CD}" "${CD}-unmounted"
        # we don't want the disk to be modifiable
        find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list' -delete
        # start with an unmounted disk
        mv "${CD}" "${CD}-unmounted"
        # we don't want the disk to be modifiable

-       addtrap 'prefix' "chmod -f -R +w $PWD/rootdir/media/cdrom/dists/ $PWD/rootdir/media/cdrom-unmounted/dists/ || true;"
+       addtrap 'prefix' "chmod -f -R +w \"$PWD/rootdir/media/cdrom/dists/\" \"$PWD/rootdir/media/cdrom-unmounted/dists/\" || true;"

        chmod -R 555 rootdir/media/cdrom-unmounted/dists
 }
 
        chmod -R 555 rootdir/media/cdrom-unmounted/dists
 }
 


@@ -1248,7 +1280,7 @@ testoutputequal() {
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testoutputequal.output"
        local COMPAREFILE="$1"
        shift
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testoutputequal.output"
        local COMPAREFILE="$1"
        shift

-       if "$@" 2>&1 | checkdiff $COMPAREFILE - >"$OUTPUT" 2>&1; then
+       if "$@" 2>&1 | checkdiff "$COMPAREFILE" - >"$OUTPUT" 2>&1; then

                msgpass
        else
                echo "=== content of file we compared with (${COMPAREFILE}) ===" >>"${OUTPUT}"
                msgpass
        else
                echo "=== content of file we compared with (${COMPAREFILE}) ===" >>"${OUTPUT}"


@@ -1258,7 +1290,7 @@ testoutputequal() {
 }
 
 testfileequal() {
 }
 
 testfileequal() {

-       msggroup "$0"
+       msggroup 'testfileequal'

        local MSG='Test for correctness of file'
        if [ "$1" = '--nomsg' ]; then
                MSG=''
        local MSG='Test for correctness of file'
        if [ "$1" = '--nomsg' ]; then
                MSG=''


@@ -1279,10 +1311,10 @@ testfileequal() {
 }
 
 testempty() {
 }
 
 testempty() {

-       msggroup "$0"
+       msggroup 'testempty'

        msgtest "Test for no output of" "$*"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testempty.comparefile"
        msgtest "Test for no output of" "$*"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testempty.comparefile"

-       if "$@" >$COMPAREFILE 2>&1 && test ! -s $COMPAREFILE; then
+       if ("$@" >"$COMPAREFILE" 2>&1 || true) && test ! -s "$COMPAREFILE"; then

                msgpass
        else
                msgfailoutput '' "$COMPAREFILE" "$@"
                msgpass
        else
                msgfailoutput '' "$COMPAREFILE" "$@"


@@ -1290,9 +1322,21 @@ testempty() {
        aptautotest 'testempty' "$@"
        msggroup
 }
        aptautotest 'testempty' "$@"
        msggroup
 }

+testnotempty() {
+       msggroup 'testnotempty'
+       msgtest "Test for some output of" "$*"
+       local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testnotempty.comparefile"
+       if ("$@" >"$COMPAREFILE" 2>&1 || true) && test -s "$COMPAREFILE"; then
+               msgpass
+       else
+               msgfailoutput '' "$COMPAREFILE" "$@"
+       fi
+       aptautotest 'testnotempty' "$@"
+       msggroup
+}

 
 testequal() {
 
 testequal() {

-       msggroup "$0"
+       msggroup 'testequal'

        local MSG='Test of equality of'
        if [ "$1" = '--nomsg' ]; then
                MSG=''
        local MSG='Test of equality of'
        if [ "$1" = '--nomsg' ]; then
                MSG=''


@@ -1300,7 +1344,7 @@ testequal() {
        fi
 
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile"
        fi
 
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequal.comparefile"

-       echo "$1" > $COMPAREFILE
+       echo "$1" > "$COMPAREFILE"

        shift
 
        if [ -n "$MSG" ]; then
        shift
 
        if [ -n "$MSG" ]; then


@@ -1312,17 +1356,17 @@ testequal() {
 }
 
 testequalor2() {
 }
 
 testequalor2() {

-       msggroup "$0"
+       msggroup 'testequalor2'

        local COMPAREFILE1="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile1"
        local COMPAREFILE2="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile2"
        local COMPAREAGAINST="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.compareagainst"
        local COMPAREFILE1="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile1"
        local COMPAREFILE2="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.comparefile2"
        local COMPAREAGAINST="${TMPWORKINGDIRECTORY}/rootdir/tmp/testequalor2.compareagainst"

-       echo "$1" > $COMPAREFILE1
-       echo "$2" > $COMPAREFILE2
+       echo "$1" > "$COMPAREFILE1"
+       echo "$2" > "$COMPAREFILE2"

        shift 2
        msgtest "Test for equality OR of" "$*"
        shift 2
        msgtest "Test for equality OR of" "$*"

-       "$@" >$COMPAREAGAINST 2>&1 || true
-       if checkdiff $COMPAREFILE1 $COMPAREAGAINST >/dev/null 2>&1 || \
-               checkdiff $COMPAREFILE2 $COMPAREAGAINST >/dev/null 2>&1
+       "$@" >"$COMPAREAGAINST" 2>&1 || true
+       if checkdiff "$COMPAREFILE1" "$COMPAREAGAINST" >/dev/null 2>&1 || \
+               checkdiff "$COMPAREFILE2" "$COMPAREAGAINST" >/dev/null 2>&1

        then
                msgpass
        else
        then
                msgpass
        else


@@ -1338,7 +1382,7 @@ testequalor2() {
 }
 
 testshowvirtual() {
 }
 
 testshowvirtual() {

-       msggroup "$0"
+       msggroup 'testshowvirtual'

        local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual"
        local PACKAGE="$1"
        shift
        local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual"
        local PACKAGE="$1"
        shift


@@ -1360,7 +1404,7 @@ N: No packages found"
 }
 
 testnopackage() {
 }
 
 testnopackage() {

-       msggroup "$0"
+       msggroup 'testnopackage'

        msgtest "Test for non-existent packages" "apt-cache show $*"
        local SHOWPKG="$(aptcache show "$@" 2>&1 | grep '^Package: ')"
        if [ -n "$SHOWPKG" ]; then
        msgtest "Test for non-existent packages" "apt-cache show $*"
        local SHOWPKG="$(aptcache show "$@" 2>&1 | grep '^Package: ')"
        if [ -n "$SHOWPKG" ]; then


@@ -1374,7 +1418,7 @@ testnopackage() {
 }
 
 testdpkgstatus() {
 }
 
 testdpkgstatus() {

-       msggroup "$0"
+       msggroup 'testdpkgstatus'

        local STATE="$1"
        local NR="$2"
        shift 2
        local STATE="$1"
        local NR="$2"
        shift 2


@@ -1392,53 +1436,46 @@ testdpkgstatus() {
 }
 
 testdpkginstalled() {
 }
 
 testdpkginstalled() {

-       msggroup "$0"
+       msggroup 'testdpkginstalled'

        testdpkgstatus 'ii' "$#" "$@"
        msggroup
 }
 
 testdpkgnotinstalled() {
        testdpkgstatus 'ii' "$#" "$@"
        msggroup
 }
 
 testdpkgnotinstalled() {

-       msggroup "$0"
+       msggroup 'testdpkgnotinstalled'

        testdpkgstatus 'ii' '0' "$@"
        msggroup
 }
 
 testmarkedauto() {
        testdpkgstatus 'ii' '0' "$@"
        msggroup
 }
 
 testmarkedauto() {

-       msggroup "$0"
+       msggroup 'testmarkedauto'

        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedauto.comparefile"
        if [ -n "$1" ]; then
                msgtest 'Test for correctly marked as auto-installed' "$*"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedauto.comparefile"
        if [ -n "$1" ]; then
                msgtest 'Test for correctly marked as auto-installed' "$*"

-               while [ -n "$1" ]; do echo "$1"; shift; done | sort > $COMPAREFILE
+               while [ -n "$1" ]; do echo "$1"; shift; done | sort > "$COMPAREFILE"

        else
                msgtest 'Test for correctly marked as auto-installed' 'no package'
        else
                msgtest 'Test for correctly marked as auto-installed' 'no package'

-               echo -n > $COMPAREFILE
+               echo -n > "$COMPAREFILE"

        fi
        testoutputequal "$COMPAREFILE" aptmark showauto
        msggroup
 }
 testmarkedmanual() {
        fi
        testoutputequal "$COMPAREFILE" aptmark showauto
        msggroup
 }
 testmarkedmanual() {

-       msggroup "$0"
+       msggroup 'testmarkedmanual'

        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedmanual.comparefile"
        if [ -n "$1" ]; then
                msgtest 'Test for correctly marked as manually installed' "$*"
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testmarkedmanual.comparefile"
        if [ -n "$1" ]; then
                msgtest 'Test for correctly marked as manually installed' "$*"

-               while [ -n "$1" ]; do echo "$1"; shift; done | sort > $COMPAREFILE
+               while [ -n "$1" ]; do echo "$1"; shift; done | sort > "$COMPAREFILE"

        else
                msgtest 'Test for correctly marked as manually installed' 'no package'
        else
                msgtest 'Test for correctly marked as manually installed' 'no package'

-               echo -n > $COMPAREFILE
+               echo -n > "$COMPAREFILE"

        fi
        testoutputequal "$COMPAREFILE" aptmark showmanual
        msggroup
 }
 
 msgfailoutput() {
        fi
        testoutputequal "$COMPAREFILE" aptmark showmanual
        msggroup
 }
 
 msgfailoutput() {

-       if [ -n "$MSGTEST_MSG" ]; then
-               echo
-               if [ -n "$MSGTEST_GRP" ] && [ "$MSGTEST_GRP" != 'NEXT' ] && [ "$MSGTEST_GRP" != "$MSGTEST_MSG" ]; then
-                       echo "${CFAIL}Part of the test group: $MSGTEST_GRP"
-               fi
-               echo -n "$MSGTEST_MSG"
-               unset MSGTEST_MSG
-       fi
+       msgreportheader 'msgfailoutput'

        local MSG="$1"
        local OUTPUT="$2"
        shift 2
        local MSG="$1"
        local OUTPUT="$2"
        shift 2


@@ -1456,6 +1493,10 @@ msgfailoutput() {
                        if expr match "$1" "$FILEFLAGS" >/dev/null; then
                                echo "#### stat(2) of file: $2 ####"
                                stat "$2" || true
                        if expr match "$1" "$FILEFLAGS" >/dev/null; then
                                echo "#### stat(2) of file: $2 ####"
                                stat "$2" || true

+                               if test -e "$2"; then
+                                       echo "#### Complete file: $2 ####"
+                                       cat >&2 "$2" || true
+                               fi

                        fi
                }
                msgfailoutputstatfile "$2" "$3"
                        fi
                }
                msgfailoutputstatfile "$2" "$3"


@@ -1465,23 +1506,26 @@ msgfailoutput() {
                done
                echo '#### test output ####'
        fi
                done
                echo '#### test output ####'
        fi

-       cat >&2 $OUTPUT
+       cat >&2 "$OUTPUT"

        msgfail "$MSG"
 }
 
        msgfail "$MSG"
 }
 

-testsuccess() {
-       msggroup "$0"
+testsuccesswithglobalerror() {
+       local TYPE="$1"
+       local ERRORS="$2"
+       shift 2
+       msggroup "$TYPE"

        if [ "$1" = '--nomsg' ]; then
                shift
        else
                msgtest 'Test for successful execution of' "$*"
        fi
        if [ "$1" = '--nomsg' ]; then
                shift
        else
                msgtest 'Test for successful execution of' "$*"
        fi

-       local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output"
-       if "$@" >${OUTPUT} 2>&1; then
+       local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/${TYPE}.output"
+       if "$@" >"${OUTPUT}" 2>&1; then

                if expr match "$1" '^apt.*' >/dev/null; then
                        if grep -q -E ' runtime error: ' "$OUTPUT"; then
                                msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
                if expr match "$1" '^apt.*' >/dev/null; then
                        if grep -q -E ' runtime error: ' "$OUTPUT"; then
                                msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"

-                       elif grep -E '^[WE]: ' "$OUTPUT" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" 2>&1; then
+                       elif grep -E "^[${ERRORS}]: " "$OUTPUT" > "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" 2>&1; then

                                if [ "$IGNORE_PTY_NOT_MOUNTED" = '1' ]; then
                                        if echo 'E: Can not write log (Is /dev/pts mounted?) - posix_openpt (2: No such file or directory)' \
                                                | cmp - "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" >/dev/null 2>&1; then
                                if [ "$IGNORE_PTY_NOT_MOUNTED" = '1' ]; then
                                        if echo 'E: Can not write log (Is /dev/pts mounted?) - posix_openpt (2: No such file or directory)' \
                                                | cmp - "${TMPWORKINGDIRECTORY}/rootdir/tmp/checkforwarnings.output" >/dev/null 2>&1; then


@@ -1492,6 +1536,12 @@ testsuccess() {
                                else
                                        msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
                                fi
                                else
                                        msgfailoutput 'successful run, but output contains warnings/errors' "$OUTPUT" "$@"
                                fi

+                       elif [ "$TYPE" = 'testsuccesswithnotice' ]; then
+                               if grep -q -E "^N: " "$OUTPUT"; then
+                                       msgpass
+                               else
+                                       msgfailoutput 'successful run, but output had no notices' "$OUTPUT" "$@"
+                               fi

                        else
                                msgpass
                        fi
                        else
                                msgpass
                        fi


@@ -1502,18 +1552,24 @@ testsuccess() {
                local EXITCODE=$?
                msgfailoutput "exitcode $EXITCODE" "$OUTPUT" "$@"
        fi
                local EXITCODE=$?
                msgfailoutput "exitcode $EXITCODE" "$OUTPUT" "$@"
        fi

-       aptautotest 'testsuccess' "$@"
+       aptautotest "$TYPE" "$@"

        msggroup
 }
        msggroup
 }

+testsuccesswithnotice() {
+       testsuccesswithglobalerror 'testsuccesswithnotice' 'WE' "$@"
+}
+testsuccess() {
+       testsuccesswithglobalerror 'testsuccess' 'NWE' "$@"
+}

 testwarning() {
 testwarning() {

-       msggroup "$0"
+       msggroup 'testwarning'

        if [ "$1" = '--nomsg' ]; then
                shift
        else
                msgtest 'Test for successful execution with warnings of' "$*"
        fi
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output"
        if [ "$1" = '--nomsg' ]; then
                shift
        else
                msgtest 'Test for successful execution with warnings of' "$*"
        fi
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output"

-       if "$@" >${OUTPUT} 2>&1; then
+       if "$@" >"${OUTPUT}" 2>&1; then

                if expr match "$1" '^apt.*' >/dev/null; then
                        if grep -q -E ' runtime error: ' "$OUTPUT"; then
                                msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"
                if expr match "$1" '^apt.*' >/dev/null; then
                        if grep -q -E ' runtime error: ' "$OUTPUT"; then
                                msgfailoutput 'compiler detected undefined behavior' "$OUTPUT" "$@"


@@ -1535,14 +1591,14 @@ testwarning() {
        msggroup
 }
 testfailure() {
        msggroup
 }
 testfailure() {

-       msggroup "$0"
+       msggroup 'testfailure'

        if [ "$1" = '--nomsg' ]; then
                shift
        else
                msgtest 'Test for failure in execution of' "$*"
        fi
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output"
        if [ "$1" = '--nomsg' ]; then
                shift
        else
                msgtest 'Test for failure in execution of' "$*"
        fi
        local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output"

-       if "$@" >${OUTPUT} 2>&1; then
+       if "$@" >"${OUTPUT}" 2>&1; then

                local EXITCODE=$?
                msgfailoutput "exitcode $EXITCODE" "$OUTPUT" "$@"
        else
                local EXITCODE=$?
                msgfailoutput "exitcode $EXITCODE" "$OUTPUT" "$@"
        else


@@ -1574,45 +1630,76 @@ testfailure() {
        msggroup
 }
 
        msggroup
 }
 

-testsuccessequal() {
-       msggroup "$0"
-       local CMP="$1"
-       shift
-       testsuccess "$@"
-       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testsuccess.output" "$CMP"
+testreturnstateequal() {
+       local STATE="$1"
+       if [ "$STATE" = 'testsuccesswithglobalerror' ]; then
+               local STATE="$2"
+               local TYPE="$3"
+               shift 3
+               msggroup "${STATE}equal"
+               if [ "$1" != '--nomsg' ]; then
+                       local CMP="$1"
+                       shift
+                       testsuccesswithglobalerror "$STATE" "$TYPE" "$@"
+                       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+               else
+                       local CMP="$2"
+                       shift 2
+                       testsuccesswithglobalerror "$STATE" "$TYPE" "$@"
+                       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+               fi
+       else
+               msggroup "${STATE}equal"
+               if [ "$2" != '--nomsg' ]; then
+                       local CMP="$2"
+                       shift 2
+                       "$STATE" "$@"
+                       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+               else
+                       local CMP="$3"
+                       shift 3
+                       "$STATE" --nomsg "$@"
+                       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/${STATE}.output" "$CMP"
+               fi
+       fi

        msggroup
 }
        msggroup
 }

+testsuccessequal() {
+       # we compare output, so we know perfectly well about N:
+       testreturnstateequal 'testsuccesswithglobalerror' 'testsuccess' 'WE' "$@"
+}

 testwarningequal() {
 testwarningequal() {

-       msggroup "$0"
-       local CMP="$1"
-       shift
-       testwarning "$@"
-       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output" "$CMP"
-       msggroup
+       testreturnstateequal 'testwarning' "$@"

 }
 testfailureequal() {
 }
 testfailureequal() {

-       msggroup "$0"
-       local CMP="$1"
-       shift
-       testfailure "$@"
-       testfileequal "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" "$CMP"
-       msggroup
+       testreturnstateequal 'testfailure' "$@"

 }
 
 testfailuremsg() {
 }
 
 testfailuremsg() {

-       msggroup "$0"
+       msggroup 'testfailuremsg'

        local CMP="$1"
        shift
        testfailure "$@"
        msgtest 'Check that the output of the previous failed command has expected' 'failures and warnings'
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailuremsg.comparefile"
        local CMP="$1"
        shift
        testfailure "$@"
        msgtest 'Check that the output of the previous failed command has expected' 'failures and warnings'
        local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailuremsg.comparefile"

-       grep '^\(W\|E\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "$COMPAREFILE" 2>&1 || true
+       grep '^\(W\|E\|N\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testfailure.output" > "$COMPAREFILE" 2>&1 || true
+       testoutputequal "$COMPAREFILE" echo "$CMP"
+       msggroup
+}
+testwarningmsg() {
+       msggroup 'testwarningmsg'
+       local CMP="$1"
+       shift
+       testwarning "$@"
+       msgtest 'Check that the output of the previous warned command has expected' 'warnings'
+       local COMPAREFILE="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarningmsg.comparefile"
+       grep '^\(W\|E\|N\):' "${TMPWORKINGDIRECTORY}/rootdir/tmp/testwarning.output" > "$COMPAREFILE" 2>&1 || true

        testoutputequal "$COMPAREFILE" echo "$CMP"
        msggroup
 }
 
 testfilestats() {
        testoutputequal "$COMPAREFILE" echo "$CMP"
        msggroup
 }
 
 testfilestats() {

-       msggroup "$0"
+       msggroup 'testfilestats'

        msgtest "Test that file $1 has $2 $3" "$4"
        if [ "$4" "$3" "$(stat --format "$2" "$1")" ]; then
                msgpass
        msgtest "Test that file $1 has $2 $3" "$4"
        if [ "$4" "$3" "$(stat --format "$2" "$1")" ]; then
                msgpass


@@ -1628,18 +1715,18 @@ testfilestats() {
        msggroup
 }
 testaccessrights() {
        msggroup
 }
 testaccessrights() {

-       msggroup "$0"
+       msggroup 'testaccessrights'

        testfilestats "$1" '%a' '=' "$2"
        msggroup
 }
 
 testwebserverlaststatuscode() {
        testfilestats "$1" '%a' '=' "$2"
        msggroup
 }
 
 testwebserverlaststatuscode() {

-       msggroup "$0"
+       msggroup 'testwebserverlaststatuscode'

        local DOWNLOG='rootdir/tmp/webserverstatus-testfile.log'
        local STATUS='downloaded/webserverstatus-statusfile.log'
        rm -f "$DOWNLOG" "$STATUS"
        msgtest 'Test last status code from the webserver was' "$1"
        local DOWNLOG='rootdir/tmp/webserverstatus-testfile.log'
        local STATUS='downloaded/webserverstatus-statusfile.log'
        rm -f "$DOWNLOG" "$STATUS"
        msgtest 'Test last status code from the webserver was' "$1"

-       if downloadfile "http://localhost:8080/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" && [ "$(cat "$STATUS")" = "$1" ]; then
+       if downloadfile "http://localhost:${APTHTTPPORT}/_config/find/aptwebserver::last-status-code" "$STATUS" > "$DOWNLOG" && [ "$(cat "$STATUS")" = "$1" ]; then

                msgpass
        else
                local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwebserverlaststatuscode.output"
                msgpass
        else
                local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testwebserverlaststatuscode.output"


@@ -1699,18 +1786,18 @@ aptautotest() {
        local TESTCALL="$1"
        local CMD="$2"
        local FIRSTOPT="$3"
        local TESTCALL="$1"
        local CMD="$2"
        local FIRSTOPT="$3"

-       local AUTOTEST="aptautotest_$(basename "$CMD" | tr -d '-')_$(echo "$FIRSTOPT" | tr -d '-')"
+       local AUTOTEST="aptautotest_$(echo "${CMD##*/}_${FIRSTOPT}" | tr -d '-')"

        if command -v $AUTOTEST >/dev/null; then
                shift 3
                # save and restore the *.output files from other tests
                # as we might otherwise override them in these automatic tests
        if command -v $AUTOTEST >/dev/null; then
                shift 3
                # save and restore the *.output files from other tests
                # as we might otherwise override them in these automatic tests

-               rm -rf ${TMPWORKINGDIRECTORY}/rootdir/tmp-before
-               mv ${TMPWORKINGDIRECTORY}/rootdir/tmp ${TMPWORKINGDIRECTORY}/rootdir/tmp-before
-               mkdir ${TMPWORKINGDIRECTORY}/rootdir/tmp
+               rm -rf "${TMPWORKINGDIRECTORY}/rootdir/tmp-before"
+               mv "${TMPWORKINGDIRECTORY}/rootdir/tmp" "${TMPWORKINGDIRECTORY}/rootdir/tmp-before"
+               mkdir "${TMPWORKINGDIRECTORY}/rootdir/tmp"

                $AUTOTEST "$TESTCALL" "$@"
                $AUTOTEST "$TESTCALL" "$@"

-               rm -rf ${TMPWORKINGDIRECTORY}/rootdir/tmp-aptautotest
-               mv ${TMPWORKINGDIRECTORY}/rootdir/tmp ${TMPWORKINGDIRECTORY}/rootdir/tmp-aptautotest
-               mv ${TMPWORKINGDIRECTORY}/rootdir/tmp-before ${TMPWORKINGDIRECTORY}/rootdir/tmp
+               rm -rf "${TMPWORKINGDIRECTORY}/rootdir/tmp-aptautotest"
+               mv "${TMPWORKINGDIRECTORY}/rootdir/tmp" "${TMPWORKINGDIRECTORY}/rootdir/tmp-aptautotest"
+               mv "${TMPWORKINGDIRECTORY}/rootdir/tmp-before" "${TMPWORKINGDIRECTORY}/rootdir/tmp"

        fi
 }
 
        fi
 }
 


@@ -1724,9 +1811,12 @@ aptautotest_aptget_update() {
        testfilestats "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:755"
        testfilestats "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:755"
        # all copied files are properly chmodded
        testfilestats "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:755"
        testfilestats "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:755"
        # all copied files are properly chmodded

+       local backupIFS="$IFS"
+       IFS="$(printf "\n\b")"

        for file in $(find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" -type f ! -name 'lock'); do
                testfilestats "$file" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
        done
        for file in $(find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists" -type f ! -name 'lock'); do
                testfilestats "$file" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
        done

+       IFS="$backupIFS"

        if [ "$TESTCALL" = 'testsuccess' ]; then
                # failure cases can retain partial files and such
                testempty find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial" -mindepth 1 ! \( -name 'lock' -o -name '*.FAILED' \)
        if [ "$TESTCALL" = 'testsuccess' ]; then
                # failure cases can retain partial files and such
                testempty find "${TMPWORKINGDIRECTORY}/rootdir/var/lib/apt/lists/partial" -mindepth 1 ! \( -name 'lock' -o -name '*.FAILED' \)