diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile
index d14ed9c74edb..e324c3a0e1c2 100644
--- a/sysutils/bareos-client/Makefile
+++ b/sysutils/bareos-client/Makefile
@@ -1,20 +1,23 @@
 PORTNAME=	bareos
+
+PORTREVISION=	1
+
 PKGNAMESUFFIX=	-client
 
 COMMENT=	Backup archiving recovery open sourced (client)
 
 CONFLICTS=	bareos20-client bareos21-client bareos22-client bareos23-client
 
 WITH_CLIENT_ONLY=yes
 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 49cef11b92d8..ab601295ce45 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,234 +1,232 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
 DISTVERSION=	24.0.0
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Backup archiving recovery open sourced (server)
 WWW=		https://www.bareos.org/
 
 LICENSE=	AGPLv3 LGPL3
 LICENSE_COMB=	multi
 
 CONFLICTS?=	bareos20-server bareos21-server bareos22-server bareos23-server
 
 BUILD_DEPENDS+=	utf8cpp>0:devel/utf8cpp \
 		microsoft-gsl>0:devel/microsoft-gsl \
 		xxhash>0:devel/xxhash \
 		tl-expected>0:devel/tl-expected \
 		cli11>0:devel/cli11
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson \
 		libfmt.so:devel/libfmt
 
 USES+=		cmake compiler:c++11-lang cpe localbase:ldflags perl5 pkgconfig readline \
 		shebangfix
 USE_GITHUB=	yes
 USE_PERL5=	run
 
 USERS=		bareos
 GROUPS=		${USERS}
 
 PLIST_SUB+=	LIB_VERSION=${PORTVERSION}
 
 USE_LDCONFIG=	yes
 SHEBANG_LANG=	perl python
 SHEBANG_GLOB=	*.py
 SHEBANG_FILES=	${WRKSRC}/contrib/misc/bsmc/bin/bsmc
 
 CPPFLAGS+=	-I${LOCALBASE}/readline
 
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SINGLE=		CRYPTO
 OPTIONS_SINGLE_CRYPTO=	OPENSSL GNUTLS
 OPTIONS_SUB=		yes
 CRYPTO_DESC=		Cryptographic library
 MTX_DESC=		Install mtx for control of autochanger devices
 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
 NDMP_CMAKE_OFF=	-Dndmp=OFF
 .endif
 
 GNUTLS_CONFIGURE_WITH=	gnutls=${LOCALBASE}
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 
 OPENSSL_USES=		ssl
 OPENSSL_CMAKE_ON=	-Dopenssl=ON
 OPENSSL_CMAKE_OFF=	-Dopenssl=OFF
 
 SCSICRYPTO_CMAKE_ON=	-Dscsi-crypto=ON
 SCSICRYPTO_CMAKE_OFF=	-Dscsi-crypto=OFF
 
 .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server"  #Till end of the file
 PYTHON_USES=		python
 PYTHON_CMAKE_ON=	-DENABLE_PYTHON=ON
 PYTHON_CMAKE_OFF=	-DENABLE_PYTHON=OFF
 PYTHON_PLUGIN=		yes
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbareos.so:sysutils/bareos-client
 USE_RC_SUBR?=	bareos-dir bareos-sd
 .endif
 
 .if defined(WITH_CLIENT_ONLY)
 SUB_FILES+=	pkg-install.client pkg-deinstall.client pkg-message.client
 .else
 SUB_FILES+=	pkg-message.server
 .endif
 
 CMAKE_ARGS+=	-Dtcp-wrappers=ON \
 		-Dsmartalloc=ON \
 		-Dsysconfdir=${PREFIX}/etc \
 		-Darchivedir=${BAREOS_DIR}/storage \
 		-Dworkingdir=${BAREOS_DIR} \
 		-Dconfdir=${PREFIX}/etc/bareos \
 		-Dlibdir=${PREFIX}/lib \
 		-Dlogdir=/var/log/bareos \
 		-Dincludedir=${PREFIX}/include/bareos \
 		-Dreadline=ON \
 		-Ddisable-conio=ON \
 		-Dbatch-insert=ON \
 		-Dhave_plugins=ON \
 		-Dplugindir=${PREFIX}/lib/bareos/plugins \
 		-Dscriptdir=${PREFIX}/lib/bareos/scripts \
 		-Dbackenddir=${PREFIX}/lib/bareos/backends \
 		-Ddump_email=root@localhost \
 		-Djob_email=root@localhost \
 		-Ddb_name=bareos \
 		-Dsbin-perm=755 \
 		-Ddb_user=bareos \
 		-Dbaseport=9101 \
 		-Dpiddir=/var/run/bareos
 
 .if defined(WITH_CLIENT_ONLY)
 CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
 
 CMAKE_ARGS+=	-Dfd-user=root \
 		-Dfd-group=wheel \
 		-Dlmdb=ON
 .else
 LMDB_CMAKE_ON=	-Dlmdb=ON
 LMDB_CMAKE_OFF=	-Dlmdb=OFF
 LMDB_CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
 
 CMAKE_ARGS+=	-Ddir-user=${BAREOS_USER} \
 		-Ddir-group=${BAREOS_GROUP} \
 		-Dsd-user=${BAREOS_USER} \
 		-Dsd-group=operator
 .endif
 
 # The user/group IDs below are registered, see
 # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID
 #
 BAREOS_USER?=	bareos
 BAREOS_GROUP?=	${BAREOS_USER}
 BAREOS_UID?=	997
 BAREOS_GID?=	${BAREOS_UID}
 BAREOS_DIR?=	/var/db/bareos
 
 PLIST_SUB+=	BAREOS_DIR=${BAREOS_DIR}
 
 SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
 		BAREOS_GROUP=${BAREOS_GROUP} \
 		BAREOS_UID=${BAREOS_UID} \
 		BAREOS_GID=${BAREOS_GID} \
 		BAREOS_DIR=${BAREOS_DIR}
 
 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)
 CONFFILES=	fd
 CMAKE_ARGS+=	-Dclient-only=ON \
 		-DENABLE_WEBUI=OFF
 
 PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
 PKGINSTALL=	${FILESDIR}/pkg-install.client
 .else
 # Server only Options
 CONFFILES=		sd dir
 CMAKE_ARGS+=	-Dbuild-dird=ON \
 		-Dbuild-stored=ON \
 		-Dbuild_client_only=OFF \
 		-DENABLE_WEBUI=OFF
 # Server default database
 
 MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 PGSQL_CMAKE_ON=		-Dpostgresql=ON
 PGSQL_USES=		pgsql
 PGSQL_SUB_LIST=		REQ_PGSQL=postgresql
 PGSQL_SUB_LIST_OFF=	REQ_PGSQL=""
 .endif
 
 .if defined(WITH_CLIENT_ONLY)
 MP1+=	bconsole.1
 MP8+=	bareos-fd.8
 .else
 MP8+=	bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \
 	btape.8 btraceback.8 bareos-dbcheck.8
 MP1+=	bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
 .endif
 
 MAKE_ENV+=	MAN8="${MP8}" MAN1="${MP1}"
 
 post-patch:
