sysutils/bareos{,-clientonly}: Upgrade to 20.0.0 (released 2020-12-16)

Frome the release note: Bareos 20 released ✔ Improved Cloud Storage integration ✔ New and revised plugins ✔ Modernized Python API ✔ New REST API Cologne, 16th December, 2020 – The Bareos team launches a new version of the Open Source backup solution of the same name. Bareos 20 includes, among other things, a new plugin to back up cloud storage objects directly via the S3 interface, a modernized Python API and a preview of the new REST API. New and improved Plugins Bareos 20 introduces the brand-new libcloud plugin , which uses the Apache Libcloud library to back up cloud storage objects directly via the S3 interface (Simple Storage Service). The Bareos plugin can thus create backups of Amazon S3 buckets directly via the S3 interface. Since Apache Libcloud is a standard library and supports other cloud storage systems as well, Bareos' libcloud plugin will be ready to back up other cloud storage objects in the future. The plugin for backups and restores of PostgreSQL databases now supports incremental backups and point-in-time recovery which makes it possible to restore any transaction state from the past. For the VMware plugin, which has been able to create (incremental) backups of snapshots since Bareos 15.2, the developers have upgraded the VDDK (Virtual Disk Development Kit) to the current version 7.0.1. The plugin now supports VMware versions 6.5, 6.7, 7 and also the release after that. The Python API and all Bareos Python plugins have been modernized. The code is now easier to read, and the included plugins have been adapted to work with both Python 2 and 3; parallel use of both versions is also possible. Users who have written their own Python plugins can refer to the porting guide in the manual to adapt the plugins. Among the ported Bareos plugins are the oVirt plugin, which enables agentless backups of virtual machines running under oVirt or Red Hat Virtualization, the VMware and PostgreSQL plugins, and the Percona XtraBackup plugin for backing up MySQL/MariaDB. Technology Preview: REST API Bareos 20 includes a technical preview of the new REST API, which will allow access to Bareos via an HTTP interface in future. Currently listed as experimental, the REST API already supports some important commands: at the moment, users can configure parts of Bareos as well as start, stop and monitor backup jobs. Hosting providers and other large environments in particular will benefit from the new REST API since it makes it possible to include typical Bareos operations in scripts or other automated procedures. Improved S3 Storage The storage backend bareos-storage-droplet has been included in the backup software since Bareos 17.2. It uses the libdroplet library which communicates with cloud storage systems via the S3 protocol. The Bareos developers have given it a general overhaul, but the most important new feature is the OpenSSL 1.1 support which includes support for current encryption technologies. The package bareos-storage-droplet used to be available for only a few Linux distributions, but since the upgrade Bareos offers packages for all Linux systems which are supported by the backup solution itself. Versioning, Changelog and other Numbers Bareos 20.0.0 is the first release that uses the so-called semantic versioning. Users can now recognize straight away if it's a major release (1st position), an update with changed functionality (2nd position) or a pure bugfix (3rd position). More transparency is provided by the continuously maintained changelog in the GitHub repository. It replaces the classic release notes, contains links to the corresponding bugs and pull requests, so that interested users can easily get information about the current progress at any time. Over 1,500 commits from a total of 22 contributors have gone into Bareos 20. The developers offer packages for 22 platforms: CentOS 7/8, Debian 9/10, Fedora 31/32/33, openSUSE 15.2, RHEL 7/8, SLES 12/15, Univention 4.4, Ubuntu 16.04/18.04/20.04, FreeBSD 11.4/12.2, macOS ≥10.13, Solaris (x86, SPARC) 11.4, Windows 10, and Windows Server ≥2012 . See https://www.bareos.org and https://www.bareos.com
author: kardel <kardel@pkgsrc.org> 2021-02-01 09:08:43 +0000
committer: kardel <kardel@pkgsrc.org> 2021-02-01 09:08:43 +0000
commit: 521504d70af2198705575677e2cdaa52366893c1 (patch)
tree: bf0cc33593f61e82f3cf470bb2ab39242fa6596a
parent: 90b55700cccaed4b2ba1a0c7ecad75cd4dc7a5fc (diff)
download: pkgsrc-521504d70af2198705575677e2cdaa52366893c1.tar.gz
54 files changed, 527 insertions, 850 deletions
diff --git a/sysutils/bareos-clientonly/Makefile b/sysutils/bareos-clientonly/Makefile
index 330528d7af2..18cf3a304e3 100644
--- a/sysutils/bareos-clientonly/Makefile
+++ b/sysutils/bareos-clientonly/Makefile
@@ -1,28 +1,26 @@
-# $NetBSD: Makefile,v 1.1 2020/07/28 06:37:25 kardel Exp $
-
-PKGNAME=		${DISTNAME:S/-/-clientonly-/}
+# $NetBSD: Makefile,v 1.2 2021/02/01 09:08:44 kardel Exp $
 
 COMMENT=		Backup Archiving REcovery Open Sourced - client
 
 CONFLICTS=		bareos-[0-9]* bacula-[0-9]* bacula-clientonly-[0-9]*
 
-PATCHDIR=		${.CURDIR}/../../sysutils/bareos/patches
-FILESDIR=		${.CURDIR}/../../sysutils/bareos/files
-DISTINFO_FILE=		${.CURDIR}/../../sysutils/bareos/distinfo
-
-PLIST_SRC=		PLIST.client
+.include "../../sysutils/bareos/Makefile.common"
 
 CMAKE_ARGS?=
 CMAKE_ARGS+=		-Dclient-only=true
 
 RCD_SCRIPTS=		bareos-fd
 
-.include "../../sysutils/bareos/Makefile.common"
+PKGNAME=		${DISTNAME:S/-/-clientonly-/}
+
+PATCHDIR=		${.CURDIR}/../../sysutils/bareos/patches
+FILESDIR=		${.CURDIR}/../../sysutils/bareos/files
+DISTINFO_FILE=		${.CURDIR}/../../sysutils/bareos/distinfo
 
 # needs to be here to get ${EGREP} defined
 .include "../../mk/bsd.pkg.mk"
 
