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

diff --combined make.sh
index 662f2c0dedec3b4ae54f83fdfd9f29e7cd985978,b674bb3f377bcbf75d0c38688a98959d7ae15134..901982b65b2bf490a4fec2e92caac8a8c6e77956
--- 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.13"                                                        # Version number
- CORE="70"                                                     # Core Level (Filename)
+ CORE="71"                                                     # Core Level (Filename)
  PAKFIRE_CORE="70"                                             # Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`            # Git Branch
  SLOGAN="www.ipfire.org"                                               # Software slogan
@@@ -333,10 -333,10 +333,11 @@@ buildbase() 
      lfsmake2 gettext
      lfsmake2 grep
      lfsmake2 groff
 +    lfsmake2 gperf
      lfsmake2 gzip
      lfsmake2 inetutils
      lfsmake2 iproute2
+     lfsmake2 jwhois
      lfsmake2 kbd
      lfsmake2 less
      lfsmake2 make