Re: [PATCH] bacula: Correction to 9.6.5

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

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

Hi Michael,

Sorry for creating a problem. I changed the Download URL because I had a problem when I ran ./make downloadsrc with $(URL_IPFIRE) in lfs/bacula I got the following error message for bacula.

Jul  3 16:16:00: Building bacula bacula     Download: https://sourceforge.net/projects/bacula/files/bacula/9.6.5/bacula-9.6.5.tar.gz/bacula-9.6.5.tar.gz
Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt'
https://sourceforge.net/projects/bacula/files/bacula/9.6.5/bacula-9.6.5.tar.gz/bacula-9.6.5.tar.gz:
2020-07-03 18:16:01 ERROR 404: Not Found.
make: *** [bacula:68: /home/ahb/sandbox/ipfire-2.x/cache/bacula-9.6.5.tar.gz] Error 8

This looked like the URL had the file name added afterwards so the file name ended up twice in the URL. I thought therefore that I had made a mistake when I wrote the download URL with the file name in my earlier patch.


I have just tried the same ./make downloadsrc with $(URL_IPFIRE) in the lfs/bacula file and it ran with no problems. So it looks like I had some unusual issue previously which has now gone away.

I now know that the URL should include the file name and if I get a similar error message in future I will not "fix it" but ask on the mailing list about it.

Sorry again for causing such noise and problem, but I have learnt now and know for the future.

Regards,

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/bacula
>> 	rm -f /root/.rnd
>> 	@rm -rf $(DIR_APP)
>> 	@$(POSTBUILD)
>> -- 
>> 2.27.0
>>