Merge remote-tracking branch 'jlentfer/multicat' into next

Conflicts:
	make.sh

diff --combined make.sh
index 939a04e9c6f3f59d4eaadc7a1390af37358b5a1b,cec5155303b2a22c513a5d088788265effd157f5..af515bfa6d591ef98e830668a1578c9df2df7696
--- 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.13"                                                        # Version number
 -CORE="68"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="68"                                             # Core Level (PAKFIRE)
 +CORE="70"                                                     # Core Level (Filename)
 +PAKFIRE_CORE="69"                                             # 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
@@@ -462,7 -462,6 +462,7 @@@ buildipfire() 
    ipfiremake libnet
    ipfiremake libnl
    ipfiremake libidn
 +  ipfiremake nasm
    ipfiremake libjpeg
    ipfiremake libexif
    ipfiremake libpng
@@@ -524,6 -523,7 +524,6 @@@
    ipfiremake logwatch
    ipfiremake misc-progs
    ipfiremake nano
 -  ipfiremake nasm
    ipfiremake URI
    ipfiremake HTML-Tagset
    ipfiremake HTML-Parser
@@@ -765,9 -765,8 +765,11 @@@
    ipfiremake nginx
    ipfiremake sendEmail
    ipfiremake sysbench
 +  ipfiremake strace
 +  ipfiremake ipfire-netboot
 +  ipfiremake lcdproc
+   ipfiremake bitstream
+   ipfiremake multicat
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild