git: cc9eff0a8439 - main - sysutils/bareos-*: Update to 24.0.7
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 18 Nov 2025 04:26:50 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=cc9eff0a84393a2cd04c87fe3f259fad0666dce6
commit cc9eff0a84393a2cd04c87fe3f259fad0666dce6
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-11-18 04:23:17 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-11-18 04:26:43 +0000
sysutils/bareos-*: Update to 24.0.7
ChangeLog at: https://github.com/bareos/bareos/releases/tag/Release%2F24.0.7
PR: 285213 290167
Reported by: ohartmann __at__ walstatt.org
Reported by: stewart+FreeBSD-BugZilla __at__ arnos-vale.net
Reported by: vrurg __at__ lflat.org
Reported by: fluffy
---
sysutils/bareos-server/Makefile | 16 ++++++++-----
sysutils/bareos-server/Makefile.common | 2 +-
sysutils/bareos-server/distinfo | 6 ++---
sysutils/bareos-server/files/bareos-dir.in | 2 +-
.../patch-core-src-plugins-stored_CMakeLists.txt | 26 ++++++++++++++--------
sysutils/bareos-server/pkg-plist | 2 +-
sysutils/bareos-server/pkg-plist.client | 5 +++++
www/bareos-webui/Makefile | 6 ++++-
8 files changed, 44 insertions(+), 21 deletions(-)
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index f109028e694e..bc28c49d2216 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,7 +1,7 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
-DISTVERSION= 24.0.5
-PORTREVISION?= 1
+DISTVERSION= 24.0.7
+PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server
@@ -20,9 +20,11 @@ BUILD_DEPENDS+= utf8cpp>0:devel/utf8cpp \
xxhash>0:devel/xxhash \
tl-expected>0:devel/tl-expected \
cli11>0:devel/cli11
+RUN_DEPENDS= bash:shells/bash
LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
libjansson.so:devel/jansson \
- libfmt.so:devel/libfmt
+ libfmt.so:devel/libfmt \
+ libxxhash.so:devel/xxhash
USES+= cmake compiler:c++11-lang cpe localbase:ldflags perl5 pkgconfig readline \
shebangfix
@@ -35,8 +37,8 @@ GROUPS= ${USERS}
PLIST_SUB+= LIB_VERSION=${PORTVERSION}
USE_LDCONFIG= yes
-SHEBANG_LANG= perl python
-SHEBANG_GLOB= *.py
+SHEBANG_LANG= bash perl python
+SHEBANG_GLOB= *.sh *.py
SHEBANG_FILES= ${WRKSRC}/contrib/misc/bsmc/bin/bsmc
CPPFLAGS+= -I${LOCALBASE}/readline
@@ -200,6 +202,10 @@ post-patch:
@${REINPLACE_CMD} -e 's|enable_testing()||g' ${WRKSRC}/CMakeLists.txt
.endif
+ @${REINPLACE_CMD} -e 's/CMAKE_INSTALL_FULL_DATAROOTDIR/CMAKE_INSTALL_DATAROOTDIR/g' \
+ ${WRKSRC}/cmake/BareosSetVariableDefaults.cmake \
+ ${WRKSRC}/webui/CMakeLists.txt
+
post-extract:
.if defined(WITH_CLIENT_ONLY)
. if defined(PYTHON_PLUGIN)
diff --git a/sysutils/bareos-server/Makefile.common b/sysutils/bareos-server/Makefile.common
index 712690fbbe33..625deddecd77 100644
--- a/sysutils/bareos-server/Makefile.common
+++ b/sysutils/bareos-server/Makefile.common
@@ -2,7 +2,7 @@ post-patch:
.if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6")
@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
@${REINPLACE_CMD} -e 's|\@bindir\@|${LOCALBASE}/bin|g' ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop.in
- @${REINPLACE_CMD} '206d' ${WRKSRC}/CMakeLists.txt
+ @${REINPLACE_CMD} '207d' ${WRKSRC}/CMakeLists.txt
.endif
post-extract:
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index 380d2053987e..bd824df4c983 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1759972761
-SHA256 (bareos-bareos-Release-24.0.5_GH0.tar.gz) = 52bbd9cde1c8a2e7fe7c00fb41215e5add112607de7a2ca77677a28752e7a8d7
-SIZE (bareos-bareos-Release-24.0.5_GH0.tar.gz) = 13392425
+TIMESTAMP = 1763416571
+SHA256 (bareos-bareos-Release-24.0.7_GH0.tar.gz) = ae60d17114f1b9081314d002186fd538c108972c332287f381cff0f63c1b22a1
+SIZE (bareos-bareos-Release-24.0.7_GH0.tar.gz) = 13402073
diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in
index 658865b50b67..875bf87066a9 100644
--- a/sysutils/bareos-server/files/bareos-dir.in
+++ b/sysutils/bareos-server/files/bareos-dir.in
@@ -42,7 +42,7 @@ bareos_start_precmd() {
bareos_dir_configtest() {
echo "Performing sanity check on ${bareos_dir_config} configuration:"
- eval ${command} -t
+ eval ${command} -c ${bareos_dir_config} -t
}
bareos_dir_reload() {
diff --git a/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt
index 35853f9c59bf..9d0c9f02dc58 100644
--- a/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt
@@ -1,15 +1,23 @@
---- core/src/plugins/stored/CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800
-+++ core/src/plugins/stored/CMakeLists.txt 2024-12-22 19:50:39.154511000 -0800
-@@ -33,6 +33,12 @@
- endif()
- endif()
+--- core/src/plugins/stored/CMakeLists.txt 2025-09-02 01:09:07.000000000 -0700
++++ core/src/plugins/stored/CMakeLists.txt 2025-11-17 13:54:37.845349000 -0800
+@@ -16,6 +16,7 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ # 02110-1301, USA.
++include(BareosPlugins)
+ message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
+ if(HAVE_WIN32)
+@@ -31,6 +32,12 @@
+ # work around https://bugs.python.org/issue4709
+ add_definitions(-DMS_WIN64)
+ endif()
++endif()
++
+if(HAVE_FREEBSD_OS)
+ include_directories(
+ ${PROJECT_SOURCE_DIR}/src/fastlz/include
+ )
-+endif()
-+
- if(ENABLE_PYTHON)
- add_subdirectory(python)
endif()
+
+ if(ENABLE_PYTHON)
diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist
index bf0908378390..7a204918ed0d 100644
--- a/sysutils/bareos-server/pkg-plist
+++ b/sysutils/bareos-server/pkg-plist
@@ -32,7 +32,7 @@ bin/bwild
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/dplcompat.conf.sample
-@comment @sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/FileStorage.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample
%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample
diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client
index 70fe4f60105d..b2bf482bebdd 100644
--- a/sysutils/bareos-server/pkg-plist.client
+++ b/sysutils/bareos-server/pkg-plist.client
@@ -41,6 +41,9 @@ bin/bconsole
%%PYTHON%%lib/bareos/plugins/bareos_tasks/LICENSE.md
%%PYTHON%%lib/bareos/plugins/bareos_tasks/README.md
%%PYTHON%%lib/bareos/plugins/bareos_tasks/__init__.py
+%%PYTHON%%lib/bareos/plugins/bareos_tasks/mariadb/BareosFdMariaDBClass.py
+%%PYTHON%%lib/bareos/plugins/bareos_tasks/mariadb/README.md
+%%PYTHON%%lib/bareos/plugins/bareos_tasks/mariadb/__init__.py
%%PYTHON%%lib/bareos/plugins/bareos_tasks/mysql/BareosFdMySQLClass.py
%%PYTHON%%lib/bareos/plugins/bareos_tasks/mysql/README.md
%%PYTHON%%lib/bareos/plugins/bareos_tasks/mysql/__init__.py
@@ -55,6 +58,8 @@ bin/bconsole
%%PYTHON%%lib/bareos/plugins/bareos_tasks/xenserver/__init__.py
lib/bareos/plugins/bpipe-fd.so
%%GFAPI%%lib/bareos/plugins/gfapi-fd.so
+%%PYTHON%%lib/bareos/plugins/mariadb-dump/README.md
+%%PYTHON%%lib/bareos/plugins/mariadb-dump/bareos-fd-mariadb-dump.py
%%PYTHON%%lib/bareos/plugins/openvz7/BareosFdPluginVz7CtFs.py
%%PYTHON%%lib/bareos/plugins/openvz7/README.md
%%PYTHON%%lib/bareos/plugins/openvz7/bareos-fd-vz7_ct_fs.py
diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index ff7d66f19472..25f234446a94 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
-DISTVERSION= 24.0.5
+DISTVERSION= 24.0.7
CATEGORIES?= www sysutils
PKGNAMESUFFIX= -webui
@@ -41,6 +41,10 @@ ETCDIRWEBUI= etc/${PORTNAME}${PKGNAMESUFFIX}
post-extract:
${FIND} ${WRKSRC}/webui -name .gitignore -delete
+post-patch:
+ @${REINPLACE_CMD} -e 's/CMAKE_INSTALL_FULL_DATAROOTDIR/CMAKE_INSTALL_DATAROOTDIR/g' \
+ ${WRKSRC}/webui/CMakeLists.txt
+
pre-install:
${FIND} ${WRKSRC}/webui -name *.in -delete