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

diff --combined config/rootfiles/common/armv5tel/initscripts
index e856697b9ab71171f8791059000d45b50ff81b74,dfe2e4869e8e472a8fd725d18663c024158fa1ef..c761e2667234bd209602194014a2cf5e13e670f4
mode 100755,100644..100755
--- 1/config/rootfiles/common/armv5tel/initscripts
--- 2/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@@ -53,7 -53,6 +53,7 @@@ etc/rc.d/init.d/mISD
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
  #etc/rc.d/init.d/motion
 +#etc/rc.d/init.d/monit
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
  #etc/rc.d/init.d/mpd
@@@ -74,13 -73,13 +74,13 @@@ etc/rc.d/init.d/networking/red.down/05-
  etc/rc.d/init.d/networking/red.down/10-ipsec
  etc/rc.d/init.d/networking/red.down/10-miniupnpd
  etc/rc.d/init.d/networking/red.down/10-ovpn
- etc/rc.d/init.d/networking/red.down/20-RL-firewall
+ etc/rc.d/init.d/networking/red.down/20-firewall
  #etc/rc.d/init.d/networking/red.up
  etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
  etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
  etc/rc.d/init.d/networking/red.up/10-miniupnpd
  etc/rc.d/init.d/networking/red.up/10-multicast
- etc/rc.d/init.d/networking/red.up/20-RL-firewall
+ etc/rc.d/init.d/networking/red.up/20-firewall
  etc/rc.d/init.d/networking/red.up/23-RS-snort
  etc/rc.d/init.d/networking/red.up/24-RS-qos
  etc/rc.d/init.d/networking/red.up/27-RS-squid
@@@ -132,7 -131,6 +132,6 @@@ etc/rc.d/init.d/upnp
  #etc/rc.d/init.d/vdradmin
  #etc/rc.d/init.d/vsftpd
  #etc/rc.d/init.d/watchdog
- #etc/rc.d/init.d/winbind
  etc/rc.d/init.d/wlanclient
  #etc/rc.d/init.d/xinetd
  #etc/rc.d/rc0.d

diff --combined config/rootfiles/common/i586/initscripts
index af099ba69b7674055ea6812904fa1e5d107972f8,622886fd647f909dc2bb340b1ca5682642789a5e..525c55c455af95534d87963da0e307178cddcbe9
mode 100755,100644..100755
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@@ -54,7 -54,6 +54,7 @@@ etc/rc.d/init.d/mISD
  #etc/rc.d/init.d/miniupnpd
  #etc/rc.d/init.d/mldonkey
  etc/rc.d/init.d/modules
 +#etc/rc.d/init.d/monit
  #etc/rc.d/init.d/motion
  etc/rc.d/init.d/mountfs
  etc/rc.d/init.d/mountkernfs
@@@ -76,13 -75,13 +76,13 @@@ etc/rc.d/init.d/networking/red.down/05-
  etc/rc.d/init.d/networking/red.down/10-ipsec
  etc/rc.d/init.d/networking/red.down/10-miniupnpd
  etc/rc.d/init.d/networking/red.down/10-ovpn
- etc/rc.d/init.d/networking/red.down/20-RL-firewall
+ etc/rc.d/init.d/networking/red.down/20-firewall
  #etc/rc.d/init.d/networking/red.up
  etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
  etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
  etc/rc.d/init.d/networking/red.up/10-miniupnpd
  etc/rc.d/init.d/networking/red.up/10-multicast
- etc/rc.d/init.d/networking/red.up/20-RL-firewall
+ etc/rc.d/init.d/networking/red.up/20-firewall
  etc/rc.d/init.d/networking/red.up/23-RS-snort
  etc/rc.d/init.d/networking/red.up/24-RS-qos
  etc/rc.d/init.d/networking/red.up/27-RS-squid
@@@ -135,7 -134,6 +135,6 @@@ etc/rc.d/init.d/upnp
  #etc/rc.d/init.d/vdradmin
  #etc/rc.d/init.d/vsftpd
  #etc/rc.d/init.d/watchdog
- #etc/rc.d/init.d/winbind
  etc/rc.d/init.d/wlanclient
  #etc/rc.d/init.d/xinetd
  #etc/rc.d/rc0.d

diff --combined lfs/initscripts
index 02f97431a2318186c57dbed65374451cf17141f1,4acf65e13eb965ae8673e0a40e72786a30d3a5c9..4acf65e13eb965ae8673e0a40e72786a30d3a5c9
mode 100755,100644..100755
--- 1/lfs/initscripts
--- 2/lfs/initscripts
+++ b/lfs/initscripts
@@@ -180,14 -180,12 +180,12 @@@ $(TARGET) 
        ln -sf ../init.d/wlanclient  /etc/rc.d/rc6.d/K82wlanclient
  
        ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
-       ln -sf ../../firewall /etc/rc.d/init.d/networking/red.up/20-RL-firewall
        ln -sf ../../../../../usr/local/bin/snortctrl \
                /etc/rc.d/init.d/networking/red.up/23-RS-snort
        ln -sf ../../../../../usr/local/bin/qosctrl \
                /etc/rc.d/init.d/networking/red.up/24-RS-qos
        ln -sf ../../squid /etc/rc.d/init.d/networking/red.up/27-RS-squid
        ln -sf ../../dnsmasq /etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
-       ln -sf ../../firewall /etc/rc.d/init.d/networking/red.down/20-RL-firewall
  
        for i in green blue orange; do \
                ln -sf any /etc/rc.d/init.d/networking/$$i; \

diff --combined make.sh
index b0d00b2813e3721bcd7228a8757641a27faa2d3d,d94271163627cefe7ecad616d467c353a751b0e4..854c64f072908dfd041ce0a1674f910f8af885b3
--- 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="85"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="84"                                             # 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
@@@ -464,6 -464,7 +464,7 @@@ buildipfire() 
    ipfiremake bind
    ipfiremake dhcp
    ipfiremake dhcpcd
+   ipfiremake boost
    ipfiremake linux-atm
    ipfiremake cpio
    ipfiremake dracut
@@@ -477,6 -478,7 +478,7 @@@
    ipfiremake fireinfo
    ipfiremake libnet
    ipfiremake libnl
+   ipfiremake libnl-3
    ipfiremake libidn
    ipfiremake nasm
    ipfiremake libjpeg
@@@ -615,6 -617,7 +617,7 @@@
    ipfiremake foomatic
    ipfiremake hplip
    ipfiremake cifs-utils
+   ipfiremake krb5
    ipfiremake samba
    ipfiremake sudo
    ipfiremake mc
@@@ -736,11 -739,9 +739,11 @@@
    ipfiremake iftop
    ipfiremake motion
    ipfiremake joe
 +  ipfiremake monit
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
 +  ipfiremake libsrtp
    ipfiremake asterisk
    ipfiremake lcr
    ipfiremake usb_modeswitch
@@@ -809,6 -810,10 +812,10 @@@
    ipfiremake stunnel
    ipfiremake sslscan
    ipfiremake owncloud
+   ipfiremake bacula
+   ipfiremake batctl
+   ipfiremake perl-PDF-API2
+   ipfiremake squid-accounting
  }
  
  buildinstaller() {