From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] bacula: Correction to 9.6.5
Date: Mon, 06 Jul 2020 15:23:50 +0100
Message-ID: <66919647-569A-4DDA-B7C6-71ED4EDF0142@ipfire.org>
In-Reply-To: <20200706114349.2261-1-ahb.ipfire@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8355001666278767347=="
List-Id: <development.lists.ipfire.org>

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

Hi,

> On 6 Jul 2020, at 12:43, Adolf Belka <ahb.ipfire(a)gmail.com> wrote:
>=20
> - Corrected Download URL to remove filename from the end of it. This is def=
ined separately.

This is actually incorrect now. We mirror all source files on our server, bec=
ause 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 downloa=
d 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>
>=20
> ---
> config/rootfiles/packages/bacula | 1 +
> lfs/bacula                       | 6 ++++--
> 2 files changed, 5 insertions(+), 2 deletions(-)
>=20
> diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/b=
acula
> 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
>=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/
> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> TARGET     =3D $(DIR_INFO)/$(THISAPP)
> PROG       =3D bacula
> -PAK_VER    =3D 5
> +PAK_VER    =3D 6
>=20
> DEPS       =3D
>=20
> @@ -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
>=20


--===============8355001666278767347==--