Merge remote-tracking branch 'ms/frr' into next

diff --combined make.sh
index c5cfab1517799ff2e6e334da5ce51d89297a6878,47e8f3fc1ec6dda54bfefe113f8936e65ed0caee..129bf6f7b548ad458f7c65ee9609d922c2541972
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -25,7 -25,7 +25,7 @@@
  NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                        # Short name
  VERSION="2.21"                                                        # Version number
 -CORE="124"                                                    # Core Level (Filename)
 +CORE="125"                                                    # Core Level (Filename)
  PAKFIRE_CORE="124"                                            # Core Level (PAKFIRE)
  GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                  # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -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=20180606
 +TOOLCHAINVER=20181024
  
  ###############################################################################
  #
@@@ -1039,7 -1039,6 +1039,7 @@@ buildbase() 
        lfsmake2 readline
        lfsmake2 readline-compat
        lfsmake2 bzip2
 +      lfsmake2 xz
        lfsmake2 pcre
        lfsmake2 pcre-compat
        lfsmake2 bash
@@@ -1074,6 -1073,8 +1074,6 @@@
        lfsmake2 util-linux
        lfsmake2 udev
        lfsmake2 vim
 -      lfsmake2 xz
 -      lfsmake2 paxctl
  }
  
  buildipfire() {
@@@ -1082,9 -1083,6 +1082,9 @@@
    lfsmake2 configroot
    lfsmake2 initscripts
    lfsmake2 backup
 +  lfsmake2 openssl
 +  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
 +  lfsmake2 openssl-compat
    lfsmake2 popt
    lfsmake2 libusb
    lfsmake2 libusb-compat
@@@ -1103,7 -1101,6 +1103,7 @@@
    lfsmake2 cpio
    lfsmake2 mdadm
    lfsmake2 dracut
 +  lfsmake2 libaio
    lfsmake2 lvm2
    lfsmake2 multipath-tools
    lfsmake2 freetype
@@@ -1172,10 -1169,14 +1172,11 @@@
    esac
    lfsmake2 intel-microcode
    lfsmake2 xtables-addons                     USPACE="1"
 -  lfsmake2 openssl
 -  [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
 -  lfsmake2 openssl-compat
    lfsmake2 libgpg-error
    lfsmake2 libgcrypt
    lfsmake2 libassuan
    lfsmake2 nettle
+   lfsmake2 json-c
    lfsmake2 libevent
    lfsmake2 libevent2
    lfsmake2 expat
@@@ -1378,7 -1379,6 +1379,7 @@@
    lfsmake2 rsync
    lfsmake2 libtirpc
    lfsmake2 rpcbind
 +  lfsmake2 keyutils
    lfsmake2 nfs
    lfsmake2 gnu-netcat
    lfsmake2 ncat
@@@ -1556,6 -1556,7 +1557,7 @@@
    lfsmake2 lua
    lfsmake2 dnsdist
    lfsmake2 bird
+   lfsmake2 frr
    lfsmake2 dmidecode
    lfsmake2 mcelog
    lfsmake2 rtpproxy