From mboxrd@z Thu Jan  1 00:00:00 1970
From: Adolf Belka <ahb.ipfire@gmail.com>
To: development@lists.ipfire.org
Subject: Re: [PATCH] bacula: Update to 9.6.3
Date: Tue, 19 May 2020 20:29:59 +0200
Message-ID: <f31ca29b-2e49-3fae-116b-0bda71d1768b@gmail.com>
In-Reply-To: <41dad4c7-b843-9d44-e047-32406a1cd565@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8419141531492702285=="
List-Id: <development.lists.ipfire.org>

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

Hallo Michael,

Having thought about it, it is clear that the rootfile needs to be in=20
the patch as well. So I will investigate further to understand why it=20
was not, fix that and re-do the patch generation and then resubmit it here.


On 18/05/2020 19:11, Adolf Belka wrote:
> Hallo Michael,
>
> I have realised that the patch file does not include the rootfiles=20
> file that shows which files are added or removed. I presume that this=20
> file also needs to be included in the patch diff listing. I will wait=20
> to resend the patch until it is confirmed that I need to include the=20
> bacula file under the rootfiles directory.
>
> Adolf.
>
> On 18/05/2020 18:34, Adolf Belka wrote:
>> Hallo Michael,
>>
>> Thanks for your feedback on the patch. This is my first attempt at=20
>> doing this so I am not surprised that I need to fix some things. I=20
>> will fix the install.sh script as mentioned below and redo the patch.
>>
>>
>> On 18/05/2020 13:08, Michael Tremer wrote:
>>> Hello Adolf,
>>>
>>> Thank you for submitting this patch.
>>>
>>> This looks very good, but there are some smaller problems in it:
>>>
>>>> On 16 May 2020, at 22:16, Adolf Belka <ahb.ipfire(a)gmail.com> wrote:
>>>>
>>>> Update bacula from 9.0.6 to 9.6.3
>>>>
>>>> - Current version of bacula in ipfire is 9.0.6 and is over two and=20
>>>> a half years old.
>>>>
>>>> - update config options in lfs to include bacula recommended=20
>>>> smartalloc option.
>>>>
>>>> - 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>
>>>> ---
>>>>
>>>> diff --git a/config/backup/includes/bacula=20
>>>> 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/lfs/bacula b/lfs/bacula
>>>> index 8c96c7ba1..878aefa0c 100644
>>>> --- a/lfs/bacula
>>>> +++ b/lfs/bacula
>>>> @@ -24,17 +24,17 @@
>>>>
>>>> =C2=A0 include 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.3
>>>>
>>>> =C2=A0 THISAPP=C2=A0=C2=A0=C2=A0 =3D bacula-$(VER)
>>>> =C2=A0 DL_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://www.bacula.org/download/10266/
>>>> =C2=A0 DIR_APP=C2=A0=C2=A0=C2=A0 =3D $(DIR_SRC)/$(THISAPP)
>>>> =C2=A0 TARGET=C2=A0=C2=A0=C2=A0=C2=A0 =3D $(DIR_INFO)/$(THISAPP)
>>>> =C2=A0 PROG=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 1
>>> We always increase the version number, even when VER is bumped, too.
>>>
>>> So, in this case it would have been 5. There person who merges this=20
>>> can fix this for you. I just wanted to let you know for next time.
>> Thanks for letting me know.
>>>> -DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D
>>>> +DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D ""
>>> We don=E2=80=99t have any =E2=80=9C=E2=80=9D in here any more.
>> Thanks for letting me know.
>>>> ########################################################################=
#######=20
>>>>
>>>> =C2=A0 # Top-level Rules
>>>> @@ -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 6d64bc27de773ee0e0ca1d836cbe4008
>>>>
>>>> =C2=A0 install : $(TARGET)
>>>>
>>>> @@ -80,12 +80,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 $(UPDATE_AUTOMAKE)
>>>> =C2=A0=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=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=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=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=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=C2=A0=C2=A0=C2=A0=C2=A0 --enable-client-only
>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 cd $(DIR_APP) && make $(MAKETUNING)
>>>> =C2=A0=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/bac=
ula
>>>> +=C2=A0=C2=A0=C2=A0 ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/ba=
cula
>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 rm -f /root/.rnd
>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 @rm -rf $(DIR_APP)
>>>> =C2=A0=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..fb45b593b
>>>> --- /dev/null
>>>> +++ b/src/paks/bacula/install.sh
>>>> @@ -0,0 +1,44 @@
>>>> +#!/bin/bash
>>>> +#######################################################################=
#####=20
>>>>
>>>> +# #
>>>> +# This file is part of the IPFire=20
>>>> 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=20
>>>> 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=20
>>>> published by=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# the Free Software Foundation; either version 2 of the License,=20
>>>> or=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# (at your option) any later=20
>>>> 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=20
>>>> 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=20
>>>> 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.=C2=A0 See=20
>>>> 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=20
>>>> 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=20
>>>> License=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# along with IPFire; if not, write to the Free=20
>>>> 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=20
>>>> 02111-1307 USA #
>>>> +# #
>>>> +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
>>>> +# #
>>>> +#######################################################################=
#####=20
>>>>
>>>> +#
>>>> +. /opt/pakfire/lib/functions.sh
>>>> +extract_files
>>>> +
>>>> +if [ -f /etc/bacula/bacula-fd.conf ]; then
>>>> +=C2=A0=C2=A0=C2=A0 mv /etc/bacula/bacula-fd.conf /etc/bacula/bacula-fd.=
conf.new
>>>> +fi
>>>> +
>>>> +restore_backup ${NAME}
>>>> +
>>>> +if [ ! -f /etc/bacula/bacula-fd.conf ]; then
>>>> +=C2=A0=C2=A0=C2=A0 cp -a /etc/bacula/bacula-fd.conf.new /etc/bacula/bac=
ula-fd.conf
>>>> +fi
>>> Why are you doing this? The backup should have taken care of this.
>>
>> Having had a think about it I realised I created my own problem.
>>
>> In the first if statement I used a mv command. If I use a cp command=20
>> then for a new install the .conf file will be coped to a .conf.new=20
>> file and the restore_backup will not have any file so the .conf and=20
>> .conf.new files will be equivalent. For an update the restore_backup=20
>> will overwrite the new .conf file with the previous version and the=20
>> new .conf file will be available in .conf.new
>>
>> The second if statement then isn't needed.
>>
>> I will redo the patch with this change and the other items you=20
>> highlighted and resend it.
>>
>>>> +
>>>> +# 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 bacula
>>>> +
>>>> +exit 0
>>>> diff --git a/src/paks/bacula/uninstall.sh=20
>>>> b/src/paks/bacula/uninstall.sh
>>>> new file mode 100644
>>>> index 000000000..4a97eb3e9
>>>> --- /dev/null
>>>> +++ b/src/paks/bacula/uninstall.sh
>>>> @@ -0,0 +1,32 @@
>>>> +#!/bin/bash
>>>> +#######################################################################=
#####=20
>>>>
>>>> +# #
>>>> +# This file is part of the IPFire=20
>>>> 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=20
>>>> 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=20
>>>> published by=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# the Free Software Foundation; either version 2 of the License,=20
>>>> or=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# (at your option) any later=20
>>>> 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=20
>>>> 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=20
>>>> 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.=C2=A0 See=20
>>>> 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=20
>>>> 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=20
>>>> License=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# along with IPFire; if not, write to the Free=20
>>>> 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=20
>>>> 02111-1307 USA #
>>>> +# #
>>>> +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
>>>> +# #
>>>> +#######################################################################=
#####=20
>>>>
>>>> +#
>>>> +. /opt/pakfire/lib/functions.sh
>>>> +stop_service ${NAME}
>>>> +make_backup ${NAME}
>>>> +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
>>>> +#######################################################################=
#####=20
>>>>
>>>> +# #
>>>> +# This file is part of the IPFire=20
>>>> 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=20
>>>> 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=20
>>>> published by=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# the Free Software Foundation; either version 2 of the License,=20
>>>> or=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# (at your option) any later=20
>>>> 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=20
>>>> 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=20
>>>> 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.=C2=A0 See=20
>>>> 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=20
>>>> 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=20
>>>> License=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #
>>>> +# along with IPFire; if not, write to the Free=20
>>>> 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=20
>>>> 02111-1307 USA #
>>>> +# #
>>>> +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
>>>> +# #
>>>> +#######################################################################=
#####=20
>>>>
>>>> +#
>>>> +. /opt/pakfire/lib/functions.sh
>>>> +./uninstall.sh
>>>> +./install.sh
>>>>
>>> -Michael
>>>

--===============8419141531492702285==--