From: Adolf Belka <ahb.ipfire@gmail.com>
To: development@lists.ipfire.org
Subject: Re: [PATCH] bacula: Correction to 9.6.5
Date: Tue, 28 Jul 2020 13:17:25 +0200 [thread overview]
Message-ID: <9e352327-add4-e50d-073e-0336807f6fa6@gmail.com> (raw)
In-Reply-To: <66919647-569A-4DDA-B7C6-71ED4EDF0142@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 3176 bytes --]
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(a)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(a)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(a)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
>>
next prev parent reply other threads:[~2020-07-28 11:17 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 11:43 Adolf Belka
2020-07-06 14:23 ` Michael Tremer
2020-07-06 16:20 ` Adolf Belka
2020-07-06 16:29 ` Matthias Fischer
2020-07-28 11:17 ` Adolf Belka [this message]
2020-07-28 18:07 ` Arne Fitzenreiter
2020-07-28 18:18 ` Michael Tremer
2020-07-29 10:19 ` Adolf Belka
2020-07-28 18:17 Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9e352327-add4-e50d-073e-0336807f6fa6@gmail.com \
--to=ahb.ipfire@gmail.com \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox