Merge remote-tracking branch 'dweismueller/telnet' into next

Conflicts:
	make.sh

diff --combined make.sh
index cf36f63a7839085502dd5d39556900763fde8d4e,57dbd693809b5a5794584516f45d8e7218eee48f..e5d62533d2041fa56712ea2cb9adccac388b9b55
--- 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.11"                                                        # Version number
 -CORE="61"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="61"                                             # Core Level (PAKFIRE)
 +CORE="62"                                                     # Core Level (Filename)
 +PAKFIRE_CORE="62"                                             # 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
@@@ -487,7 -487,6 +487,7 @@@ buildipfire() 
    ipfiremake libnl
    ipfiremake libidn
    ipfiremake libjpeg
 +  ipfiremake libexif
    ipfiremake libpng
    ipfiremake libtiff
    ipfiremake libart
@@@ -633,7 -632,6 +633,7 @@@
    ipfiremake libogg
    ipfiremake libvorbis
    ipfiremake libdvbpsi
 +  ipfiremake flac
    ipfiremake lame
    ipfiremake sox
    ipfiremake libshout
@@@ -769,8 -767,7 +769,9 @@@
    ipfiremake lcd4linux
    ipfiremake mtr
    ipfiremake tcpick
 +  ipfiremake minidlna
 +  ipfiremake fping
+   ipfiremake telnet
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild