Merge branch 'master' into upnp

diff --combined make.sh
index 8a99c7553293269208cea22bd63424094aef25da,331479dab22665a9bc9bc052b36db6d9e056ca47..13672542f315e1a8e7231d79b6f2ae1bbcb869a3
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,8 -25,8 +25,8 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.7"                                                 # Version number
- CORE="42"                                                     # Core Level (Filename)
- PAKFIRE_CORE="41"                                             # Core Level (PAKFIRE)
+ CORE="43"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="42"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -227,10 -227,6 +227,10 @@@ prepareenv() 
  }
  
  buildtoolchain() {
 +    if [ "$(uname -m)" = "x86_64" ]; then
 +        exiterror "Cannot build toolchain on x86_64. Please use the download."
 +    fi
 +
      LOGFILE="$BASEDIR/log/_build.toolchain.log"
      export LOGFILE
      ORG_PATH=$PATH
@@@ -652,7 -648,6 +652,7 @@@ buildipfire() 
    ipfiremake minicom
    ipfiremake ddrescue
    ipfiremake imspector
 +  ipfiremake miniupnpd
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -794,7 -789,7 +794,7 @@@ ipfirepackages() 
  case "$1" in 
  build)
        clear
 -      BUILDMACHINE=`uname -m`
 +      BUILDMACHINE="i686"
        PACKAGE=`ls -v -r $BASEDIR/cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz 2> /dev/null | head -n 1`
        #only restore on a clean disk
        if [ ! -f log/cleanup-toolchain-2-tools ]; then
@@@ -922,7 -917,7 +922,7 @@@ toolchain
        prepareenv
        beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
        buildtoolchain
 -      BUILDMACHINE=`uname -m`
 +      BUILDMACHINE="i686"
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $BUILDMACHINE" | tee -a $LOGFILE
        test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
        cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE.tar.gz \
@@@ -934,7 -929,7 +934,7 @@@
        stdumount
        ;;
  gettoolchain)
 -      BUILDMACHINE=`uname -m`
 +      BUILDMACHINE="i686"
        # arbitrary name to be updated in case of new toolchain package upload
        PACKAGE=$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$BUILDMACHINE
        if [ ! -f $BASEDIR/cache/toolchains/$PACKAGE.tar.gz ]; then