Merge branch 'master' into pakfire3

diff --combined make.sh
index 0f369b3f2e315712ab4bba0556b484665931c27b,54f3aec7f7b78d581ba13de29441e951cbb36ce4..1d760a204eaa18908d7c25bf689744be1e952e4a
--- 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.9"                                                 # Version number
- CORE="49"                                                     # Core Level (Filename)
- PAKFIRE_CORE="48"                                             # Core Level (PAKFIRE)
+ CORE="50"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="49"                                             # 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
@@@ -247,6 -247,7 +247,7 @@@ buildtoolchain() 
      NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
      export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
      lfsmake1 ccache   PASS=1
+     lfsmake1 make     PASS=1
      lfsmake1 binutils PASS=1
      lfsmake1 gcc              PASS=1
      export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@@ -270,7 -271,7 +271,7 @@@
      lfsmake1 grep
      lfsmake1 gzip
      lfsmake1 m4
-     lfsmake1 make
+     lfsmake1 make     PASS=2
      lfsmake1 patch
      lfsmake1 perl
      lfsmake1 sed
@@@ -416,8 -417,6 +417,8 @@@ buildipfire() 
    ipfiremake pam
    ipfiremake openssl
    ipfiremake curl
 +  ipfiremake tcl
 +  ipfiremake sqlite
    ipfiremake python
    ipfiremake fireinfo
    ipfiremake libnet
@@@ -651,6 -650,7 +652,6 @@@
    ipfiremake splix
    ipfiremake streamripper
    ipfiremake sshfs
 -  ipfiremake sqlite
    ipfiremake taglib
    ipfiremake mediatomb
    ipfiremake sslh
@@@ -681,6 -681,7 +682,6 @@@
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
 -  ipfiremake tcl
    ipfiremake imspector
    ipfiremake miniupnpd
    ipfiremake client175
@@@ -690,13 -691,6 +691,13 @@@
    ipfiremake python-m2crypto
    ipfiremake crda
    ipfiremake libsatsolver
 +  ipfiremake python-satsolver
 +  ipfiremake python-distutils-extra
 +  ipfiremake python-lzma
 +  ipfiremake python-progressbar
 +  ipfiremake python-xattr
 +  ipfiremake intltool
 +  ipfiremake pakfire3-deps
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild