X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbacula;h=1921db11a8796f92be2656a5dbad534783c02efc;hb=3c73b7fbf02f29e4f4b9ca72bf22e480ca2cf74c;hp=0e7d39ba62e93555ad4ce7797e7ec232bbbe53b4;hpb=5ae99dd2d1ed307959f25143e6c343a53e4df373;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/bacula b/lfs/bacula
index 0e7d39ba62..1921db11a8 100644
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2009  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.2.13
+VER        = 9.6.6
 
 THISAPP    = bacula-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,9 +32,12 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bacula
-PAK_VER    = 2
+PAK_VER    = 7
 
-DEPS       = ""
+DEPS       =
+
+# For GCC 10
+CFLAGS    += -Wno-error=narrowing
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 43417bae0c221afb1f30a581c9e0f2fe
+$(DL_FILE)_MD5 = 1ba9e2a2d979cbe9b5d76187f98418ac
 
 install : $(TARGET)
 
@@ -77,14 +80,18 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure \
 				--prefix=/usr \
+				--enable-smartalloc \
 				--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
+	ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
+	install -v -m 644 ${DIR_SRC}/config/backup/includes/bacula \
+			/var/ipfire/backup/addons/includes/bacula
 	rm -f /root/.rnd
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)