Merge remote-tracking branch 'morlix/bacula' into next

Conflicts:
	make.sh

diff --cc make.sh
index 62ace297226662dfb8ff500f6283fd7ecc7a76d1,9361f78a5ccbd0d779f4044ad0c7d608354a6c7f..4ca05499553be969ef84378cd8800f4c5c49df92
--- 1/make.sh
--- 2/make.sh
+++ b/make.sh
@@@ -807,7 -803,7 +807,8 @@@ buildipfire() 
    ipfiremake iotop
    ipfiremake stunnel
    ipfiremake sslscan
 +  ipfiremake owncloud
+   ipfiremake bacula
  }
  
  buildinstaller() {