| Message ID | 20200706114349.2261-1-ahb.ipfire@gmail.com |
|---|---|
| State | Superseded |
| 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4B0kJC6yq2z3xGx for <patchwork@web04.haj.ipfire.org>; Mon, 6 Jul 2020 11:44:43 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4B0kJB5pb2z1PT; Mon, 6 Jul 2020 11:44:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4B0kJB4bkzz2yZd; Mon, 6 Jul 2020 11:44:42 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4B0kJ91n6Nz2xb4 for <development@lists.ipfire.org>; Mon, 6 Jul 2020 11:44:41 +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 4B0kJ76LZfz1PT for <development@lists.ipfire.org>; Mon, 6 Jul 2020 11:44:39 +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 1jsPY1-0002rT-Do; Mon, 06 Jul 2020 13:44:33 +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 1jsPY1-0087CP-4F; Mon, 06 Jul 2020 13:44:33 +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 CF6A63EC8; Mon, 6 Jul 2020 13:44:33 +0200 (CEST) From: Adolf Belka <ahb.ipfire@gmail.com> To: development@lists.ipfire.org Subject: [PATCH] bacula: Correction to 9.6.5 Date: Mon, 6 Jul 2020 13:43:49 +0200 Message-Id: <20200706114349.2261-1-ahb.ipfire@gmail.com> X-Mailer: git-send-email 2.27.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.3 cv=KbhJTTQD c=1 sm=1 tr=0 a=N0UC3/faf55XGTeY5t7zSQ==:17 a=9+rZDBEiDlHhcck0kWbJtElFXBc=:19 a=x7bEGLp0ZPQA:10 a=6yxbeI8x3IIA:10 a=_RQrkK6FrEwA:10 a=pGLkceISAAAA:8 a=FP58Ms26AAAA:8 a=BEKZz61yNc4yx3t9lCMA: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=1594035880; 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=+AK+JvHuPrBS0rB+63eRCMlE/vnic2kM6darlkB8LLE=; b=ME/uvReI5y6OaUBn5adZO0kOpmEye089ErL4vx+IF0uub4cywl/NW0Zq/RiZZFQDgFmDmA D9t4jmGlEMUBlKDzvrKB7naXXjJcB6gkFNnVg7u6VCQe7AOPZjgDCKWlO2ptIBhkd07k1g XCvGYruItRB4JgaB48W28vzBsBTShS4gY73I7sp/9Hyyy4KMMu8rG9+1fiKCM2vazDHono /FBzx/eTdNHfIqUal1U9KU0K9yUX7jq1qknkaw7RAs2qyzBaLv8pkV9ggCYJHrQ1pDDgsH MM7BrH2NTsQeaAR5LF1x9f7x3K+zfAwQ4EbODmVpAnmgbUBqG+r/koI2xvs33g== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1594035881; a=rsa-sha256; cv=none; b=QMLbMAYQkJS7xQrCbqcHWC+FhyNXu9OGhwQfG1c2ISgpJi12u7FfBjd0uxeYjh6ItDR9Z8 EpjfJUi7/YjrbRmW7d9n2uXiu62OUR1A7LWKSq77/Zu09/s6ptKqwg/XLxPIW268V4sYXi RKysKO8pxlmSGca9P/EWJFoOk1XOoy8FC22Fa1Ro5TfAopXWNouZHSof3SaHulR8r6xUZt E0P4u3XezF1lZQJu7M5Cziakha/tCPbbBh+V+b1ZHNi0gJgK2njT/r+I4/9Yrxhdwouavs znxuiVUfutcJqBn0khHBoqM3R7ZPakXJonNBqGHSGf5pQ5jz7b1/6wduV0H7xQ== ARC-Authentication-Results: i=1; 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 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: 4B0kJ76LZfz1PT X-Spamd-Result: default: False [0.90 / 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]; MX_GOOD(-0.01)[]; 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)[]; 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: Correction to 9.6.5
|
|
Commit Message
Adolf Belka
July 6, 2020, 11:43 a.m. UTC
- Corrected Download URL to remove filename from the end of it. This is defined separately.
- 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@gmail.com>
---
config/rootfiles/packages/bacula | 1 +
lfs/bacula | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
Comments
Hi, > On 6 Jul 2020, at 12:43, Adolf Belka <ahb.ipfire@gmail.com> wrote: > > - Corrected Download URL to remove filename from the end of it. This is defined separately. This is actually incorrect now. We mirror all source files on our server, because 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 download 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@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@gmail.com> > > --- > config/rootfiles/packages/bacula | 1 + > lfs/bacula | 6 ++++-- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula > 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 = 9.6.5 > > THISAPP = bacula-$(VER) > DL_FILE = $(THISAPP).tar.gz > -DL_FROM = $(URL_IPFIRE) > +DL_FROM = https://sourceforge.net/projects/bacula/files/bacula/9.6.5/ > DIR_APP = $(DIR_SRC)/$(THISAPP) > TARGET = $(DIR_INFO)/$(THISAPP) > PROG = bacula > -PAK_VER = 5 > +PAK_VER = 6 > > DEPS = > > @@ -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) > -- > 2.27.0 >
Hi Michael, Sorry for creating a problem. I changed the Download URL because I had a problem when I ran ./make downloadsrc with $(URL_IPFIRE) in lfs/bacula I got the following error message for bacula. Jul 3 16:16:00: Building bacula bacula Download: https://sourceforge.net/projects/bacula/files/bacula/9.6.5/bacula-9.6.5.tar.gz/bacula-9.6.5.tar.gz Loaded CA certificate '/etc/ssl/certs/ca-certificates.crt' https://sourceforge.net/projects/bacula/files/bacula/9.6.5/bacula-9.6.5.tar.gz/bacula-9.6.5.tar.gz: 2020-07-03 18:16:01 ERROR 404: Not Found. make: *** [bacula:68: /home/ahb/sandbox/ipfire-2.x/cache/bacula-9.6.5.tar.gz] Error 8 This looked like the URL had the file name added afterwards so the file name ended up twice in the URL. I thought therefore that I had made a mistake when I wrote the download URL with the file name in my earlier patch. I have just tried the same ./make downloadsrc with $(URL_IPFIRE) in the lfs/bacula file and it ran with no problems. So it looks like I had some unusual issue previously which has now gone away. I now know that the URL should include the file name and if I get a similar error message in future I will not "fix it" but ask on the mailing list about it. Sorry again for causing such noise and problem, but I have learnt now and know for the future. Regards, Adolf. On 06/07/2020 16:23, Michael Tremer wrote: > Hi, > >> On 6 Jul 2020, at 12:43, Adolf Belka <ahb.ipfire@gmail.com> wrote: >> >> - Corrected Download URL to remove filename from the end of it. This is defined separately. > This is actually incorrect now. We mirror all source files on our server, because 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 download 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@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@gmail.com> >> >> --- >> config/rootfiles/packages/bacula | 1 + >> lfs/bacula | 6 ++++-- >> 2 files changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula >> 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 = 9.6.5 >> >> THISAPP = bacula-$(VER) >> DL_FILE = $(THISAPP).tar.gz >> -DL_FROM = $(URL_IPFIRE) >> +DL_FROM = https://sourceforge.net/projects/bacula/files/bacula/9.6.5/ >> DIR_APP = $(DIR_SRC)/$(THISAPP) >> TARGET = $(DIR_INFO)/$(THISAPP) >> PROG = bacula >> -PAK_VER = 5 >> +PAK_VER = 6 >> >> DEPS = >> >> @@ -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) >> -- >> 2.27.0 >>
Hi,
On 06.07.2020 18:20, Adolf Belka wrote:
> Sorry again for causing such noise and problem, but I have learnt now and know for the future.
Don't worry, such things - and more ( ;-) ) - happened to me, too.
Best,
Matthias
Dear All, Noticed that the bacula update that was in Core 147 release was 9.6.5-5 and didn't include this correction patch to 9.6.5-6. This means that the current bacula release works with no problems but there is no backup include file. Not a huge problem and if any users have a problem with this I can show them how to add the right bits to their local setups. My question is whether this patch will then get merged in with the next core update, especially with the error I made on the Download URL and the fact that it was created against the development build of Core 147. Or does this patch need to be marked as superseded and I have to create a new patch file against the released version of Core 147? All the best, Adolf On 06/07/2020 16:23, Michael Tremer wrote: > Hi, > >> On 6 Jul 2020, at 12:43, Adolf Belka <ahb.ipfire@gmail.com> wrote: >> >> - Corrected Download URL to remove filename from the end of it. This is defined separately. > This is actually incorrect now. We mirror all source files on our server, because 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 download 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@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@gmail.com> >> >> --- >> config/rootfiles/packages/bacula | 1 + >> lfs/bacula | 6 ++++-- >> 2 files changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula >> 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 = 9.6.5 >> >> THISAPP = bacula-$(VER) >> DL_FILE = $(THISAPP).tar.gz >> -DL_FROM = $(URL_IPFIRE) >> +DL_FROM = https://sourceforge.net/projects/bacula/files/bacula/9.6.5/ >> DIR_APP = $(DIR_SRC)/$(THISAPP) >> TARGET = $(DIR_INFO)/$(THISAPP) >> PROG = bacula >> -PAK_VER = 5 >> +PAK_VER = 6 >> >> DEPS = >> >> @@ -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) >> -- >> 2.27.0 >>
Micheal has already written that the download url not points to our server. This is the reason why i have not merged this yet. Arne Am 2020-07-28 13:17, schrieb Adolf Belka: > Dear All, > > Noticed that the bacula update that was in Core 147 release was > 9.6.5-5 and didn't include this correction patch to 9.6.5-6. > > This means that the current bacula release works with no problems but > there is no backup include file. Not a huge problem and if any users > have a problem with this I can show them how to add the right bits to > their local setups. > > My question is whether this patch will then get merged in with the > next core update, especially with the error I made on the Download URL > and the fact that it was created against the development build of Core > 147. Or does this patch need to be marked as superseded and I have to > create a new patch file against the released version of Core 147? > > All the best, > > Adolf > > On 06/07/2020 16:23, Michael Tremer wrote: >> Hi, >> >>> On 6 Jul 2020, at 12:43, Adolf Belka <ahb.ipfire@gmail.com> wrote: >>> >>> - Corrected Download URL to remove filename from the end of it. This >>> is defined separately. >> This is actually incorrect now. We mirror all source files on our >> server, because 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 >> download 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@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@gmail.com> >>> >>> --- >>> config/rootfiles/packages/bacula | 1 + >>> lfs/bacula | 6 ++++-- >>> 2 files changed, 5 insertions(+), 2 deletions(-) >>> >>> diff --git a/config/rootfiles/packages/bacula >>> b/config/rootfiles/packages/bacula >>> 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 = 9.6.5 >>> >>> THISAPP = bacula-$(VER) >>> DL_FILE = $(THISAPP).tar.gz >>> -DL_FROM = $(URL_IPFIRE) >>> +DL_FROM = >>> https://sourceforge.net/projects/bacula/files/bacula/9.6.5/ >>> DIR_APP = $(DIR_SRC)/$(THISAPP) >>> TARGET = $(DIR_INFO)/$(THISAPP) >>> PROG = bacula >>> -PAK_VER = 5 >>> +PAK_VER = 6 >>> >>> DEPS = >>> >>> @@ -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) >>> -- 2.27.0 >>>
Hi, I sent a fixed version of that patch. Please merge that one. Best, -Michael On Tue, 2020-07-28 at 20:07 +0200, Arne Fitzenreiter wrote: > Micheal has already written that the download url not points to > our server. This is the reason why i have not merged this yet. > > Arne > > > Am 2020-07-28 13:17, schrieb Adolf Belka: > > Dear All, > > > > Noticed that the bacula update that was in Core 147 release was > > 9.6.5-5 and didn't include this correction patch to 9.6.5-6. > > > > This means that the current bacula release works with no problems > > but > > there is no backup include file. Not a huge problem and if any > > users > > have a problem with this I can show them how to add the right bits > > to > > their local setups. > > > > My question is whether this patch will then get merged in with the > > next core update, especially with the error I made on the Download > > URL > > and the fact that it was created against the development build of > > Core > > 147. Or does this patch need to be marked as superseded and I have > > to > > create a new patch file against the released version of Core 147? > > > > All the best, > > > > Adolf > > > > On 06/07/2020 16:23, Michael Tremer wrote: > > > Hi, > > > > > > > On 6 Jul 2020, at 12:43, Adolf Belka <ahb.ipfire@gmail.com> > > > > wrote: > > > > > > > > - Corrected Download URL to remove filename from the end of it. > > > > This > > > > is defined separately. > > > This is actually incorrect now. We mirror all source files on > > > our > > > server, because 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 > > > download 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@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@gmail.com> > > > > > > > > --- > > > > config/rootfiles/packages/bacula | 1 + > > > > lfs/bacula | 6 ++++-- > > > > 2 files changed, 5 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/config/rootfiles/packages/bacula > > > > b/config/rootfiles/packages/bacula > > > > 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 = 9.6.5 > > > > > > > > THISAPP = bacula-$(VER) > > > > DL_FILE = $(THISAPP).tar.gz > > > > -DL_FROM = $(URL_IPFIRE) > > > > +DL_FROM = > > > > https://sourceforge.net/projects/bacula/files/bacula/9.6.5/ > > > > DIR_APP = $(DIR_SRC)/$(THISAPP) > > > > TARGET = $(DIR_INFO)/$(THISAPP) > > > > PROG = bacula > > > > -PAK_VER = 5 > > > > +PAK_VER = 6 > > > > > > > > DEPS = > > > > > > > > @@ -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/bacu > > > > la > > > > rm -f /root/.rnd > > > > @rm -rf $(DIR_APP) > > > > @$(POSTBUILD) > > > > -- 2.27.0 > > > >
Dear Michael and Arne, Thanks very much. I have seen that the patch has been merged in Core 148 in git. Adolf. On 28/07/2020 20:18, Michael Tremer wrote: > Hi, > > I sent a fixed version of that patch. Please merge that one. > > Best, > -Michael > > On Tue, 2020-07-28 at 20:07 +0200, Arne Fitzenreiter wrote: >> Micheal has already written that the download url not points to >> our server. This is the reason why i have not merged this yet. >> >> Arne >> >> >> Am 2020-07-28 13:17, schrieb Adolf Belka: >>> Dear All, >>> >>> Noticed that the bacula update that was in Core 147 release was >>> 9.6.5-5 and didn't include this correction patch to 9.6.5-6. >>> >>> This means that the current bacula release works with no problems >>> but >>> there is no backup include file. Not a huge problem and if any >>> users >>> have a problem with this I can show them how to add the right bits >>> to >>> their local setups. >>> >>> My question is whether this patch will then get merged in with the >>> next core update, especially with the error I made on the Download >>> URL >>> and the fact that it was created against the development build of >>> Core >>> 147. Or does this patch need to be marked as superseded and I have >>> to >>> create a new patch file against the released version of Core 147? >>> >>> All the best, >>> >>> Adolf >>> >>> On 06/07/2020 16:23, Michael Tremer wrote: >>>> Hi, >>>> >>>>> On 6 Jul 2020, at 12:43, Adolf Belka <ahb.ipfire@gmail.com> >>>>> wrote: >>>>> >>>>> - Corrected Download URL to remove filename from the end of it. >>>>> This >>>>> is defined separately. >>>> This is actually incorrect now. We mirror all source files on >>>> our >>>> server, because 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 >>>> download 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@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@gmail.com> >>>>> >>>>> --- >>>>> config/rootfiles/packages/bacula | 1 + >>>>> lfs/bacula | 6 ++++-- >>>>> 2 files changed, 5 insertions(+), 2 deletions(-) >>>>> >>>>> diff --git a/config/rootfiles/packages/bacula >>>>> b/config/rootfiles/packages/bacula >>>>> 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 = 9.6.5 >>>>> >>>>> THISAPP = bacula-$(VER) >>>>> DL_FILE = $(THISAPP).tar.gz >>>>> -DL_FROM = $(URL_IPFIRE) >>>>> +DL_FROM = >>>>> https://sourceforge.net/projects/bacula/files/bacula/9.6.5/ >>>>> DIR_APP = $(DIR_SRC)/$(THISAPP) >>>>> TARGET = $(DIR_INFO)/$(THISAPP) >>>>> PROG = bacula >>>>> -PAK_VER = 5 >>>>> +PAK_VER = 6 >>>>> >>>>> DEPS = >>>>> >>>>> @@ -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/bacu >>>>> la >>>>> rm -f /root/.rnd >>>>> @rm -rf $(DIR_APP) >>>>> @$(POSTBUILD) >>>>> -- 2.27.0 >>>>>
diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula 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 = 9.6.5 THISAPP = bacula-$(VER) DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) +DL_FROM = https://sourceforge.net/projects/bacula/files/bacula/9.6.5/ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bacula -PAK_VER = 5 +PAK_VER = 6 DEPS = @@ -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)