Merge branch 'master' into next

[ipfire-2.x.git] / lfs / bacula

diff --git a/lfs/bacula b/lfs/bacula
index 890a51208e7527c37bedb9070dc15a31df1729fe..0e7d39ba62e93555ad4ce7797e7ec232bbbe53b4 100644 (file)
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 5.2.6
+VER        = 5.2.13
 
 THISAPP    = bacula-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://downloads.sourceforge.net/project/bacula/bacula/$(VER)/
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bacula
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 914483b92539598678542bd2ddb28043
+$(DL_FILE)_MD5 = 43417bae0c221afb1f30a581c9e0f2fe
 
 install : $(TARGET)
 
@@ -77,9 +77,15 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --enable-client-only
+       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
-       mv /sbin/bacula /etc/init.d/bacula
+       ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
+       rm -f /root/.rnd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
+