bacula: Update to 9.6.5

- Update bacula from version 9.0.6 to 9.6.5
  Version 9.0.6 is over two and a half years old.
- Update config options in lfs to include bacula recommended smartalloc option.
  "This enables the inclusion of the Smartalloc orphaned buffer detection
  code. This option is highly recommended. Because we never build without this option,
  you may experience problems if it is not enabled. In this case, simply re-enable the
  option. We strongly recommend keeping this option enabled as it helps detect memory
  leaks. This configuration parameter is used while building Bacula"
- Add install, uninstall and update files in src/paks/bacula
- Updated backup/includes to backup the config file and the File Daemon state file.

Signed-off-by: Adolf Belka <ahb.ipfire@gmail.com>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula
index 8d5c119f95a9df2f62f1dd4ed92540cd351b7684..92bce0eba0be6b69118fa83dff8d7ae47f6f0168 100644 (file)
--- a/config/backup/includes/bacula
+++ b/config/backup/includes/bacula
@@ -1 +1,2 @@
-/etc/bacula/
+/etc/bacula/bacula-fd.conf
+/var/bacula/working/bacula-fd.9102.state

diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula
index 64fb0d2ca7b429bb78df134f0b00a9f2ec8eb82d..4ee408fc4154c56549bb7456f6e5be03791d48a2 100644 (file)
--- a/config/rootfiles/packages/bacula
+++ b/config/rootfiles/packages/bacula
@@ -13,22 +13,23 @@ etc/bacula/bacula-fd.conf
 #etc/bacula/btraceback.gdb
 #etc/bacula/btraceback.mdb
 #etc/bacula/disk-changer
+#etc/bacula/isworm
 #etc/bacula/mtx-changer
 #etc/bacula/mtx-changer.conf
 #etc/bacula/tapealert
 etc/rc.d/init.d/bacula
 #opt/bacula
 #opt/bacula/log
-usr/lib/bpipe-fd.so
-usr/lib/libbac-9.0.6.so
+#usr/lib/bpipe-fd.so
+usr/lib/libbac-9.6.5.so
 #usr/lib/libbac.la
-#usr/lib/libbac.so
-usr/lib/libbaccfg-9.0.6.so
+usr/lib/libbac.so
+usr/lib/libbaccfg-9.6.5.so
 #usr/lib/libbaccfg.la
-#usr/lib/libbaccfg.so
-usr/lib/libbacfind-9.0.6.so
+usr/lib/libbaccfg.so
+usr/lib/libbacfind-9.6.5.so
 #usr/lib/libbacfind.la
-#usr/lib/libbacfind.so
+usr/lib/libbacfind.so
 #usr/sbin/bacula
 usr/sbin/bacula-fd
 #usr/sbin/bbconsjson
@@ -61,4 +62,4 @@ usr/sbin/bacula-fd
 #usr/share/man/man8/bwild.8.gz
 #usr/share/man/man8/dbcheck.8.gz
 #var/bacula
-var/bacula/working
+#var/bacula/working

diff --git a/lfs/bacula b/lfs/bacula
index 8c96c7ba14c2abbf984ea30b2239bdce736c0e29..1e4db011b1826b17321ad4c190cefced022d97c4 100644 (file)
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 9.0.6
+VER        = 9.6.5
 
 THISAPP    = bacula-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bacula
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9168e398808c42bf290515f60892f643
+$(DL_FILE)_MD5 = e58eb531483de98d0410b33e3ec3d96a
 
 install : $(TARGET)
 
@@ -80,12 +80,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        $(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
        rm -f /root/.rnd
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/paks/bacula/install.sh b/src/paks/bacula/install.sh
new file mode 100644 (file)
index 0000000..8bcd380
--- /dev/null
+++ b/src/paks/bacula/install.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+if [ ! -d /var/bacula/working ]; then
+       mkdir -p /var/bacula/working
+fi
+restore_backup ${NAME}
+# create startlinks
+ln -sf ../init.d/bacula /etc/rc.d/rc0.d/K35bacula
+ln -sf ../init.d/bacula /etc/rc.d/rc3.d/S65bacula
+ln -sf ../init.d/bacula /etc/rc.d/rc6.d/K35bacula
+start_service ${NAME}
+exit 0

diff --git a/src/paks/bacula/uninstall.sh b/src/paks/bacula/uninstall.sh
new file mode 100644 (file)
index 0000000..1a0a167
--- /dev/null
+++ b/src/paks/bacula/uninstall.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+# Remove /var/bacula/ directory
+rm -r /var/bacula
+remove_files
+# Remove all start links.
+rm -rf /etc/rc.d/rc*.d/*bacula
+exit 0

diff --git a/src/paks/bacula/update.sh b/src/paks/bacula/update.sh
new file mode 100644 (file)
index 0000000..89c40d0
--- /dev/null
+++ b/src/paks/bacula/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire 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 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire 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 IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh