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

Conflicts:
	make.sh

diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula
new file mode 100644 (file)
index 0000000..8d5c119
--- /dev/null
+++ b/config/backup/includes/bacula
@@ -0,0 +1 @@
+/etc/bacula/

diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula
new file mode 100644 (file)
index 0000000..9084347
--- /dev/null
+++ b/config/rootfiles/packages/bacula
@@ -0,0 +1,62 @@
+#etc/bacula
+#etc/bacula/bacula
+#etc/bacula/bacula-ctl-dir
+etc/bacula/bacula-ctl-fd
+#etc/bacula/bacula-ctl-sd
+etc/bacula/bacula-fd.conf
+#etc/bacula/bacula_config
+#etc/bacula/bconsole
+#etc/bacula/bconsole.conf
+#etc/bacula/btraceback.dbx
+#etc/bacula/btraceback.gdb
+#etc/bacula/btraceback.mdb
+#etc/bacula/disk-changer
+#etc/bacula/dvd-handler
+#etc/bacula/mtx-changer
+#etc/bacula/mtx-changer.conf
+etc/rc.d/init.d/bacula
+usr/lib/bpipe-fd.so
+usr/lib/libbac-5.2.13.so
+#usr/lib/libbac.la
+#usr/lib/libbac.so
+usr/lib/libbaccfg-5.2.13.so
+#usr/lib/libbaccfg.la
+#usr/lib/libbaccfg.so
+usr/lib/libbacfind-5.2.13.so
+#usr/lib/libbacfind.la
+#usr/lib/libbacfind.so
+usr/lib/libbacpy-5.2.13.so
+#usr/lib/libbacpy.la
+#usr/lib/libbacpy.so
+#usr/sbin/bacula
+usr/sbin/bacula-fd
+#usr/sbin/bconsole
+#usr/sbin/btraceback
+#usr/share/doc/bacula
+#usr/share/doc/bacula/ChangeLog
+#usr/share/doc/bacula/INSTALL
+#usr/share/doc/bacula/LICENSE
+#usr/share/doc/bacula/README
+#usr/share/doc/bacula/ReleaseNotes
+#usr/share/doc/bacula/VERIFYING
+#usr/share/doc/bacula/technotes
+#usr/share/man/man1/bacula-bwxconsole.1.gz
+#usr/share/man/man1/bacula-tray-monitor.1.gz
+#usr/share/man/man1/bat.1.gz
+#usr/share/man/man1/bsmtp.1.gz
+#usr/share/man/man8/bacula-dir.8.gz
+#usr/share/man/man8/bacula-fd.8.gz
+#usr/share/man/man8/bacula-sd.8.gz
+#usr/share/man/man8/bacula.8.gz
+#usr/share/man/man8/bconsole.8.gz
+#usr/share/man/man8/bcopy.8.gz
+#usr/share/man/man8/bextract.8.gz
+#usr/share/man/man8/bls.8.gz
+#usr/share/man/man8/bregex.8.gz
+#usr/share/man/man8/bscan.8.gz
+#usr/share/man/man8/btape.8.gz
+#usr/share/man/man8/btraceback.8.gz
+#usr/share/man/man8/bwild.8.gz
+#usr/share/man/man8/dbcheck.8.gz
+#var/bacula
+var/bacula/working

diff --git a/lfs/bacula b/lfs/bacula
new file mode 100644 (file)
index 0000000..0e7d39b
--- /dev/null
+++ b/lfs/bacula
@@ -0,0 +1,91 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 5.2.13
+
+THISAPP    = bacula-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = bacula
+PAK_VER    = 2
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 43417bae0c221afb1f30a581c9e0f2fe
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && ./configure \
+                               --prefix=/usr \
+                               --sysconfdir=/etc/bacula \
+                               --with-working-dir=/var/bacula/working \
+                               --enable-client-only
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
+       rm -f /root/.rnd
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
+

diff --git a/make.sh b/make.sh
index 62ace297226662dfb8ff500f6283fd7ecc7a76d1..4ca05499553be969ef84378cd8800f4c5c49df92 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -808,6 +808,7 @@ buildipfire() {
   ipfiremake stunnel
   ipfiremake sslscan
   ipfiremake owncloud
+  ipfiremake bacula
 }
 
 buildinstaller() {