Re: [PATCH] bacula: Update to 9.6.6

[Michael Tremer <michael.tremer@ipfire.org>]

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

Hello,

> On 28 Sep 2020, at 14:35, Adolf Belka <ahb.ipfire(a)gmail.com> wrote:
> 
> - 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/ReleaseNotes/
> 	Source file available at https://sourceforge.net/projects/bacula/files/bacula/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 file 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 all 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 want 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(-)
> 
> 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/bacula
> 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 @@
> 
> include Config
> 
> -VER        = 9.6.5
> +VER        = 9.6.6
> 
> THISAPP    = bacula-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
> DIR_APP    = $(DIR_SRC)/$(THISAPP)
> TARGET     = $(DIR_INFO)/$(THISAPP)
> PROG       = bacula
> -PAK_VER    = 6
> +PAK_VER    = 7
> 
> DEPS       =
> 
> @@ -47,7 +47,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = e58eb531483de98d0410b33e3ec3d96a
> +$(DL_FILE)_MD5 = 1ba9e2a2d979cbe9b5d76187f98418ac
> 
> install : $(TARGET)
> 
> @@ -85,6 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
> 				--prefix=/usr \
> 				--enable-smartalloc \
> 				--sysconfdir=/etc/bacula \
> +				--libdir=/usr/lib/bacula \
> 				--with-working-dir=/var/bacula/working \
> 				--enable-client-only
> 	cd $(DIR_APP) && make $(MAKETUNING)
> -- 
> 2.28.0
>