Merge remote-tracking branch 'origin/next' into kernel-4.14

diff --combined make.sh
index e7b385ce90e7dcd23771c1cd0129b6864a167b30,0fe559ca5b628a904632032e9562ce977ccbf07b..eb2c972a5e3eb2b9850208e521e27a39dcb8ddd2
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -17,7 -17,7 +17,7 @@@
  # along with IPFire; if not, write to the Free Software                    #
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
  #                                                                          #
- # Copyright (C) 2007-2017 IPFire Team <info@ipfire.org>.                   #
+ # Copyright (C) 2007-2018 IPFire Team <info@ipfire.org>.                   #
  #                                                                          #
  ############################################################################
  #
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"                                                 # Software nam
  SNAME="ipfire"                                                        # Short name
  VERSION="2.19"                                                        # Version number
  CORE="118"                                                    # Core Level (Filename)
- PAKFIRE_CORE="117"                                            # Core Level (PAKFIRE)
+ PAKFIRE_CORE="118"                                            # 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
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
  
 -TOOLCHAINVER=20171121
 +TOOLCHAINVER=20180126
  
  ###############################################################################
  #
@@@ -144,14 -144,14 +144,14 @@@ configure_build() 
                        BUILDTARGET="${build_arch}-unknown-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="x86"
 -                      CFLAGS_ARCH="-m64 -mtune=generic"
 +                      CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
                        ;;
  
                i586)
                        BUILDTARGET="${build_arch}-pc-linux-gnu"
                        CROSSTARGET="${build_arch}-cross-linux-gnu"
                        BUILD_PLATFORM="x86"
 -                      CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
 +                      CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
                        ;;
  
                aarch64)
@@@ -952,7 -952,6 +952,7 @@@ buildtoolchain() 
        lfsmake1 tar
        lfsmake1 texinfo
        lfsmake1 xz
 +      lfsmake1 flex
        lfsmake1 fake-environ
        lfsmake1 strip
        lfsmake1 cleanup-toolchain
@@@ -983,6 -982,7 +983,6 @@@ buildbase() 
        lfsmake2 iana-etc
        lfsmake2 m4
        lfsmake2 bison
 -      lfsmake2 ncurses-compat
        lfsmake2 ncurses
        lfsmake2 procps
        lfsmake2 libtool
@@@ -1042,7 -1042,9 +1042,7 @@@ buildipfire() 
    lfsmake2 unzip
    lfsmake2 which
    lfsmake2 linux-firmware
 -  lfsmake2 ath10k-firmware
    lfsmake2 dvb-firmwares
 -  lfsmake2 mt7601u-firmware
    lfsmake2 zd1211-firmware
    lfsmake2 rpi-firmware
    lfsmake2 bc
@@@ -1061,34 -1063,33 +1061,34 @@@
    lfsmake2 libnetfilter_cthelper
    lfsmake2 libnetfilter_cttimeout
    lfsmake2 iptables
 +  lfsmake2 elfutils
  
    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=""
                ;;
@@@ -1467,6 -1468,7 +1467,6 @@@
    lfsmake2 sendEmail
    lfsmake2 sysbench
    lfsmake2 strace
 -  lfsmake2 elfutils
    lfsmake2 ltrace
    lfsmake2 ipfire-netboot
    lfsmake2 lcdproc