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: Update to 9.6.6
Date: Mon, 28 Sep 2020 16:13:05 +0100
Message-ID: <4167BA24-C6D4-4AC2-9A6A-FBB3DB14F509@ipfire.org>
In-Reply-To: <20200928133542.5606-1-ahb.ipfire@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8289990532384033421=="
List-Id: <development.lists.ipfire.org>

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

Hello,

> On 28 Sep 2020, at 14:35, Adolf Belka <ahb.ipfire(a)gmail.com> wrote:
>=20
> - Update bacula from version 9.6.5 to 9.6.6
> 	This is a minor bug release
> 	See https://sourceforge.net/projects/bacula/files/bacula/9.6.6/ReleaseNote=
s/
> 	Source file available at https://sourceforge.net/projects/bacula/files/bac=
ula/9.6.6/bacula-9.6.6.tar.gz
> - Modified backup/includes file to backup the /var/bacula/working directory=
 contents
> 	state filename could be varied if user modifies the port number for the fi=
le daemon
> - Moved the library files from /usr/lib/ to /user/lib/bacula/
> 	This ensures no .so files in /usr/lib/. Bacula has the .so at the end of a=
ll the library file names

Why is this an issue? Plenty of packages have that and those libraries might =
need to be in /usr/lib so the the runtime linker can find them. We do not wan=
t rpath compiled in.

Best,
-Michael

> Signed-off-by: Adolf Belka <ahb.ipfire(a)gmail.com>
> ---
> config/backup/includes/bacula    |  2 +-
> config/rootfiles/packages/bacula | 21 +++++++++++----------
> lfs/bacula                       |  7 ++++---
> 3 files changed, 16 insertions(+), 14 deletions(-)
>=20
> diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula
> index 92bce0eba..de1d9cc48 100644
> --- a/config/backup/includes/bacula
> +++ b/config/backup/includes/bacula
> @@ -1,2 +1,2 @@
> /etc/bacula/bacula-fd.conf
> -/var/bacula/working/bacula-fd.9102.state
> +/var/bacula/working/
> diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/b=
acula
> index dc9179489..55488c61b 100644
> --- a/config/rootfiles/packages/bacula
> +++ b/config/rootfiles/packages/bacula
> @@ -20,16 +20,17 @@ etc/bacula/bacula-fd.conf
> etc/rc.d/init.d/bacula
> #opt/bacula
> #opt/bacula/log
> -#usr/lib/bpipe-fd.so
> -usr/lib/libbac-9.6.5.so
> -#usr/lib/libbac.la
> -usr/lib/libbac.so
> -usr/lib/libbaccfg-9.6.5.so
> -#usr/lib/libbaccfg.la
> -usr/lib/libbaccfg.so
> -usr/lib/libbacfind-9.6.5.so
> -#usr/lib/libbacfind.la
> -usr/lib/libbacfind.so
> +#usr/lib/bacula
> +#usr/lib/bacula/bpipe-fd.so
> +usr/lib/bacula/libbac-9.6.6.so
> +#usr/lib/bacula/libbac.la
> +usr/lib/bacula/libbac.so
> +usr/lib/bacula/libbaccfg-9.6.6.so
> +#usr/lib/bacula/libbaccfg.la
> +usr/lib/bacula/libbaccfg.so
> +usr/lib/bacula/libbacfind-9.6.6.so
> +#usr/lib/bacula/libbacfind.la
> +usr/lib/bacula/libbacfind.so
> #usr/sbin/bacula
> usr/sbin/bacula-fd
> #usr/sbin/bbconsjson
> diff --git a/lfs/bacula b/lfs/bacula
> index 3201688f4..154b4a633 100644
> --- a/lfs/bacula
> +++ b/lfs/bacula
> @@ -24,7 +24,7 @@
>=20
> include Config
>=20
> -VER        =3D 9.6.5
> +VER        =3D 9.6.6
>=20
> THISAPP    =3D bacula-$(VER)
> DL_FILE    =3D $(THISAPP).tar.gz
> @@ -32,7 +32,7 @@ DL_FROM    =3D $(URL_IPFIRE)
> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> TARGET     =3D $(DIR_INFO)/$(THISAPP)
> PROG       =3D bacula
> -PAK_VER    =3D 6
> +PAK_VER    =3D 7
>=20
> DEPS       =3D
>=20
> @@ -47,7 +47,7 @@ objects =3D $(DL_FILE)
>=20
> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>=20
> -$(DL_FILE)_MD5 =3D e58eb531483de98d0410b33e3ec3d96a
> +$(DL_FILE)_MD5 =3D 1ba9e2a2d979cbe9b5d76187f98418ac
>=20
> install : $(TARGET)
>=20
> @@ -85,6 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 				--prefix=3D/usr \
> 				--enable-smartalloc \
> 				--sysconfdir=3D/etc/bacula \
> +				--libdir=3D/usr/lib/bacula \
> 				--with-working-dir=3D/var/bacula/working \
> 				--enable-client-only
> 	cd $(DIR_APP) && make $(MAKETUNING)
> --=20
> 2.28.0
>=20


--===============8289990532384033421==--