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

diff --combined make.sh
index a3906d746710412fbcd072f35d682bb3f30f4617,739fc531066892bbf8a78e6179830eec2b1f4750..3f4e5774f7bc7751290817b9278793f8357fe58d
--- 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.15"                                                        # Version number
- CORE="80"                                                     # Core Level (Filename)
- PAKFIRE_CORE="80"                                             # Core Level (PAKFIRE)
+ CORE="81"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="81"                                             # 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
@@@ -478,6 -478,7 +478,7 @@@ buildipfire() 
    ipfiremake fireinfo
    ipfiremake libnet
    ipfiremake libnl
+   ipfiremake libnl-3
    ipfiremake libidn
    ipfiremake nasm
    ipfiremake libjpeg
@@@ -741,7 -742,6 +742,7 @@@
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
 +  ipfiremake libsrtp
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch
@@@ -811,6 -811,9 +812,9 @@@
    ipfiremake sslscan
    ipfiremake owncloud
    ipfiremake bacula
+   ipfiremake batctl
+   ipfiremake perl-PDF-API2
+   ipfiremake squid-accounting
  }
  
  buildinstaller() {