Re: [PATCH] bacula: Correction to 9.6.5

[Adolf Belka <ahb.ipfire@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 4138 bytes --]

Dear Michael and Arne,

Thanks very much. I have seen that the patch has been merged in Core 148 in git.

Adolf.

On 28/07/2020 20:18, Michael Tremer wrote:
> Hi,
>
> I sent a fixed version of that patch. Please merge that one.
>
> Best,
> -Michael
>
> On Tue, 2020-07-28 at 20:07 +0200, Arne Fitzenreiter wrote:
>> Micheal has already written that the download url not points to
>> our server. This is the reason why i have not merged this yet.
>>
>> Arne
>>
>>
>> Am 2020-07-28 13:17, schrieb Adolf Belka:
>>> Dear All,
>>>
>>> Noticed that the bacula update that was in Core 147 release was
>>> 9.6.5-5 and didn't include this correction patch to 9.6.5-6.
>>>
>>> This means that the current bacula release works with no problems
>>> but
>>> there is no backup include file. Not a huge problem and if any
>>> users
>>> have a problem with this I can show them how to add the right bits
>>> to
>>> their local setups.
>>>
>>> My question is whether this patch will then get merged in with the
>>> next core update, especially with the error I made on the Download
>>> URL
>>> and the fact that it was created against the development build of
>>> Core
>>> 147. Or does this patch need to be marked as superseded and I have
>>> to
>>> create a new patch file against the released version of Core 147?
>>>
>>> All the best,
>>>
>>> Adolf
>>>
>>> On 06/07/2020 16:23, Michael Tremer wrote:
>>>> Hi,
>>>>
>>>>> On 6 Jul 2020, at 12:43, Adolf Belka <ahb.ipfire(a)gmail.com>
>>>>> wrote:
>>>>>
>>>>> - Corrected Download URL to remove filename from the end of it.
>>>>> This
>>>>> is defined separately.
>>>> This is actually incorrect now. We mirror all source files on
>>>> our
>>>> server, because the upstream servers make files disappear, are
>>>> slow or
>>>> unreachable. With our own server, we have control over that.
>>>>
>>>> You currently do not have write permissions to that share, but
>>>> please
>>>> download the file into your cache/ directory manually and the
>>>> person
>>>> who merges the patch will get the tarball onto our server for
>>>> now.
>>>>
>>>> The rest of the patch looks good to me:
>>>>
>>>> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
>>>>
>>>> Best,
>>>> -Michael
>>>>
>>>>> - Corrected to include install command for backup file which
>>>>> was
>>>>> missed in previous patch.
>>>>> - Added backup file to rootfiles list.
>>>>> Signed-off-by: Adolf Belka<ahb.ipfire(a)gmail.com>
>>>>>
>>>>> ---
>>>>> config/rootfiles/packages/bacula | 1 +
>>>>> lfs/bacula                       | 6 ++++--
>>>>> 2 files changed, 5 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/config/rootfiles/packages/bacula
>>>>> b/config/rootfiles/packages/bacula
>>>>> index 4ee408fc4..dc9179489 100644
>>>>> --- a/config/rootfiles/packages/bacula
>>>>> +++ b/config/rootfiles/packages/bacula
>>>>> @@ -63,3 +63,4 @@ usr/sbin/bacula-fd
>>>>> #usr/share/man/man8/dbcheck.8.gz
>>>>> #var/bacula
>>>>> #var/bacula/working
>>>>> +var/ipfire/backup/addons/includes/bacula
>>>>> diff --git a/lfs/bacula b/lfs/bacula
>>>>> index 1e4db011b..74606cbda 100644
>>>>> --- a/lfs/bacula
>>>>> +++ b/lfs/bacula
>>>>> @@ -28,11 +28,11 @@ VER        = 9.6.5
>>>>>
>>>>> THISAPP    = bacula-$(VER)
>>>>> DL_FILE    = $(THISAPP).tar.gz
>>>>> -DL_FROM    = $(URL_IPFIRE)
>>>>> +DL_FROM    =
>>>>> https://sourceforge.net/projects/bacula/files/bacula/9.6.5/
>>>>> DIR_APP    = $(DIR_SRC)/$(THISAPP)
>>>>> TARGET     = $(DIR_INFO)/$(THISAPP)
>>>>> PROG       = bacula
>>>>> -PAK_VER    = 5
>>>>> +PAK_VER    = 6
>>>>>
>>>>> DEPS       =
>>>>>
>>>>> @@ -87,6 +87,8 @@ $(TARGET) : $(patsubst
>>>>> %,$(DIR_DL)/%,$(objects))
>>>>> 	cd $(DIR_APP) && make $(MAKETUNING)
>>>>> 	cd $(DIR_APP) && make install
>>>>> 	ln -sf /etc/bacula/bacula-ctl-fd
>>>>> /etc/rc.d/init.d/bacula
>>>>> +	install -v -m 644
>>>>> ${DIR_SRC}/config/backup/includes/bacula \
>>>>> +			/var/ipfire/backup/addons/includes/bacu
>>>>> la
>>>>> 	rm -f /root/.rnd
>>>>> 	@rm -rf $(DIR_APP)
>>>>> 	@$(POSTBUILD)
>>>>> -- 2.27.0
>>>>>