diff --git a/sysutils/bareos18-server/Makefile b/sysutils/bareos18-server/Makefile
index c1218a24f4be..4d45d528cba4 100644
--- a/sysutils/bareos18-server/Makefile
+++ b/sysutils/bareos18-server/Makefile
@@ -1,243 +1,243 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	18.2.11
+DISTVERSION=	18.2.12
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	18-server
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT?=	Backup archiving recovery open sourced (server)
 
 LICENSE=	AGPLv3 LGPL3
 LICENSE_COMB=	multi
 
 CONFLICTS?=	bacula17*-server-* bareos16-server-* bareos-server-*
 
 LIB_DEPENDS+=	liblzo2.so:archivers/lzo2 \
 		libjansson.so:devel/jansson
 
 USES+=		cmake:insource compiler:c++11-lang cpe localbase 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
 SHEBANG_FILES=	${WRKSRC}/core/src/cats/make_catalog_backup.pl.in
 
 CPPFLAGS+=	-I${LOCALBASE}/readline -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 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} == "18-server"
 OPTIONS_GROUP=	BACKENDS
 OPTIONS_GROUP_BACKENDS=	CEPHFS GFAPI RADOS
 OPTIONS_DEFINE=		MTX PYTHON NDMP NLS SCSICRYPTO
 OPTIONS_DEFAULT+=	PGSQL SCSICRYPTO
 OPTIONS_SINGLE_DATABASE=	SQLITE3 MYSQL PGSQL
 OPTIONS_SINGLE+=		DATABASE
 DATABASE_DESC=		Database support
 CEPHFS_DESC=	CEPHFS backend support
 GFAPI_DESC=	GFAPI backend support
 RADOS_DESC=	RADOS backend 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} == "18-client" || ${PKGNAMESUFFIX} == "18-server"  #Till end of the file
 PYTHON_USES=		python
 PYTHON_CMAKE_ON=	-Dpython=ON
 PYTHON_CMAKE_OFF=	-Dpython=OFF
 PYTHON_PLUGIN=		yes
 
 .if !defined(WITH_CLIENT_ONLY)
 LIB_DEPENDS+=	libbareos.so:sysutils/bareos18-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=OFF \
 		-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 \
 		-Dtest-plugin=OFF \
 		-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)
 LMDB_CMAKE_ON=	-Dlmdb=ON
 LMDB_CMAKE_OFF=	-Dlmdb=OFF
 LMDB_CFLAGS+=	-DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
 
 CMAKE_ARGS+=	-Dfd-user=root \
 		-Dfd-group=wheel
 .else
 CMAKE_ARGS+=	-Ddir-user=${BAREOS_USER} \
 		-Ddir-group=${BAREOS_GROUP} \
 		-Dsd-user=${BAREOS_USER} \
 		-Dsd-group=operator \
 		-Dlmdb=OFF
 .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
 CEPHFS_CMAKE_ON=	-Dcephfs=ON
 CEPHFS_LIB_DEPENDS=	libcephfs.so:net/ceph14
 GFAPI_CMAKE_ON=		-Dgfapi=ON
 GFAPI_LIB_DEPENDS=	libglusterfs.so:net/glusterfs
 RADOS_CMAKE_ON=		-Drados=ON -Dcephfs=ON
 RADOS_LIB_DEPENDS=	librados.so:net/ceph14
 
 # Client only or full server version
 .if defined(WITH_CLIENT_ONLY)
 CONFFILES=	fd
 CMAKE_ARGS+=	-Dclient-only=ON
 
 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
 # Server default database
 
 MYSQL_CMAKE_ON=		-Dmysql=ON
 MYSQL_USES=	mysql
 SQLITE3_CMAKE_ON=	-Dsqlite3=ON
 SQLITE3_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 PGSQL_CMAKE_ON=		-Dpostgresql=ON
 PGSQL_USES=	pgsql
 
 MTX_RUN_DEPENDS=	${LOCALBASE}/sbin/mtx:misc/mtx
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMYSQL}
 DBTYPE=			mysql
 SUB_LIST+=		REQ_MYSQL=mysql REQ_PGSQL=""
 .elif ${PORT_OPTIONS:MSQLITE3}
 DBTYPE=			sqlite3
 .else
 DBTYPE=			postgresql
 SUB_LIST+=		REQ_MYSQL="" REQ_PGSQL=postgresql
 .endif
 PLIST_SUB+=		DBTYPE=${DBTYPE}
 
 .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}  '42d' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's|api/glfs.h|glusterfs/api/glfs.h|g' \
 		${WRKSRC}/core/src/stored/backends/gfapi_device.h
 	@${REINPLACE_CMD} -e 's|sm_dump(false)|sm_dump(jcr,false)|g' \
 		${WRKSRC}/core/src/tools/btestls.cc
 .if ${PKGNAMESUFFIX} == "18-server"
 	@${REINPLACE_CMD}  '23d' ${WRKSRC}/core/src/CMakeLists.txt
 	@${REINPLACE_CMD}  '25d' ${WRKSRC}/core/src/plugins/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'
 
 .if !target(post-install)
 post-install:
 .if defined(WITH_CLIENT_ONLY)
 	${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/
 	${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${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
 	${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample
 .endif
 	@${MKDIR} ${STAGEDIR}/var/run/bareos
 .endif
 .else
 .include "${MASTERDIR}/Makefile.common"
 .endif # 18-client and 18-server are defined
 .include <bsd.port.mk>
diff --git a/sysutils/bareos18-server/distinfo b/sysutils/bareos18-server/distinfo
index 1a2a9365707a..d4efe597a9d9 100644
--- a/sysutils/bareos18-server/distinfo
+++ b/sysutils/bareos18-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1624927674
-SHA256 (bareos-bareos-Release-18.2.11_GH0.tar.gz) = 34f5e538ef8fbc990a39880ab92237c0623fd674bf36980763e1b8abfcef772e
-SIZE (bareos-bareos-Release-18.2.11_GH0.tar.gz) = 10564238
+TIMESTAMP = 1636153212
+SHA256 (bareos-bareos-Release-18.2.12_GH0.tar.gz) = 65499d86bc0a41a796f8a6aaef3e32cb324f39f3300cf32927a84e0fd3a35075
+SIZE (bareos-bareos-Release-18.2.12_GH0.tar.gz) = 10566403
diff --git a/sysutils/bareos18-server/pkg-plist.client b/sysutils/bareos18-server/pkg-plist.client
index c5f1adff4f90..120e4eb52fdf 100644
--- a/sysutils/bareos18-server/pkg-plist.client
+++ b/sysutils/bareos18-server/pkg-plist.client
@@ -1,59 +1,60 @@
 bin/bconsole
 @sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample
 @group bareos
 @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
 @group bareos
 lib/libbareos.so
 lib/libbareos.so.18
 lib/libbareos.so.%%LIB_VERSION%%
 lib/libbareosfind.so
 lib/libbareosfind.so.18
 lib/libbareosfind.so.%%LIB_VERSION%%
 %%LMDB%%lib/libbareoslmdb.so
 %%LMDB%%lib/libbareoslmdb.so.18
 %%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%%
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py
 %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py
 %%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py
 %%PYTHON%%lib/bareos/plugins/bareos-fd.py.template
 %%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py
 lib/bareos/plugins/bpipe-fd.so
+lib/bareos/plugins/test-plugin-fd.so
 %%CEPHFS%%lib/bareos/plugins/cephfs-fd.so
 %%GFAPI%%lib/bareos/plugins/gfapi-fd.so
 %%PYTHON%%lib/bareos/plugins/python-fd.so
 %%RADOS%%lib/bareos/plugins/rados-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
 lib/bareos/scripts/btraceback.dbx
 lib/bareos/scripts/btraceback.gdb
 lib/bareos/scripts/btraceback.mdb
 man/man1/bconsole.1.gz
 man/man8/bareos-fd.8.gz
 man/man8/bareos.8.gz
 @group bareos
 sbin/bareos
 @group bareos
 sbin/bareos-fd
 @group bareos
 sbin/bconsole
 @group wheel
 sbin/btraceback
 @group bareos
 %%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset
 %%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job
 @dir(bareos,bareos,)  %%BAREOS_DIR%%
 @dir(bareos,bareos,) /var/log/bareos
 @dir(bareos,bareos,) /var/run/bareos
diff --git a/www/bareos18-webui/Makefile b/www/bareos18-webui/Makefile
index 505b70cf9c30..3c522c4a2d20 100644
--- a/www/bareos18-webui/Makefile
+++ b/www/bareos18-webui/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	18.2.11
+DISTVERSION=	18.2.12
 CATEGORIES?=	www sysutils
 PKGNAMESUFFIX=	18-webui
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	PHP-Frontend to manage Bareos over the web
 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/webui/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bareos
 GH_PROJECT=	bareos
 
 USES=		cpe php
 USE_PHP=	openssl gettext ctype hash json session iconv
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
 PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 SUB_LIST=	BAREOSWEBUIDIR=${WWWDIR}
 WWWDIR=		${PREFIX}/www/${PORTNAME}18
 
 OPTIONS_DEFINE=		MYSQL PGSQL ZENDFRAMEWORK
 OPTIONS_DEFAULT=	PGSQL
 ZENDFRAMEWORK_DESC=	Install zend framework
 
 MYSQL_USE=		PHP=pdo_mysql
 PGSQL_USE=		PHP=pdo_pgsql
 ZENDFRAMEWORK_RUN_DEPENDS=	${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
 
 post-extract:
 	${RM} ${WRKSRC}/webui/config/autoload/.gitignore
 	${RM} ${WRKSRC}/webui/data/cache/.gitignore
 	${RM} ${WRKSRC}/webui/vendor/.gitignore
 	${MV} ${WRKSRC}/webui/version.php.in ${WRKSRC}/webui/version.php
 	${MV} ${WRKSRC}/webui/config/autoload/global.php.in ${WRKSRC}/webui/config/autoload/global.php
 	${MV} ${WRKSRC}/webui/module/Application/view/layout/layout.phtml.in ${WRKSRC}/webui/module/Application/view/layout/layout.phtml
 	${MV} ${WRKSRC}/webui/module/Application/view/layout/login.phtml.in ${WRKSRC}/webui/module/Application/view/layout/login.phtml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' -e 's|@WEBUICONFDIR@|${ETCDIR}|g' -e \
 		's|@dirport@|9101|g' ${WRKSRC}/webui/config/autoload/global.php
 	@${REINPLACE_CMD} -e 's|@BAREOS_FULL_VERSION@|${PORTVERSION}|g' ${WRKSRC}/webui/version.php
 
 do-install:
 	@${ECHO} "Installing in ${WWWDIR}"
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
 	@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
 	cd ${WRKSRC}/webui && ${COPYTREE_SHARE} "config data module public vendor" \
 		${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/*.php ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/composer* ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/phpunit.xml ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini.in ${STAGEDIR}${ETCDIR}/directors.ini
 	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini.in ${STAGEDIR}${ETCDIR}/configuration.ini
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/apache/bareos-webui.conf ${STAGEDIR}${ETCDIR}/apache-bareos-webui.conf
 	${INSTALL_DATA} ${WRKSRC}/webui/install/nginx/bareos-webui.conf ${STAGEDIR}${ETCDIR}/nginx-bareos-webui.conf
 
 .include <bsd.port.mk>
diff --git a/www/bareos18-webui/distinfo b/www/bareos18-webui/distinfo
index aec6192bdfe5..0205375856bd 100644
--- a/www/bareos18-webui/distinfo
+++ b/www/bareos18-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625884718
-SHA256 (bareos-bareos-Release-18.2.11_GH0.tar.gz) = 34f5e538ef8fbc990a39880ab92237c0623fd674bf36980763e1b8abfcef772e
-SIZE (bareos-bareos-Release-18.2.11_GH0.tar.gz) = 10564238
+TIMESTAMP = 1636161885
+SHA256 (bareos-bareos-Release-18.2.12_GH0.tar.gz) = 65499d86bc0a41a796f8a6aaef3e32cb324f39f3300cf32927a84e0fd3a35075
+SIZE (bareos-bareos-Release-18.2.12_GH0.tar.gz) = 10566403