From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] bacula: Update to 9.6.6 Date: Tue, 29 Sep 2020 09:38:03 +0100 Message-ID: <55A77FC1-6B54-4335-8EF0-BF487C45628B@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4073189294901551664==" List-Id: --===============4073189294901551664== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, > On 28 Sep 2020, at 16:49, Adolf Belka wrote: >=20 > Hallo Michael, These seem to be two different schools of thought=E2=80=A6 > My understanding was that rootfiles are supposed to have any files in /usr/= lib/ with .so at the end of them prepended with #. Other programmes I have lo= oked at in IPFire have libraries with .so.version-number so they don't end in= .so and don't need to be commented out. Normally you would have something like this: libabc.so libabc.so.1 libabc.so.1.2.3 In that case, the linker would be searching for libabc.so which is a symlink = to libabc.so.1 and that is the filename that would be linked into a binary th= at is linked against libabc at compile time. Therefore, the libabc.so is no longer needed as nothing will be searching for= it at runtime. The runtime linker will only be looking for libabc.so.1 which= is a symlink to libabc.so.1.2.3. > However bacula has library files with.version-number.so so all of them end = in .so and according to the rules I read in the Building Addons topic in the = wiki, I should comment them all out but bacula would then fail to work. Bacula follows a different approach, which potentially is the slightly incorr= ect one. But hey. You have libabc-1.2.3.so which would also be linked into the bacula binary. T= hat way, it will always be looking for a library with exactly that name. A pa= tched and improved version would not work because it would have a different n= ame (e.g. libabc-1.2.4.so) and not be found. Because of the symlink structure= it would be used in the example above. > I am okay leaving the libraries in /usr/lib/ by removing the libdir command= in the configure definition but then there will be libraries in that directo= ry that end in .so and are not commented out in the rootfiles. So that means, you cannot simply always remove all libraries that end in .so.= The correct answer is: It depends. In 99% of the cases you can have a look where the version number is and that = will tell you. > Let me know if I should redo the patch using /usr/lib/ for the libraries. Therefore I would suggest to keep bacula=E2=80=99s files in /usr/lib. I would also suggest that you split these three changes (the backup fix, the = version update and - formerly - the move to /usr/lib/bacula) as separate patc= hes. That makes it easier to audit because the reviewer can see what changes = belong together and which don=E2=80=99t. Best, -Michael > Regards, >=20 > Adolf. >=20 > On 28/09/2020 17:13, Michael Tremer wrote: >> Hello, >>=20 >>> On 28 Sep 2020, at 14:35, Adolf Belka 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/ReleaseNo= tes/ >>> Source file available at https://sourceforge.net/projects/bacula/files/b= acula/9.6.6/bacula-9.6.6.tar.gz >>> - Modified backup/includes file to backup the /var/bacula/working directo= ry 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 mig= ht need to be in /usr/lib so the the runtime linker can find them. We do not = want rpath compiled in. >>=20 >> Best, >> -Michael >>=20 >>> Signed-off-by: Adolf Belka >>> --- >>> 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= /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 @@ >>>=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 --===============4073189294901551664==--