Merge remote-tracking branch 'origin/master' into kernel-4.9

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --combined make.sh
index 89c3e56cafaba1c0df9b6fc3f6501ce10e755507,f4a651af9ffefed3f84b86116df224fbdc206539..a21db99af58ae070121d493cc6fd3ecb3881631f
--- 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.19"                                                        # Version number
- CORE="112"                                                    # Core Level (Filename)
- PAKFIRE_CORE="112"                                            # Core Level (PAKFIRE)
+ CORE="115"                                                    # Core Level (Filename)
+ PAKFIRE_CORE="115"                                            # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
  CONFIG_ROOT=/var/ipfire                                               # Configuration rootdir
@@@ -433,29 -433,29 +433,29 @@@ buildipfire() 
    case "${BUILD_ARCH}" in
        x86_64)
                lfsmake2 linux                  KCFG=""
 -              lfsmake2 backports                      KCFG=""
 -              lfsmake2 e1000e                 KCFG=""
 -              lfsmake2 igb                            KCFG=""
 -              lfsmake2 ixgbe                  KCFG=""
 +#             lfsmake2 backports                      KCFG=""
 +#             lfsmake2 e1000e                 KCFG=""
 +#             lfsmake2 igb                            KCFG=""
 +#             lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
        i586)
                # x86-pae (Native and new XEN) kernel build
                lfsmake2 linux                  KCFG="-pae"
 -              lfsmake2 backports                      KCFG="-pae"
 -              lfsmake2 e1000e                 KCFG="-pae"
 -              lfsmake2 igb                            KCFG="-pae"
 -              lfsmake2 ixgbe                  KCFG="-pae"
 +#             lfsmake2 backports                      KCFG="-pae"
 +#             lfsmake2 e1000e                 KCFG="-pae"
 +#             lfsmake2 igb                            KCFG="-pae"
 +#             lfsmake2 ixgbe                  KCFG="-pae"
                lfsmake2 xtables-addons         KCFG="-pae"
                lfsmake2 linux-initrd                   KCFG="-pae"
  
                # x86 kernel build
                lfsmake2 linux                  KCFG=""
 -              lfsmake2 backports                      KCFG=""
 -              lfsmake2 e1000e                 KCFG=""
 -              lfsmake2 igb                            KCFG=""
 -              lfsmake2 ixgbe                  KCFG=""
 +#             lfsmake2 backports                      KCFG=""
 +#             lfsmake2 e1000e                 KCFG=""
 +#             lfsmake2 igb                            KCFG=""
 +#             lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
@@@ -497,6 -497,8 +497,8 @@@
    lfsmake2 libevent2
    lfsmake2 libevent2-compat
    lfsmake2 expat
+   lfsmake2 apr
+   lfsmake2 aprutil
    lfsmake2 unbound
    lfsmake2 gnutls
    lfsmake2 bind
@@@ -546,6 -548,7 +548,7 @@@
    lfsmake2 web-user-interface
    lfsmake2 flag-icons
    lfsmake2 jquery
+   lfsmake2 bootstrap
    lfsmake2 arping
    lfsmake2 beep
    lfsmake2 dvdrtools
@@@ -624,6 -627,7 +627,7 @@@
    lfsmake2 openssh
    lfsmake2 fontconfig
    lfsmake2 dejavu-fonts-ttf
+   lfsmake2 ubuntu-font-family
    lfsmake2 freefont
    lfsmake2 pixman
    lfsmake2 cairo
@@@ -862,6 -866,8 +866,8 @@@
    lfsmake2 owncloud
    lfsmake2 bacula
    lfsmake2 batctl
+   lfsmake2 perl-Font-TTF
+   lfsmake2 perl-IO-String
    lfsmake2 perl-PDF-API2
    lfsmake2 squid-accounting
    lfsmake2 pigz
@@@ -885,6 -891,8 +891,8 @@@
    lfsmake2 perl-common-sense
    lfsmake2 perl-inotify2
    lfsmake2 perl-Net-IP
+   lfsmake2 wio
+   lfsmake2 iftop
  }
  
  buildinstaller() {