From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH] bacula: Update to 9.6.5 Date: Tue, 16 Jun 2020 10:21:14 +0200 Message-ID: In-Reply-To: <5B7750E6-80B0-4D44-8C59-285C72D63DED@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6094320989694569479==" List-Id: --===============6094320989694569479== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hallo Michael, I wasn't sure how to add additional comments to a patch that weren't intended= to go into the git repository. So I sent a separate e-mail with subject "bac= ula add-on". Sorry for probably causing confusion. This patch is an update from 9.0.6 to 9.6.5 and as the patch from 9.0.6 had n= ot yet been merged I mentioned in the other email that the previous patch sho= uld be removed from patchwork and this one used. Since then Jan Lentfer responded to my email and highlighted a situation that= could occur if people have an earlier version of the bacula director/storage= daemons running. This can happen for example with distros that are slow to u= pgrade to newer versions or that aim to have very stable unchanging packages. Bacula will usually (though they do not guarantee it) work with an older File= daemon package but not with a newer version. So with my patch to bring bacul= a in IPFire up-to-date then there could be people whose systems would stop wo= rking with the File daemon on IPFire as their backup server has an earlier ve= rsion of the director/storage daemons. After thinking about it for a while I have concluded that the best thing is t= o leave IPFire with version 9.0.6 of the File daemon, i.e. the status quo, an= d remove all my bacula patches from patchwork. Looking through the bacula rel= ease history it looks like 9.0.6 is expected to work with the current release= d director/storage daemons. If that ever changes then we can decide what to d= o with it at that time. I will continue installing the latest version of bacula as a locally built ad= d-on as I have been doing for some time as all my bacula systems are built fr= om source so I can easily keep them aligned. I will also keep an eye out for = if a release indicates that a file daemon update is required. So my proposal now is to remove, or reject all of my bacula patches that are = in patchwork. All the best, Adolf. On 15/06/2020 12:36, Michael Tremer wrote: > Hello Adolf, > > Thank you very much for submitting this patch. > > I am slightly losing track of all the bacula patches, so please help me to = understand. > > The last patch that was sent was n update to 9.6.3, v2: > > https://lists.ipfire.org/pipermail/development/2020-May/007779.html > > What has changed since then? Is this just an update from 9.6.3 to 9.6.5? Th= is won=E2=80=99t merge then if the previous patch is being merged. > >> On 13 Jun 2020, at 14:43, Adolf Belka wrote: >> >> - 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 = years old. >> - Update config options in lfs to include bacula recommended smartalloc op= tion. >> - Add install, uninstall and update files in src/paks/bacula >> - Updated backup/includes to only backup the config file. > You are saying what you have changed, but not why. Please see my questions = below. > >> Signed-off-by: Adolf Belka >> >> --- >> config/backup/includes/bacula | 2 +- >> config/rootfiles/packages/bacula | 17 +++++++------- >> lfs/bacula | 11 ++++----- >> src/paks/bacula/install.sh | 38 ++++++++++++++++++++++++++++++++ >> src/paks/bacula/uninstall.sh | 33 +++++++++++++++++++++++++++ >> src/paks/bacula/update.sh | 26 ++++++++++++++++++++++ >> 6 files changed, 113 insertions(+), 14 deletions(-) >> create mode 100644 src/paks/bacula/install.sh >> create mode 100644 src/paks/bacula/uninstall.sh >> create 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/= bacula >> index 64fb0d2ca..4ee408fc4 100644 >> --- 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 > Bacula is using a horrible method to version their libraries... > >> @@ -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 8c96c7ba1..b6b0d9cbf 100644 >> --- a/lfs/bacula >> +++ b/lfs/bacula >> @@ -24,15 +24,15 @@ >> >> include Config >> >> -VER =3D 9.0.6 >> +VER =3D 9.6.5 >> >> THISAPP =3D bacula-$(VER) >> DL_FILE =3D $(THISAPP).tar.gz >> -DL_FROM =3D $(URL_IPFIRE) >> +DL_FROM =3D https://sourceforge.net/projects/bacula/files/bacula/9.6.5= /bacula-9.6.5.tar.gz >> DIR_APP =3D $(DIR_SRC)/$(THISAPP) >> TARGET =3D $(DIR_INFO)/$(THISAPP) >> PROG =3D bacula >> -PAK_VER =3D 4 >> +PAK_VER =3D 5 >> >> DEPS =3D >> >> @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) >> >> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >> >> -$(DL_FILE)_MD5 =3D 9168e398808c42bf290515f60892f643 >> +$(DL_FILE)_MD5 =3D e58eb531483de98d0410b33e3ec3d96a >> >> install : $(TARGET) >> >> @@ -80,12 +80,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> $(UPDATE_AUTOMAKE) >> cd $(DIR_APP) && ./configure \ >> --prefix=3D/usr \ >> + --enable-smartalloc \ > What does this do? > >> --sysconfdir=3D/etc/bacula \ >> --with-working-dir=3D/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 >> 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. = # >> +# # >> +# 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 US= A # >> +# # >> +# Copyright (C) 2007 IPFire-Team . = # >> +# # >> +#########################################################################= ### >> +# >> +. /opt/pakfire/lib/functions.sh >> +extract_files >> +if [ -f /etc/bacula/bacula-fd.conf ]; then >> + cp /etc/bacula/bacula-fd.conf /etc/bacula/bacula-fd.conf.new >> +fi > I thought I have asked this before: > > Why is this file being moved? We should have a backup taking care of backin= g up configuration 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 >> 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. = # >> +# # >> +# 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 US= A # >> +# # >> +# Copyright (C) 2007 IPFire-Team . = # >> +# # >> +#########################################################################= ### >> +# >> +. /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 > I suppose this is all related to above. > > Why is /var/bacula being deleted? What would be in that directory? > >> +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. = # >> +# # >> +# 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 US= A # >> +# # >> +# Copyright (C) 2007 IPFire-Team . = # >> +# # >> +#########################################################################= ### >> +# >> +. /opt/pakfire/lib/functions.sh >> +./uninstall.sh >> +./install.sh >> --=20 >> 2.27.0 >> > I am looking forward to be able to merge this soon and I am happy that you = are taking care of this add-on which has been neglected. > > :) > > Best, > -Michael > > --===============6094320989694569479==--