-	@${REINPLACE_CMD}  '136,141d' ${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD}  '202d' ${WRKSRC}/CMakeLists.txt
 .if ${PKGNAMESUFFIX} == "-server"
 	@${REINPLACE_CMD}  '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
 .endif
 .if ${PKGNAMESUFFIX} == "-client"
 	@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|enable_testing()||g' ${WRKSRC}/CMakeLists.txt
 .endif
 
 post-extract:
 .if defined(WITH_CLIENT_ONLY)
 .	if defined(PYTHON_PLUGIN)
 		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset
 		@${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job
 .	endif
 .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
 
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
 	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf.sample ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample
 .else
 	${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample
 	${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp
 	${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample
 .endif
 	@${MKDIR} ${STAGEDIR}/var/run/bareos
 .endif
 .else
 .include "${MASTERDIR}/Makefile.common"
 .endif # -client and -server are defined
 
 .include <bsd.port.mk>
diff --git a/sysutils/bareos-server/files/patch-CMakeLists.txt b/sysutils/bareos-server/files/patch-CMakeLists.txt
index ecd8676b7841..4404b90a2c50 100644
--- a/sysutils/bareos-server/files/patch-CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-CMakeLists.txt
@@ -1,18 +1,16 @@
---- CMakeLists.txt.orig	2024-12-22 22:53:59.736189000 -0800
-+++ CMakeLists.txt	2024-12-22 22:54:34.147041000 -0800
-@@ -202,12 +202,10 @@
+--- CMakeLists.txt	2024-12-16 09:10:50.000000000 -0800
++++ CMakeLists.txt	2024-12-31 23:52:42.840766000 -0800
+@@ -202,11 +202,8 @@
    if(ENABLE_WEBUI)
      add_subdirectory(webui)
    endif()
 -  if(NOT client-only)
 -    if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 -      add_subdirectory(contrib)
 -    endif()
 -    add_subdirectory(systemtests)
 +  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 +    add_subdirectory(contrib)
    endif()
-+  add_subdirectory(systemtests)
  endif()
  
- if(docs
diff --git a/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake b/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake
new file mode 100644
index 000000000000..d8b63ec3265e
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-cmake_BareosCcache.cmake
@@ -0,0 +1,12 @@
+--- 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 @@
+ 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")
+-  list(APPEND CCACHE_CMDLINE "namespace=bareos")
+   set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_CMDLINE}")
+   set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_CMDLINE}")
+ endif()
diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist
index 2d4c5de8c4bc..2af76717ff46 100644
--- a/sysutils/bareos-server/pkg-plist
+++ b/sysutils/bareos-server/pkg-plist
@@ -1,165 +1,163 @@
 bin/bregex
 bin/bsmtp
 bin/bwild
 @sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample
 @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/fileset/plugin-ldap.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/job/backup-ldap.conf.sample
-@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample
 @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/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
 @comment @sample(,bareos,640) %%ETCDIR%%/bareos-regress.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
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample
 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/Dedupable.conf.sample
 %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample
 etc/logrotate.d/bareos-dir
 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
 %%PYTHON%%lib/bareos/plugins/BareosDirWrapper.py
 %%PYTHON%%lib/bareos/plugins/BareosSdPluginBaseclass.py
 %%PYTHON%%lib/bareos/plugins/BareosSdWrapper.py
 lib/bareos/plugins/autoxflate-sd.so
 %%PYTHON%%lib/bareos/plugins/bareos-dir-class-plugin.py
 %%PYTHON%%lib/bareos/plugins/bareos-dir-nsca-sender.py
 %%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py
 %%PYTHON%%lib/bareos/plugins/python3-dir.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
 %%PGSQL%%lib/bareos/scripts/ddl/drops/postgresql.sql
 %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql
 %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-readonly.sql
 %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql.sql
 lib/bareos/scripts/ddl/updates/postgresql.10_11.sql
 lib/bareos/scripts/ddl/updates/postgresql.11_12.sql
 lib/bareos/scripts/ddl/updates/postgresql.12_14.sql
 lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql
 lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql
 lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql
 lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql
 lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql
 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.bee.1017_2004.sql
 lib/bareos/scripts/ddl/versions.map
 lib/bareos/scripts/delete_catalog_backup
 lib/bareos/scripts/disk-changer
 lib/bareos/scripts/drop_bareos_database
 lib/bareos/scripts/drop_bareos_tables
 lib/bareos/scripts/grant_bareos_privileges
 lib/bareos/scripts/make_bareos_tables
 lib/bareos/scripts/make_catalog_backup
 lib/bareos/scripts/mtx-changer
 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.%%LIB_VERSION%%
 lib/libbareossd.so
 lib/libbareossd.so.24
 lib/libbareossd.so.%%LIB_VERSION%%
 lib/libbareossql.so
 lib/libbareossql.so.24
 lib/libbareossql.so.%%LIB_VERSION%%
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_EXT_SUFFIX%%.so
 share/man/man1/bregex.1.gz
 share/man/man1/bwild.1.gz
 share/man/man8/bareos-dbcheck.8.gz
 share/man/man8/bareos-dir.8.gz
 share/man/man8/bareos-sd.8.gz
+share/man/man8/bareos.8.gz
 share/man/man8/bcopy.8.gz
 share/man/man8/bextract.8.gz
 share/man/man8/bls.8.gz
 share/man/man8/bpluginfo.8.gz
 share/man/man8/bscan.8.gz
 share/man/man8/bscrypto.8.gz
 share/man/man8/btape.8.gz
 sbin/bareos-dbcheck
 sbin/bareos-dir
 sbin/bareos-sd
 sbin/bcopy
 sbin/bdedupestimate
 sbin/bextract
 sbin/bls
 sbin/bpluginfo
 sbin/bregex
 sbin/bscan
 sbin/bscrypto
 sbin/bsmtp
 sbin/btape
 sbin/btestls
 sbin/bwild
 sbin/chio-bareos
 sbin/testfind
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user
 @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client
 @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp
 @dir(bareos,bareos,) %%BAREOS_DIR%%
 @dir(bareos,bareos,) %%BAREOS_DIR%%/storage
 @dir(bareos,bareos,) /var/log/bareos
 @dir(bareos,bareos,) /var/run/bareos