Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

diff --combined make.sh
index d23d575358794bbad67879d1c3a95ad829bede52,129bf6f7b548ad458f7c65ee9609d922c2541972..89ada46799b32f5f0fb02bfcb958e44c466b6e9a
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -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=20181024
 +TOOLCHAINVER=20181030
  
  ###############################################################################
  #
@@@ -1176,6 -1176,7 +1176,7 @@@ buildipfire() 
    lfsmake2 libgcrypt
    lfsmake2 libassuan
    lfsmake2 nettle
+   lfsmake2 json-c
    lfsmake2 libevent
    lfsmake2 libevent2
    lfsmake2 expat
@@@ -1556,6 -1557,7 +1557,7 @@@
    lfsmake2 lua
    lfsmake2 dnsdist
    lfsmake2 bird
+   lfsmake2 frr
    lfsmake2 dmidecode
    lfsmake2 mcelog
    lfsmake2 rtpproxy