-CONFIG_TEMPLATES!=	${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.client 2>/dev/null | sed -e 's/ /\\ /g'
+CONFIG_TEMPLATES!=	${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST 2>/dev/null | sed -e 's/ /\\ /g'
 CONF_FILES?=
 
 .for l in ${CONFIG_TEMPLATES}
@@ -31,7 +29,34 @@ CONF_FILES+=	${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
 
 BUILD_DEFS+=	VARBASE # to keep pkglint happy
 
-MAKE_DIRS?=
-MAKE_DIRS+=	${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
-MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}
-MAKE_DIRS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
+DIR_PERMS.bareos-fd.d=	${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+DIR_PERMS=		${REAL_ROOT_USER} ${BAREOS_GROUP} 0775
+
+# spool directory
+MAKE_DIRS_PERMS?=
+MAKE_DIRS_PERMS+=	${VARBASE}/${PKG_SYSCONFSUBDIR} \
+			${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+=	${VARBASE}/${PKG_SYSCONFSUBDIR}/db \
+			${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+MAKE_DIRS_PERMS+=	${VARBASE}/${PKG_SYSCONFSUBDIR}/db/working \
+			${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+
+CONF_FILES_PERMS?=
+.for l in ${CONFIG_TEMPLATES}
+CONF_FILES_PERMS+=	${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//} \
+			${DIR_PERMS.${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+.endfor
+
+D=
+.for l in ${CONFIG_TEMPLATES:H:O:u}
+.  if ${l} != ${CONFIG_TEMPLATE_PATH}
+MAKE_DIRS_PERMS+=	${l:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/} \
+			${DIR_PERMS.${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+D+=			${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,${PKG_SYSCONFDIR}/\1,}
+.  endif
+.endfor
+
+.for l in ${D:O:u}
+MAKE_DIRS_PERMS+=	${l} \
+			${DIR_PERMS.${l:C,^${PKG_SYSCONFDIR}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+.endfor
diff --git a/sysutils/bareos-clientonly/PLIST.client b/sysutils/bareos-clientonly/PLIST
index 991f2b64e48..af89bf3827c 100644
--- a/sysutils/bareos-clientonly/PLIST.client
+++ b/sysutils/bareos-clientonly/PLIST
@@ -1,20 +1,34 @@
-@comment $NetBSD: PLIST.client,v 1.1 2020/07/28 06:37:25 kardel Exp $
+@comment $NetBSD: PLIST,v 1.1 2021/02/01 09:08:44 kardel Exp $
 bin/bconsole
 lib/bareos/plugins/BareosFdPluginBaseclass.py
 lib/bareos/plugins/BareosFdPluginLDAP.py
+lib/bareos/plugins/BareosFdPluginLibcloud.py
+lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py
 lib/bareos/plugins/BareosFdPluginLocalFileset.py
 lib/bareos/plugins/BareosFdPluginOvirt.py
 lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py
+lib/bareos/plugins/BareosFdPluginPostgres.py
+lib/bareos/plugins/BareosFdPluginVMware.py
 lib/bareos/plugins/BareosFdWrapper.py
+lib/bareos/plugins/BareosLibcloudApi.py
 lib/bareos/plugins/bareos-fd-ldap.py
+lib/bareos/plugins/bareos-fd-libcloud.py
 lib/bareos/plugins/bareos-fd-local-fileset.py
-lib/bareos/plugins/bareos-fd-mock-test.py
 lib/bareos/plugins/bareos-fd-ovirt.py
 lib/bareos/plugins/bareos-fd-percona-xtrabackup.py
-lib/bareos/plugins/bareos-fd.py.template
-lib/bareos/plugins/bareos_fd_consts.py
+lib/bareos/plugins/bareos-fd-postgres.py
+lib/bareos/plugins/bareos-fd-vmware.py
+lib/bareos/plugins/bareos_libcloud_api/__init__.py
+lib/bareos/plugins/bareos_libcloud_api/bucket_explorer.py
+lib/bareos/plugins/bareos_libcloud_api/debug.py
+lib/bareos/plugins/bareos_libcloud_api/get_libcloud_driver.py
+lib/bareos/plugins/bareos_libcloud_api/mtime.py
+lib/bareos/plugins/bareos_libcloud_api/process_base.py
+lib/bareos/plugins/bareos_libcloud_api/queue_message.py
+lib/bareos/plugins/bareos_libcloud_api/utils.py
+lib/bareos/plugins/bareos_libcloud_api/worker.py
 lib/bareos/plugins/bpipe-fd.so
-lib/bareos/plugins/python-fd.so
+lib/bareos/plugins/python3-fd.so
 lib/bareos/scripts/bareos
 lib/bareos/scripts/bareos-config
 lib/bareos/scripts/bareos-config-lib.sh
@@ -24,17 +38,18 @@ lib/bareos/scripts/btraceback.dbx
 lib/bareos/scripts/btraceback.gdb
 lib/bareos/scripts/btraceback.mdb
 lib/libbareos.so
-lib/libbareos.so.19
+lib/libbareos.so.20
 lib/libbareos.so.${PKGVERSION}
 lib/libbareosfastlz.so
-lib/libbareosfastlz.so.19
+lib/libbareosfastlz.so.20
 lib/libbareosfastlz.so.${PKGVERSION}
 lib/libbareosfind.so
-lib/libbareosfind.so.19
+lib/libbareosfind.so.20
 lib/libbareosfind.so.${PKGVERSION}
 lib/libbareoslmdb.so
-lib/libbareoslmdb.so.19
+lib/libbareoslmdb.so.20
 lib/libbareoslmdb.so.${PKGVERSION}
+${PYSITELIB}/bareosfd.so
 man/man1/bconsole.1
 man/man8/bareos-fd.8
 man/man8/bareos.8
diff --git a/sysutils/bareos/Makefile b/sysutils/bareos/Makefile
index 166edda14f7..1d00c869201 100644
--- a/sysutils/bareos/Makefile
+++ b/sysutils/bareos/Makefile
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2020/11/05 09:09:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2021/02/01 09:08:43 kardel Exp $
 
 CONFLICTS=		bareos-clientonly-[0-9]* bacula-clientonly-[0-9]* bacula-[0-9]*
 
 COMMENT=		Backup Archiving REcovery Open Sourced
-PKGREVISION=		2
-
-PLIST_SRC=		PLIST.common
 
 RCD_SCRIPTS=		bareos bareos-dir bareos-sd bareos-fd
 
@@ -20,9 +17,13 @@ BUILD_DEFS+=		VARBASE
 # needs to be here to get ${EGREP} defined
 .include "../../mk/bsd.pkg.mk"
 
-REPLACE_PERL+=		core/src/cats/make_catalog_backup.pl.in
+DIR_PERMS.bareos-dir.d=	${BAREOS_DIR_USER} ${BAREOS_GROUP} 0770
+DIR_PERMS.bareos-sd.d=	${BAREOS_SD_USER} ${BAREOS_GROUP} 0770
+DIR_PERMS.bareos-fd.d=	${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
+DIR_PERMS=		${REAL_ROOT_USER} ${BAREOS_GROUP} 0775
 
 # spool directory
+MAKE_DIRS_PERMS?=
 MAKE_DIRS_PERMS+=	${VARBASE}/${PKG_SYSCONFSUBDIR} \
 			${REAL_ROOT_USER} ${BAREOS_GROUP} 0770
 MAKE_DIRS_PERMS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working \
@@ -37,12 +38,24 @@ MAKE_DIRS_PERMS+=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}/storage \
 post-install:
 	${LN} -fs ${PKG_SYSCONFSUBDIR}/backends/libbareossd-gentape.so ${DESTDIR:Q}/${BAREOS_LIBDIR:Q}/libbareossd-gentape.so
 
-CONFIG_TEMPLATES!=	${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q} PLIST.common 2>/dev/null | sed -e 's/ /\\ /g'
-CONF_FILES?=
+CONFIG_TEMPLATES!=	${EGREP} "^"${CONFIG_TEMPLATE_PATH:Q}/ PLIST 2>/dev/null | sed -e 's/ /\\ /g'
 
+CONF_FILES_PERMS?=
 .for l in ${CONFIG_TEMPLATES}
-CONF_FILES+=	${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//}
+CONF_FILES_PERMS+=	${l} ${PKG_SYSCONFDIR}${l:S/^${CONFIG_TEMPLATE_PATH}//} \
+			${DIR_PERMS.${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+.endfor
+
+D=
+.for l in ${CONFIG_TEMPLATES:H:O:u}
+.  if ${l} != ${CONFIG_TEMPLATE_PATH}
+MAKE_DIRS_PERMS+=	${l:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/} \
+			${DIR_PERMS.${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+D+=			${l:C,^${CONFIG_TEMPLATE_PATH}/([^/]+).*$,${PKG_SYSCONFDIR}/\1,}
+.  endif
 .endfor
 
-MAKE_DIRS?=
-MAKE_DIRS+=	${CONFIG_TEMPLATES:H:O:u:S/^${CONFIG_TEMPLATE_PATH}/${PKG_SYSCONFDIR}/}
+.for l in ${D:O:u}
+MAKE_DIRS_PERMS+=	${l} \
+			${DIR_PERMS.${l:C,^${PKG_SYSCONFDIR}/([^/]+).*$,\1,}:U${DIR_PERMS}}
+.endfor
diff --git a/sysutils/bareos/Makefile.common b/sysutils/bareos/Makefile.common
index d55b7c6441c..892a91393be 100644
--- a/sysutils/bareos/Makefile.common
+++ b/sysutils/bareos/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2020/07/28 06:36:29 kardel Exp $
+# $NetBSD: Makefile.common,v 1.2 2021/02/01 09:08:43 kardel Exp $
 # used by sysutils/bareos-clientonly/Makefile
 
 GITHUB_PROJECT=	bareos
-VERSION=	19.2.8
+VERSION=	20.0.0
 GITHUB_TAG=	Release/${VERSION}
 
 DISTNAME=	bareos-${VERSION}
@@ -22,15 +22,14 @@ USE_LANGUAGES+=	c c++
 USE_CMAKE=	yes
 CMAKE_ARG_PATH=	..
 CONFIGURE_DIRS=	core/_build
-# needs to be able to do compare-and-swap on time_t (cmpxchg8b)
-.if ${MACHINE_ARCH} == "i386"
-CXXFLAGS+=	-march=i586
-.endif
+
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB}
+
+REPLACE_PERL+=		core/src/cats/make_catalog_backup.pl.in
 
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_MESSAGE.paths=	Fixing absolute paths.
-SUBST_FILES.paths=	core/CMakeLists.txt
 SUBST_FILES.paths+=	core/src/cats/make_catalog_backup.pl.in
 SUBST_SED.paths=	-e 's,"/usr/local,"${PREFIX},g'
 SUBST_SED.paths+=	-e 's,"/var/log,"${VARBASE}/log,g'
@@ -43,8 +42,8 @@ BUILD_DEFS+=		VARBASE
 
 # file locations
 PKG_SYSCONFSUBDIR?=	bareos
-BAREOS_PIDDIR?=		${VARBASE}/run
-BAREOS_LOGDIR?=		${VARBASE}/log
+BAREOS_PIDDIR?=		${VARBASE}/run/${PKG_SYSCONFSUBDIR}
+BAREOS_LOGDIR?=		${VARBASE}/log/${PKG_SYSCONFSUBDIR}
 BAREOS_LIBDIR?=		${PREFIX}/lib
 BAREOS_WORKINGDIR?=	${VARBASE}/db/${PKG_SYSCONFSUBDIR}
 
@@ -76,12 +75,15 @@ FILES_SUBST+=		BAREOS_GROUP=${BAREOS_GROUP}
 FILES_SUBST+=		BAREOS_DIR_USER=${BAREOS_DIR_USER}
 FILES_SUBST+=		BAREOS_SD_USER=${BAREOS_SD_USER}
 
+# additional CXX parameters - document pkgsrc origin
+CXXFLAGS+=	-DBAREOS_BINARY_INFO=\\\"pkgsrc-compiled\\\"
+CXXFLAGS+=	-DBAREOS_JOBLOG_MESSAGE=\\\"'pkgsrc '"${DISTNAME}"\\\"
+CXXFLAGS+=	-DBAREOS_SERVICES_MESSAGE=\\\"'pkgsrc-compiled binaries are UNSUPPORTED by bareos.com (https://www.bareos.com).\\n'\\\"
+
 # cmake arguments
 CMAKE_ARGS+=	-DCMAKE_INSTALL_PREFIX=${PREFIX}
 CMAKE_ARGS+=	-DCMAKE_STAGING_PREFIX=${BUILDLINK_DIR}
-# reduce job log noise: CXXFLAGS+=-DNO_ADV=1
 CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS="${CXXFLAGS}"
-CMAKE_ARGS+=	-DSKIP_GTEST=1
 CMAKE_ARGS+=	-Dconfigtemplatedir=${PREFIX}/${CONFIG_TEMPLATE_PATH}
 CMAKE_ARGS+=	-Dworkingdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}/working
 CMAKE_ARGS+=	-Dsubsysdir=${VARBASE}/db/${PKG_SYSCONFSUBDIR}
@@ -94,15 +96,18 @@ CMAKE_ARGS+=	-Ddir-user=${BAREOS_DIR_USER}
 CMAKE_ARGS+=	-Ddir-group=${BAREOS_GROUP}
 CMAKE_ARGS+=	-Dsd-user=${BAREOS_SD_USER}
 CMAKE_ARGS+=	-Dsd-group=${BAREOS_GROUP}
-CMAKE_ARGS+=	-Dfd-user=root
+CMAKE_ARGS+=	-Dfd-user=${REAL_ROOT_USER}
 CMAKE_ARGS+=	-Dfd-group=${BAREOS_GROUP}
 
 .include "../../mk/bsd.prefs.mk"
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 # dependencies
+.include "../../mk/atomic64.mk"
 .include "../../archivers/lzo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/python27/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/sysutils/bareos/PLIST.common b/sysutils/bareos/PLIST
index a47baa85bba..11cff3f1070 100644
--- a/sysutils/bareos/PLIST.common
+++ b/sysutils/bareos/PLIST
@@ -1,9 +1,8 @@
-@comment $NetBSD: PLIST.common,v 1.1 2020/07/28 06:36:29 kardel Exp $
+@comment $NetBSD: PLIST,v 1.1 2021/02/01 09:08:43 kardel Exp $
 bin/bconsole
 bin/bregex
 bin/bsmtp
 bin/bwild
-bin/timelimit
 include/bareos/address_conf.h
 include/bareos/alist.h
 include/bareos/attr.h
@@ -35,7 +34,6 @@ include/bareos/jcr.h
 include/bareos/lex.h
 include/bareos/lib.h
 include/bareos/lockmgr.h
-include/bareos/md5.h
 include/bareos/mem_pool.h
 include/bareos/message.h
 include/bareos/messages_resource.h
@@ -51,8 +49,7 @@ include/bareos/scsi_crypto.h
 include/bareos/scsi_lli.h
 include/bareos/scsi_tapealert.h
 include/bareos/serial.h
-include/bareos/sha1.h
-include/bareos/status.h
+include/bareos/status_packet.h
 include/bareos/thread_list.h
 include/bareos/tls.h
 include/bareos/tls_conf.h
@@ -69,30 +66,40 @@ lib/bareos/plugins/BareosDirPluginBaseclass.py
 lib/bareos/plugins/BareosDirWrapper.py
 lib/bareos/plugins/BareosFdPluginBaseclass.py
 lib/bareos/plugins/BareosFdPluginLDAP.py
+lib/bareos/plugins/BareosFdPluginLibcloud.py
+lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py
 lib/bareos/plugins/BareosFdPluginLocalFileset.py
 lib/bareos/plugins/BareosFdPluginOvirt.py
 lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py
+lib/bareos/plugins/BareosFdPluginPostgres.py
+lib/bareos/plugins/BareosFdPluginVMware.py
 lib/bareos/plugins/BareosFdWrapper.py
+lib/bareos/plugins/BareosLibcloudApi.py
 lib/bareos/plugins/BareosSdPluginBaseclass.py
 lib/bareos/plugins/BareosSdWrapper.py
 lib/bareos/plugins/autoxflate-sd.so
 lib/bareos/plugins/bareos-dir-class-plugin.py
-lib/bareos/plugins/bareos-dir.py.template
 lib/bareos/plugins/bareos-fd-ldap.py
+lib/bareos/plugins/bareos-fd-libcloud.py
 lib/bareos/plugins/bareos-fd-local-fileset.py
-lib/bareos/plugins/bareos-fd-mock-test.py
 lib/bareos/plugins/bareos-fd-ovirt.py
 lib/bareos/plugins/bareos-fd-percona-xtrabackup.py
-lib/bareos/plugins/bareos-fd.py.template
+lib/bareos/plugins/bareos-fd-postgres.py
+lib/bareos/plugins/bareos-fd-vmware.py
 lib/bareos/plugins/bareos-sd-class-plugin.py
-lib/bareos/plugins/bareos-sd.py.template
-lib/bareos/plugins/bareos_dir_consts.py
-lib/bareos/plugins/bareos_fd_consts.py
-lib/bareos/plugins/bareos_sd_consts.py
+lib/bareos/plugins/bareos_libcloud_api/__init__.py
+lib/bareos/plugins/bareos_libcloud_api/bucket_explorer.py
+lib/bareos/plugins/bareos_libcloud_api/debug.py
+lib/bareos/plugins/bareos_libcloud_api/get_libcloud_driver.py
+lib/bareos/plugins/bareos_libcloud_api/mtime.py
+lib/bareos/plugins/bareos_libcloud_api/process_base.py
+lib/bareos/plugins/bareos_libcloud_api/queue_message.py
+lib/bareos/plugins/bareos_libcloud_api/utils.py
+lib/bareos/plugins/bareos_libcloud_api/worker.py
 lib/bareos/plugins/bpipe-fd.so
-lib/bareos/plugins/python-dir.so
-lib/bareos/plugins/python-fd.so
-lib/bareos/plugins/python-sd.so
+lib/bareos/plugins/python3-dir.so
+lib/bareos/plugins/python3-fd.so
+lib/bareos/plugins/python3-sd.so
 lib/bareos/plugins/scsicrypto-sd.so
 lib/bareos/plugins/scsitapealert-sd.so
 lib/bareos/scripts/bareos
@@ -136,25 +143,28 @@ lib/bareos/scripts/make_catalog_backup.pl
 lib/bareos/scripts/query.sql
 lib/bareos/scripts/update_bareos_tables
 lib/libbareos.so
-lib/libbareos.so.19
+lib/libbareos.so.20
 lib/libbareos.so.${PKGVERSION}
 lib/libbareoscats.so
-lib/libbareoscats.so.19
+lib/libbareoscats.so.20
 lib/libbareoscats.so.${PKGVERSION}
 lib/libbareosfastlz.so
-lib/libbareosfastlz.so.19
+lib/libbareosfastlz.so.20
 lib/libbareosfastlz.so.${PKGVERSION}
 lib/libbareosfind.so
-lib/libbareosfind.so.19
+lib/libbareosfind.so.20
 lib/libbareosfind.so.${PKGVERSION}
 lib/libbareoslmdb.so
-lib/libbareoslmdb.so.19
+lib/libbareoslmdb.so.20
 lib/libbareoslmdb.so.${PKGVERSION}
 lib/libbareossd-gentape.so
 lib/libbareossd.so
 lib/libbareossql.so
-lib/libbareossql.so.19
+lib/libbareossql.so.20
 lib/libbareossql.so.${PKGVERSION}
+${PYSITELIB}/bareosdir.so
+${PYSITELIB}/bareosfd.so
+${PYSITELIB}/bareossd.so
 man/man1/bareos-tray-monitor.1
 man/man1/bconsole.1
 man/man1/bregex.1
@@ -193,7 +203,6 @@ sbin/btape
 sbin/btestls
 sbin/btraceback
 sbin/bwild
-sbin/timelimit
 share/examples/bareos/configtemplates/bareos-dir.d/catalog/MyCatalog.conf
 share/examples/bareos/configtemplates/bareos-dir.d/client/bareos-fd.conf
 share/examples/bareos/configtemplates/bareos-dir.d/console/bareos-mon.conf
diff --git a/sysutils/bareos/distinfo b/sysutils/bareos/distinfo
index 335bd0d801e..1f250900c84 100644
--- a/sysutils/bareos/distinfo
+++ b/sysutils/bareos/distinfo
@@ -1,46 +1,32 @@
-$NetBSD: distinfo,v 1.4 2020/08/25 08:32:13 kardel Exp $
+$NetBSD: distinfo,v 1.5 2021/02/01 09:08:43 kardel Exp $
 
-SHA1 (bareos-19.2.8.tar.gz) = b26f7db66e108eed1e20b11c36f994456419748e
-RMD160 (bareos-19.2.8.tar.gz) = 221777925946ab05ddc00063ba51daf4555f16d1
-SHA512 (bareos-19.2.8.tar.gz) = 60bbbbd949a63f978cf1ed7d0cfc22c22f117d8c2700eb47531e15b2d91fc700c522519f0b816cd1040283f09b4c81f36910c66c8b6f4bf1ff22180e979bdeb5
-Size (bareos-19.2.8.tar.gz) = 12604929 bytes
-SHA1 (patch-core_CMakeLists.txt) = 17524dd14c665f00a8911589b52f930ec55e1e0e
-SHA1 (patch-core_cmake_BareosCheckIncludes.cmake) = 8f2a88768acdbe9adf94939ae1dabd3edf40144b
-SHA1 (patch-core_cmake_BareosFindAllLibraries.cmake) = eb33f59f616a5d265a6371dcc028a3031b5dbab5
-SHA1 (patch-core_cmake_BareosFindPrograms.cmake) = a3ed507365fb123ea84911451655ced5f07c7f32
-SHA1 (patch-core_cmake_BareosInstallConfigFiles.cmake) = bad0e5c0c87e726aaac49da99857b3699f0d28e2
-SHA1 (patch-core_cmake_BareosSetVariableDefaults.cmake) = a0ff2802d0583fca2685250bd4a5e0c8259837b2
-SHA1 (patch-core_cmake_BareosTimeFunctions.cmake) = aafa1dd9652ae8cc57414a405f03247242100ba9
-SHA1 (patch-core_platforms_netbsd_CMakeLists.txt) = dd6a54bac7e4b51e3f564f83cc7f78a8826a0d8e
-SHA1 (patch-core_platforms_netbsd_chio-changer) = 4bc4d7382db8e41bd1a10852e429e8f4e16e9fe4
-SHA1 (patch-core_scripts_CMakeLists.txt) = b7869d18651e6e6da4ad5f23c8f4c80d0166aa7c
-SHA1 (patch-core_scripts_bareos-config-lib.sh.in) = f9f657406dea5df23c59bceed286ff5f3ae580d0
-SHA1 (patch-core_src_CMakeLists.txt) = 3db708e8ece43b1087773470a19ea3362aec3d79
-SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = a31110c1219058a03a4f44411a848ff997aca3c1
-SHA1 (patch-core_src_cats_postgresql__queries.inc) = d255a93a039d671d9dad7b7b096dfff97095aa6e
-SHA1 (patch-core_src_dird_admin.cc) = 0e361de94ff0763c8ac17f32ccb0115c998a7ec2
-SHA1 (patch-core_src_dird_archive.cc) = fa383d6edb8aec942b6c44a35acf50d5ebe5c888
-SHA1 (patch-core_src_dird_authenticate__console.cc) = c5339303583edda8fc9d0c7e741aa6e6b8fc4306
-SHA1 (patch-core_src_dird_backup.cc) = a416a9342d695aaaf438af87113e34a1c4016ebd
-SHA1 (patch-core_src_dird_consolidate.cc) = 934a87e8e799585c4a5bf53c30b0e670b01f3372
-SHA1 (patch-core_src_dird_dird__conf.cc) = b2d619d164acfa8949e8d10d45972dbce7f3b258
-SHA1 (patch-core_src_dird_migrate.cc) = 694f86a15f532f9c13c387f1617be79342ba6e84
-SHA1 (patch-core_src_dird_restore.cc) = ab2243457a788b963ab2dfc6b03046539ee5d06a
-SHA1 (patch-core_src_dird_verify.cc) = b4f346a62358bffc09d5247d1636e352a2318eb0
-SHA1 (patch-core_src_filed_accurate__lmdb.cc) = a3436251902b16a2ed4617a750a36a8a70284fee
-SHA1 (patch-core_src_findlib_acl.cc) = 79d47ae5f79e4e2629a0330787cc45b8347a42e2
-SHA1 (patch-core_src_findlib_find__one.cc) = 50eb6d289b7b2a7b33ee5828db31d03169833d9c
-SHA1 (patch-core_src_lib_mem__pool.cc) = 16b5adc4a5b2b4fd542b4d330e03283b8994a4a7
-SHA1 (patch-core_src_lib_scsi__lli.cc) = 09aa887d71009baa2ce2203c46c88a89097d6546
-SHA1 (patch-core_src_lib_scsi__tapealert.cc) = 11feff157ec8abbbbf689eed9aecd15b336fb28e
-SHA1 (patch-core_src_lib_version.c) = edfd88aed983ea3ce1ead6846707b5625ad5fc51
-SHA1 (patch-core_src_lmdb_mdb.c) = 6cb69f975c23ec5ae52eb1daa8f6f73b7cbf71fd
-SHA1 (patch-core_src_plugins_stored_scsicrypto-sd.cc) = d59125fd445536e220140acf16e43605a4a98e9c
-SHA1 (patch-core_src_plugins_stored_scsitapealert-sd.cc) = 92ef75fbddb587957ec972480a87fe0f5b110111
-SHA1 (patch-core_src_stored_acquire.cc) = c239b2a4a3769b3f99315fae5cc5ee564454a1ad
-SHA1 (patch-core_src_stored_bscan.cc) = 5dfcf88e8049c7717f947349fa127495007b65c6
-SHA1 (patch-core_src_stored_btape.cc) = b3e368e049cec3e9a0c86d9ce29489b53592ff33
-SHA1 (patch-core_src_stored_device.cc) = 34b8069d53d67f90dc43ff44893a990aef40e5c5
-SHA1 (patch-core_src_stored_dir__cmd.cc) = 5c4cc412817a8d8d9eb51b563dbd37bc3f7a7aea
-SHA1 (patch-core_src_stored_label.cc) = 669164289bcb7a2d27e8c63db32d6bf84a3be97e
-SHA1 (patch-core_src_stored_mount.cc) = 7d8b822449068b1f6cd3f411535bbbab4fefba0a
+SHA1 (bareos-20.0.0.tar.gz) = e0ad526ec2d740943892b391a2f0286414c678de
+RMD160 (bareos-20.0.0.tar.gz) = 183d779c1b7b7c5146522c67add9d38dea60a520
+SHA512 (bareos-20.0.0.tar.gz) = 14961ed5db7d169e1e529eded47299129cd92fe29974bd457863756cdee47aa0731fe65ece8439e71a7c474b483c2cfc1a95dd6d8419bf9ae3d3690db52bc3cf
+Size (bareos-20.0.0.tar.gz) = 13325939 bytes
+SHA1 (patch-core_CMakeLists.txt) = e59c94620769db0b26d6255830753bdc3b42ad77
+SHA1 (patch-core_cmake_BareosCheckIncludes.cmake) = bb3703ee083b3aa6ea8d5819c0064324037c560a
+SHA1 (patch-core_cmake_BareosFindAllLibraries.cmake) = 35ddd7c2f95f56aa5f65c5f6f2d39700c350e492
+SHA1 (patch-core_cmake_BareosFindPrograms.cmake) = 89172bc64ba28ca901c3fb5f150f814c0e063875
+SHA1 (patch-core_cmake_BareosInstallConfigFiles.cmake) = a0110766eee99c19bda4de506a86b29a74032e8d
+SHA1 (patch-core_cmake_BareosSetVariableDefaults.cmake) = 1dcdfb5a1a3b6494bb101b4b810646d58bfeb662
+SHA1 (patch-core_cmake_BareosTimeFunctions.cmake) = 237c1237712b361135c0f6e6a1c15b9832c105c5
+SHA1 (patch-core_platforms_netbsd_CMakeLists.txt) = c9d656ed5d51dd9a668186ea7c06c7767c732e4f
+SHA1 (patch-core_platforms_netbsd_chio-changer) = 882dbe658f587362fb5616f5d1ad1abec4763871
+SHA1 (patch-core_scripts_CMakeLists.txt) = bb2c8d62d085c22813490137c467443b7c024e70
+SHA1 (patch-core_scripts_bareos-config-lib.sh.in) = 4aa83a53dc9e8383ed79a0258dbaab6d0110366a
+SHA1 (patch-core_src_cats_make__catalog__backup.pl.in) = ac17b314b16dced9be81580af9fa385f99baeebd
+SHA1 (patch-core_src_cats_postgresql__queries.inc) = 495b4cc6c95a4c0708019f5f36eb10e9259e1341
+SHA1 (patch-core_src_console_CMakeLists.txt) = 0c5571696a456d57f8db5d1f17e8300b6177a77b
+SHA1 (patch-core_src_dird_dird__conf.cc) = 8a0be37b36e4cbc2d0369903b5e74c495d364a49
+SHA1 (patch-core_src_filed_accurate__lmdb.cc) = 125f80e40b02ba9e2f07a0c11480131a0d6ee573
+SHA1 (patch-core_src_findlib_acl.cc) = 8a1a5cc8d739160baf39b85052843b703d3acd75
+SHA1 (patch-core_src_findlib_find__one.cc) = aa44a3567cb1cf4948931903b0257ac5fb6ec278
+SHA1 (patch-core_src_lib_scsi__lli.cc) = f064befcf56363e5a43190131a20837691602ab1
+SHA1 (patch-core_src_lib_scsi__tapealert.cc) = d99290311bbe10290e9ca1fe2a97beb5d91d1e93
+SHA1 (patch-core_src_lmdb_mdb.c) = 8f83c89fb7bad04b53ebebd416f6080f650e695e
+SHA1 (patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc) = e934004e0e71ffb7df7c342abd88e927e6e894ca
+SHA1 (patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc) = b43f8ba6152532d11e0154dc74d2df393a98d888
+SHA1 (patch-core_src_stored_btape.cc) = c1f0637e649d3d1220105e36d616850b338fafae
+SHA1 (patch-core_src_stored_dev.cc) = 8ad73c6e3ff923dc56f4b070a904d886af175f8a
+SHA1 (patch-systemtests_tests_droplet-s3_testrunner) = 42f760df63beca850ab7a4b9c2d5995f09299a4e
diff --git a/sysutils/bareos/files/bareos-dir.sh b/sysutils/bareos/files/bareos-dir.sh
index 6ad45ce8e32..38f1274cae3 100644
--- a/sysutils/bareos/files/bareos-dir.sh
+++ b/sysutils/bareos/files/bareos-dir.sh
@@ -13,6 +13,14 @@ command="@PREFIX@/sbin/bareos-dir"
 required_dirs="@BAREOS_ETCDIR@/bareos-dir.d"
 pidfile="@BAREOS_PIDDIR@/bareos-dir.9101.pid"
 command_args="-u @BAREOS_DIR_USER@ -g @BAREOS_GROUP@"
+start_precmd=make_dirs
+
+make_dirs() {
+	@MKDIR@ -m 0775 -p @BAREOS_PIDDIR@
+	@CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_PIDDIR@
+	@MKDIR@ -m 0775 -p @BAREOS_LOGDIR@
+	@CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_LOGDIR@
+}
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
diff --git a/sysutils/bareos/files/bareos-fd.sh b/sysutils/bareos/files/bareos-fd.sh
index 8d644d872ca..b3f631cae40 100644
--- a/sysutils/bareos/files/bareos-fd.sh
+++ b/sysutils/bareos/files/bareos-fd.sh
@@ -13,6 +13,15 @@ command="@PREFIX@/sbin/bareos-fd"
 required_dirs="@BAREOS_ETCDIR@/bareos-fd.d"
 pidfile="@BAREOS_PIDDIR@/bareos-fd.9102.pid"
 command_args="-g @BAREOS_GROUP@"
+start_precmd=make_dirs
+
+make_dirs() {
+	@MKDIR@ -m 0775 -p @BAREOS_PIDDIR@
+	@CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_PIDDIR@
+	@MKDIR@ -m 0775 -p @BAREOS_LOGDIR@
+	@CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_LOGDIR@
+}
+
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
diff --git a/sysutils/bareos/files/bareos-sd.sh b/sysutils/bareos/files/bareos-sd.sh
index 3437c141bff..dede9890a01 100644
--- a/sysutils/bareos/files/bareos-sd.sh
+++ b/sysutils/bareos/files/bareos-sd.sh
@@ -13,6 +13,15 @@ command="@PREFIX@/sbin/bareos-sd"
 required_dirs="@BAREOS_ETCDIR@/bareos-sd.d"
 pidfile="@BAREOS_PIDDIR@/bareos-sd.9103.pid"
 command_args="-u @BAREOS_SD_USER@ -g @BAREOS_GROUP@"
+start_precmd=make_dirs
+
+make_dirs() {
+	@MKDIR@ -m 0775 -p @BAREOS_PIDDIR@
+	@CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_PIDDIR@
+	@MKDIR@ -m 0775 -p @BAREOS_LOGDIR@
+	@CHOWN@ @BAREOS_DIR_USER@:@BAREOS_GROUP@ @BAREOS_LOGDIR@
+}
+
 
 if [ -f /etc/rc.subr ]; then
 	load_rc_config $name
diff --git a/sysutils/bareos/patches/patch-core_CMakeLists.txt b/sysutils/bareos/patches/patch-core_CMakeLists.txt
index 0452b2ffe0e..ede8143f424 100644
--- a/sysutils/bareos/patches/patch-core_CMakeLists.txt
+++ b/sysutils/bareos/patches/patch-core_CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-core_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_CMakeLists.txt,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 	Setup NetBSD parameters
 	Due to current lack of XDR quad marshalling NDMP
 	needs to be disabled.
 
---- core/CMakeLists.txt.orig	2020-04-16 08:31:41.000000000 +0000
+--- core/CMakeLists.txt.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/CMakeLists.txt
-@@ -264,6 +264,15 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD
+@@ -259,10 +259,19 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD
    link_libraries(intl)
  endif()
  
@@ -14,15 +14,20 @@ $NetBSD: patch-core_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
 +   set(HAVE_NETBSD_OS 1)
 +   set(ndmp 0)
 +   set(PSCMD "ps -ax -o pid,command")
-+   include_directories(@PREFIX@/include)
-+   link_directories(@PREFIX@/lib)
++   include_directories(${PREFIX}/include)
++   link_directories(${PREFIX}/lib)
 +   link_libraries(intl)
 +endif()
 +
  if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
    set(HAVE_DARWIN_OS 1)
    # set(CMAKE_INCLUDE_PATH  "${OPENSSL_INCLUDE_DIR}:${CMAKE_INCLUDE_PATH}")
-@@ -652,6 +661,7 @@ try_compile(
+-  set(CMAKE_INCLUDE_PATH "/usr/local/opt/:${CMAKE_INCLUDE_PATH}")
++  set(CMAKE_INCLUDE_PATH "${PREFIX}/opt/:${CMAKE_INCLUDE_PATH}")
+   link_directories(/usr/local/lib)
+ 
+   include_directories(/usr/local/opt/gettext/include)
+@@ -648,6 +657,7 @@ try_compile(
    ${PROJECT_SOURCE_DIR}/src/compile_tests/trivially_copyable.cc
  )
  
@@ -30,7 +35,7 @@ $NetBSD: patch-core_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
  set(ndmp "${ndmp}")
  set(lmdb "${lmdb}")
  set(build_client_only "${client-only}")
-@@ -666,7 +676,8 @@ if(${acl})
+@@ -662,7 +672,8 @@ if(${acl})
        set(HAVE_ACL 1)
        message(STATUS "acl found, libs: ${ACL_LIBS}")
      else()
diff --git a/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake b/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake
index 95299ee6910..2f1453fb728 100644
--- a/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake
+++ b/sysutils/bareos/patches/patch-core_cmake_BareosCheckIncludes.cmake
@@ -1,24 +1,23 @@
-$NetBSD: patch-core_cmake_BareosCheckIncludes.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosCheckIncludes.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 	Fix header file checks for NetBSD
 
---- core/cmake/BareosCheckIncludes.cmake.orig	2020-04-16 08:31:41.000000000 +0000
+--- core/cmake/BareosCheckIncludes.cmake.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/cmake/BareosCheckIncludes.cmake
-@@ -55,7 +55,7 @@ check_include_files(sys/dl.h HAVE_SYS_DL
+@@ -38,7 +38,7 @@ check_include_files(sys/bitypes.h HAVE_S
+ check_include_files(sys/capability.h HAVE_SYS_CAPABILITY_H)
  check_include_files(sys/ea.h HAVE_SYS_EA_H)
  check_include_files("sys/types.h;sys/extattr.h" HAVE_SYS_EXTATTR_H)
- check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H)
 -check_include_files(sys/mtio.h HAVE_SYS_MTIO_H)
 +check_include_files("sys/types.h;sys/mtio.h" HAVE_SYS_MTIO_H)
- check_include_files(sys/ndir.h HAVE_SYS_NDIR_H)
  check_include_files(sys/nvpair.h HAVE_SYS_NVPAIR_H)
- check_include_files(sys/select.h HAVE_SYS_SELECT_H)
-@@ -134,7 +134,7 @@ check_include_files("sys/types.h;sys/scs
-                     HAVE_SYS_SCSI_IMPL_USCSI_H)
+ 
+ check_include_files("sys/types.h;sys/tape.h" HAVE_SYS_TAPE_H)
+@@ -88,6 +88,6 @@ check_include_files(
+ )
  check_include_files("stdio.h;camlib.h" HAVE_CAMLIB_H)
  check_include_files(cam/scsi/scsi_message.h HAVE_CAM_SCSI_SCSI_MESSAGE_H)
 -check_include_files(dev/scsipi/scsipi_all.h HAVE_DEV_SCSIPI_SCSIPI_ALL_H)
 +check_include_files("sys/types.h;dev/scsipi/scsipi_all.h" HAVE_DEV_SCSIPI_SCSIPI_ALL_H)
  
  check_include_files(scsi/uscsi_all.h HAVE_USCSI_ALL_H)
- check_include_files(scsi/uscsi_all.h HAVE_SCSI_USCSI_ALL_H)
diff --git a/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake b/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake
index f5e76debc75..cca98b1cfc7 100644
--- a/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake
+++ b/sysutils/bareos/patches/patch-core_cmake_BareosFindAllLibraries.cmake
@@ -1,17 +1,24 @@
-$NetBSD: patch-core_cmake_BareosFindAllLibraries.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosFindAllLibraries.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-provide a way to disable googletest which may be found by
-cmake but it is not in buildlink. can be optionalized
-later.
+	cmake build gets confused when both versions of python 2 and 3 are
+	availabe. as python 2.7 is eol prefer python 3 in this case.
 
---- core/cmake/BareosFindAllLibraries.cmake.orig	2020-06-23 13:14:52.254196443 +0000
+--- core/cmake/BareosFindAllLibraries.cmake.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/cmake/BareosFindAllLibraries.cmake
-@@ -82,7 +82,7 @@ bareosfindlibrary("util")
- bareosfindlibrary("dl")
- bareosfindlibrary("acl")
- # BareosFindLibrary("wrap")
--if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES SunPro)
-+if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES SunPro AND NOT SKIP_GTEST)
-   bareosfindlibrary("gtest")
-   bareosfindlibrary("gtest_main")
-   bareosfindlibrary("gmock")
+@@ -44,7 +44,7 @@ else()
+     set(HAVE_PYTHON 1)
+   endif()
+ 
+-  if(${Python2_FOUND})
++  if(${Python2_FOUND} AND NOT ${Python3_FOUND})
+     set(PYTHON_EXECUTABLE
+         ${Python2_EXECUTABLE}
+         PARENT_SCOPE
+@@ -62,6 +62,7 @@ else()
+   endif()
+ 
+   if(${Python3_FOUND})
++    set(Python2_FOUND 0)
+     set(PYTHON_EXECUTABLE
+         ${Python3_EXECUTABLE}
+         PARENT_SCOPE
diff --git a/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake b/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake
index b4fc58048de..9983a095819 100644
--- a/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake
+++ b/sysutils/bareos/patches/patch-core_cmake_BareosFindPrograms.cmake
@@ -1,11 +1,11 @@
-$NetBSD: patch-core_cmake_BareosFindPrograms.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosFindPrograms.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 	the pkgsrc build system provides awk on the path.
-	The cmake build system uses this build path for
+	the cmake build system uses this build path for
 	installed scripts - change the way the awk path
 	is found.
 
---- core/cmake/BareosFindPrograms.cmake.orig	2020-07-09 17:39:20.000000000 +0000
+--- core/cmake/BareosFindPrograms.cmake.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/cmake/BareosFindPrograms.cmake
 @@ -18,10 +18,14 @@
  #   02110-1301, USA.
diff --git a/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake b/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake
index 57bd4f1f6d0..49463e099d0 100644
--- a/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake
+++ b/sysutils/bareos/patches/patch-core_cmake_BareosInstallConfigFiles.cmake
@@ -1,64 +1,64 @@
-$NetBSD: patch-core_cmake_BareosInstallConfigFiles.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosInstallConfigFiles.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-	The original build source is lax on the permissions.
-	Adjust permission to match pkgsrc expectations.
+	the original build source is lax on the permissions.
+	adjust permissions to match pkgsrc expectations.
 
---- core/cmake/BareosInstallConfigFiles.cmake.orig	2020-07-09 17:39:20.000000000 +0000
+--- core/cmake/BareosInstallConfigFiles.cmake.orig	2021-01-22 12:52:32.430510739 +0000
 +++ core/cmake/BareosInstallConfigFiles.cmake
-@@ -69,6 +69,7 @@ macro(
-         file(
-           INSTALL "${configfile}.new"
-           DESTINATION "${DESTCONFDIR}/${resname}"
-+	  FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
-         )
+@@ -61,13 +61,15 @@ macro(BareosInstallConfigFiles CONFDIR C
+         file(RENAME "${configfile}" "${configfile}.new")
+ 
+         message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}")
+-        file(COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}")
++        file(COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}"
++	     FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ)
          file(RENAME "${configfile}.new" "${configfile}")
        else()
-@@ -76,7 +77,8 @@ macro(
-           STATUS
-             "${resname}/${fname} as ${resname}/${fname} (new installation)"
+         message(
+           STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)"
          )
 -        file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
-+        file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}" 
++        file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}"
 +	     FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ)
        endif()
      endforeach()
    endforeach()
-@@ -121,6 +123,7 @@ macro(
-         file(
-           COPY "${BackendConfigSrcDir}/${configfile}.new"
-           DESTINATION "${DESTCONFDIR}/${dir}"
-+	  FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
+@@ -111,6 +113,7 @@ macro(BareosInstallConfigFiles CONFDIR C
+         )
+         file(COPY "${BackendConfigSrcDir}/${configfile}.new"
+              DESTINATION "${DESTCONFDIR}/${dir}"
++	     FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
          )
          file(RENAME "${BackendConfigSrcDir}/${configfile}.new"
-              "${BackendConfigSrcDir}/${configfile}")
-@@ -129,6 +132,7 @@ macro(
-         file(
-           COPY "${BackendConfigSrcDir}/${configfile}"
-           DESTINATION "${DESTCONFDIR}/${dir}"
-+	  FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
+              "${BackendConfigSrcDir}/${configfile}"
+@@ -119,6 +122,7 @@ macro(BareosInstallConfigFiles CONFDIR C
+         message(STATUS "${configfile} as ${configfile}")
+         file(COPY "${BackendConfigSrcDir}/${configfile}"
+              DESTINATION "${DESTCONFDIR}/${dir}"
++	     FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
          )
        endif()
      endforeach()
-@@ -151,6 +155,7 @@ macro(
-       file(
-         COPY "${BackendConfigSrcDir}/${configfile}"
-         DESTINATION "${DESTCONFDIR}/${dir}"
-+	FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+@@ -140,6 +144,7 @@ macro(BareosInstallConfigFiles CONFDIR C
+ 
+       file(COPY "${BackendConfigSrcDir}/${configfile}"
+            DESTINATION "${DESTCONFDIR}/${dir}"
++	   FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
        )
      endforeach()
  
-@@ -183,11 +188,14 @@ macro(
-             file(
-               COPY "${configfile}.new"
-               DESTINATION "${DESTCONFDIR}/${resname}"
-+	      FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
+@@ -175,11 +180,14 @@ macro(BareosInstallConfigFiles CONFDIR C
+             file(RENAME "${configfile}" "${configfile}.new")
+             file(COPY "${configfile}.new"
+                  DESTINATION "${DESTCONFDIR}/${resname}"
++		 FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
              )
              file(RENAME "${configfile}.new" "${configfile}")
            else()
              message(STATUS "${resname}/${fname} as ${resname}/${fname}")
 -            file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}")
 +            file(COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}"
-+	         FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
++		 FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
 +	    )
            endif()
          else()
diff --git a/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake
index 59fbe253cf9..2fd04399fee 100644
--- a/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake
+++ b/sysutils/bareos/patches/patch-core_cmake_BareosSetVariableDefaults.cmake
@@ -1,19 +1,10 @@
-$NetBSD: patch-core_cmake_BareosSetVariableDefaults.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosSetVariableDefaults.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-provide absolute paths
+	disable ndmp due to missing xdr marshalling code
 
---- core/cmake/BareosSetVariableDefaults.cmake.orig	2020-06-22 13:09:58.135202289 +0000
+--- core/cmake/BareosSetVariableDefaults.cmake.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/cmake/BareosSetVariableDefaults.cmake
-@@ -124,7 +124,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin"
- 
-   # logdir
-   if(NOT DEFINED logdir)
--    set(logdir "${CMAKE_INSTALL_LOCALSTATEDIR}/log/${CMAKE_PROJECT_NAME}")
-+    set(logdir "/${CMAKE_INSTALL_LOCALSTATEDIR}/log/${CMAKE_PROJECT_NAME}")
-   endif()
- 
-   # datarootdir
-@@ -412,6 +412,8 @@ endif()
+@@ -413,6 +413,8 @@ endif()
  # ndmp
  if(NOT DEFINED ndmp)
    set(ndmp ON)
diff --git a/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake b/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake
index 424b046e42a..6ce0e1f80c2 100644
--- a/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake
+++ b/sysutils/bareos/patches/patch-core_cmake_BareosTimeFunctions.cmake
@@ -1,17 +1,15 @@
-$NetBSD: patch-core_cmake_BareosTimeFunctions.cmake,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_cmake_BareosTimeFunctions.cmake,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-Use the POSIX compatible way of doing date calculations.
+	use the POSIX compatible way of doing date calculations.
 
---- core/cmake/BareosTimeFunctions.cmake.orig	2020-04-16 08:31:41.000000000 +0000
+--- core/cmake/BareosTimeFunctions.cmake.orig	2021-01-22 12:44:55.503593980 +0000
 +++ core/cmake/BareosTimeFunctions.cmake
-@@ -37,8 +37,8 @@ function(
+@@ -30,7 +30,7 @@ function(timestamp_at at result format)
+     set(old_lang "$ENV{LC_ALL}")
+     set(ENV{LC_ALL} "C")
      execute_process(
-       COMMAND
-         ${DATECMD}
--        --utc
--        "--date=@${at}"
-+        -u
-+        "-d @${at}"
-         "+${format}"
+-      COMMAND ${DATECMD} --utc "--date=@${at}" "+${format}"
++      COMMAND ${DATECMD} -u "--date=@${at}" "+${format}"
        OUTPUT_VARIABLE out
        OUTPUT_STRIP_TRAILING_WHITESPACE
+     )
diff --git a/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt b/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt
index ada2a13058b..eed8ca403bf 100644
--- a/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt
+++ b/sysutils/bareos/patches/patch-core_platforms_netbsd_CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-core_platforms_netbsd_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_platforms_netbsd_CMakeLists.txt,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-	Add installation of chio-changer script
+	add installation of chio-changer script
 
---- core/platforms/netbsd/CMakeLists.txt.orig	2019-04-01 11:02:03.728443554 +0000
+--- core/platforms/netbsd/CMakeLists.txt.orig	2021-01-21 10:16:11.935292480 +0000
 +++ core/platforms/netbsd/CMakeLists.txt
 @@ -0,0 +1,11 @@
 +# NetBSD specifics
diff --git a/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer b/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer
index 25df3e1851e..9ef3f5c9b56 100644
--- a/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer
+++ b/sysutils/bareos/patches/patch-core_platforms_netbsd_chio-changer
@@ -1,8 +1,8 @@
-$NetBSD: patch-core_platforms_netbsd_chio-changer,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_platforms_netbsd_chio-changer,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 	NetBSD changer script using NetBSD chio command
 
---- core/platforms/netbsd/chio-changer.orig	2020-07-22 11:05:39.078612642 +0000
+--- core/platforms/netbsd/chio-changer.orig	2021-01-21 10:16:11.945124363 +0000
 +++ core/platforms/netbsd/chio-changer
 @@ -0,0 +1,134 @@
 +#!/bin/sh
diff --git a/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt b/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt
index 5fa642380d3..7084adee79f 100644
--- a/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt
+++ b/sysutils/bareos/patches/patch-core_scripts_CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_scripts_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_scripts_CMakeLists.txt,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 suppress mtx-changer installation if not found
 
---- core/scripts/CMakeLists.txt.orig	2020-07-09 17:39:20.000000000 +0000
+--- core/scripts/CMakeLists.txt.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/scripts/CMakeLists.txt
-@@ -35,25 +35,37 @@ install(
+@@ -36,25 +36,37 @@ install(
  install(
    FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config
          bareos-config-lib.sh bareos-ctl-funcs
diff --git a/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in b/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in
index 7511a2ce5fa..68ff95f7837 100644
--- a/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in
+++ b/sysutils/bareos/patches/patch-core_scripts_bareos-config-lib.sh.in
@@ -1,15 +1,15 @@
-$NetBSD: patch-core_scripts_bareos-config-lib.sh.in,v 1.1 2020/08/25 08:32:14 kardel Exp $
+$NetBSD: patch-core_scripts_bareos-config-lib.sh.in,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 	add $PREFIX/{bin,sbin} to PATH to avoid tripping over
 	missing commands (like db programs)
 
---- core/scripts/bareos-config-lib.sh.in.orig	2020-08-25 07:03:03.539870629 +0000
+--- core/scripts/bareos-config-lib.sh.in.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/scripts/bareos-config-lib.sh.in
-@@ -4,6 +4,7 @@ BAREOS_CONFIG_DIR=${BAREOS_CONFIG_DIR:-@
+@@ -23,6 +23,7 @@ BAREOS_CONFIG_DIR=${BAREOS_CONFIG_DIR:-@
  BAREOS_SBIN_DIR=${BAREOS_SBIN_DIR:-@sbindir@}
  DBCHECK="${BAREOS_SBIN_DIR}/bareos-dbcheck -c ${BAREOS_CONFIG_DIR} -B"
  AWK="@AWK@"
-+PATH=${PATH}:@bindir@:@sbindir@
++PATH=@PREFIX@/bin:@PREFIX@/sbin:${PATH}
  
  SEC_GROUPS="tape disk"
  
diff --git a/sysutils/bareos/patches/patch-core_src_CMakeLists.txt b/sysutils/bareos/patches/patch-core_src_CMakeLists.txt
deleted file mode 100644
index 98f569a8c67..00000000000
--- a/sysutils/bareos/patches/patch-core_src_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-core_src_CMakeLists.txt,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-make ndmp conditional
-
---- core/src/CMakeLists.txt.orig	2020-06-22 13:23:09.152706321 +0000
-+++ core/src/CMakeLists.txt
-@@ -20,7 +20,7 @@
- if(NOT client-only)
-   add_subdirectory(tools)
-   add_subdirectory(cats)
--  if(NOT HAVE_WIN32 AND ndmp)
-+  if(HAVE_NDMP AND ndmp)
-     add_subdirectory(ndmp)
-   endif()
-   add_subdirectory(dird)
diff --git a/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in b/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
index 2dd9fd887e4..c81bbd90f7a 100644
--- a/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
+++ b/sysutils/bareos/patches/patch-core_src_cats_make__catalog__backup.pl.in
@@ -1,15 +1,9 @@
-$NetBSD: patch-core_src_cats_make__catalog__backup.pl.in,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_cats_make__catalog__backup.pl.in,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-	XXX sort of works, but should ge generalized
+	include ${PREFIX}/{bin,sbin} in path to find db programs/tools
 
 --- core/src/cats/make_catalog_backup.pl.in.orig	2020-07-09 17:39:20.000000000 +0000
 +++ core/src/cats/make_catalog_backup.pl.in
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!@PREFIX@/bin/perl
- use strict;
- 
- =head1 SCRIPT
 @@ -36,6 +36,7 @@ use strict;
  my $cat = shift or die "Usage: $0 catalogname";
  my $dir_conf='@sbindir@/bareos-dbcheck -B -c @confdir@';
diff --git a/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc b/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc
index 39a766be906..1e2dd97b8ba 100644
--- a/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc
+++ b/sysutils/bareos/patches/patch-core_src_cats_postgresql__queries.inc
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_src_cats_postgresql__queries.inc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_cats_postgresql__queries.inc,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-	Disambuguate reference columns
+	disambiguate reference columns
 
---- core/src/cats/postgresql_queries.inc.orig	2019-01-31 11:53:07.846130361 +0000
+--- core/src/cats/postgresql_queries.inc.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/src/cats/postgresql_queries.inc
-@@ -170,7 +170,7 @@ const char *BareosDbPostgresql::query_de
+@@ -171,7 +171,7 @@ const char *BareosDbPostgresql::query_de
  ,
  
  /* 0016_uar_list_jobs */
@@ -13,7 +13,7 @@ $NetBSD: patch-core_src_cats_postgresql__queries.inc,v 1.1 2020/07/28 06:36:29 k
    "FROM Client, Job "
   "WHERE Client.ClientId = Job.ClientId "
     "AND JobStatus IN ('T','W') "
-@@ -179,7 +179,7 @@ const char *BareosDbPostgresql::query_de
+@@ -180,7 +180,7 @@ const char *BareosDbPostgresql::query_de
  ,
  
  /* 0017_uar_print_jobs */
diff --git a/sysutils/bareos/patches/patch-core_src_console_CMakeLists.txt b/sysutils/bareos/patches/patch-core_src_console_CMakeLists.txt
new file mode 100644
index 00000000000..90d4db08808
--- /dev/null
+++ b/sysutils/bareos/patches/patch-core_src_console_CMakeLists.txt
@@ -0,0 +1,24 @@
+$NetBSD: patch-core_src_console_CMakeLists.txt,v 1.1 2021/02/01 09:08:43 kardel Exp $
+
+	install config file with proper permissions
+
+--- core/src/console/CMakeLists.txt.orig	2021-01-22 17:06:22.267142097 +0000
++++ core/src/console/CMakeLists.txt
+@@ -62,11 +62,15 @@ install(
+   set(DESTDIR \$ENV{DESTDIR})
+   if(NOT EXISTS \$ENV{DESTDIR}${configtemplatedir}/bconsole.conf)
+     message(STATUS \"Installing: \$ENV{DESTDIR}${configtemplatedir}/bconsole.conf\")
+-    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf DESTINATION \$ENV{DESTDIR}${configtemplatedir})
++    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf DESTINATION \$ENV{DESTDIR}${configtemplatedir}
++	 FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
++    )
+   else()
+     message(STATUS \"Installing: \$ENV{DESTDIR}${configtemplatedir}/bconsole.conf.new\")
+     file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf.new)
+-    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf.new DESTINATION \$ENV{DESTDIR}${configtemplatedir})
++    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf.new DESTINATION \$ENV{DESTDIR}${configtemplatedir}
++	 FILE_PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ
++    )
+     file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf.new ${CMAKE_CURRENT_SOURCE_DIR}/bconsole.conf)
+   endif()
+ "
diff --git a/sysutils/bareos/patches/patch-core_src_dird_admin.cc b/sysutils/bareos/patches/patch-core_src_dird_admin.cc
deleted file mode 100644
index d5b55d03d57..00000000000
--- a/sysutils/bareos/patches/patch-core_src_dird_admin.cc
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-core_src_dird_admin.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	Remove inadequate clutter in production messages
-
---- core/src/dird/admin.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/dird/admin.cc
-@@ -120,10 +120,15 @@ void AdminCleanup(JobControlRecord* jcr,
-          "  Scheduled time:         %s\n"
-          "  Start time:             %s\n"
-          "  End time:               %s\n"
-+#ifndef NO_ADV
-          "  Bareos binary info:     %s\n"
-+#endif
-          "  Termination:            %s\n\n"),
-        kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, edt, jcr->impl->jr.JobId,
--       jcr->impl->jr.Job, schedt, sdt, edt, kBareosVersionStrings.JoblogMessage,
-+       jcr->impl->jr.Job, schedt, sdt, edt,
-+#ifndef NO_ADV
-+       kBareosVersionStrings.JoblogMessage,
-+#endif
-        TermMsg);
- 
-   Dmsg0(debuglevel, "Leave AdminCleanup()\n");
diff --git a/sysutils/bareos/patches/patch-core_src_dird_archive.cc b/sysutils/bareos/patches/patch-core_src_dird_archive.cc
deleted file mode 100644
index bb6a24b9869..00000000000
--- a/sysutils/bareos/patches/patch-core_src_dird_archive.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-core_src_dird_archive.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	Remove inadequate clutter in production messages
-
---- core/src/dird/archive.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/dird/archive.cc
-@@ -120,11 +120,16 @@ void ArchiveCleanup(JobControlRecord* jc
-          "  Scheduled time:         %s\n"
-          "  Start time:             %s\n"
-          "  End time:               %s\n"
-+#ifndef NO_ADV
-          "  Bareos binary info:     %s\n"
-+#endif
-          "  Termination:            %s\n\n"),
-        kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, edt,
-        jcr->impl->jr.JobId, jcr->impl->jr.Job, schedt, sdt, edt,
--       kBareosVersionStrings.JoblogMessage, TermMsg);
-+#ifndef NO_ADV
-+       kBareosVersionStrings.JoblogMessage,
-+#endif
-+       TermMsg);
- 
-   Dmsg0(debuglevel, "Leave ArchiveCleanup()\n");
- }
diff --git a/sysutils/bareos/patches/patch-core_src_dird_authenticate__console.cc b/sysutils/bareos/patches/patch-core_src_dird_authenticate__console.cc
deleted file mode 100644
index 4ec19f8b038..00000000000
--- a/sysutils/bareos/patches/patch-core_src_dird_authenticate__console.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-core_src_dird_authenticate__console.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	Remove inadequate clutter in production messages
-
---- core/src/dird/authenticate_console.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/dird/authenticate_console.cc
-@@ -216,10 +216,12 @@ bool ConsoleAuthenticatorFrom_18_2::Send
- bool ConsoleAuthenticatorFrom_18_2::SendInfoMessage()
- {
-   std::string message;
-+#ifndef NO_ADV
-   message += kBareosVersionStrings.BinaryInfo;
-   message += " binary\n";
-   message += kBareosVersionStrings.ServicesMessage;
-   message += "\n";
-+#endif
-   message += "You are ";
-   if (ua_->user_acl) {
-     message += "logged in as: ";
diff --git a/sysutils/bareos/patches/patch-core_src_dird_backup.cc b/sysutils/bareos/patches/patch-core_src_dird_backup.cc
deleted file mode 100644
index 79186887fbf..00000000000
--- a/sysutils/bareos/patches/patch-core_src_dird_backup.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-core_src_dird_backup.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	Remove inadequate clutter in production messages
-
---- core/src/dird/backup.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/dird/backup.cc
-@@ -1194,7 +1194,9 @@ void GenerateBackupSummary(JobControlRec
-         "  Last Volume Bytes:      %s (%sB)\n"
-         "%s"                                        /* Daemon status info */
-         "%s"                                        /* SecureErase status */
-+#ifndef NO_ADV
-         "  Bareos binary info:     %s\n"
-+#endif
-         "  Termination:            %s\n\n"),
-         BAREOS, my_name, kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate,
-         HOST_OS, DISTNAME, DISTVER,
-@@ -1222,7 +1224,9 @@ void GenerateBackupSummary(JobControlRec
-         edit_uint64_with_suffix(mr.VolBytes, ec8),
-         daemon_status.c_str(),
-         secure_erase_status.c_str(),
-+#ifndef NO_ADV
-         kBareosVersionStrings.JoblogMessage,
-+#endif
-         TermMsg);
- 
-   /* clang-format on */
diff --git a/sysutils/bareos/patches/patch-core_src_dird_consolidate.cc b/sysutils/bareos/patches/patch-core_src_dird_consolidate.cc
deleted file mode 100644
index 33f67754619..00000000000
--- a/sysutils/bareos/patches/patch-core_src_dird_consolidate.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-core_src_dird_consolidate.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	Remove inadequate clutter in production messages
-
---- core/src/dird/consolidate.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/dird/consolidate.cc
-@@ -384,11 +384,16 @@ void ConsolidateCleanup(JobControlRecord
-          "  Scheduled time:         %s\n"
-          "  Start time:             %s\n"
-          "  End time:               %s\n"
-+#ifndef NO_ADV
-          "  Bareos binary info:     %s\n"
-+#endif
-          "  Termination:            %s\n\n"),
-        kBareosVersionStrings.Full, kBareosVersionStrings.ShortDate, edt,
-        jcr->impl->jr.JobId, jcr->impl->jr.Job, schedt, sdt, edt,
--       kBareosVersionStrings.JoblogMessage, TermMsg);
-+#ifndef NO_ADV
-+       kBareosVersionStrings.JoblogMessage,
-+#endif
-+       TermMsg);
- 
-   Dmsg0(debuglevel, "Leave ConsolidateCleanup()\n");
- }
diff --git a/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc b/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc
index 22d86b42cbd..31e733c592a 100644
--- a/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc
+++ b/sysutils/bareos/patches/patch-core_src_dird_dird__conf.cc
@@ -1,16 +1,16 @@
-$NetBSD: patch-core_src_dird_dird__conf.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_dird_dird__conf.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-	Add dumping of Honor No Dump Flag
+	add dumping of Honor No Dump Flag
 
---- core/src/dird/dird_conf.cc.orig	2020-04-16 08:31:41.000000000 +0000
+--- core/src/dird/dird_conf.cc.orig	2021-01-22 16:02:33.229527262 +0000
 +++ core/src/dird/dird_conf.cc
-@@ -2006,6 +2006,9 @@ bool FilesetResource::PrintConfig(PoolMe
-           case 'M': /* MD5 */
-             IndentConfigItem(cfg_str, 3, "Signature = MD5\n");
-             break;
-+          case 'N': /* Honor No Dump Flag  */
-+            IndentConfigItem(cfg_str, 3, "Honor No Dump Flag = Yes\n");
-+            break;
-           case 'n':
-             IndentConfigItem(cfg_str, 3, "Replace = Never\n");
-             break;
+@@ -1981,6 +1981,9 @@ void FilesetResource::PrintConfigInclude
+       case 'M': /* MD5 */
+         send.KeyQuotedString("Signature", "MD5");
+         break;
++      case 'N': /* honor nodump flag */
++        send.KeyBool("HonornoDumpFlag", true);
++        break;
+       case 'n':
+         send.KeyQuotedString("Replace", "Never");
+         break;
diff --git a/sysutils/bareos/patches/patch-core_src_dird_migrate.cc b/sysutils/bareos/patches/patch-core_src_dird_migrate.cc
deleted file mode 100644
index ac290700837..00000000000
--- a/sysutils/bareos/patches/patch-core_src_dird_migrate.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-core_src_dird_migrate.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	remove inadequate clutter in status messages
-
---- core/src/dird/migrate.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/dird/migrate.cc
-@@ -1764,7 +1764,9 @@ static inline void GenerateMigrateSummar
-            "  Last Volume Bytes:      %s (%sB)\n"
-            "  SD Errors:              %d\n"
-            "  SD termination status:  %s\n"
-+#ifndef NO_ADV
-            "  Bareos binary info:     %s\n"
-+#endif
-            "  Termination:            %s\n\n"),
-          BAREOS, my_name, kBareosVersionStrings.Full,
-          kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
-@@ -1798,7 +1800,11 @@ static inline void GenerateMigrateSummar
-          mig_jcr ? mig_jcr->VolumeName : _("*None*"), jcr->VolSessionId,
-          jcr->VolSessionTime, edit_uint64_with_commas(mr->VolBytes, ec4),
-          edit_uint64_with_suffix(mr->VolBytes, ec5), jcr->impl->SDErrors,
--         sd_term_msg, kBareosVersionStrings.JoblogMessage, term_code);
-+         sd_term_msg,
-+#ifndef NO_ADV
-+         kBareosVersionStrings.JoblogMessage,
-+#endif
-+         term_code);
-   } else {
-     /*
-      * Copy/Migrate selection only Job.
-@@ -1813,14 +1819,20 @@ static inline void GenerateMigrateSummar
-            "  End time:               %s\n"
-            "  Elapsed time:           %s\n"
-            "  Priority:               %d\n"
-+#ifndef NO_ADV
-            "  Bareos binary info:     %s\n"
-+#endif
-            "  Termination:            %s\n\n"),
-          BAREOS, my_name, kBareosVersionStrings.Full,
-          kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
-          edit_uint64(jcr->impl->jr.JobId, ec8), jcr->impl->jr.Job,
-          jcr->impl->res.catalog->resource_name_, jcr->impl->res.catalog_source,
-          sdt, edt, edit_utime(RunTime, elapsed, sizeof(elapsed)),
--         jcr->JobPriority, kBareosVersionStrings.JoblogMessage, term_code);
-+         jcr->JobPriority,
-+#ifndef NO_ADV
-+         kBareosVersionStrings.JoblogMessage,
-+#endif
-+         term_code);
-   }
- }
- 
diff --git a/sysutils/bareos/patches/patch-core_src_dird_restore.cc b/sysutils/bareos/patches/patch-core_src_dird_restore.cc
deleted file mode 100644
index 9afb0de1bbe..00000000000
--- a/sysutils/bareos/patches/patch-core_src_dird_restore.cc
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-core_src_dird_restore.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	remove inadequate clutter in status messages
-
---- core/src/dird/restore.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/dird/restore.cc
-@@ -562,7 +562,9 @@ void GenerateRestoreSummary(JobControlRe
-              "  Bytes Restored:         %s\n"
-              "  Rate:                   %.1f KB/s\n"
-              "  SD termination status:  %s\n"
-+#ifndef NO_ADV
-              "  Bareos binary info:     %s\n"
-+#endif
-              "  Termination:            %s\n\n"),
-            BAREOS, my_name, kBareosVersionStrings.Full,
-            kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
-@@ -572,7 +574,11 @@ void GenerateRestoreSummary(JobControlRe
-            edit_uint64_with_commas((uint64_t)jcr->impl->ExpectedFiles, ec1),
-            edit_uint64_with_commas((uint64_t)jcr->impl->jr.JobFiles, ec2),
-            edit_uint64_with_commas(jcr->impl->jr.JobBytes, ec3), (float)kbps,
--           sd_term_msg, kBareosVersionStrings.JoblogMessage, TermMsg);
-+           sd_term_msg,
-+#ifndef NO_ADV
-+           kBareosVersionStrings.JoblogMessage,
-+#endif
-+           TermMsg);
-       break;
-     default:
-       if (me->secure_erase_cmdline) {
-@@ -607,7 +613,9 @@ void GenerateRestoreSummary(JobControlRe
-              "  FD termination status:  %s\n"
-              "  SD termination status:  %s\n"
-              "%s"
-+#ifndef NO_ADV
-              "  Bareos binary info:     %s\n"
-+#endif
-              "  Termination:            %s\n\n"),
-            BAREOS, my_name, kBareosVersionStrings.Full,
-            kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
-@@ -618,7 +626,10 @@ void GenerateRestoreSummary(JobControlRe
-            edit_uint64_with_commas((uint64_t)jcr->impl->jr.JobFiles, ec2),
-            edit_uint64_with_commas(jcr->impl->jr.JobBytes, ec3), (float)kbps,
-            jcr->JobErrors, fd_term_msg, sd_term_msg,
--           secure_erase_status.c_str(), kBareosVersionStrings.JoblogMessage,
-+           secure_erase_status.c_str(),
-+#ifndef NO_ADV
-+	   kBareosVersionStrings.JoblogMessage,
-+#endif
-            TermMsg);
-       break;
-   }
diff --git a/sysutils/bareos/patches/patch-core_src_dird_verify.cc b/sysutils/bareos/patches/patch-core_src_dird_verify.cc
deleted file mode 100644
index 99eb9a5c867..00000000000
--- a/sysutils/bareos/patches/patch-core_src_dird_verify.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-core_src_dird_verify.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	remove inadequate clutter in status messages
-
---- core/src/dird/verify.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/dird/verify.cc
-@@ -567,7 +567,9 @@ void VerifyCleanup(JobControlRecord* jcr
-              "  Non-fatal FD errors:    %d\n"
-              "  FD termination status:  %s\n"
-              "  SD termination status:  %s\n"
-+#ifndef NO_ADV
-              "  Bareos binary info:     %s\n"
-+#endif
-              "  Termination:            %s\n\n"),
-            BAREOS, my_name, kBareosVersionStrings.Full,
-            kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
-@@ -577,7 +579,10 @@ void VerifyCleanup(JobControlRecord* jcr
-            Name, sdt, edt,
-            edit_uint64_with_commas(jcr->impl->ExpectedFiles, ec1),
-            edit_uint64_with_commas(jcr->JobFiles, ec2), jcr->JobErrors,
--           fd_term_msg, sd_term_msg, kBareosVersionStrings.JoblogMessage,
-+           fd_term_msg, sd_term_msg,
-+#ifndef NO_ADV
-+	   kBareosVersionStrings.JoblogMessage,
-+#endif
-            TermMsg);
-       break;
-     default:
-@@ -596,7 +601,9 @@ void VerifyCleanup(JobControlRecord* jcr
-              "  Files Examined:         %s\n"
-              "  Non-fatal FD errors:    %d\n"
-              "  FD termination status:  %s\n"
-+#ifndef NO_ADV
-              "  Bareos binary info:     %s\n"
-+#endif
-              "  Termination:            %s\n\n"),
-            BAREOS, my_name, kBareosVersionStrings.Full,
-            kBareosVersionStrings.ShortDate, HOST_OS, DISTNAME, DISTVER,
-@@ -604,7 +611,10 @@ void VerifyCleanup(JobControlRecord* jcr
-            jcr->impl->res.fileset->resource_name_, JobLevelToString(JobLevel),
-            jcr->impl->res.client->resource_name_, jcr->impl->previous_jr.JobId,
-            Name, sdt, edt, edit_uint64_with_commas(jcr->JobFiles, ec1),
--           jcr->JobErrors, fd_term_msg, kBareosVersionStrings.JoblogMessage,
-+           jcr->JobErrors, fd_term_msg,
-+#ifndef NO_ADV
-+	   kBareosVersionStrings.JoblogMessage,
-+#endif
-            TermMsg);
-       break;
-   }
diff --git a/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc b/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc
index 7bd5ef6b302..8704df6030e 100644
--- a/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc
+++ b/sysutils/bareos/patches/patch-core_src_filed_accurate__lmdb.cc
@@ -1,9 +1,9 @@
-$NetBSD: patch-core_src_filed_accurate__lmdb.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_filed_accurate__lmdb.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 	avoid uninitialized member crash.
 	lmdb not verified to be working correctly though.
 
---- core/src/filed/accurate_lmdb.cc.orig	2020-07-17 12:18:09.949358135 +0000
+--- core/src/filed/accurate_lmdb.cc.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/src/filed/accurate_lmdb.cc
 @@ -45,6 +45,7 @@ static int debuglevel = 100;
  BareosAccurateFilelistLmdb::BareosAccurateFilelistLmdb(JobControlRecord* jcr,
diff --git a/sysutils/bareos/patches/patch-core_src_findlib_acl.cc b/sysutils/bareos/patches/patch-core_src_findlib_acl.cc
index 73b4282e044..bdd88a6c70d 100644
--- a/sysutils/bareos/patches/patch-core_src_findlib_acl.cc
+++ b/sysutils/bareos/patches/patch-core_src_findlib_acl.cc
@@ -1,65 +1,71 @@
-$NetBSD: patch-core_src_findlib_acl.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_findlib_acl.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 	make ACL compile on NetBSD (10.x onward)
 
---- core/src/findlib/acl.cc.orig	2020-04-16 08:31:41.000000000 +0000
+--- core/src/findlib/acl.cc.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/src/findlib/acl.cc
-@@ -552,7 +552,8 @@ static bacl_exit_code (*os_parse_acl_str
+@@ -34,6 +34,7 @@
+  *   - AIX (pre-5.3 and post 5.3 acls, acl_get and aclx_get interface)
+  *   - Darwin
+  *   - FreeBSD (POSIX and NFSv4/ZFS acls)
++ *   - NetBSD (POSIX and NFSv4/ZFS acls)
+  *   - GNU Hurd
+  *   - HPUX
+  *   - IRIX
+@@ -556,6 +557,7 @@ static bacl_exit_code (*os_parse_acl_str
+     = aix_parse_acl_streams;
  
- #elif defined(HAVE_DARWIN_OS) || defined(HAVE_FREEBSD_OS) || \
-     defined(HAVE_IRIX_OS) || defined(HAVE_OSF1_OS) ||        \
--    defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
-+    defined(HAVE_NETBSD_OS) || defined(HAVE_LINUX_OS) ||     \
-+    defined(HAVE_HURD_OS)
+ #    elif defined(HAVE_DARWIN_OS) || defined(HAVE_FREEBSD_OS) \
++	|| defined(HAVE_NETBSD_OS)                            \
+         || defined(HAVE_IRIX_OS) || defined(HAVE_OSF1_OS)     \
+         || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
  
- #include <sys/types.h>
- 
-@@ -590,7 +591,7 @@ static bacl_exit_code (*os_parse_acl_str
+@@ -595,7 +597,7 @@ static bacl_exit_code (*os_parse_acl_str
  /**
   * On FreeBSD we can get numeric ACLs
   */
--#if defined(HAVE_FREEBSD_OS)
-+#if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
- #if defined(BACL_WANT_NUMERIC_IDS)
- #define BACL_ALTERNATE_TEXT ACL_TEXT_NUMERIC_IDS
- #endif
-@@ -652,7 +653,7 @@ static acl_type_t BacToOsAcltype(bacl_ty
- static int AclCountEntries(acl_t acl)
+-#      if defined(HAVE_FREEBSD_OS)
++#      if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
+ #        if defined(BACL_WANT_NUMERIC_IDS)
+ #          define BACL_ALTERNATE_TEXT ACL_TEXT_NUMERIC_IDS
+ #        endif
+@@ -658,7 +660,7 @@ static int AclCountEntries(acl_t acl)
  {
    int count = 0;
--#if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
-+#if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS) || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
+ #      if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) \
+-          || defined(HAVE_HURD_OS)
++          || defined(HAVE_HURD_OS) || defined(HAVE_NETBSD_OS)
    acl_entry_t ace;
    int entry_available;
  
-@@ -693,7 +694,7 @@ static bool AclIsTrivial(acl_t acl)
-    */
+@@ -700,7 +702,7 @@ static bool AclIsTrivial(acl_t acl)
    acl_entry_t ace;
    acl_tag_t tag;
--#if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
-+#if defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS) || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
+ #        if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) \
+-            || defined(HAVE_HURD_OS)
++            || defined(HAVE_HURD_OS) || defined(HAVE_NETBSD_OS)
    int entry_available;
  
    entry_available = acl_get_entry(acl, ACL_FIRST_ENTRY, &ace);
-@@ -793,7 +794,7 @@ static bacl_exit_code generic_get_acl_fr
+@@ -800,7 +802,7 @@ static bacl_exit_code generic_get_acl_fr
        goto bail_out;
      }
- #endif
--#if defined(HAVE_FREEBSD_OS) && defined(_PC_ACL_NFS4)
-+#if (defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)) && defined(_PC_ACL_NFS4)
+ #      endif
+-#      if defined(HAVE_FREEBSD_OS) && defined(_PC_ACL_NFS4)
++#      if (defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)) && defined(_PC_ACL_NFS4)
      if (acltype == BACL_TYPE_NFS4) {
        int trivial;
        if (acl_is_trivial_np(acl, &trivial) == 0) {
-@@ -1066,7 +1067,7 @@ static bacl_exit_code (*os_parse_acl_str
-                                               uint32_t content_length) =
-     darwin_parse_acl_streams;
+@@ -1073,7 +1075,7 @@ static bacl_exit_code (*os_parse_acl_str
+                                               uint32_t content_length)
+     = darwin_parse_acl_streams;
  
--#elif defined(HAVE_FREEBSD_OS)
-+#elif defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
+-#      elif defined(HAVE_FREEBSD_OS)
++#      elif defined(HAVE_FREEBSD_OS) || defined(HAVE_NETBSD_OS)
  /**
   * Define the supported ACL streams for these OSes
   */
-@@ -1091,6 +1092,8 @@ static bacl_exit_code freebsd_build_acl_
+@@ -1098,6 +1100,8 @@ static bacl_exit_code freebsd_build_acl_
        BErrNo be;
  
        switch (errno) {
@@ -68,7 +74,7 @@ $NetBSD: patch-core_src_findlib_acl.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
          case ENOENT:
            return bacl_exit_ok;
          default:
-@@ -1119,6 +1122,8 @@ static bacl_exit_code freebsd_build_acl_
+@@ -1126,6 +1130,8 @@ static bacl_exit_code freebsd_build_acl_
          BErrNo be;
  
          switch (errno) {
diff --git a/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc b/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc
index 82ac96eb00d..4c98df4e378 100644
--- a/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc
+++ b/sysutils/bareos/patches/patch-core_src_findlib_find__one.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-core_src_findlib_find__one.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_findlib_find__one.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-	Simplify UF_NODUMP test
+	simplify UF_NODUMP test
 
---- core/src/findlib/find_one.cc.orig	2020-04-16 08:31:41.000000000 +0000
+--- core/src/findlib/find_one.cc.orig	2021-01-22 13:22:58.585014513 +0000
 +++ core/src/findlib/find_one.cc
-@@ -206,7 +206,7 @@ static bool VolumeHasAttrlist(const char
+@@ -208,7 +208,7 @@ static bool VolumeHasAttrlist(const char
   */
  static inline bool no_dump(JobControlRecord* jcr, FindFilesPacket* ff_pkt)
  {
 -#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
 +#if defined(UF_NODUMP)
-   if (BitIsSet(FO_HONOR_NODUMP, ff_pkt->flags) &&
-       (ff_pkt->statp.st_flags & UF_NODUMP)) {
+   if (BitIsSet(FO_HONOR_NODUMP, ff_pkt->flags)
+       && (ff_pkt->statp.st_flags & UF_NODUMP)) {
      Jmsg(jcr, M_INFO, 1, _("     NODUMP flag set - will not process %s\n"),
diff --git a/sysutils/bareos/patches/patch-core_src_lib_mem__pool.cc b/sysutils/bareos/patches/patch-core_src_lib_mem__pool.cc
deleted file mode 100644
index 63a14e4ac05..00000000000
--- a/sysutils/bareos/patches/patch-core_src_lib_mem__pool.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-core_src_lib_mem__pool.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-Calculation memory sums passing a struct abufhead * into a method/function
-that expects a POOLMEM * may fail with negative buffer overrun on certain
-memory allocations.
-Also, as nothing uses the calculated value, we can just drop the broken
-code.
-
---- core/src/lib/mem_pool.cc.orig	2020-07-17 14:40:23.419195873 +0000
-+++ core/src/lib/mem_pool.cc
-@@ -290,7 +290,6 @@ void CloseMemoryPool()
- {
-   struct abufhead *buf, *next;
-   int count = 0;
--  uint64_t bytes = 0;
- 
-   P(mutex);
-   for (int i = 1; i <= PM_MAX; i++) {
-@@ -298,7 +297,6 @@ void CloseMemoryPool()
-     while (buf) {
-       next = buf->next;
-       count++;
--      bytes += SizeofPoolMemory((char*)buf);
-       free((char*)buf);
-       buf = next;
-     }
diff --git a/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc b/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc
index ad0da8fec72..b4b95ef9553 100644
--- a/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc
+++ b/sysutils/bareos/patches/patch-core_src_lib_scsi__lli.cc
@@ -1,18 +1,18 @@
-$NetBSD: patch-core_src_lib_scsi__lli.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_lib_scsi__lli.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
-	Fix coding - was probably never tested with scsi-crypto flag
+	fix coding - was probably never tested with scsi-crypto flag
 
---- core/src/lib/scsi_lli.cc.orig	2020-04-16 08:31:41.000000000 +0000
+--- core/src/lib/scsi_lli.cc.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/src/lib/scsi_lli.cc
-@@ -410,6 +410,7 @@ bool CheckScsiAtEod(int fd) { return fal
- #elif defined(HAVE_NETBSD_OS) || defined(HAVE_OPENBSD_OS)
+@@ -411,6 +411,7 @@ bool CheckScsiAtEod(int fd) { return fal
+ #  elif defined(HAVE_NETBSD_OS) || defined(HAVE_OPENBSD_OS)
  
- #if defined(HAVE_NETBSD_OS)
-+#include <sys/scsiio.h>
- #include <dev/scsipi/scsipi_all.h>
- #else
- #include <scsi/uscsi_all.h>
-@@ -432,7 +433,7 @@ static inline bool do_scsi_cmd_page(int 
+ #    if defined(HAVE_NETBSD_OS)
++#      include <sys/scsiio.h>
+ #      include <dev/scsipi/scsipi_all.h>
+ #    else
+ #      include <scsi/uscsi_all.h>
+@@ -433,7 +434,7 @@ static inline bool do_scsi_cmd_page(int 
  {
    int rc;
    scsireq_t req;
@@ -21,7 +21,7 @@ $NetBSD: patch-core_src_lib_scsi__lli.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
    bool opened_device = false;
    bool retval = false;
  
-@@ -476,20 +477,18 @@ static inline bool do_scsi_cmd_page(int 
+@@ -477,20 +478,18 @@ static inline bool do_scsi_cmd_page(int 
        retval = true;
        break;
      case SCCMD_SENSE:
diff --git a/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc b/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc
index ac556d09f1f..7590e0c9c9b 100644
--- a/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc
+++ b/sysutils/bareos/patches/patch-core_src_lib_scsi__tapealert.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_src_lib_scsi__tapealert.cc,v 1.1 2020/08/21 06:01:36 kardel Exp $
+$NetBSD: patch-core_src_lib_scsi__tapealert.cc,v 1.2 2021/02/01 09:08:43 kardel Exp $
 
 	fix result bit setting by keeping the uint64_t type and
 	not trip over endian issues and off by one errors for
 	result_index == 64.
 
---- core/src/lib/scsi_tapealert.cc.orig	2020-08-20 16:04:40.584902268 +0000
+--- core/src/lib/scsi_tapealert.cc.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/src/lib/scsi_tapealert.cc
 @@ -172,7 +172,7 @@ bool GetTapealertFlags(int fd, const cha
            if (result_index == tapealert_mappings[j].flag) {
diff --git a/sysutils/bareos/patches/patch-core_src_lib_version.c b/sysutils/bareos/patches/patch-core_src_lib_version.c
deleted file mode 100644
index 1f85546278b..00000000000
--- a/sysutils/bareos/patches/patch-core_src_lib_version.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-core_src_lib_version.c,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	note pkgsrc compile origin
-
---- core/src/lib/version.c.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/lib/version.c
-@@ -48,18 +48,18 @@
- #endif
- 
- #if !defined BAREOS_BINARY_INFO
--#define BAREOS_BINARY_INFO "self-compiled"
-+#define BAREOS_BINARY_INFO "pkgsrc-compiled"
- #endif
- 
- #if !defined BAREOS_SERVICES_MESSAGE
- #define BAREOS_SERVICES_MESSAGE                             \
--  "self-compiled binaries are UNSUPPORTED by bareos.com.\n" \
-+  "pkgsrc-compiled binaries are UNSUPPORTED by bareos.com.\n" \
-   "Get official binaries and vendor support on https://www.bareos.com"
- #endif
- 
- #if !defined BAREOS_JOBLOG_MESSAGE
- #define BAREOS_JOBLOG_MESSAGE \
--  "self-compiled: Get official binaries and vendor support on bareos.com"
-+  "pkgsrc-compiled: Get official binaries and vendor support on bareos.com"
- #endif
- 
- #define BAREOS_COPYRIGHT_MESSAGE_WITH_FSF_AND_PLANETS            \
diff --git a/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c b/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c
index 2759439c937..c4aecb1dfec 100644
--- a/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c
+++ b/sysutils/bareos/patches/patch-core_src_lmdb_mdb.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-core_src_lmdb_mdb.c,v 1.2 2020/08/04 12:56:15 kardel Exp $
+$NetBSD: patch-core_src_lmdb_mdb.c,v 1.3 2021/02/01 09:08:43 kardel Exp $
 
 	use POSIX semaphores on NetBSD
 
---- core/src/lmdb/mdb.c.orig	2020-08-04 12:17:56.368741881 +0000
+--- core/src/lmdb/mdb.c.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/src/lmdb/mdb.c
 @@ -150,7 +150,11 @@ typedef SSIZE_T	ssize_t;
  
diff --git a/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto-sd.cc b/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto-sd.cc
deleted file mode 100644
index 171953fbad0..00000000000
--- a/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto-sd.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-core_src_plugins_stored_scsicrypto-sd.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	The original hooks did not clear the key soon enough.
-	It was possible to change media in the tape library 
-	without the key being cleared causing key confusion
-	when bareos operation was mixed with other library clients.
-	Now the key is cleared whenever the device is closed.
-
---- core/src/plugins/stored/scsicrypto-sd.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/plugins/stored/scsicrypto-sd.cc
-@@ -181,6 +181,7 @@ static bRC newPlugin(bpContext* ctx)
-    * bsdEventLabelWrite - Write of volume label clear key as volume
-    *                      labels are unencrypted.
-    * bsdEventVolumeUnload - Unload of volume clear key
-+   * bsdEventDeviceClose  - Unload of volume clear key (auto changer)
-    * bsdEventReadError - Read error on volume see if its due to
-    *                     the fact encryption is enabled and we
-    *                     have either the wrong key loaded or no key
-@@ -190,10 +191,10 @@ static bRC newPlugin(bpContext* ctx)
-    * bsdEventVolumeStatus - plugin callback for encryption status
-    *                        of the volume loaded in the drive.
-    */
--  bfuncs->registerBareosEvents(ctx, 7, bsdEventLabelRead, bsdEventLabelVerified,
-+  bfuncs->registerBareosEvents(ctx, 8, bsdEventLabelRead, bsdEventLabelVerified,
-                                bsdEventLabelWrite, bsdEventVolumeUnload,
--                               bsdEventReadError, bsdEventDriveStatus,
--                               bsdEventVolumeStatus);
-+                               bsdEventDeviceClose, bsdEventReadError,
-+			       bsdEventDriveStatus, bsdEventVolumeStatus);
- 
-   return bRC_OK;
- }
-@@ -240,6 +241,7 @@ static bRC handlePluginEvent(bpContext* 
-     case bsdEventLabelRead:
-     case bsdEventLabelWrite:
-     case bsdEventVolumeUnload:
-+    case bsdEventDeviceClose:
-       return do_clear_scsi_encryption_key(value);
-     case bsdEventLabelVerified:
-       return do_set_scsi_encryption_key(value);
diff --git a/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc b/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc
new file mode 100644
index 00000000000..d95f28f0c74
--- /dev/null
+++ b/sysutils/bareos/patches/patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc
@@ -0,0 +1,34 @@
+$NetBSD: patch-core_src_plugins_stored_scsicrypto_scsicrypto-sd.cc,v 1.1 2021/02/01 09:08:43 kardel Exp $
+
+	The original hooks did not clear the key soon enough.
+	It was possible to change media in the tape library 
+	without the key being cleared causing key confusion
+	when bareos operation was mixed with other library clients.
+	Now the key is cleared whenever the device is closed.
+
+--- core/src/plugins/stored/scsicrypto/scsicrypto-sd.cc.orig	2021-01-22 16:17:58.773087567 +0000
++++ core/src/plugins/stored/scsicrypto/scsicrypto-sd.cc
+@@ -192,11 +192,13 @@ static bRC newPlugin(PluginContext* ctx)
+    *                       of the drive.
+    * bSdEventVolumeStatus - plugin callback for encryption status
+    *                        of the volume loaded in the drive.
++   * bSdEventDeviceClose - clear encryption status on close to
++   *                       avoid lingering keys
+    */
+   bareos_core_functions->registerBareosEvents(
+-      ctx, 7, bSdEventLabelRead, bSdEventLabelVerified, bSdEventLabelWrite,
++      ctx, 8, bSdEventLabelRead, bSdEventLabelVerified, bSdEventLabelWrite,
+       bSdEventVolumeUnload, bSdEventReadError, bSdEventDriveStatus,
+-      bSdEventVolumeStatus);
++      bSdEventDeviceClose, bSdEventVolumeStatus);
+ 
+   return bRC_OK;
+ }
+@@ -243,6 +245,7 @@ static bRC handlePluginEvent(PluginConte
+     case bSdEventLabelRead:
+     case bSdEventLabelWrite:
+     case bSdEventVolumeUnload:
++    case bSdEventDeviceClose:
+       return do_clear_scsi_encryption_key(value);
+     case bSdEventLabelVerified:
+       return do_set_scsi_encryption_key(value);
diff --git a/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert-sd.cc b/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert-sd.cc
deleted file mode 100644
index 97b963818fa..00000000000
--- a/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert-sd.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-core_src_plugins_stored_scsitapealert-sd.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	Tape alerts where not always gathered, add missing cases.
-
---- core/src/plugins/stored/scsitapealert-sd.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/plugins/stored/scsitapealert-sd.cc
-@@ -126,8 +126,8 @@ static bRC newPlugin(bpContext* ctx)
-    * Only register plugin events we are interested in.
-    */
-   bfuncs->registerBareosEvents(
--      ctx, 6, bsdEventVolumeLoad, bsdEventLabelVerified, bsdEventReadError,
--      bsdEventWriteError, bsdEventVolumeUnload, bsdEventDeviceRelease);
-+      ctx, 7, bsdEventVolumeLoad, bsdEventLabelVerified, bsdEventReadError,
-+      bsdEventWriteError, bsdEventVolumeLoad, bsdEventVolumeUnload, bsdEventDeviceRelease);
- 
-   return bRC_OK;
- }
-@@ -174,7 +174,9 @@ static bRC handlePluginEvent(bpContext* 
-     case bsdEventLabelVerified:
-     case bsdEventReadError:
-     case bsdEventWriteError:
-+    case bsdEventVolumeLoad:
-     case bsdEventVolumeUnload:
-+    case bsdEventDeviceRelease:
-       return handle_tapealert_readout(value);
-     default:
-       Dmsg1(debuglevel, "scsitapealert-sd: Unknown event %d\n",
diff --git a/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc b/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc
new file mode 100644
index 00000000000..6b6670ee7d5
--- /dev/null
+++ b/sysutils/bareos/patches/patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc
@@ -0,0 +1,27 @@
+$NetBSD: patch-core_src_plugins_stored_scsitapealert_scsitapealert-sd.cc,v 1.1 2021/02/01 09:08:43 kardel Exp $
+
+	tape alerts where not always gathered, add missing cases.
+
+--- core/src/plugins/stored/scsitapealert/scsitapealert-sd.cc.orig	2021-01-22 16:12:55.749020270 +0000
++++ core/src/plugins/stored/scsitapealert/scsitapealert-sd.cc
+@@ -129,8 +129,8 @@ static bRC newPlugin(PluginContext* ctx)
+    * Only register plugin events we are interested in.
+    */
+   bareos_core_functions->registerBareosEvents(
+-      ctx, 6, bSdEventVolumeLoad, bSdEventLabelVerified, bSdEventReadError,
+-      bSdEventWriteError, bSdEventVolumeUnload, bSdEventDeviceRelease);
++      ctx, 7, bSdEventVolumeLoad, bSdEventLabelVerified, bSdEventReadError,
++      bSdEventWriteError, bSdEventVolumeLoad, bSdEventVolumeUnload, bSdEventDeviceRelease);
+ 
+   return bRC_OK;
+ }
+@@ -177,7 +177,9 @@ static bRC handlePluginEvent(PluginConte
+     case bSdEventLabelVerified:
+     case bSdEventReadError:
+     case bSdEventWriteError:
++    case bSdEventVolumeLoad:
+     case bSdEventVolumeUnload:
++    case bSdEventDeviceRelease:
+       return handle_tapealert_readout(value);
+     default:
+       Dmsg1(debuglevel, "scsitapealert-sd: Unknown event %d\n",
diff --git a/sysutils/bareos/patches/patch-core_src_stored_acquire.cc b/sysutils/bareos/patches/patch-core_src_stored_acquire.cc
deleted file mode 100644
index afcbab9c286..00000000000
--- a/sysutils/bareos/patches/patch-core_src_stored_acquire.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-core_src_stored_acquire.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	For NetBSD SCSI ioctl to go through the device must be writable.
-
---- core/src/stored/acquire.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/stored/acquire.cc
-@@ -283,7 +283,7 @@ bool AcquireDeviceForRead(DeviceControlR
-      * it opens it. If it is a tape, it checks the volume name
-      */
-     Dmsg1(rdebuglevel, "stored: open vol=%s\n", dcr->VolumeName);
--    if (!dev->open(dcr, OPEN_READ_ONLY)) {
-+    if (!dev->open(dcr, dev->device->drive_crypto_enabled ? OPEN_READ_WRITE : OPEN_READ_ONLY)) {
-       if (!dev->poll) {
-         Jmsg3(jcr, M_WARNING, 0,
-               _("Read open device %s Volume \"%s\" failed: ERR=%s\n"),
diff --git a/sysutils/bareos/patches/patch-core_src_stored_bscan.cc b/sysutils/bareos/patches/patch-core_src_stored_bscan.cc
deleted file mode 100644
index d6c9503a19d..00000000000
--- a/sysutils/bareos/patches/patch-core_src_stored_bscan.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-core_src_stored_bscan.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	Remove inadequate clutter in production messages
-
---- core/src/stored/bscan.cc.orig	2020-06-23 13:36:11.694151050 +0000
-+++ core/src/stored/bscan.cc
-@@ -1449,14 +1449,19 @@ static bool UpdateJobRecord(BareosDb* db
-              "Volume Session Id:      %d\n"
-              "Volume Session Time:    %d\n"
-              "Last Volume Bytes:      %s\n"
-+#ifndef NO_ADV
-              "Bareos binary info:     %s\n"
-+#endif
-              "Termination:            %s\n\n"),
-            edt, mjcr->JobId, mjcr->Job, mjcr->impl->fileset_name,
-            job_level_to_str(mjcr->getJobLevel()), mjcr->client_name, sdt, edt,
-            edit_uint64_with_commas(mjcr->JobFiles, ec1),
-            edit_uint64_with_commas(mjcr->JobBytes, ec2), mjcr->VolSessionId,
-            mjcr->VolSessionTime, edit_uint64_with_commas(mr.VolBytes, ec3),
--           kBareosVersionStrings.BinaryInfo, TermMsg);
-+#ifndef NO_ADV
-+           kBareosVersionStrings.BinaryInfo,
-+#endif
-+	   TermMsg);
-   }
-   FreeJcr(mjcr);
- 
diff --git a/sysutils/bareos/patches/patch-core_src_stored_btape.cc b/sysutils/bareos/patches/patch-core_src_stored_btape.cc
index 6fafe19df58..115e33cd2e9 100644
--- a/sysutils/bareos/patches/patch-core_src_stored_btape.cc
+++ b/sysutils/bareos/patches/patch-core_src_stored_btape.cc
@@ -1,10 +1,10 @@
-$NetBSD: patch-core_src_stored_btape.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
+$NetBSD: patch-core_src_stored_btape.cc,v 1.2 2021/02/01 09:08:44 kardel Exp $
 
-	Add missing free*() calls to keep smartalloc happy
+	add missing free*() calls
 
---- core/src/stored/btape.cc.orig	2020-04-16 08:31:41.000000000 +0000
+--- core/src/stored/btape.cc.orig	2020-12-16 07:46:16.000000000 +0000
 +++ core/src/stored/btape.cc
-@@ -331,6 +331,7 @@ int main(int margc, char* margv[])
+@@ -327,6 +327,7 @@ int main(int margc, char* margv[])
  
  static void TerminateBtape(int status)
  {
@@ -12,7 +12,7 @@ $NetBSD: patch-core_src_stored_btape.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
    FreeJcr(jcr);
    jcr = NULL;
  
-@@ -369,6 +370,8 @@ static void TerminateBtape(int status)
+@@ -365,6 +366,8 @@ static void TerminateBtape(int status)
    }
  
    StopWatchdog();
@@ -21,7 +21,7 @@ $NetBSD: patch-core_src_stored_btape.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
    TermMsg();
    RecentJobResultsList::Cleanup();
    CleanupJcrChain();
-@@ -377,7 +380,6 @@ static void TerminateBtape(int status)
+@@ -373,7 +376,6 @@ static void TerminateBtape(int status)
    exit(status);
  }
  
diff --git a/sysutils/bareos/patches/patch-core_src_stored_dev.cc b/sysutils/bareos/patches/patch-core_src_stored_dev.cc
new file mode 100644
index 00000000000..e6820bd9935
--- /dev/null
+++ b/sysutils/bareos/patches/patch-core_src_stored_dev.cc
@@ -0,0 +1,39 @@
+$NetBSD: patch-core_src_stored_dev.cc,v 1.1 2021/02/01 09:08:44 kardel Exp $
+
+	spool.cc makes use of a ficticious temporary device that
+	has .device_resource set - ~Device() did not
+	verify that device_resource->dev referenced
+	this instance before clearing the link.
+	this leads to much confusion in the reservation code.
+
+	to use SCSI passthru file descriptors must be opened
+	READ_WRITE for scsi-crypto.
+
+--- core/src/stored/dev.cc.orig	2020-12-16 07:46:16.000000000 +0000
++++ core/src/stored/dev.cc
+@@ -635,7 +635,12 @@ bool Device::open(DeviceControlRecord* d
+     return false;
+   }
+ 
++#ifdef HAVE_NETBSD_OS
++  omode = device_resource->drive_crypto_enabled ? DeviceMode::OPEN_READ_WRITE : omode;
++#endif
++
+   Dmsg1(100, "call OpenDevice mode=%s\n", mode_to_str(omode));
++
+   OpenDevice(dcr, omode);
+ 
+   /*
+@@ -1278,7 +1283,11 @@ Device::~Device()
+   pthread_mutex_destroy(&spool_mutex);
+   // RwlDestroy(&lock);
+   attached_dcrs.clear();
+-  if (device_resource) { device_resource->dev = nullptr; }
++  // drop device_resource link only if it references us
++  if (device_resource && device_resource->dev == this) {
++    Dmsg1(900, "term dev: link from device_resource cleared\n");
++    device_resource->dev = nullptr;
++  }
+ }
+ 
+ bool Device::CanStealLock() const
diff --git a/sysutils/bareos/patches/patch-core_src_stored_device.cc b/sysutils/bareos/patches/patch-core_src_stored_device.cc
deleted file mode 100644
index 95dab4423ba..00000000000
--- a/sysutils/bareos/patches/patch-core_src_stored_device.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-core_src_stored_device.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	when using scsi_crypto on NetBSD the
-	file descriptios must be opened read/write
-	as read and write scsi commands are issued
-	for key management
-
---- core/src/stored/device.cc.orig	2020-06-25 07:59:33.880425717 +0000
-+++ core/src/stored/device.cc
-@@ -282,11 +282,16 @@ bool FirstOpenDevice(DeviceControlRecord
-   }
- 
-   int mode;
--  if (dev->HasCap(CAP_STREAM)) {
--    mode = OPEN_WRITE_ONLY;
-+  if (dev->device->drive_crypto_enabled) {
-+    mode = OPEN_READ_WRITE;
-   } else {
--    mode = OPEN_READ_ONLY;
-+    if (dev->HasCap(CAP_STREAM)) {
-+      mode = OPEN_WRITE_ONLY;
-+    } else {
-+      mode = OPEN_READ_ONLY;
-+    }
-   }
-+
-   Dmsg0(129, "Opening device.\n");
-   if (!dev->open(dcr, mode)) {
-     Emsg1(M_FATAL, 0, _("dev open failed: %s\n"), dev->errmsg);
diff --git a/sysutils/bareos/patches/patch-core_src_stored_dir__cmd.cc b/sysutils/bareos/patches/patch-core_src_stored_dir__cmd.cc
deleted file mode 100644
index 866ed80a5fa..00000000000
--- a/sysutils/bareos/patches/patch-core_src_stored_dir__cmd.cc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-core_src_stored_dir__cmd.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	For SCSI ioctl to work on NetBSD the device must be open for writing.
-
---- core/src/stored/dir_cmd.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/stored/dir_cmd.cc
-@@ -997,7 +997,7 @@ static bool MountCmd(JobControlRecord* j
-             TryAutoloadDevice(jcr, dcr, slot, "");
-           }
-           /* We freed the device, so reopen it and wake any waiting threads */
--          if (!dev->open(dcr, OPEN_READ_ONLY)) {
-+          if (!dev->open(dcr, dev->device->drive_crypto_enabled ? OPEN_READ_WRITE : OPEN_READ_ONLY)) {
-             dir->fsend(_("3901 Unable to open device %s: ERR=%s\n"),
-                        dev->print_name(), dev->bstrerror());
-             if (dev->blocked() == BST_UNMOUNTED) {
-@@ -1062,7 +1062,7 @@ static bool MountCmd(JobControlRecord* j
-                   dev->print_name());
-             }
-           } else if (dev->IsTape()) {
--            if (!dev->open(dcr, OPEN_READ_ONLY)) {
-+            if (!dev->open(dcr, dev->device->drive_crypto_enabled ? OPEN_READ_WRITE : OPEN_READ_ONLY)) {
-               dir->fsend(_("3901 Unable to open device %s: ERR=%s\n"),
-                          dev->print_name(), dev->bstrerror());
-               break;
diff --git a/sysutils/bareos/patches/patch-core_src_stored_label.cc b/sysutils/bareos/patches/patch-core_src_stored_label.cc
deleted file mode 100644
index cb8ed2430ae..00000000000
--- a/sysutils/bareos/patches/patch-core_src_stored_label.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-core_src_stored_label.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	For SCSI ioctl to work on NetBSD the device must be open for writing.
-
---- core/src/stored/label.cc.orig	2020-04-16 08:31:41.000000000 +0000
-+++ core/src/stored/label.cc
-@@ -92,7 +92,7 @@ int ReadDevVolumeLabel(DeviceControlReco
-         dev->max_block_size);
- 
-   if (!dev->IsOpen()) {
--    if (!dev->open(dcr, OPEN_READ_ONLY)) { return VOL_IO_ERROR; }
-+    if (!dev->open(dcr, OPEN_READ_WRITE)) { return VOL_IO_ERROR; }
-   }
- 
-   dev->ClearLabeled();
diff --git a/sysutils/bareos/patches/patch-core_src_stored_mount.cc b/sysutils/bareos/patches/patch-core_src_stored_mount.cc
deleted file mode 100644
index 0ff715d1ac9..00000000000
--- a/sysutils/bareos/patches/patch-core_src_stored_mount.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-core_src_stored_mount.cc,v 1.1 2020/07/28 06:36:29 kardel Exp $
-
-	when using scsi_crypto on NetBSD the
-	file descriptios must be opened read/write
-	as read and write scsi commands are issued
-	for key management
-
---- core/src/stored/mount.cc.orig	2020-06-25 08:19:03.686643613 +0000
-+++ core/src/stored/mount.cc
-@@ -246,10 +246,14 @@ mount_next_vol:
-   /*
-    * Ensure the device is open
-    */
--  if (dev->HasCap(CAP_STREAM)) {
--    mode = OPEN_WRITE_ONLY;
--  } else {
-+  if (dev->device->drive_crypto_enabled) {
-     mode = OPEN_READ_WRITE;
-+  } else {
-+    if (dev->HasCap(CAP_STREAM)) {
-+      mode = OPEN_WRITE_ONLY;
-+    } else {
-+      mode = OPEN_READ_ONLY;
-+    }
-   }
- 
-   /*
diff --git a/sysutils/bareos/patches/patch-systemtests_tests_droplet-s3_testrunner b/sysutils/bareos/patches/patch-systemtests_tests_droplet-s3_testrunner
new file mode 100644
index 00000000000..7053ef2e9c1
--- /dev/null
+++ b/sysutils/bareos/patches/patch-systemtests_tests_droplet-s3_testrunner
@@ -0,0 +1,15 @@
+$NetBSD: patch-systemtests_tests_droplet-s3_testrunner,v 1.1 2021/02/01 09:08:44 kardel Exp $
+
+	portability fix
+
+--- systemtests/tests/droplet-s3/testrunner.orig	2021-01-21 10:17:53.629198675 +0000
++++ systemtests/tests/droplet-s3/testrunner
+@@ -31,7 +31,7 @@ BackupDirectory="${tmp}/data"
+ # Data will be placed at "${tmp}/data/".
+ setup_data "$@"
+ 
+-if [ "$1" == "init" ]; then
++if [ "$1" = "init" ]; then
+   exit 0
+ fi
+
author	kardel <kardel@pkgsrc.org>	2021-02-01 09:08:43 +0000
committer	kardel <kardel@pkgsrc.org>	2021-02-01 09:08:43 +0000
commit	521504d70af2198705575677e2cdaa52366893c1 (patch)
tree	bf0cc33593f61e82f3cf470bb2ab39242fa6596a
parent	90b55700cccaed4b2ba1a0c7ecad75cd4dc7a5fc (diff)
download	pkgsrc-521504d70af2198705575677e2cdaa52366893c1.tar.gz