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

Conflicts:
	config/rootfiles/packages/asterisk

diff --combined config/rootfiles/common/armv5tel/initscripts
index 0a1a81109d553a5def8f42f0f4ccc4cb3f32360e,1ec9ed4f4bfa5b4db3ba304d860c779d8c7c9d7d..e856697b9ab71171f8791059000d45b50ff81b74
mode 100755,100644..100755
--- 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
@@@ -52,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

diff --combined config/rootfiles/common/i586/initscripts
index d48d6a51be6543cc703c9cccea57e2c38a2e5313,153a5f49e7612c4feb55aaf712f1b411b19bccb2..af099ba69b7674055ea6812904fa1e5d107972f8
mode 100755,100644..100755
--- 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
@@@ -53,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

diff --combined make.sh
index 5c32f73b514bf0d07094b0ee5554d35da34872d5,b50a07b238073fd95949ff149864af5e47aec9e0..cf964f1286a8efdc4773fd5707adfdf8e51c93cf
--- 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="78"                                                     # Core Level (Filename)
- PAKFIRE_CORE="78"                                             # Core Level (PAKFIRE)
+ CORE="80"                                                     # Core Level (Filename)
+ PAKFIRE_CORE="80"                                             # 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
@@@ -385,9 -385,6 +385,6 @@@ buildipfire() 
    export LOGFILE
    ipfiremake configroot
    ipfiremake backup
-   ipfiremake bind
-   ipfiremake dhcp
-   ipfiremake dhcpcd
    ipfiremake libusb
    ipfiremake libusbx
    ipfiremake libpcap
@@@ -459,14 -456,20 +456,20 @@@
                ;;
    esac
    ipfiremake pkg-config
+   ipfiremake openssl
+   ipfiremake openssl-compat
+   ipfiremake libgpg-error
+   ipfiremake libgcrypt
+   ipfiremake libassuan
+   ipfiremake bind
+   ipfiremake dhcp
+   ipfiremake dhcpcd
    ipfiremake linux-atm
    ipfiremake cpio
    ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
    ipfiremake pam
-   ipfiremake openssl
-   ipfiremake openssl-compat
    ipfiremake curl
    ipfiremake tcl
    ipfiremake sqlite
@@@ -505,6 -508,7 +508,7 @@@
    ipfiremake arping
    ipfiremake beep
    ipfiremake dvdrtools
+   ipfiremake nettle
    ipfiremake dnsmasq
    ipfiremake dosfstools
    ipfiremake reiserfsprogs
@@@ -732,7 -736,6 +736,7 @@@
    ipfiremake iftop
    ipfiremake motion
    ipfiremake joe
 +  ipfiremake monit
    ipfiremake nut
    ipfiremake watchdog
    ipfiremake libpri
@@@ -760,6 -763,7 +764,7 @@@
    ipfiremake python-progressbar
    ipfiremake python-xattr
    ipfiremake intltool
+   ipfiremake ddns
    ipfiremake transmission
    ipfiremake dpfhack
    ipfiremake lcd4linux
@@@ -770,8 -774,6 +775,6 @@@
    ipfiremake fping
    ipfiremake telnet
    ipfiremake xinetd
-   ipfiremake libgpg-error
-   ipfiremake libassuan
    ipfiremake gpgme
    ipfiremake pygpgme
    ipfiremake pakfire3
@@@ -804,6 -806,7 +807,7 @@@
    ipfiremake iotop
    ipfiremake stunnel
    ipfiremake sslscan
+   ipfiremake owncloud
  }
  
  buildinstaller() {