git: 679e84dff509 - main - sysutils/bareos-*: Update to 25.0.1
Date: Sat, 27 Dec 2025 23:21:14 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=679e84dff509c06ee7e3de4bcb8b5d926f2eb340
commit 679e84dff509c06ee7e3de4bcb8b5d926f2eb340
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-12-27 23:18:53 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-12-27 23:21:05 +0000
sysutils/bareos-*: Update to 25.0.1
- Remove GPAPI options
- Add export PATH to bareos-dir rc script
ChangeLog at: https://github.com/bareos/bareos/releases
PR: 243102 291824
---
sysutils/bareos-client/Makefile | 6 +-
sysutils/bareos-server/Makefile | 22 +-
sysutils/bareos-server/Makefile.common | 18 +-
sysutils/bareos-server/distinfo | 6 +-
sysutils/bareos-server/files/bareos-dir.in | 2 +
sysutils/bareos-server/files/patch-CMakeLists.txt | 11 +-
.../files/patch-cmake_BareosCcache.cmake | 12 +-
.../files/patch-contrib-misc-bsmc_CMakeLists.txt | 11 -
.../patch-contrib-misc-media__vault_CMakeLists.txt | 42 +
.../bareos-server/files/patch-core-CMakeLists.txt | 43 +-
.../patch-core-cmake_BareosCheckIncludes.cmake | 12 -
..._BareosDetermineHaveLowLevelScsiInterface.cmake | 11 +
.../patch-core-cmake_BareosFindAllLibraries.cmake | 12 -
.../files/patch-core-scripts_CMakeLists.txt | 40 +-
.../files/patch-core-src-cats_CMakeLists.txt | 11 +
.../files/patch-core-src-dird_CMakeLists.txt | 24 +-
.../patch-core-src-qt-tray-monitor_CMakeLists.txt | 51 +-
.../files/patch-core-src-stored_CMakelists.txt | 32 +-
.../files/patch-core-src-tools_CMakeLists.txt | 14 +-
.../files/patch-core-src_CMakeLists.txt | 65 +-
sysutils/bareos-server/pkg-plist | 17 +-
sysutils/bareos-server/pkg-plist.client | 24 +-
sysutils/bareos-traymonitor/Makefile | 27 +-
sysutils/py-python-bareos/Makefile | 2 +-
sysutils/py-python-bareos/distinfo | 6 +-
www/bareos-webui/Makefile | 4 +-
www/bareos-webui/distinfo | 6 +-
www/bareos-webui/pkg-descr | 5 +-
www/bareos-webui/pkg-plist | 3874 +++++++++-----------
29 files changed, 2020 insertions(+), 2390 deletions(-)
diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile
index aafc3ed4bc6d..0fffa0c9483c 100644
--- a/sysutils/bareos-client/Makefile
+++ b/sysutils/bareos-client/Makefile
@@ -6,7 +6,7 @@ PKGNAMESUFFIX= -client
COMMENT= Backup archiving recovery open sourced (client)
-CONFLICTS= bareos20-client bareos21-client bareos22-client bareos23-client
+CONFLICTS= bareos22-client bareos23-client bareos24-client
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bareos-fd
@@ -14,10 +14,6 @@ USE_RC_SUBR= bareos-fd
PLIST= ${PKGDIR}/pkg-plist.client
MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server
-OPTIONS_GROUP= PLUGINS
-OPTIONS_GROUP_PLUGINS= GFAPI
OPTIONS_DEFINE= NLS PYTHON SCSICRYPTO
-GFAPI_DESC= GFAPI fd plugin support
-
.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index bc28c49d2216..bfba09577cc5 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
-DISTVERSION= 24.0.7
+DISTVERSION= 25.0.1
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
@@ -13,7 +13,7 @@ WWW= https://www.bareos.org/
LICENSE= AGPLv3 LGPL3
LICENSE_COMB= multi
-CONFLICTS?= bareos20-server bareos21-server bareos22-server bareos23-server
+CONFLICTS?= bareos22-server bareos23-server bareos24-server
BUILD_DEPENDS+= utf8cpp>0:devel/utf8cpp \
microsoft-gsl>0:devel/microsoft-gsl \
@@ -53,15 +53,12 @@ NDMP_DESC= Enable build of NDMP support
SCSICRYPTO_DESC= Build LTO AME crypto plugin
.if ${PKGNAMESUFFIX} == "-server"
-OPTIONS_GROUP= BACKENDS
-OPTIONS_GROUP_BACKENDS= GFAPI
OPTIONS_DEFINE= MTX PYTHON LMDB NDMP NLS SCSICRYPTO
OPTIONS_DEFAULT+= LMDB PGSQL SCSICRYPTO
OPTIONS_SINGLE_DATABASE= PGSQL
OPTIONS_SINGLE+= DATABASE
BACKENDS_DESC= Storage backends
DATABASE_DESC= Database support
-GFAPI_DESC= GFAPI backend support
LMDB_DESC= Enable faster accurate backup support
NDMP_CMAKE_ON= -Dndmp=ON
@@ -117,7 +114,8 @@ CMAKE_ARGS+= -Dtcp-wrappers=ON \
-Dsbin-perm=755 \
-Ddb_user=bareos \
-Dbaseport=9101 \
- -Dpiddir=/var/run/bareos
+ -Dpiddir=/var/run/bareos \
+ -Dlocalbase=${LOCALBASE}
.if defined(WITH_CLIENT_ONLY)
CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
@@ -155,8 +153,6 @@ SUB_LIST= BAREOS_USER=${BAREOS_USER} \
NLS_USES= gettext
NLS_CMAKE_ON= -Dnls=ON
-GFAPI_CMAKE_ON= -Dgfapi=ON
-GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs
# Client only or full server version
.if defined(WITH_CLIENT_ONLY)
@@ -215,8 +211,14 @@ post-extract:
.endif
@${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \
${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf'
- @${MV} ${WRKSRC}/contrib/misc/bsmc/etc/bareos/bsmc.conf \
- ${WRKSRC}/contrib/misc/bsmc/etc/bareos/bsmc.conf.sample
+ @${MV} ${WRKSRC}/contrib/misc/media_vault/media_vault.ini.example.in \
+ ${WRKSRC}/contrib/misc/media_vault/media_vault.ini.in
+ @${MV} ${WRKSRC}/contrib/misc/media_vault/job_admin-media_vault.conf.example.in \
+ ${WRKSRC}/contrib/misc/media_vault/job_admin-media_vault.conf.in
+ @${MV} ${WRKSRC}/contrib/misc/media_vault/console_media_vault.conf.example \
+ ${WRKSRC}/contrib/misc/media_vault/console_media_vault.conf
+ @${MV} ${WRKSRC}/contrib/misc/media_vault/profile_media_vault.conf.example \
+ ${WRKSRC}/contrib/misc/media_vault/profile_media_vault.conf
.if !target(post-install)
post-install:
diff --git a/sysutils/bareos-server/Makefile.common b/sysutils/bareos-server/Makefile.common
index 625deddecd77..d818daabe6be 100644
--- a/sysutils/bareos-server/Makefile.common
+++ b/sysutils/bareos-server/Makefile.common
@@ -1,12 +1,12 @@
post-patch:
-.if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6")
+.if ${PKGNAMESUFFIX} == "-traymonitor"
@${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} '207d' ${WRKSRC}/CMakeLists.txt
+ @${REINPLACE_CMD} '217d' ${WRKSRC}/CMakeLists.txt
.endif
post-extract:
-.if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6")
+.if ${PKGNAMESUFFIX} == "-traymonitor"
@${MV} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/client/FileDaemon-local.conf.in \
${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/client/FileDaemon-local.conf
@${MV} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/director/Director-local.conf.in \
@@ -15,6 +15,14 @@ post-extract:
${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/monitor/bareos-mon.conf
@${MV} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf.in \
${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf
+ @${MV} ${WRKSRC}/contrib/misc/media_vault/media_vault.ini.example.in \
+ ${WRKSRC}/contrib/misc/media_vault/media_vault.ini.in
+ @${MV} ${WRKSRC}/contrib/misc/media_vault/job_admin-media_vault.conf.example.in \
+ ${WRKSRC}/contrib/misc/media_vault/job_admin-media_vault.conf.in
+ @${MV} ${WRKSRC}/contrib/misc/media_vault/console_media_vault.conf.example \
+ ${WRKSRC}/contrib/misc/media_vault/console_media_vault.conf
+ @${MV} ${WRKSRC}/contrib/misc/media_vault/profile_media_vault.conf.example \
+ ${WRKSRC}/contrib/misc/media_vault/profile_media_vault.conf
.endif
post-build:
@@ -23,7 +31,7 @@ post-build:
.endif
pre-install:
-.if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6")
+.if (${PKGNAMESUFFIX} == "-traymonitor")
. for d in client director monitor storage
${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}
${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \;
@@ -40,7 +48,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static
${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static
.endif
-.if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6")
+.if (${PKGNAMESUFFIX} == "-traymonitor")
# Install config files and preserve existing ones
.for d in client director monitor storage
${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index bd824df4c983..e0c15bad5003 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1763416571
-SHA256 (bareos-bareos-Release-24.0.7_GH0.tar.gz) = ae60d17114f1b9081314d002186fd538c108972c332287f381cff0f63c1b22a1
-SIZE (bareos-bareos-Release-24.0.7_GH0.tar.gz) = 13402073
+TIMESTAMP = 1766038737
+SHA256 (bareos-bareos-Release-25.0.1_GH0.tar.gz) = b44c481ddf1cfdf603e1b1fc1c4e4a120d5a0e9f34f781c90b1c487fc4716f27
+SIZE (bareos-bareos-Release-25.0.1_GH0.tar.gz) = 12308189
diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in
index 875bf87066a9..271e2050a9b8 100644
--- a/sysutils/bareos-server/files/bareos-dir.in
+++ b/sysutils/bareos-server/files/bareos-dir.in
@@ -20,6 +20,8 @@ rcvar=${name}_enable
load_rc_config $name
+export PATH="${PATH}:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin"
+
: ${bareos_dir_enable="NO"}
: ${bareos_dir_flags="-u bareos -g bareos -v"}
: ${bareos_dir_config="%%PREFIX%%/etc/bareos/"}
diff --git a/sysutils/bareos-server/files/patch-CMakeLists.txt b/sysutils/bareos-server/files/patch-CMakeLists.txt
index 4404b90a2c50..ef19e667f692 100644
--- a/sysutils/bareos-server/files/patch-CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800
-+++ CMakeLists.txt 2024-12-31 23:52:42.840766000 -0800
-@@ -202,11 +202,8 @@
+--- CMakeLists.txt.orig 2025-12-04 05:19:30.000000000 -0800
++++ CMakeLists.txt 2025-12-17 22:33:08.301699000 -0800
+@@ -220,13 +220,9 @@
if(ENABLE_WEBUI)
add_subdirectory(webui)
endif()
@@ -8,7 +8,10 @@
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
- add_subdirectory(contrib)
- endif()
-- add_subdirectory(systemtests)
+- if(ENABLE_SYSTEMTESTS)
+- add_subdirectory(systemtests)
+- endif()
++
+ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+ add_subdirectory(contrib)
endif()
diff --git a/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake b/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake
index d8b63ec3265e..f6f95a15fdb2 100644
--- a/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake
+++ b/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake
@@ -1,11 +1,15 @@
---- cmake/BareosCcache.cmake 2024-12-31 23:51:38.882883000 -0800
-+++ cmake/BareosCcache.cmake 2024-12-31 23:51:48.133339000 -0800
-@@ -20,9 +20,6 @@
+--- cmake/BareosCcache.cmake 2025-12-04 05:19:30.000000000 -0800
++++ cmake/BareosCcache.cmake 2025-12-17 22:35:19.935427000 -0800
+@@ -20,13 +20,6 @@
find_program(CCACHE_PROGRAM ccache)
if(CCACHE_PROGRAM)
set(CCACHE_CMDLINE "${CCACHE_PROGRAM}")
- list(APPEND CCACHE_CMDLINE "base_dir=${CMAKE_SOURCE_DIR}")
-- list(APPEND CCACHE_CMDLINE "hash_dir=true")
+- if(CCACHE_MAY_HASHDIR)
+- list(APPEND CCACHE_CMDLINE "hash_dir=true")
+- else()
+- list(APPEND CCACHE_CMDLINE "hash_dir=false")
+- endif()
- list(APPEND CCACHE_CMDLINE "namespace=bareos")
set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_CMDLINE}")
set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_CMDLINE}")
diff --git a/sysutils/bareos-server/files/patch-contrib-misc-bsmc_CMakeLists.txt b/sysutils/bareos-server/files/patch-contrib-misc-bsmc_CMakeLists.txt
deleted file mode 100644
index 2074cf886be9..000000000000
--- a/sysutils/bareos-server/files/patch-contrib-misc-bsmc_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/misc/bsmc/CMakeLists.txt 2023-04-07 17:32:44.243346000 -0500
-+++ contrib/misc/bsmc/CMakeLists.txt 2023-04-07 17:33:04.594841000 -0500
-@@ -27,7 +27,7 @@
- )
-
- install(
-- FILES etc/bareos/bsmc.conf
-+ FILES etc/bareos/bsmc.conf.sample
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
- DESTINATION "${confdir}"
- )
diff --git a/sysutils/bareos-server/files/patch-contrib-misc-media__vault_CMakeLists.txt b/sysutils/bareos-server/files/patch-contrib-misc-media__vault_CMakeLists.txt
new file mode 100644
index 000000000000..54c151fdd144
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-contrib-misc-media__vault_CMakeLists.txt
@@ -0,0 +1,42 @@
+--- contrib/misc/media_vault/CMakeLists.txt 2025-12-18 20:20:59.404384000 -0800
++++ contrib/misc/media_vault/CMakeLists.txt 2025-12-18 20:33:03.264603000 -0800
+@@ -36,8 +36,8 @@
+ bareos_configure_file(
+ FILES
+ media_vault.sh.in
+- media_vault.ini.example.in
+- job_admin-media_vault.conf.example.in
++ media_vault.ini.in
++ job_admin-media_vault.conf.in
+ )
+
+ install(
+@@ -56,24 +56,24 @@
+
+ install(
+ CODE "
+- bareos_install_single_config_file(\"${CMAKE_CURRENT_BINARY_DIR}/media_vault.ini.example\" \"${configtemplatedir}\" \"\")
++ bareos_install_single_config_file(\"${CMAKE_CURRENT_BINARY_DIR}/media_vault.ini\" \"${configtemplatedir}\" \"\")
+ "
+ )
+
+ install(
+ CODE "
+- bareos_install_single_config_file(\"${CMAKE_CURRENT_SOURCE_DIR}/console_media_vault.conf.example\" \"${configtemplatedir}\" \"bareos-dir.d/console\")
++ bareos_install_single_config_file(\"${CMAKE_CURRENT_SOURCE_DIR}/console_media_vault.conf\" \"${configtemplatedir}\" \"bareos-dir.d/console\")
+ "
+ )
+
+ install(
+ CODE "
+- bareos_install_single_config_file(\"${CMAKE_CURRENT_BINARY_DIR}/job_admin-media_vault.conf.example\" \"${configtemplatedir}\" \"bareos-dir.d/job\")
++ bareos_install_single_config_file(\"${CMAKE_CURRENT_BINARY_DIR}/job_admin-media_vault.conf\" \"${configtemplatedir}\" \"bareos-dir.d/job\")
+ "
+ )
+
+ install(
+ CODE "
+- bareos_install_single_config_file(\"${CMAKE_CURRENT_SOURCE_DIR}/profile_media_vault.conf.example\" \"${configtemplatedir}\" \"bareos-dir.d/profile\")
++ bareos_install_single_config_file(\"${CMAKE_CURRENT_SOURCE_DIR}/profile_media_vault.conf\" \"${configtemplatedir}\" \"bareos-dir.d/profile\")
+ "
+ )
diff --git a/sysutils/bareos-server/files/patch-core-CMakeLists.txt b/sysutils/bareos-server/files/patch-core-CMakeLists.txt
index 136514c20b69..4d5c3123ae2f 100644
--- a/sysutils/bareos-server/files/patch-core-CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-CMakeLists.txt
@@ -1,28 +1,16 @@
---- core/CMakeLists.txt 2023-12-13 17:44:47.000000000 -0500
-+++ core/CMakeLists.txt 2024-01-10 01:25:40.807505000 -0500
-@@ -333,7 +333,9 @@
+--- core/CMakeLists.txt.orig 2025-12-04 05:19:30.000000000 -0800
++++ core/CMakeLists.txt 2025-12-27 00:25:56.520747000 -0800
+@@ -255,7 +255,9 @@
set(HAVE_FREEBSD_OS 1)
- include_directories(/usr/local/include)
+ include_directories(SYSTEM /usr/local/include)
link_directories(/usr/local/lib)
-- link_libraries(intl)
-+ if(nls)
-+ link_libraries(intl)
-+ endif()
++if(nls)
+ link_libraries(intl)
++endif()
check_cxx_compiler_flag(
-Wunused-but-set-variable compiler_will_warn_of_unused_but_set_variable
)
-@@ -386,7 +388,9 @@
- add_definitions("-D_FILE_OFFSET_BITS=64")
- endif()
-
--include(FindIntl)
-+if(nls)
-+ include(FindIntl)
-+endif()
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra")
-@@ -400,7 +404,7 @@
+@@ -333,7 +335,7 @@
include(BareosFindStaticCodeAnalysisTools)
if(NOT client-only
@@ -31,9 +19,20 @@
AND CMAKE_SIZEOF_VOID_P EQUAL 8
)
# droplet does not build on solaris because of sys/cdefs.h: No such file or
-@@ -777,7 +781,6 @@
+@@ -407,7 +409,9 @@
- include(BareosConfigureFile)
+ include(BareosCheckSymbols)
+
+-include(BareosDetermineHaveLowLevelScsiInterface)
++if(scsi-crypto)
++ include(BareosDetermineHaveLowLevelScsiInterface)
++endif()
+
+ include(acltypes)
+
+@@ -676,7 +680,6 @@
+ GLOB_RECURSE "${CMAKE_CURRENT_SOURCE_DIR}/src/defaultconfigs/*" COPY
+ )
-add_subdirectory(platforms)
add_subdirectory(src)
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake
deleted file mode 100644
index c43a68df2c25..000000000000
--- a/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- core/cmake/BareosCheckIncludes.cmake.orig 2024-12-16 09:10:50.000000000 -0800
-+++ core/cmake/BareosCheckIncludes.cmake 2024-12-22 19:21:38.094235000 -0800
-@@ -62,7 +62,9 @@
-
- include(CheckSymbolExists)
-
-+if(gfapi)
- check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H)
-+endif()
-
- check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H)
-
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosDetermineHaveLowLevelScsiInterface.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosDetermineHaveLowLevelScsiInterface.cmake
new file mode 100644
index 000000000000..9029ae16ea28
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core-cmake_BareosDetermineHaveLowLevelScsiInterface.cmake
@@ -0,0 +1,11 @@
+--- core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake 2025-12-18 20:01:29.947071000 -0800
++++ core/cmake/BareosDetermineHaveLowLevelScsiInterface.cmake 2025-12-18 20:01:40.919760000 -0800
+@@ -53,7 +53,7 @@
+ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+ if("${HAVE_CAMLIB_H}" AND "${HAVE_CAM_SCSI_SCSI_MESSAGE_H}")
+ set(HAVE_LOWLEVEL_SCSI_INTERFACE 1)
+- target_link_libraries(bareos-low-level-scsi PRIVATE cam)
++ target_link_libraries(bareos-low-level-scsi INTERFACE cam)
+ else()
+ set(HAVE_LOWLEVEL_SCSI_INTERFACE 0)
+ message(
diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
deleted file mode 100644
index 40bcee0e6b50..000000000000
--- a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake
+++ /dev/null
@@ -1,12 +0,0 @@
---- core/cmake/BareosFindAllLibraries.cmake 2023-03-24 08:05:20.000000000 -0500
-+++ core/cmake/BareosFindAllLibraries.cmake 2023-04-05 16:21:00.503424000 -0500
-@@ -177,7 +177,9 @@
-
- bareosfindlibraryandheaders("pthread" "pthread.h" "")
- bareosfindlibraryandheaders("cap" "sys/capability.h" "")
-+if(gfapi)
- bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "")
-+endif()
-
- bareosfindlibraryandheaders("pam" "security/pam_appl.h" "")
-
diff --git a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
index 3dba2a2e1430..6c8c69148bd6 100644
--- a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
@@ -1,7 +1,7 @@
---- core/scripts/CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800
-+++ core/scripts/CMakeLists.txt 2024-12-22 19:45:34.147106000 -0800
-@@ -34,14 +34,14 @@
- mtx-changer.in
+--- core/scripts/CMakeLists.txt 2025-12-04 05:19:30.000000000 -0800
++++ core/scripts/CMakeLists.txt 2025-12-17 23:21:00.429268000 -0800
+@@ -31,37 +31,37 @@
+ mtx-logrotate.in
)
-install(
@@ -10,23 +10,6 @@
- WORLD_READ WORLD_EXECUTE
- DESTINATION "${sbindir}"
-)
--if(NOT client-only)
-+if(client-only)
- install(
-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/btraceback
-+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
-+ WORLD_READ WORLD_EXECUTE
-+ DESTINATION "${sbindir}"
-+ )
-+ install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
- WORLD_READ WORLD_EXECUTE
-@@ -61,32 +61,34 @@
- WORLD_READ WORLD_EXECUTE
- DESTINATION "${scriptdir}"
- )
--endif()
-install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos-config-lib.sh btraceback.gdb
- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
@@ -39,16 +22,21 @@
- DESTINATION "${scriptdir}"
-)
-if(NOT client-only)
-+
++if(client-only)
install(
-- FILES bareos-ctl-funcs btraceback.dbx btraceback.mdb
+- FILES btraceback.dbx btraceback.mdb
++ FILES ${CMAKE_CURRENT_BINARY_DIR}/btraceback
++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++ WORLD_READ WORLD_EXECUTE
++ DESTINATION "${sbindir}"
++ )
++ install(
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos-config-lib.sh btraceback.gdb
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
DESTINATION "${scriptdir}"
)
-endif()
-if(TARGET python3-fd)
-+
install(
- FILES bareos_encode_string.py
+ FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos-config
@@ -56,13 +44,11 @@
WORLD_READ WORLD_EXECUTE
DESTINATION "${scriptdir}"
)
-+
+ install(
-+ FILES bareos-ctl-funcs btraceback.dbx btraceback.mdb
++ FILES btraceback.dbx btraceback.mdb
+ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+ DESTINATION "${scriptdir}"
+ )
-+
+ if(TARGET python3-fd)
+ install(
+ FILES bareos_encode_string.py
diff --git a/sysutils/bareos-server/files/patch-core-src-cats_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-cats_CMakeLists.txt
new file mode 100644
index 000000000000..2fc0e7317bf6
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core-src-cats_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- core/src/cats/CMakeLists.txt 2025-12-26 23:48:48.485670000 -0800
++++ core/src/cats/CMakeLists.txt 2025-12-26 23:45:40.019548000 -0800
+@@ -35,7 +35,7 @@
+ sql_update.cc
+ postgresql.cc
+ )
+-target_link_libraries(bareossql PUBLIC Bareos::Lib PostgreSQL::PostgreSQL)
++target_link_libraries(bareossql PRIVATE Bareos::Lib PostgreSQL::PostgreSQL)
+
+ set_target_properties(
+ bareossql PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}"
diff --git a/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
index 92b3686b93db..1beff6f89116 100644
--- a/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
@@ -1,20 +1,20 @@
---- core/src/dird/CMakeLists.txt 2023-12-13 17:44:47.000000000 -0500
-+++ core/src/dird/CMakeLists.txt 2024-01-10 01:43:08.391137000 -0500
-@@ -160,7 +160,7 @@
- target_sources(bareos-dir PRIVATE dird.cc)
+--- core/src/dird/CMakeLists.txt 2025-12-04 05:19:30.000000000 -0800
++++ core/src/dird/CMakeLists.txt 2025-12-17 23:24:01.816218000 -0800
+@@ -139,7 +139,7 @@
+ endif()
target_link_libraries(
-- bareos-dir PRIVATE dird_objects bareossql bareosfind CLI11::CLI11
-+ bareos-dir PRIVATE ${JANSSON_LIBRARIES} dird_objects bareossql bareosfind CLI11::CLI11
+- bareos-dir PRIVATE dird_objects Bareos::SQL Bareos::Findlib CLI11::CLI11
++ bareos-dir PRIVATE ${JANSSON_LIBRARIES} dird_objects Bareos::SQL Bareos::Findlib pthread CLI11::CLI11
)
- if(HAVE_WIN32)
-@@ -185,7 +185,7 @@
- add_executable(bareos-dbcheck ${DBCHKSRCS})
-
+ if(HAVE_NDMP)
+@@ -170,7 +170,7 @@
+ )
+ bareos_windows_resource(bareos-dbcheck dbcheckres.rc.in)
target_link_libraries(
-- bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES}
-+ bareos-dbcheck PRIVATE ${JANSSON_LIBRARIES} bareossql bareos bareosfind ${OPENSSL_LIBRARIES}
+- bareos-dbcheck PRIVATE Bareos::SQL Bareos::Lib Bareos::Findlib OpenSSL::SSL
++ bareos-dbcheck PRIVATE ${JANSSON_LIBRARIES} Bareos::SQL Bareos::Lib Bareos::Findlib OpenSSL::SSL
CLI11::CLI11
)
diff --git a/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt
index ae40c590a923..18d9c10036ac 100644
--- a/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt
@@ -1,33 +1,38 @@
---- core/src/qt-tray-monitor/CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800
-+++ core/src/qt-tray-monitor/CMakeLists.txt 2024-12-22 23:44:53.885128000 -0800
-@@ -28,22 +28,19 @@
- set(CMAKE_AUTOUIC ON)
- set(CMAKE_AUTORCC ON)
-
--find_package(Qt6 COMPONENTS Core Widgets)
--if(Qt6Widgets_FOUND)
-- message(STATUS "Found QT6Widgets")
-+if(bat-qt6)
-+ find_package(Qt6 COMPONENTS Core Widgets)
-+ if(Qt6Widgets_FOUND)
-+ message(STATUS "Found QT6Widgets")
-+ else()
-+ message(FATAL_ERROR "QT6Widgets NOT found, cannot build tray-monitor")
-+ endif()
+--- core/src/qt-tray-monitor/CMakeLists.txt 2025-12-04 05:19:30.000000000 -0800
++++ core/src/qt-tray-monitor/CMakeLists.txt 2025-12-17 23:29:03.682687000 -0800
+@@ -40,19 +40,7 @@
+ if(Qt6Widgets_FOUND)
+ message(STATUS "Found QT6Widgets")
else()
- message(STATUS "QT6Widgets NOT found, checking for Qt5 ...")
- find_package(Qt5 COMPONENTS Core Widgets)
- if(Qt5Widgets_FOUND)
- message(STATUS "Found QT5Widgets")
- else()
+- find_package(Qt5 QUIET COMPONENTS Core Widgets)
+- if(Qt5Widgets_FOUND)
+- message(STATUS "Found QT5Widgets")
+- else()
- message(STATUS "QT5Widgets NOT found, checking for Qt4 ...")
- find_package(Qt4)
- if(NOT Qt4_FOUND)
- message(
-- FATAL_ERROR "Both Qt5 and Qt4 not found, cannot build tray-monitor"
+- FATAL_ERROR "None of Qt6, Qt5 or Qt4 found, cannot build tray-monitor."
- )
- endif()
-+ message(STATUS "QT5Widgets NOT found, cannot build tray-monitor")
- endif()
+- endif()
++ message(STATUS "QT6Widgets NOT found ...")
+ endif()
+
+ if(HAVE_WIN32)
+@@ -82,14 +70,6 @@
endif()
+ target_link_libraries(bareos-tray-monitor PRIVATE Bareos::Lib CLI11::CLI11)
+-
+-if(TARGET Qt4::QtGui)
+- target_link_libraries(bareos-tray-monitor PRIVATE Qt4::QtGui)
+-endif()
+-
+-if(TARGET Qt5::Widgets)
+- target_link_libraries(bareos-tray-monitor PRIVATE Qt5::Widgets)
+-endif()
+
+ if(TARGET Qt6::Widgets)
+ target_link_libraries(bareos-tray-monitor PRIVATE Qt6::Widgets)
diff --git a/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt b/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt
index 1c64699cf173..f887fd52e3dd 100644
--- a/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt
@@ -1,20 +1,20 @@
---- core/src/stored/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500
-+++ core/src/stored/CMakeLists.txt 2023-04-05 16:36:35.928423000 -0500
-@@ -168,7 +168,7 @@
-
- target_link_libraries(stored_objects PRIVATE Threads::Threads)
- target_link_libraries(
-- bareos-sd PRIVATE stored_objects bareos bareossd bareosfind CLI11::CLI11
-+ bareos-sd PRIVATE ${JANSSON_LIBRARIES} stored_objects bareos bareossd bareosfind CLI11::CLI11
- )
-
- if(HAVE_WIN32)
-@@ -177,7 +177,7 @@
+--- core/src/stored/CMakeLists.txt 2025-12-04 05:19:30.000000000 -0800
++++ core/src/stored/CMakeLists.txt 2025-12-17 23:32:58.159045000 -0800
+@@ -122,7 +122,7 @@
endif()
+
if(HAVE_NDMP)
- target_link_libraries(stored_objects PRIVATE bareosndmp)
-- target_link_libraries(bareos-sd PRIVATE bareosndmp)
-+ target_link_libraries(bareos-sd PRIVATE ${JANSSON_LIBRARIES} bareosndmp)
+- target_link_libraries(stored_objects PRIVATE bareosndmp)
++ target_link_libraries(stored_objects PRIVATE ${JANSSON_LIBRARIES} bareosndmp)
endif()
- add_executable(bls ${BLSSRCS})
+ add_executable(bareos-sd stored.cc)
+@@ -133,7 +133,7 @@
+ target_link_libraries(bareos-sd PRIVATE comctl32)
+ endif()
+ target_link_libraries(
+- bareos-sd PRIVATE Bareos::SD Bareos::Lib Bareos::LibSD Bareos::Findlib
++ bareos-sd PRIVATE ${JANSSON_LIBRARIES} Bareos::SD Bareos::Lib Bareos::LibSD Bareos::Findlib pthread
+ CLI11::CLI11
+ )
+
diff --git a/sysutils/bareos-server/files/patch-core-src-tools_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-tools_CMakeLists.txt
index d1646a91b45f..f99611c376d7 100644
--- a/sysutils/bareos-server/files/patch-core-src-tools_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-tools_CMakeLists.txt
@@ -1,6 +1,6 @@
---- core/src/tools/CMakeLists.txt 2023-12-13 17:44:47.000000000 -0500
-+++ core/src/tools/CMakeLists.txt 2024-01-18 23:59:23.120490000 -0500
-@@ -69,10 +69,39 @@
+--- core/src/tools/CMakeLists.txt 2025-12-04 05:19:30.000000000 -0800
++++ core/src/tools/CMakeLists.txt 2025-12-18 18:54:26.372478000 -0800
+@@ -67,10 +67,39 @@
endif()
if(NOT client-only)
@@ -31,13 +31,13 @@
+
+ include_directories(../fastlz/include)
+ add_library(fd_objects STATIC ${FDSRCS})
-+ target_link_libraries(fd_objects PRIVATE bareos bareosfastlz ${ZLIB_LIBRARIES})
++ target_link_libraries(fd_objects PRIVATE Bareos::Lib Bareos::Fastlz ${ZLIB_LIBRARIES} pthread)
+
set(TSTFNDSRCS testfind.cc testfind_fd.cc dummysockets.cc)
add_executable(testfind ${TSTFNDSRCS})
target_link_libraries(
-- testfind dird_objects fd_objects bareosfind CLI11::CLI11
-+ testfind dird_objects fd_objects bareosfind CLI11::CLI11 ${JANSSON_LIBRARIES}
+- testfind Bareos::Dir Bareos::FD Bareos::Findlib CLI11::CLI11
++ testfind Bareos::Dir fd_objects Bareos::Findlib CLI11::CLI11 ${JANSSON_LIBRARIES}
)
list(APPEND TOOLS_SBIN testfind)
- endif()
+
diff --git a/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt
index 014d82c162fb..20c7285b47cf 100644
--- a/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt
@@ -1,17 +1,55 @@
---- core/src/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500
-+++ core/src/CMakeLists.txt 2023-04-07 16:15:16.297335000 -0500
-@@ -18,7 +18,9 @@
- # 02110-1301, USA.
- message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
+--- core/src/CMakeLists.txt 2025-12-04 05:19:30.000000000 -0800
++++ core/src/CMakeLists.txt 2025-12-20 18:26:16.808405000 -0800
+@@ -22,15 +22,42 @@
+ bareos_configure_file(FILES include/config.h.in)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+-if(${HAVE_LMDB})
+- add_subdirectory(lmdb)
++if(NOT client-only)
++ add_library(Bareos::Lib IMPORTED SHARED)
++ set_target_properties(Bareos::Lib PROPERTIES
++ IMPORTED_LOCATION "${localbase}/lib/libbareos.so"
++ INTERFACE_INCLUDE_DIRECTORIES "${localbase}/include"
++ INTERFACE_LINK_LIBRARIES ""
++ )
++
++ add_library(Bareos::Findlib IMPORTED SHARED)
++ set_target_properties(Bareos::Findlib PROPERTIES
++ IMPORTED_LOCATION "${localbase}/lib/libbareosfind.so"
++ INTERFACE_INCLUDE_DIRECTORIES "${localbase}/include"
++ INTERFACE_LINK_LIBRARIES ""
++ )
++
++ add_library(Bareos::Fastlz IMPORTED SHARED)
++ set_target_properties(Bareos::Fastlz PROPERTIES
++ IMPORTED_LOCATION "${localbase}/lib/libbareosfastlz.so"
++ INTERFACE_INCLUDE_DIRECTORIES "${localbase}/include"
++ INTERFACE_LINK_LIBRARIES ""
++ )
+ endif()
+-add_subdirectory(lib)
+-add_subdirectory(findlib)
+-add_subdirectory(fastlz)
-add_subdirectory(filed)
+if(client-only)
-+ add_subdirectory(filed)
++ if(${HAVE_LMDB})
++ add_subdirectory(lmdb)
++ endif()
++ add_subdirectory(lib)
++ add_subdirectory(findlib)
++ add_subdirectory(fastlz)
+endif()
++if(client-only)
++ add_subdirectory(filed)
++endif()
++
if(NOT client-only)
add_subdirectory(tools)
-@@ -40,24 +42,28 @@
+ add_subdirectory(cats)
+@@ -51,17 +78,21 @@
elseif(NOT GTest_FOUND)
message(STATUS "Skipping unit tests as gtest was not found")
else()
@@ -25,26 +63,13 @@
-if(ENABLE_BCONSOLE)
- add_subdirectory(console)
--endif()
+if(client-only)
+ if(ENABLE_BCONSOLE)
+ add_subdirectory(console)
+ endif()
-
--if(${HAVE_LMDB})
-- add_subdirectory(lmdb)
-+ if(${HAVE_LMDB})
-+ add_subdirectory(lmdb)
-+ endif()
-+ add_subdirectory(lib)
-+ add_subdirectory(findlib)
-+ add_subdirectory(fastlz)
endif()
--add_subdirectory(lib)
--add_subdirectory(findlib)
+
add_subdirectory(plugins)
--add_subdirectory(fastlz)
+
if(${traymonitor})
add_subdirectory(qt-tray-monitor)
diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist
index 7a204918ed0d..a25118401adb 100644
--- a/sysutils/bareos-server/pkg-plist
+++ b/sysutils/bareos-server/pkg-plist
@@ -10,11 +10,8 @@ bin/bwild
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample
-%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample
-%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample
-%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
@@ -24,18 +21,18 @@ bin/bwild
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/webui-admin.conf.sample
+@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/webui-readonly.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample
%%ETCDIR%%/bareos-dir.d/storage/Dedupable.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample
-%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample
@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
@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
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/dplcompat.conf.sample
@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.sample
@@ -50,7 +47,6 @@ lib/bareos/backends/libbareossd-dedupable.so
lib/bareos/backends/libbareossd-dplcompat.so
lib/bareos/backends/libbareossd-fifo.so
lib/bareos/backends/libbareossd-file.so
-%%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so
lib/bareos/backends/libbareossd-tape.so
%%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py
%%PYTHON%%lib/bareos/plugins/BareosDirPluginNscaSender.py
@@ -65,8 +61,6 @@ lib/bareos/plugins/autoxflate-sd.so
%%PYTHON%%lib/bareos/plugins/python3-sd.so
%%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so
%%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so
-lib/bareos/scripts/bareos-ctl-dir
-lib/bareos/scripts/bareos-ctl-sd
lib/bareos/scripts/bareos-glusterfind-wrapper
lib/bareos/scripts/create_bareos_database
%%PGSQL%%lib/bareos/scripts/ddl/creates/postgresql.sql
@@ -86,6 +80,7 @@ lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql
lib/bareos/scripts/ddl/updates/postgresql.2192_2210.sql
lib/bareos/scripts/ddl/updates/postgresql.2210_2230.sql
lib/bareos/scripts/ddl/updates/postgresql.2230_2240.sql
+lib/bareos/scripts/ddl/updates/postgresql.2240_2250.sql
lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql
lib/bareos/scripts/ddl/versions.map
lib/bareos/scripts/delete_catalog_backup
@@ -100,13 +95,13 @@ lib/bareos/scripts/query.sql
lib/bareos/scripts/s3cmd-wrapper.sh
lib/bareos/scripts/update_bareos_tables
%%NDMP%%lib/libbareosndmp.so
-%%NDMP%%lib/libbareosndmp.so.24
+%%NDMP%%lib/libbareosndmp.so.25
%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
lib/libbareossd.so
-lib/libbareossd.so.24
+lib/libbareossd.so.25
lib/libbareossd.so.%%LIB_VERSION%%
lib/libbareossql.so
-lib/libbareossql.so.24
+lib/libbareossql.so.25
lib/libbareossql.so.%%LIB_VERSION%%
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_TAG%%.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_TAG%%.so
diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client
index b2bf482bebdd..4adce1199b59 100644
--- a/sysutils/bareos-server/pkg-plist.client
+++ b/sysutils/bareos-server/pkg-plist.client
@@ -2,19 +2,19 @@
bin/bconsole
%%PYTHON%%bin/bsmc
%%PYTHON%%bin/chunk_check.py
-@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
@group bareos
+@sample %%ETCDIR%%/bareos-dir.d/console/console_media_vault.conf.sample
+@sample %%ETCDIR%%/bareos-dir.d/job/job_admin-media_vault.conf.sample
+@sample %%ETCDIR%%/bareos-dir.d/profile/profile_media_vault.conf.sample
+@sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
@sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample
-@group bareos
@sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample
-@group bareos
@sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample
-@group bareos
@sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample
+@sample %%ETCDIR%%/media_vault.ini.sample
@group bareos
%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bsmc.conf.sample
%%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
-%%PYTHON%%lib/bareos/plugins/BareosFdPluginLibcloud.py
%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py
%%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
%%PYTHON%%lib/bareos/plugins/BareosLibcloudApi.py
@@ -57,34 +57,30 @@ bin/bconsole
%%PYTHON%%lib/bareos/plugins/bareos_tasks/xenserver/README.md
%%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
%%PYTHON%%lib/bareos/plugins/python3-fd.so
-lib/bareos/scripts/bareos
lib/bareos/scripts/bareos-config
lib/bareos/scripts/bareos-config-lib.sh
-lib/bareos/scripts/bareos-ctl-fd
-lib/bareos/scripts/bareos-ctl-funcs
%%PYTHON%%lib/bareos/scripts/bareos_encode_string.py
lib/bareos/scripts/btraceback.dbx
lib/bareos/scripts/btraceback.gdb
lib/bareos/scripts/btraceback.mdb
%%PYTHON%%lib/bareos/scripts/reschedule_job_as_full.sh
lib/libbareos.so
-lib/libbareos.so.24
+lib/libbareos.so.25
lib/libbareos.so.%%LIB_VERSION%%
lib/libbareosfastlz.so
-lib/libbareosfastlz.so.24
+lib/libbareosfastlz.so.25
lib/libbareosfastlz.so.%%LIB_VERSION%%
lib/libbareosfind.so
-lib/libbareosfind.so.24
+lib/libbareosfind.so.25
lib/libbareosfind.so.%%LIB_VERSION%%
lib/libbareoslmdb.so
-lib/libbareoslmdb.so.24
+lib/libbareoslmdb.so.25
lib/libbareoslmdb.so.%%LIB_VERSION%%
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_TAG%%.so
share/man/man1/bareos-tray-monitor.1.gz
@@ -93,8 +89,6 @@ share/man/man1/bsmtp.1.gz
share/man/man8/bareos-fd.8.gz
share/man/man8/btraceback.8.gz
@group bareos
-sbin/bareos
-@group bareos
sbin/bareos-fd
@group bareos
sbin/bconsole
diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile
index ebbd801f9eb0..dc0a8371b569 100644
--- a/sysutils/bareos-traymonitor/Makefile
+++ b/sysutils/bareos-traymonitor/Makefile
@@ -1,33 +1,18 @@
PORTREVISION= 0
+PKGNAMESUFFIX= -traymonitor
+
*** 4028 LINES SKIPPED ***