Merge remote-tracking branch 'ummeegge/iptraf-ng' into next

Conflicts:
	make.sh

diff --combined make.sh
index 538151ccd1b608f19ceed9414bb8d3c661378643,4424e762f96d7afebbbab1abdf1962436ffbcd2e..50a58782d1b4a9430075b2d4a181dc315470d595
--- 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="72"                                                     # Core Level (Filename)
 -PAKFIRE_CORE="71"                                             # Core Level (PAKFIRE)
 +CORE="73"                                                     # Core Level (Filename)
 +PAKFIRE_CORE="72"                                             # 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
@@@ -333,7 -333,6 +333,7 @@@ buildbase() 
      lfsmake2 gettext
      lfsmake2 grep
      lfsmake2 groff
 +    lfsmake2 gperf
      lfsmake2 gzip
      lfsmake2 inetutils
      lfsmake2 iproute2
@@@ -780,9 -779,7 +780,10 @@@ buildipfire() 
    ipfiremake perl-File-Tail
    ipfiremake perl-TimeDate
    ipfiremake swatch
 +  ipfiremake tor
 +  ipfiremake arm
 +  ipfiremake wavemon
+   ipfiremake iptraf-ng
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild