From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <ahb.ipfire@gmail.com>
To: development@lists.ipfire.org
Subject: [PATCH] bacula: Update to 9.6.5
Date: Sat, 13 Jun 2020 15:43:13 +0200
Message-ID: <a4ec892c-475c-191d-c52a-22a030ec4eac@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6229403066167772275=="
List-Id: <development.lists.ipfire.org>

--===============6229403066167772275==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

- Update bacula from 9.0.6 to 9.6.5
- Current version of bacula in ipfire is 9.0.6 and is over two and a half yea=
rs old.
- Update config options in lfs to include bacula recommended smartalloc optio=
n.
- Add install, uninstall and update files in src/paks/bacula
- Updated backup/includes to only backup the config file.
Signed-off-by: Adolf Belka<ahb.ipfire(a)gmail.com>

---
 =C2=A0config/backup/includes/bacula=C2=A0=C2=A0=C2=A0 |=C2=A0 2 +-
 =C2=A0config/rootfiles/packages/bacula | 17 +++++++-------
 =C2=A0lfs/bacula=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 11=
 ++++-----
 =C2=A0src/paks/bacula/install.sh=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 38 ++=
++++++++++++++++++++++++++++++
 =C2=A0src/paks/bacula/uninstall.sh=C2=A0=C2=A0=C2=A0=C2=A0 | 33 ++++++++++++=
+++++++++++++++
 =C2=A0src/paks/bacula/update.sh=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | =
26 ++++++++++++++++++++++
 =C2=A06 files changed, 113 insertions(+), 14 deletions(-)
 =C2=A0create mode 100644 src/paks/bacula/install.sh
 =C2=A0create mode 100644 src/paks/bacula/uninstall.sh
 =C2=A0create mode 100644 src/paks/bacula/update.sh

diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula
index 8d5c119f9..0da11db7d 100644
--- a/config/backup/includes/bacula
+++ b/config/backup/includes/bacula
@@ -1 +1 @@
-/etc/bacula/
+/etc/bacula/bacula-fd.conf
diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bac=
ula
index 64fb0d2ca..4ee408fc4 100644
--- a/config/rootfiles/packages/bacula
+++ b/config/rootfiles/packages/bacula
@@ -13,22 +13,23 @@ etc/bacula/bacula-fd.conf
 =C2=A0#etc/bacula/btraceback.gdb
 =C2=A0#etc/bacula/btraceback.mdb
 =C2=A0#etc/bacula/disk-changer
+#etc/bacula/isworm
 =C2=A0#etc/bacula/mtx-changer
 =C2=A0#etc/bacula/mtx-changer.conf
 =C2=A0#etc/bacula/tapealert
 =C2=A0etc/rc.d/init.d/bacula
 =C2=A0#opt/bacula
 =C2=A0#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
 =C2=A0#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
 =C2=A0#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
 =C2=A0#usr/lib/libbacfind.la
-#usr/lib/libbacfind.so
+usr/lib/libbacfind.so
 =C2=A0#usr/sbin/bacula
 =C2=A0usr/sbin/bacula-fd
 =C2=A0#usr/sbin/bbconsjson
@@ -61,4 +62,4 @@ usr/sbin/bacula-fd
 =C2=A0#usr/share/man/man8/bwild.8.gz
 =C2=A0#usr/share/man/man8/dbcheck.8.gz
 =C2=A0#var/bacula
-var/bacula/working
+#var/bacula/working
diff --git a/lfs/bacula b/lfs/bacula
index 8c96c7ba1..b6b0d9cbf 100644
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -24,15 +24,15 @@

 =C2=A0include Config

-VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 9.0.6
+VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 9.6.5

 =C2=A0THISAPP=C2=A0=C2=A0=C2=A0 =3D bacula-$(VER)
 =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0 =3D $(THISAPP).tar.gz
-DL_FROM=C2=A0=C2=A0=C2=A0 =3D $(URL_IPFIRE)
+DL_FROM=C2=A0=C2=A0=C2=A0 =3D https://sourceforge.net/projects/bacula/files/=
bacula/9.6.5/bacula-9.6.5.tar.gz
 =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0 =3D $(DIR_SRC)/$(THISAPP)
 =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(DIR_INFO)/$(THISAPP)
 =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D bacula
