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

diff --combined config/qos/makeqosscripts.pl
index aadd959ec068fd0cd548323b0691d8e141013eeb,824a9937fa3da68a9a71608a6e4e6cdb414641b6..bc460db92b47caf4cd23601effa2af4dff54c664
--- 1/config/qos/makeqosscripts.pl
--- 2/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@@ -252,8 -252,8 +252,8 @@@ foreach $subclassentry (sort @subclasse
  }
  print <<END
  
 -      ### add l7-filter to POSTROUTING chain to see all traffic
 -      iptables -t mangle -A POSTROUTING -m layer7 --l7proto unset
 +      ### add l7-filter to PREROUTING chain to see all traffic
 +      iptables -t mangle -A PREROUTING -m layer7 --l7proto unset
  
        ### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-OUT
@@@ -715,7 -715,7 +715,7 @@@ print <<EN
        iptables -t mangle --flush  QOS-TOS >/dev/null 2>&1
        iptables -t mangle --delete-chain QOS-TOS >/dev/null 2>&1
        # remove l7-filter
 -      iptables -t mangle --delete POSTROUTING -m layer7 --l7proto unset
 +      iptables -t mangle --delete PREROUTING -m layer7 --l7proto unset
  
        rmmod sch_htb >/dev/null 2>&1
  
@@@ -726,7 -726,7 +726,7 @@@
        echo "Quality of Service was successfully cleared!"
    ;;
    gen|generate)
-       echo -n "Generateing the QoS-Scripts..."
+       echo -n "Generating the QoS-Scripts..."
        /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh
        echo ".Done!"
        exit 0

diff --combined make.sh
index a41db5413659bd82952ca780751bf860d53be183,c03e464b5108d53f4b9a96053b2358fcc7618948..691444cd9611c6187a1b32db0889018a49f8c001
--- 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="119"                                                    # Core Level (Filename)
- PAKFIRE_CORE="119"                                            # Core Level (PAKFIRE)
+ CORE="120"                                                    # Core Level (Filename)
+ PAKFIRE_CORE="120"                                            # 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
@@@ -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)
@@@ -1044,12 -1044,13 +1044,12 @@@ buildipfire() 
    lfsmake2 unzip
    lfsmake2 which
    lfsmake2 linux-firmware
 -  lfsmake2 ath10k-firmware
    lfsmake2 dvb-firmwares
 -  lfsmake2 mt7601u-firmware
 +  lfsmake2 xr819-firmware
    lfsmake2 zd1211-firmware
    lfsmake2 rpi-firmware
    lfsmake2 bc
 -  lfsmake2 u-boot
 +  lfsmake2 u-boot MKIMAGE=1
    lfsmake2 cpio
    lfsmake2 mdadm
    lfsmake2 dracut
@@@ -1064,61 -1065,67 +1064,62 @@@
    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=""
                ;;
  
        armv5tel)
 -              # arm-rpi (Raspberry Pi) kernel build
 -              lfsmake2 linux                  KCFG="-rpi"
 -              lfsmake2 backports                      KCFG="-rpi"
 -              lfsmake2 xtables-addons         KCFG="-rpi"
 -              lfsmake2 linux-initrd                   KCFG="-rpi"
 +              # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
 +              lfsmake2 linux                  KCFG="-kirkwood"
 +#             lfsmake2 backports                      KCFG="-kirkwood"
 +#             lfsmake2 e1000e                 KCFG="-kirkwood"
 +#             lfsmake2 igb                            KCFG="-kirkwood"
 +#             lfsmake2 ixgbe                  KCFG="-kirkwood"
 +              lfsmake2 xtables-addons         KCFG="-kirkwood"
 +              lfsmake2 linux-initrd                   KCFG="-kirkwood"
  
                # arm multi platform (Panda, Wandboard ...) kernel build
                lfsmake2 linux                  KCFG="-multi"
 -              lfsmake2 backports                      KCFG="-multi"
 -              lfsmake2 e1000e                 KCFG="-multi"
 -              lfsmake2 igb                            KCFG="-multi"
 -              lfsmake2 ixgbe                  KCFG="-multi"
 +#             lfsmake2 backports                      KCFG="-multi"
 +#             lfsmake2 e1000e                 KCFG="-multi"
 +#             lfsmake2 igb                            KCFG="-multi"
 +#             lfsmake2 ixgbe                  KCFG="-multi"
                lfsmake2 xtables-addons         KCFG="-multi"
                lfsmake2 linux-initrd                   KCFG="-multi"
 -
 -              # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
 -              lfsmake2 linux                  KCFG="-kirkwood"
 -              lfsmake2 backports                      KCFG="-kirkwood"
 -              lfsmake2 e1000e                 KCFG="-kirkwood"
 -              lfsmake2 igb                            KCFG="-kirkwood"
 -              lfsmake2 ixgbe                  KCFG="-kirkwood"
 -              lfsmake2 xtables-addons         KCFG="-kirkwood"
 -              lfsmake2 linux-initrd                   KCFG="-kirkwood"
                ;;
    esac
    lfsmake2 xtables-addons                     USPACE="1"
    lfsmake2 openssl
    [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+   lfsmake2 openssl-compat
    lfsmake2 libgpg-error
    lfsmake2 libgcrypt
    lfsmake2 libassuan
@@@ -1428,7 -1435,7 +1429,8 @@@
    lfsmake2 powertop
    lfsmake2 parted
    lfsmake2 swig
 +  lfsmake2 u-boot
+   lfsmake2 python-typing
    lfsmake2 python-m2crypto
    lfsmake2 wireless-regdb
    lfsmake2 crda
@@@ -1458,6 -1465,7 +1460,6 @@@
    lfsmake2 sendEmail
    lfsmake2 sysbench
    lfsmake2 strace
 -  lfsmake2 elfutils
    lfsmake2 ltrace
    lfsmake2 ipfire-netboot
    lfsmake2 lcdproc
@@@ -1486,6 -1494,7 +1488,6 @@@
    lfsmake2 pigz
    lfsmake2 tmux
    lfsmake2 perl-Text-CSV_XS
 -  lfsmake2 swconfig
    lfsmake2 haproxy
    lfsmake2 ipset
    lfsmake2 lua