From patchwork Sat Jun 13 13:43:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 3204 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 49kf1q2GnJz3wdc for ; Sat, 13 Jun 2020 13:43:27 +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 49kf1m4W5Mz1dy; Sat, 13 Jun 2020 13:43:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 49kf1m1tR0z2yVl; Sat, 13 Jun 2020 13:43:24 +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 49kf1l1Wz8z2y3H for ; Sat, 13 Jun 2020 13:43:23 +0000 (UTC) Received: from smtpq3.tb.mail.iss.as9143.net (smtpq3.tb.mail.iss.as9143.net [212.54.42.166]) (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 49kf1j31Llz1DS for ; Sat, 13 Jun 2020 13:43:21 +0000 (UTC) Received: from [212.54.42.137] (helo=smtp6.tb.mail.iss.as9143.net) by smtpq3.tb.mail.iss.as9143.net with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6RH-0005iJ-2K for development@lists.ipfire.org; Sat, 13 Jun 2020 15:43:15 +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 1jk6RG-00AQJ4-O3 for development@lists.ipfire.org; Sat, 13 Jun 2020 15:43:14 +0200 Received: from [192.168.26.32] (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 1026B3E2B for ; Sat, 13 Jun 2020 15:43:14 +0200 (CEST) To: development@lists.ipfire.org From: Adolf Belka Subject: [PATCH] bacula: Update to 9.6.5 Message-ID: Date: Sat, 13 Jun 2020 15:43:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 Content-Language: en-GB 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=IkcTkHD0fZMA:10 a=x7bEGLp0ZPQA:10 a=6yxbeI8x3IIA:10 a=nTHF0DUjJn0A:10 a=pGLkceISAAAA:8 a=FP58Ms26AAAA:8 a=2jW0gPRiAAAA:8 a=3yV7UxjuTTS7dbMzXy8A:9 a=QEXdDO2ut3YA:10 a=3VCx8bP5vPwQSM_nLb0P:22 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=1592055801; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=15bNmWv2Xgt5nEP3GRqo3RkHCu3E660azTMf0VchN1g=; b=w+yPNtVFPdqX9228kAibPwmVUrM8rYkXPThWuDaCPJ+3M75JVjUcU05bHt5+h40YEGos5y F94LhK3X1gKEhPznGbSIXUeL6FlF6oEbpAi6sGGhYF4OZnjnIjv9Zi+54Pxr2zJghKzeqX fFVQAHfjTKfzTb925sUKBr8m5XxVworyEMZj+frtLuuTDESfWFvQfzdOWCaqw7ChzmVVm1 huYFjGybtx5Kb2TI36trO1Hf+yGQjB8KgZyGH2T9F6IIXa4jjHyry50TVjQ0dzu7BAPE7N eTlvDaT2UoWfDirYMaAEhMVjPqkdvsAihPBRyUEKD0a7w3BPtxFAmrv0m4sAVA== ARC-Seal: i=1; s=202003rsa; d=lists.ipfire.org; t=1592055801; a=rsa-sha256; cv=none; b=TzDx/cY7ZmhdGv6FPg5UOhce4LayW0wXJBM3LCEePamokrJN8eTm+rN/gDOWUGCgdedvcg U0gEtUQ70o7L2oq8tvABViO/XBEKYyO+p6HLvLQkmy0ZQ0IcjpR3SenX+/OyP3X2OJ+SUI STFOrzCdBfkqo8gAXIamVceTCroYrR9vfXJaiXKf8seJIlJKPJQt+vWN3creGJeTVCX0oh pK8sSosmTrNUCuihWhfUjceUuHfoha3LxcTtnyifCea79ncFXt1Q3FQStvRiRIYXtc4Q5A p24EIoD6EKJ4DFT3opcBdGevxCoif1IMWZMTG75oYmK+ZhmMOEcxoiseqUiVZA== 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.166 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.166 is neither permitted nor denied by domain of ahbipfire@gmail.com) smtp.mailfrom=ahbipfire@gmail.com X-Rspamd-Queue-Id: 49kf1j31Llz1DS X-Spamd-Result: default: False [-3.94 / 11.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[212.54.42.166:from]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_NONE(0.00)[]; ARC_SIGNED(0.00)[i=1]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:33915, ipnet:212.54.32.0/20, country:NL]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; HAS_X_AS(0.00)[]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[212.54.42.166:from]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; BAYES_HAM(-3.00)[99.99%]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[development@lists.ipfire.org]; RCPT_COUNT_ONE(0.00)[1]; RECEIVED_SPAMHAUS_PBL(0.00)[24.132.103.33:received]; NEURAL_HAM(-0.83)[-0.833]; IP_REPUTATION_SPAM(0.01)[asn: 33915(0.00), country: NL(0.01), ip: 212.54.42.166(0.00)]; 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" - Update bacula from 9.0.6 to 9.6.5 - Current version of bacula in ipfire is 9.0.6 and is over two and a half years old. - Update config options in lfs to include bacula recommended smartalloc option. - Add install, uninstall and update files in src/paks/bacula - Updated backup/includes to only backup the config file. Signed-off-by: Adolf Belka ---  config/backup/includes/bacula    |  2 +-  config/rootfiles/packages/bacula | 17 +++++++-------  lfs/bacula                       | 11 ++++-----  src/paks/bacula/install.sh       | 38 ++++++++++++++++++++++++++++++++  src/paks/bacula/uninstall.sh     | 33 +++++++++++++++++++++++++++  src/paks/bacula/update.sh        | 26 ++++++++++++++++++++++  6 files changed, 113 insertions(+), 14 deletions(-)  create mode 100644 src/paks/bacula/install.sh  create mode 100644 src/paks/bacula/uninstall.sh  create mode 100644 src/paks/bacula/update.sh diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula index 8d5c119f9..0da11db7d 100644 --- a/config/backup/includes/bacula +++ b/config/backup/includes/bacula @@ -1 +1 @@ -/etc/bacula/ +/etc/bacula/bacula-fd.conf diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula index 64fb0d2ca..4ee408fc4 100644 --- a/config/rootfiles/packages/bacula +++ b/config/rootfiles/packages/bacula @@ -13,22 +13,23 @@ etc/bacula/bacula-fd.conf  #etc/bacula/btraceback.gdb  #etc/bacula/btraceback.mdb  #etc/bacula/disk-changer +#etc/bacula/isworm  #etc/bacula/mtx-changer  #etc/bacula/mtx-changer.conf  #etc/bacula/tapealert  etc/rc.d/init.d/bacula  #opt/bacula  #opt/bacula/log -usr/lib/bpipe-fd.so -usr/lib/libbac-9.0.6.so +#usr/lib/bpipe-fd.so +usr/lib/libbac-9.6.5.so  #usr/lib/libbac.la -#usr/lib/libbac.so -usr/lib/libbaccfg-9.0.6.so +usr/lib/libbac.so +usr/lib/libbaccfg-9.6.5.so  #usr/lib/libbaccfg.la -#usr/lib/libbaccfg.so -usr/lib/libbacfind-9.0.6.so +usr/lib/libbaccfg.so +usr/lib/libbacfind-9.6.5.so  #usr/lib/libbacfind.la -#usr/lib/libbacfind.so +usr/lib/libbacfind.so  #usr/sbin/bacula  usr/sbin/bacula-fd  #usr/sbin/bbconsjson @@ -61,4 +62,4 @@ usr/sbin/bacula-fd  #usr/share/man/man8/bwild.8.gz  #usr/share/man/man8/dbcheck.8.gz  #var/bacula -var/bacula/working +#var/bacula/working diff --git a/lfs/bacula b/lfs/bacula index 8c96c7ba1..b6b0d9cbf 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -24,15 +24,15 @@  include Config -VER        = 9.0.6 +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/bacula-9.6.5.tar.gz  DIR_APP    = $(DIR_SRC)/$(THISAPP)  TARGET     = $(DIR_INFO)/$(THISAPP)  PROG       = bacula -PAK_VER    = 4 +PAK_VER    = 5  DEPS       = @@ -44,7 +44,7 @@ objects = $(DL_FILE)  $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9168e398808c42bf290515f60892f643 +$(DL_FILE)_MD5 = e58eb531483de98d0410b33e3ec3d96a  install : $(TARGET) @@ -80,12 +80,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))      $(UPDATE_AUTOMAKE)      cd $(DIR_APP) && ./configure \                  --prefix=/usr \ +                --enable-smartalloc \                  --sysconfdir=/etc/bacula \                  --with-working-dir=/var/bacula/working \                  --enable-client-only      cd $(DIR_APP) && make $(MAKETUNING)      cd $(DIR_APP) && make install -    ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula +    ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula      rm -f /root/.rnd      @rm -rf $(DIR_APP)      @$(POSTBUILD) diff --git a/src/paks/bacula/install.sh b/src/paks/bacula/install.sh new file mode 100644 index 000000000..49aef9379 --- /dev/null +++ b/src/paks/bacula/install.sh @@ -0,0 +1,38 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall.                                # +# # +# IPFire is free software; you can redistribute it and/or modify           # +# it under the terms of the GNU General Public License as published by     # +# the Free Software Foundation; either version 2 of the License, or        # +# (at your option) any later version.                                      # +# # +# IPFire is distributed in the hope that it will be useful,                # +# but WITHOUT ANY WARRANTY; without even the implied warranty of           # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            # +# GNU General Public License for more details.                             # +# # +# You should have received a copy of the GNU General Public License        # +# along with IPFire; if not, write to the Free Software                    # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team .                        # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +if [ -f /etc/bacula/bacula-fd.conf ]; then +    cp /etc/bacula/bacula-fd.conf /etc/bacula/bacula-fd.conf.new +fi +if [ ! -d /var/bacula/working ]; then +    mkdir -p /var/bacula/working +fi +restore_backup ${NAME} +# create startlinks +ln -sf ../init.d/bacula /etc/rc.d/rc0.d/K35bacula +ln -sf ../init.d/bacula /etc/rc.d/rc3.d/S65bacula +ln -sf ../init.d/bacula /etc/rc.d/rc6.d/K35bacula +start_service ${NAME} +exit 0 diff --git a/src/paks/bacula/uninstall.sh b/src/paks/bacula/uninstall.sh new file mode 100644 index 000000000..762bb103c --- /dev/null +++ b/src/paks/bacula/uninstall.sh @@ -0,0 +1,33 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall.                                # +# # +# IPFire is free software; you can redistribute it and/or modify           # +# it under the terms of the GNU General Public License as published by     # +# the Free Software Foundation; either version 2 of the License, or        # +# (at your option) any later version.                                      # +# # +# IPFire is distributed in the hope that it will be useful,                # +# but WITHOUT ANY WARRANTY; without even the implied warranty of           # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            # +# GNU General Public License for more details.                             # +# # +# You should have received a copy of the GNU General Public License        # +# along with IPFire; if not, write to the Free Software                    # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team .                        # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +# Remove bacula-fd.conf.new file and /var/bacula/ directory +rm -rf /etc/bacula/bacula-fd.conf.new +rm -r /var/bacula +remove_files +# Remove all start links. +rm -rf /etc/rc.d/rc*.d/*bacula +exit 0 diff --git a/src/paks/bacula/update.sh b/src/paks/bacula/update.sh new file mode 100644 index 000000000..89c40d0d7 --- /dev/null +++ b/src/paks/bacula/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall.                                # +# # +# IPFire is free software; you can redistribute it and/or modify           # +# it under the terms of the GNU General Public License as published by     # +# the Free Software Foundation; either version 2 of the License, or        # +# (at your option) any later version.                                      # +# # +# IPFire is distributed in the hope that it will be useful,                # +# but WITHOUT ANY WARRANTY; without even the implied warranty of           # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            # +# GNU General Public License for more details.                             # +# # +# You should have received a copy of the GNU General Public License        # +# along with IPFire; if not, write to the Free Software                    # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team .                        # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh