This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via d3ea3e932fc7f59a0c88806b3092bd3d5fe2704f (commit) via 7cb0220f4a91af2d227d08a1b60538444337f3e6 (commit) from 0bb5687fb7b4a29aee5bcec25acda37b701f2115 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit d3ea3e932fc7f59a0c88806b3092bd3d5fe2704f Author: Adolf Belka adolf.belka@ipfire.org Date: Mon May 6 18:58:20 2024 +0200
bacula: Update to version 13.0.4
- Update from version 11.0.6 to 13.0.4 - Update of rootfile - Version 13.x has now been released for 12 months so updating the File Daemon to 13.x should be good. - Version 11.x was released 40 months ago. - Changelog The changes are all related to the Director and the Storage Daemon. The changelog states that older file daemons "should" be compatible with 13.x DIR & SD. This change ensures IPfire "is" compatible with the 13.x DIR & SD.
Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 7cb0220f4a91af2d227d08a1b60538444337f3e6 Author: Adolf Belka adolf.belka@ipfire.org Date: Sat May 4 15:05:20 2024 +0200
update.sh: Add SPAMHAUS_DROP if SPAMHAUS_EDROP was previously used
- I realised that the previous patch for update.sh related to the ipblocklist removal of ALIENVAULT and SPAMHAUS_EDROP only removed the SPAMHAUS_EDROP setting. It makes sense to add SPAMHAUS_DROP to the settings file if SPAMHAUS_EDROP was previously used and SPAMHAUS_DROP was not selected. - This patch adds the above change.
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/186/update.sh | 4 ++++ config/rootfiles/packages/bacula | 6 +++--- lfs/bacula | 8 ++++---- 3 files changed, 11 insertions(+), 7 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/186/update.sh b/config/rootfiles/core/186/update.sh index 444b041a4..5d7add89f 100644 --- a/config/rootfiles/core/186/update.sh +++ b/config/rootfiles/core/186/update.sh @@ -141,6 +141,7 @@ fi
# Remove any entry for ALIENVAULT or SPAMHAUS_EDROP from the ipblocklist modified file # and the associated ipblocklist files from the /var/lib/ipblocklist directory +# If SPAMHAUS_EDROP was used and SPAMHAUS_DROP not used then add SPAMHAUS_DROP to settings file sed -i '/ALIENVAULT=/d' /var/ipfire/ipblocklist/modified sed -i '/SPAMHAUS_EDROP=/d' /var/ipfire/ipblocklist/modified if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then @@ -148,6 +149,9 @@ if [ -e /var/lib/ipblocklist/ALIENVAULT.conf ]; then fi if [ -e /var/lib/ipblocklist/SPAMHAUS_EDROP.conf ]; then rm /var/lib/ipblocklist/SPAMHAUS_EDROP.conf + if [ ! -e /var/lib/ipblocklist/SPAMHAUS_DROP.conf ]; then + echo "SPAMHAUS_DROP=on" >> /var/ipfire/ipblocklist/settings + fi fi
# This update needs a reboot... diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula index 2a092cccd..0a3f3b3f7 100644 --- a/config/rootfiles/packages/bacula +++ b/config/rootfiles/packages/bacula @@ -21,13 +21,13 @@ etc/rc.d/init.d/bacula #opt/bacula #opt/bacula/log #usr/lib/bpipe-fd.so -usr/lib/libbac-11.0.6.so +usr/lib/libbac-13.0.4.so #usr/lib/libbac.la usr/lib/libbac.so -usr/lib/libbaccfg-11.0.6.so +usr/lib/libbaccfg-13.0.4.so #usr/lib/libbaccfg.la usr/lib/libbaccfg.so -usr/lib/libbacfind-11.0.6.so +usr/lib/libbacfind-13.0.4.so #usr/lib/libbacfind.la usr/lib/libbacfind.so #usr/sbin/bacula diff --git a/lfs/bacula b/lfs/bacula index 5fb085a61..f2a794a29 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ include Config
SUMMARY = Enterprise-ready Network Backup Software
-VER = 11.0.6 +VER = 13.0.4
THISAPP = bacula-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bacula -PAK_VER = 12 +PAK_VER = 13
DEPS =
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_BLAKE2 = 60b1c1f4de3cef7470f0f33aa9d361393cee176222bb911d93bac108b8e3a6e38d73acdcc8b773a06d8820039d2e12a4216a5773a4fab4a9c35095607bd6b7c6 +$(DL_FILE)_BLAKE2 = e54a754280178f74f97fdbb3c91a596b632d80739fedd5f847d183f0852ea9e82bba55ad9a745ee1ceb945bd527d33b117bc3c866783bd3073166bd20607a72a
install : $(TARGET)
hooks/post-receive -- IPFire 2.x development tree