From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] bacula: Update to 9.6.5 Date: Tue, 16 Jun 2020 11:28:27 +0100 Message-ID: <0E911F7A-D8E6-4478-B778-F4C14821EC4B@ipfire.org> In-Reply-To: <985DC8A1-D8C0-4548-9642-0346A48ACF3F@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3636485975182884316==" List-Id: --===============3636485975182884316== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, Turns out the patch won=E2=80=99t merge because it got corrupted. Did you use git send-email to send it or some other mail agent? root(a)michael:/build/ipfire-2.x# pwclient git-am -s 3204 Applying patch #3204 using u'git am -s' Description: bacula: Update to 9.6.5 warning: Patch sent with format=3Dflowed; space at the end of lines might be = lost. Applying: bacula: Update to 9.6.5 error: corrupt patch at line 25 Patch failed at 0001 bacula: Update to 9.6.5 hint: Use 'git am --show-current-patch' to see the failed patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". 'git am' failed with exit status 128 Best, -Michael > On 16 Jun 2020, at 10:07, Michael Tremer wrot= e: >=20 > Good morning Adolf, >=20 >> On 16 Jun 2020, at 09:21, Adolf Belka wrote: >>=20 >> Hallo Michael, >>=20 >> I wasn't sure how to add additional comments to a patch that weren't inten= ded to go into the git repository. So I sent a separate e-mail with subject "= bacula add-on". Sorry for probably causing confusion. >=20 > No worries. I guess we are all trying to understand what everyone is doing. >=20 > Patchwork is really messy at the moment. We are shipping big releases, and = many of patches remain in there because they do not fit into the releases any= more - simply because of disk space. With the next release turn, there might= already be more urgent things that have lined up=E2=80=A6 This time another = wonderful CPU vulnerability presented by Intel. >=20 >> This patch is an update from 9.0.6 to 9.6.5 and as the patch from 9.0.6 ha= d not yet been merged I mentioned in the other email that the previous patch = should be removed from patchwork and this one used. >=20 > Ideally submit another release as an extra patch that then can only be merg= ed when the first one was matched. That makes it easier to review individual = changes instead of reviewing one large patch that is growing larger and large= r. >=20 >> Since then Jan Lentfer responded to my email and highlighted a situation t= hat could occur if people have an earlier version of the bacula director/stor= age daemons running. This can happen for example with distros that are slow t= o upgrade to newer versions or that aim to have very stable unchanging packag= es. >=20 > I think that email did not make it to the list - or I have missed it. >=20 >> Bacula will usually (though they do not guarantee it) work with an older F= ile daemon package but not with a newer version. So with my patch to bring ba= cula in IPFire up-to-date then there could be people whose systems would stop= working with the File daemon on IPFire as their backup server has an earlier= version of the director/storage daemons. >>=20 >> After thinking about it for a while I have concluded that the best thing i= s to leave IPFire with version 9.0.6 of the File daemon, i.e. the status quo,= and remove all my bacula patches from patchwork. Looking through the bacula = release history it looks like 9.0.6 is expected to work with the current rele= ased director/storage daemons. If that ever changes then we can decide what t= o do with it at that time. >=20 > If the upstream project decides to break compatibility there is nothing we = can do about it. We can delay shipping a broken version for a brief while, bu= t we cannot remain on an unmaintained release for years. >=20 > Hence I will merge your last patch and mark the others as superseded. They = are no longer needed. >=20 > I still have no idea what you are trying to do in the scripts, but I guess = we can hope for the best :) >=20 >> I will continue installing the latest version of bacula as a locally built= add-on as I have been doing for some time as all my bacula systems are built= from source so I can easily keep them aligned. I will also keep an eye out f= or if a release indicates that a file daemon update is required. >>=20 >>=20 >> So my proposal now is to remove, or reject all of my bacula patches that a= re in patchwork. >=20 > I would rather prefer that you keep sending those patches when you are upda= ting the software. Nobody else is taking care of this package right now and t= he only other option would be to remove it then, which I wouldn=E2=80=99t rea= lly want. >=20 > Best, > -Michael >=20 >>=20 >> All the best, >>=20 >> Adolf. >>=20 >>=20 >> On 15/06/2020 12:36, Michael Tremer wrote: >>> Hello Adolf, >>>=20 >>> Thank you very much for submitting this patch. >>>=20 >>> I am slightly losing track of all the bacula patches, so please help me t= o understand. >>>=20 >>> The last patch that was sent was n update to 9.6.3, v2: >>>=20 >>> https://lists.ipfire.org/pipermail/development/2020-May/007779.html >>>=20 >>> What has changed since then? Is this just an update from 9.6.3 to 9.6.5? = This won=E2=80=99t merge then if the previous patch is being merged. >>>=20 >>>> On 13 Jun 2020, at 14:43, Adolf Belka wrote: >>>>=20 >>>> - 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 hal= f years old. >>>> - Update config options in lfs to include bacula recommended smartalloc = option. >>>> - 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 question= s below. >>>=20 >>>> Signed-off-by: Adolf Belka >>>>=20 >>>> --- >>>> 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 >>>>=20 >>>> diff --git a/config/backup/includes/bacula b/config/backup/includes/bacu= la >>>> 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/package= s/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... >>>=20 >>>> @@ -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 @@ >>>>=20 >>>> include Config >>>>=20 >>>> -VER =3D 9.0.6 >>>> +VER =3D 9.6.5 >>>>=20 >>>> 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 >>>>=20 >>>> DEPS =3D >>>>=20 >>>> @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) >>>>=20 >>>> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >>>>=20 >>>> -$(DL_FILE)_MD5 =3D 9168e398808c42bf290515f60892f643 >>>> +$(DL_FILE)_MD5 =3D e58eb531483de98d0410b33e3ec3d96a >>>>=20 >>>> install : $(TARGET) >>>>=20 >>>> @@ -80,12 +80,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >>>> $(UPDATE_AUTOMAKE) >>>> cd $(DIR_APP) && ./configure \ >>>> --prefix=3D/usr \ >>>> + --enable-smartalloc \ >>> What does this do? >>>=20 >>>> --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 = USA # >>>> +# # >>>> +# 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: >>>=20 >>> Why is this file being moved? We should have a backup taking care of back= ing up configuration files. >>>=20 >>>> +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 = USA # >>>> +# # >>>> +# 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. >>>=20 >>> Why is /var/bacula being deleted? What would be in that directory? >>>=20 >>>> +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 = USA # >>>> +# # >>>> +# Copyright (C) 2007 IPFire-Team . = # >>>> +# # >>>> +#######################################################################= ##### >>>> +# >>>> +. /opt/pakfire/lib/functions.sh >>>> +./uninstall.sh >>>> +./install.sh >>>> --=20 >>>> 2.27.0 >>>>=20 >>> I am looking forward to be able to merge this soon and I am happy that yo= u are taking care of this add-on which has been neglected. >>>=20 >>> :) >>>=20 >>> Best, >>> -Michael >>>=20 >>>=20 >=20 --===============3636485975182884316==--