| Message ID | 20200928133542.5606-1-ahb.ipfire@gmail.com |
|---|---|
| State | Accepted |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C0Nnz6027z3wh4 for <patchwork@web04.haj.ipfire.org>; Mon, 28 Sep 2020 13:36:07 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C0Nnx22qTzqD; Mon, 28 Sep 2020 13:36:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C0Nnx0l7Mz2xkc; Mon, 28 Sep 2020 13:36:05 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C0Nnv4FBdz2xcS for <development@lists.ipfire.org>; Mon, 28 Sep 2020 13:36:03 +0000 (UTC) Received: from smtpq4.tb.mail.iss.as9143.net (smtpq4.tb.mail.iss.as9143.net [212.54.42.167]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPS id 4C0Nnt6GQgzqD for <development@lists.ipfire.org>; Mon, 28 Sep 2020 13:36:02 +0000 (UTC) Received: from [212.54.42.137] (helo=smtp6.tb.mail.iss.as9143.net) by smtpq4.tb.mail.iss.as9143.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ahb.ipfire@gmail.com>) id 1kMtJy-0002mT-9s; Mon, 28 Sep 2020 15:36:02 +0200 Received: from j103033.upc-j.chello.nl ([24.132.103.33] helo=rhea.saturn.pimb.org) by smtp6.tb.mail.iss.as9143.net with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from <ahb.ipfire@gmail.com>) id 1kMtJy-00F51M-0A; Mon, 28 Sep 2020 15:36:02 +0200 Received: from hyperion.saturn.pimb.org (hyperion.saturn.pimb.org [192.168.26.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by rhea.saturn.pimb.org (Postfix) with ESMTPSA id 0EB0D3EF3; Mon, 28 Sep 2020 15:36:02 +0200 (CEST) From: Adolf Belka <ahb.ipfire@gmail.com> To: development@lists.ipfire.org Subject: [PATCH] bacula: Update to 9.6.6 Date: Mon, 28 Sep 2020 15:35:42 +0200 Message-Id: <20200928133542.5606-1-ahb.ipfire@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SourceIP: 24.132.103.33 X-Authenticated-Sender: adolf.belka@ziggo.nl (via SMTP) X-Ziggo-spambar: / X-Ziggo-spamscore: 0.0 X-Ziggo-spamreport: CMAE Analysis: v=2.4 cv=UZjv9IeN c=1 sm=1 tr=0 ts=5f71e6c2 a=N0UC3/faf55XGTeY5t7zSQ==:17 a=9+rZDBEiDlHhcck0kWbJtElFXBc=:19 a=x7bEGLp0ZPQA:10 a=6yxbeI8x3IIA:10 a=reM5J-MqmosA:10 a=FP58Ms26AAAA:8 a=pGLkceISAAAA:8 a=-fK3LjrCrc3xE4zztUgA:9 X-Ziggo-Spam-Status: No X-Spam-Status: No X-Spam-Flag: No ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.ipfire.org; s=202003rsa; t=1601300162; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yaDC4r7QGpIbCcVtr9Ogv7uMgtoSTlz9e46JOQNw3gM=; b=RuhOZV2DvLSl1ZjczV4Gv+unJnU8C7sqDniPVhg5TVt356Vl4hO4yUbLZzNxBhlkTxGj3N Y+Gw1EgQ7tPdjNwx2lVShLrRaeZ4l0XS9QcJCFcPIpa/BGMsiGMtDI1PFx2nbEb4Ah6Efx q9/YyuZRlJrxYDhv8CU0LwB2wzVZSgdjhq4QDzFijopBsw+7hGIc0uuLOwftDZZ6Vl1Q/B zw8Tw9bOWeVJ57gWlNZi5cZ6qTrqBk26NlkSdEmcExjwxwpMmTqMEVIpiRV7arYaC27HCX W3ZLqAp7TvAOf5WULnYhoco75iAQzmwifPZDIG1izkLUUVZktEnB1FXLECrfbg== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1601300162; a=rsa-sha256; cv=none; b=XHHSfLfVFAz3bkW/o9B8vjIo4XFoihvG0T1WoYES1Fd2NG/Wds8dtm67qMQm+a8FOlJHPK 6G6KugTK8HiQsn6VMx95O9hw8GPyMw6LtMRlDhjMRT7jh5Nz/SGzuQKMWpGzDP0EHCYF0M 7HRB6u6gs01znffO9+4ns0BRvwZzXt0Mb6L6s5Z/zPgtI2kc3tWY0/vQq2JSk6IG8q6vR3 04OLZn/yBKeQpYfEcsaPGsxMcJrY/+powpEPfzIFpGayt35VpKn5J1v0aoaHSq0cuSd7sJ rnRrkZ5nFDf23QIemJjGpcbZk05eMAVPhE/FhtIEbw0A05mxKhzC5IpFT2RwPA== ARC-Authentication-Results: i=1; mail01.ipfire.org; dkim=none; spf=softfail (mail01.ipfire.org: 212.54.42.167 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com Authentication-Results: mail01.ipfire.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mail01.ipfire.org: 212.54.42.167 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com X-Rspamd-Queue-Id: 4C0Nnt6GQgzqD X-Spamd-Result: default: False [-0.07 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; R_MISSING_CHARSET(2.50)[]; ARC_SIGNED(0.00)[i=1]; BROKEN_CONTENT_TYPE(1.50)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_LOW(-0.10)[212.54.42.167:from]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; HAS_X_AS(0.00)[]; ASN(0.00)[asn:33915, ipnet:212.54.32.0/20, country:NL]; TAGGED_FROM(0.00)[]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; BAYES_HAM(-3.00)[99.99%]; TAGGED_RCPT(0.00)[]; MIME_GOOD(-0.10)[text/plain]; RECEIVED_SPAMHAUS_PBL(0.00)[24.132.103.33:received]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM(-0.98)[-0.977]; IP_REPUTATION_SPAM(0.01)[asn: 33915(0.00), country: NL(0.01), ip: 212.54.42.167(0.00)]; RWL_MAILSPIKE_POSSIBLE(0.00)[212.54.42.167:from]; FREEMAIL_CC(0.00)[gmail.com]; RCVD_TLS_ALL(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none] X-Rspamd-Server: mail01.haj.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
| Series |
bacula: Update to 9.6.6
|
|
Commit Message
Adolf Belka
Sept. 28, 2020, 1:35 p.m. UTC
- 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
Signed-off-by: Adolf Belka <ahb.ipfire@gmail.com>
---
config/backup/includes/bacula | 2 +-
config/rootfiles/packages/bacula | 21 +++++++++++----------
lfs/bacula | 7 ++++---
3 files changed, 16 insertions(+), 14 deletions(-)
Comments
Hello, > On 28 Sep 2020, at 14:35, Adolf Belka <ahb.ipfire@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@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 >
Hallo Michael, 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 looked at in IPFire have libraries with .so.version-number so they don't end in .so and don't need to be commented out. 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. 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 directory that end in .so and are not commented out in the rootfiles. Let me know if I should redo the patch using /usr/lib/ for the libraries. Regards, Adolf. On 28/09/2020 17:13, Michael Tremer wrote: > Hello, > >> On 28 Sep 2020, at 14:35, Adolf Belka <ahb.ipfire@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@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 >>
Hi, > On 28 Sep 2020, at 16:49, Adolf Belka <ahb.ipfire@gmail.com> wrote: > > Hallo Michael, These seem to be two different schools of thought… > 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 looked 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 that 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 incorrect one. But hey. You have libabc-1.2.3.so which would also be linked into the bacula binary. That way, it will always be looking for a library with exactly that name. A patched and improved version would not work because it would have a different name (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 directory 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’s 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 patches. That makes it easier to audit because the reviewer can see what changes belong together and which don’t. Best, -Michael > Regards, > > Adolf. > > On 28/09/2020 17:13, Michael Tremer wrote: >> Hello, >> >>> On 28 Sep 2020, at 14:35, Adolf Belka <ahb.ipfire@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@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 >>>
Hi Michael, Thanks for the feedback and clarification. I understand now and will follow your advice. Will create new patches for the two changes remaining. Thanks, Adolf On 29/09/2020 10:38, Michael Tremer wrote: > Hi, > >> On 28 Sep 2020, at 16:49, Adolf Belka <ahb.ipfire@gmail.com> wrote: >> >> Hallo Michael, > These seem to be two different schools of thought… > >> 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 looked 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 that 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 incorrect one. But hey. > > You have libabc-1.2.3.so which would also be linked into the bacula binary. That way, it will always be looking for a library with exactly that name. A patched and improved version would not work because it would have a different name (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 directory 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’s 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 patches. That makes it easier to audit because the reviewer can see what changes belong together and which don’t. > > Best, > -Michael > >> Regards, >> >> Adolf. >> >> On 28/09/2020 17:13, Michael Tremer wrote: >>> Hello, >>> >>>> On 28 Sep 2020, at 14:35, Adolf Belka <ahb.ipfire@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@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 >>>>
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)