-PAK_VER=C2=A0=C2=A0=C2=A0 =3D 4
+PAK_VER=C2=A0=C2=A0=C2=A0 =3D 5

 =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D

@@ -44,7 +44,7 @@ objects =3D $(DL_FILE)

 =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 =3D 9168e398808c42bf290515f60892f643
+$(DL_FILE)_MD5 =3D e58eb531483de98d0410b33e3ec3d96a

 =C2=A0install : $(TARGET)

@@ -80,12 +80,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 =C2=A0=C2=A0=C2=A0=C2=A0 $(UPDATE_AUTOMAKE)
 =C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && ./configure \
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 --prefix=3D/usr \
+=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =
--enable-smartalloc \
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 --sysconfdir=3D/etc/bacula \
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 --with-working-dir=3D/var/bacula/working \
 =C2=A0=C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=C2=A0 =C2=A0=C2=A0=
=C2=A0 --enable-client-only
 =C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && make $(MAKETUNING)
 =C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && make install
-=C2=A0=C2=A0=C2=A0 ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
+=C2=A0=C2=A0=C2=A0 ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
 =C2=A0=C2=A0=C2=A0=C2=A0 rm -f /root/.rnd
 =C2=A0=C2=A0=C2=A0=C2=A0 @rm -rf $(DIR_APP)
 =C2=A0=C2=A0=C2=A0=C2=A0 @$(POSTBUILD)
diff --git a/src/paks/bacula/install.sh b/src/paks/bacula/install.sh
new file mode 100644
index 000000000..49aef9379
--- /dev/null
+++ b/src/paks/bacula/install.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0 #
+# #
+# IPFire is free software; you can redistribute it and/or modify=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# it under the terms of the GNU General Public License as published by=C2=A0=
=C2=A0=C2=A0=C2=A0 #
+# the Free Software Foundation; either version 2 of the License, or=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# (at your option) any later version.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+# IPFire is distributed in the hope that it will be useful,=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# GNU General Public License for more details.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+# You should have received a copy of the GNU General Public License=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# along with IPFire; if not, write to the Free Software=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA=C2=A0 02111-1307 =
USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>.=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+if [ -f /etc/bacula/bacula-fd.conf ]; then
+=C2=A0=C2=A0=C2=A0 cp /etc/bacula/bacula-fd.conf /etc/bacula/bacula-fd.conf.=
new
+fi
+if [ ! -d /var/bacula/working ]; then
+=C2=A0=C2=A0=C2=A0 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
index 000000000..762bb103c
--- /dev/null
+++ b/src/paks/bacula/uninstall.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0 #
+# #
+# IPFire is free software; you can redistribute it and/or modify=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# it under the terms of the GNU General Public License as published by=C2=A0=
=C2=A0=C2=A0=C2=A0 #
+# the Free Software Foundation; either version 2 of the License, or=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# (at your option) any later version.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+# IPFire is distributed in the hope that it will be useful,=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# GNU General Public License for more details.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+# You should have received a copy of the GNU General Public License=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# along with IPFire; if not, write to the Free Software=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA=C2=A0 02111-1307 =
USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>.=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+# Remove bacula-fd.conf.new file and /var/bacula/ directory
+rm -rf /etc/bacula/bacula-fd.conf.new
+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
index 000000000..89c40d0d7
--- /dev/null
+++ b/src/paks/bacula/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0 #
+# #
+# IPFire is free software; you can redistribute it and/or modify=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# it under the terms of the GNU General Public License as published by=C2=A0=
=C2=A0=C2=A0=C2=A0 #
+# the Free Software Foundation; either version 2 of the License, or=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# (at your option) any later version.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+# IPFire is distributed in the hope that it will be useful,=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# GNU General Public License for more details.=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+# You should have received a copy of the GNU General Public License=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# along with IPFire; if not, write to the Free Software=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0 #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA=C2=A0 02111-1307 =
USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>.=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
--=20
2.27.0


--===============6229403066167772275==--