Merge remote-tracking branch 'origin/next' into install-raid

diff --combined config/rootfiles/common/armv5tel/initscripts
index 5321a6bce2b4ffc93d0a3bd3eee3c0e62f2b6fcd,dfe2e4869e8e472a8fd725d18663c024158fa1ef..5e40079a9fa317dfac347f542c2a703f2364a13b
--- 1/config/rootfiles/common/armv5tel/initscripts
--- 2/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@@ -24,6 -24,7 +24,7 @@@ etc/rc.d/init.d/consol
  #etc/rc.d/init.d/cyrus-imapd
  #etc/rc.d/init.d/cyrus-sasl
  etc/rc.d/init.d/dhcp
+ etc/rc.d/init.d/dhcrelay
  etc/rc.d/init.d/dnsmasq
  etc/rc.d/init.d/fcron
  #etc/rc.d/init.d/fetchmail
@@@ -43,6 -44,7 +44,6 @@@ etc/rc.d/init.d/ipse
  etc/rc.d/init.d/leds
  etc/rc.d/init.d/localnet
  etc/rc.d/init.d/mISDN
 -#etc/rc.d/init.d/mdadm
  #etc/rc.d/init.d/mediatomb
  #etc/rc.d/init.d/messagebus
  #etc/rc.d/init.d/miau
@@@ -71,13 -73,13 +72,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
@@@ -129,7 -131,6 +130,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 7fab7dd4c3efa686c34d56ff083a78586dfb1fa0,622886fd647f909dc2bb340b1ca5682642789a5e..6704251d5a316b6078208c9260134c829626dd02
--- 1/config/rootfiles/common/i586/initscripts
--- 2/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@@ -26,6 -26,7 +26,7 @@@ etc/rc.d/init.d/consol
  #etc/rc.d/init.d/cyrus-imapd
  #etc/rc.d/init.d/cyrus-sasl
  etc/rc.d/init.d/dhcp
+ etc/rc.d/init.d/dhcrelay
  etc/rc.d/init.d/dnsmasq
  etc/rc.d/init.d/fcron
  #etc/rc.d/init.d/fetchmail
@@@ -45,6 -46,7 +46,6 @@@ etc/rc.d/init.d/ipse
  etc/rc.d/init.d/leds
  etc/rc.d/init.d/localnet
  etc/rc.d/init.d/mISDN
 -#etc/rc.d/init.d/mdadm
  #etc/rc.d/init.d/mediatomb
  #etc/rc.d/init.d/messagebus
  #etc/rc.d/init.d/miau
@@@ -73,13 -75,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 -134,6 +133,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 make.sh
index 869a6efd5dbf5f8399d0c54c62cae86c477ec1f7,4cbdae4fad0040ffcf6aab447e246b0c3b70cef8..fa556194b78bedf93c5c092ddcd31b4103f9efde
--- 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="79"                                                     # Core Level (Filename)
- PAKFIRE_CORE="79"                                             # Core Level (PAKFIRE)
+ CORE="82"                                                     # 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
@@@ -362,6 -362,7 +362,6 @@@ buildbase() 
      lfsmake2 less
      lfsmake2 make
      lfsmake2 man
 -    lfsmake2 mktemp
      lfsmake2 kmod
      lfsmake2 net-tools
      lfsmake2 patch
@@@ -384,9 -385,6 +384,6 @@@ buildipfire() 
    export LOGFILE
    ipfiremake configroot
    ipfiremake backup
-   ipfiremake bind
-   ipfiremake dhcp
-   ipfiremake dhcpcd
    ipfiremake libusb
    ipfiremake libusbx
    ipfiremake libpcap
@@@ -400,9 -398,6 +397,9 @@@
    ipfiremake rpi-firmware
    ipfiremake bc
    ipfiremake u-boot
 +  ipfiremake cpio
 +  ipfiremake mdadm
 +  ipfiremake dracut
  
    case "${TARGET_ARCH}" in
        i586)
@@@ -461,12 -456,21 +458,19 @@@
                ;;
    esac
    ipfiremake pkg-config
+   ipfiremake openssl
+   ipfiremake openssl-compat
+   ipfiremake libgpg-error
+   ipfiremake libgcrypt
+   ipfiremake libassuan
+   ipfiremake bind
+   ipfiremake dhcp
+   ipfiremake dhcpcd
+   ipfiremake boost
    ipfiremake linux-atm
 -  ipfiremake cpio
 -  ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
-   ipfiremake openssl
-   ipfiremake openssl-compat
    ipfiremake curl
    ipfiremake tcl
    ipfiremake sqlite
@@@ -474,6 -478,7 +478,7 @@@
    ipfiremake fireinfo
    ipfiremake libnet
    ipfiremake libnl
+   ipfiremake libnl-3
    ipfiremake libidn
    ipfiremake nasm
    ipfiremake libjpeg
@@@ -487,7 -492,6 +492,7 @@@
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
 +  ipfiremake libsmooth
    ipfiremake attr
    ipfiremake acl
    ipfiremake libcap
@@@ -506,6 -510,7 +511,7 @@@
    ipfiremake arping
    ipfiremake beep
    ipfiremake dvdrtools
+   ipfiremake nettle
    ipfiremake dnsmasq
    ipfiremake dosfstools
    ipfiremake reiserfsprogs
@@@ -612,6 -617,7 +618,7 @@@
    ipfiremake foomatic
    ipfiremake hplip
    ipfiremake cifs-utils
+   ipfiremake krb5
    ipfiremake samba
    ipfiremake sudo
    ipfiremake mc
@@@ -741,6 -747,7 +748,6 @@@
    ipfiremake usb_modeswitch
    ipfiremake usb_modeswitch_data
    ipfiremake zerofree
 -  ipfiremake mdadm
    ipfiremake pound
    ipfiremake minicom
    ipfiremake ddrescue
@@@ -759,6 -766,7 +766,7 @@@
    ipfiremake python-progressbar
    ipfiremake python-xattr
    ipfiremake intltool
+   ipfiremake ddns
    ipfiremake transmission
    ipfiremake dpfhack
    ipfiremake lcd4linux
@@@ -769,8 -777,6 +777,6 @@@
    ipfiremake fping
    ipfiremake telnet
    ipfiremake xinetd
-   ipfiremake libgpg-error
-   ipfiremake libassuan
    ipfiremake gpgme
    ipfiremake pygpgme
    ipfiremake pakfire3
@@@ -803,6 -809,11 +809,11 @@@
    ipfiremake iotop
    ipfiremake stunnel
    ipfiremake sslscan
+   ipfiremake owncloud
+   ipfiremake bacula
+   ipfiremake batctl
+   ipfiremake perl-PDF-API2
+   ipfiremake squid-accounting
  }
  
  buildinstaller() {
@@@ -812,6 -823,7 +823,6 @@@
    ipfiremake memtest
    ipfiremake installer
    installmake strip
 -  ipfiremake initrd
  }
  
  buildpackages() {