From patchwork Mon Jul 6 11:43:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3246 Return-Path: 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 ; 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 ; 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 ; 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 ) 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 ) 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 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 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 Reviewed-by: Michael Tremer --- 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)