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: Correction to 9.6.5
Date: Mon, 06 Jul 2020 18:20:14 +0200
Message-ID: <0f277711-a1e0-fc03-829b-0142a4d05245@gmail.com>
In-Reply-To: <66919647-569A-4DDA-B7C6-71ED4EDF0142@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8356546802981762140=="
List-Id: <development.lists.ipfire.org>

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

Hi Michael,

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

Jul=C2=A0 3 16:16:00: Building bacula bacula=C2=A0=C2=A0=C2=A0 =C2=A0Download=
: 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.g=
z/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/b=
acula file and it ran with no problems. So it looks like I had some unusual i=
ssue previously which has now gone away.

I now know that the URL should include the file name and if I get a similar e=
rror 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 kno=
w 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 de=
fined separately.
> This is actually incorrect now. We mirror all source files on our server, b=
ecause the upstream servers make files disappear, are slow or unreachable. Wi=
th our own server, we have control over that.
>
> You currently do not have write permissions to that share, but please downl=
oad the file into your cache/ directory manually and the person who merges th=
e 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        =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/
>> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
>> TARGET     =3D $(DIR_INFO)/$(THISAPP)
>> PROG       =3D bacula
>> -PAK_VER    =3D 5
>> +PAK_VER    =3D 6
>>
>> DEPS       =3D
>>
>> @@ -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)
>> --=20
>> 2.27.0
>>

--===============8356546802981762140==--