Index: head/sysutils/bareos-client/Makefile =================================================================== --- head/sysutils/bareos-client/Makefile (revision 558142) +++ head/sysutils/bareos-client/Makefile (revision 558143) @@ -1,24 +1,25 @@ # $FreeBSD$ PORTNAME= bareos PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) CONFLICTS= bareos18-client-* bareos17-client-* bareos16-client-* WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server OPTIONS_GROUP= PLUGINS -OPTIONS_GROUP_PLUGINS= GFAPI RADOS +OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= NLS PYTHON LMDB SCSICRYPTO +CEPHFS_DESC= CEPHFS fd plugin support GFAPI_DESC= GFAPI fd plugin support RADOS_DESC= RADOS fd plugin support LMDB_DESC= Enable build of LMDB support .include "${MASTERDIR}/Makefile" Index: head/sysutils/bareos-server/Makefile =================================================================== --- head/sysutils/bareos-server/Makefile (revision 558142) +++ head/sysutils/bareos-server/Makefile (revision 558143) @@ -1,236 +1,240 @@ # $FreeBSD$ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 19.2.7 +DISTVERSION= 19.2.9 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi CONFLICTS?= bacula18*-server bacula17*-server-* bareos16-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= cmake compiler:c++11-lang localbase pkgconfig readline:port \ +USES+= cmake compiler:c++11-lang localbase perl5 pkgconfig readline:port \ shebangfix USE_GITHUB= yes +USE_PERL5= run USERS= bareos GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} USE_LDCONFIG= yes SHEBANG_LANG= perl SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFAULT= OPENSSL OPTIONS_SINGLE= CRYPTO OPTIONS_SINGLE_CRYPTO= OPENSSL GNUTLS OPTIONS_SUB= yes CRYPTO_DESC= Cryptographic library MTX_DESC= Install mtx for control of autochanger devices NDMP_DESC= Enable build of NDMP support SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "-server" OPTIONS_GROUP= BACKENDS -OPTIONS_GROUP_BACKENDS= GFAPI RADOS +OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO OPTIONS_DEFAULT+= PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL OPTIONS_SINGLE+= DATABASE BACKENDS_DESC= Storage backends DATABASE_DESC= Database support +CEPHFS_DESC= CEPHFS backend support GFAPI_DESC= GFAPI backend support RADOS_DESC= RADOS backend support NDMP_CMAKE_ON= -Dndmp=ON NDMP_CMAKE_OFF= -Dndmp=OFF .endif GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls OPENSSL_USES= ssl OPENSSL_CMAKE_ON= -Dopenssl=ON OPENSSL_CMAKE_OFF= -Dopenssl=OFF SCSICRYPTO_CMAKE_ON= -Dscsi-crypto=ON SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF .if ${PKGNAMESUFFIX} == "-client" || ${PKGNAMESUFFIX} == "-server" #Till end of the file PYTHON_USES= python PYTHON_CMAKE_ON= -Dpython=ON PYTHON_CMAKE_OFF= -Dpython=OFF PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbareos.so:sysutils/bareos-client USE_RC_SUBR?= bareos-dir bareos-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else SUB_FILES+= pkg-message.server .endif CMAKE_ARGS+= -Dtcp-wrappers=ON \ -Dsmartalloc=ON \ -Dsysconfdir=${PREFIX}/etc \ -Darchivedir=${BAREOS_DIR}/storage \ -Dworkingdir=${BAREOS_DIR} \ -Dconfdir=${PREFIX}/etc/bareos \ -Dlibdir=${PREFIX}/lib \ -Dlogdir=/var/log/bareos \ -Dincludedir=${PREFIX}/include/bareos \ -Dreadline=ON \ -Ddisable-conio=ON \ -Dbatch-insert=ON \ -Dhave_plugins=ON \ -Dplugindir=${PREFIX}/lib/bareos/plugins \ -Dscriptdir=${PREFIX}/lib/bareos/scripts \ -Dbackenddir=${PREFIX}/lib/bareos/backends \ -Ddump_email=root@localhost \ -Djob_email=root@localhost \ -Ddb_name=bareos \ -Dsbin-perm=755 \ -Ddb_user=bareos \ -Dbaseport=9101 \ -Dpiddir=/var/run/bareos .if defined(WITH_CLIENT_ONLY) LMDB_CMAKE_ON= -Dlmdb=ON LMDB_CMAKE_OFF= -Dlmdb=OFF LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 CMAKE_ARGS+= -Dfd-user=root \ -Dfd-group=wheel .else CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \ -Ddir-group=${BAREOS_GROUP} \ -Dsd-user=${BAREOS_USER} \ -Dsd-group=operator \ -Dlmdb=OFF .endif # The user/group IDs below are registered, see # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID # BAREOS_USER?= bareos BAREOS_GROUP?= ${BAREOS_USER} BAREOS_UID?= 997 BAREOS_GID?= ${BAREOS_UID} BAREOS_DIR?= /var/db/bareos PLIST_SUB+= BAREOS_DIR=${BAREOS_DIR} SUB_LIST= BAREOS_USER=${BAREOS_USER} \ BAREOS_GROUP=${BAREOS_GROUP} \ BAREOS_UID=${BAREOS_UID} \ BAREOS_GID=${BAREOS_GID} \ BAREOS_DIR=${BAREOS_DIR} NLS_USES= gettext NLS_CMAKE_ON= -Dnls=ON +CEPHFS_CMAKE_ON= -Dcephfs=ON +CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 GFAPI_CMAKE_ON= -Dgfapi=ON GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs -RADOS_CMAKE_ON= -Drados=ON +RADOS_CMAKE_ON= -Drados=ON -Dcephfs=ON RADOS_LIB_DEPENDS= librados.so:net/ceph14 # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CMAKE_ARGS+= -Dclient-only=ON PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client PKGINSTALL= ${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir CMAKE_ARGS+= -Dbuild-dird=ON \ -Dbuild-stored=ON \ -Dbuild_client_only=OFF # Server default database MYSQL_CMAKE_ON= -Dmysql=ON MYSQL_USES= mysql SQLITE3_CMAKE_ON= -Dsqlite3=ON SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include .if ${PORT_OPTIONS:MMYSQL} DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} DBTYPE= sqlite3 .else DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} .endif .if defined(WITH_CLIENT_ONLY) MP1+= bconsole.1 MP8+= bareos-fd.8 .else MP8+= bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 bareos-dbcheck.8 MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 .endif MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: @${REINPLACE_CMD} '69,72d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "-server" @${REINPLACE_CMD} '24d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif post-extract: .if defined(WITH_CLIENT_ONLY) . if defined(PYTHON_PLUGIN) @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job . endif .endif @${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \ ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf' .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample ${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp ${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample .endif @${MKDIR} ${STAGEDIR}/var/run/bareos .endif .else .include "${MASTERDIR}/Makefile.common" .endif # -client and -server are defined .include Index: head/sysutils/bareos-server/distinfo =================================================================== --- head/sysutils/bareos-server/distinfo (revision 558142) +++ head/sysutils/bareos-server/distinfo (revision 558143) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589241929 -SHA256 (bareos-bareos-Release-19.2.7_GH0.tar.gz) = 283c1fa9cb6a96b1f09b402cd507ecd8bf798458bafcbfad867da08d33d12653 -SIZE (bareos-bareos-Release-19.2.7_GH0.tar.gz) = 12602338 +TIMESTAMP = 1607980168 +SHA256 (bareos-bareos-Release-19.2.9_GH0.tar.gz) = ea203d4bdacc8dcc86164a74f628888ce31cc90858398498137bd25900b8f723 +SIZE (bareos-bareos-Release-19.2.9_GH0.tar.gz) = 12886739 Index: head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake =================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake (revision 558142) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake (revision 558143) @@ -1,32 +1,32 @@ ---- core/cmake/BareosCheckIncludes.cmake 2020-02-03 01:03:16.451463000 -0500 -+++ core/cmake/BareosCheckIncludes.cmake 2020-02-03 01:07:12.138547000 -0500 -@@ -98,16 +98,20 @@ - check_include_files(sys/ea.h HAVE_SYS_EA_H) - check_include_files(sys/proplist.h HAVE_SYS_PROPLIST_H) +--- core/cmake/BareosCheckIncludes.cmake 2020-12-11 08:44:43.000000000 -0500 ++++ core/cmake/BareosCheckIncludes.cmake 2020-12-14 19:30:00.380545000 -0500 +@@ -100,21 +100,21 @@ check_include_files(sys/xattr.h HAVE_SYS_XATTR_H) --check_include_files(api/glfs.h HAVE_API_GLFS_H) + check_include_files(api/glfs.h HAVE_API_GLFS_H) + ++if(cephfs) + check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) ++check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX) ++endif() + +-include(CheckSymbolExists) +-include(CMakePushCheckState) +-cmake_push_check_state() +-set(CMAKE_REQUIRED_LIBRARIES cephfs) +-check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPH_STATX) +-cmake_pop_check_state() - --check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) --check_include_files("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H) --check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) --check_include_files(radosstriper/libradosstriper.h -- HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) -- -+if(gfapi) -+ check_include_files(glusterfs/api/glfs.h HAVE_API_GLFS_H) ++if(rados) + check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) + check_include_files(radosstriper/libradosstriper.h + HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) ++endif() + # CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H) -check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) ++if(gfapi) + check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) -+endif() -+if(cephfs) -+ check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) -+ check_include_files("sys/stat.h;cephfs/ceph_statx.h" HAVE_CEPHFS_CEPH_STATX_H) -+endif() -+if(rados) -+ check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) -+ check_include_files(radosstriper/libradosstriper.h -+ HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) +endif() check_include_files(elasto/data.h HAVE_ELASTO_DATA_H) check_include_files(elasto/file.h HAVE_ELASTO_FILE_H) Index: head/sysutils/bareos-server/pkg-plist =================================================================== --- head/sysutils/bareos-server/pkg-plist (revision 558142) +++ head/sysutils/bareos-server/pkg-plist (revision 558143) @@ -1,180 +1,185 @@ bin/bregex bin/bsmtp bin/bwild bin/timelimit @sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/LinuxAll.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/SelfTest.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/WindowsAllDrives.conf.sample +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-gfapi.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ovirt.conf.sample %%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample %%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample +%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreGFAPI.conf.sample %%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreRados.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ovirt.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-dir.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/director/bareos-mon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample etc/logrotate.d/bareos-dir lib/bareos/backends/libbareoscats-%%DBTYPE%%.so lib/bareos/backends/libbareossd-fifo.so lib/bareos/backends/libbareossd-gentape.so +%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so %%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so %%RADOS%%lib/bareos/backends/libbareossd-rados.so lib/bareos/backends/libbareossd-tape.so %%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosDirWrapper.py %%PYTHON%%lib/bareos/plugins/BareosSdPluginBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosSdWrapper.py lib/bareos/plugins/autoxflate-sd.so %%PYTHON%%lib/bareos/plugins/bareos-dir-class-plugin.py %%PYTHON%%lib/bareos/plugins/bareos-dir.py.template %%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py %%PYTHON%%lib/bareos/plugins/bareos-sd.py.template %%PYTHON%%lib/bareos/plugins/bareos_dir_consts.py %%PYTHON%%lib/bareos/plugins/bareos_sd_consts.py %%PYTHON%%lib/bareos/plugins/python-dir.so %%PYTHON%%lib/bareos/plugins/python-sd.so %%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so %%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so lib/bareos/scripts/bareos-ctl-dir lib/bareos/scripts/bareos-ctl-sd lib/bareos/scripts/bareos-explorer lib/bareos/scripts/bareos-glusterfind-wrapper lib/bareos/scripts/create_bareos_database %%MYSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql %%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql %%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql %%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql %%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql %%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.12_14.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.14_2001.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2001_2002.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2171_2192.sql %%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql lib/bareos/scripts/ddl/versions.map lib/bareos/scripts/delete_catalog_backup lib/bareos/scripts/disk-changer lib/bareos/scripts/drop_bareos_database lib/bareos/scripts/drop_bareos_tables lib/bareos/scripts/grant_bareos_privileges lib/bareos/scripts/make_bareos_tables lib/bareos/scripts/make_catalog_backup lib/bareos/scripts/make_catalog_backup.pl lib/bareos/scripts/mtx-changer lib/bareos/scripts/query.sql lib/bareos/scripts/update_bareos_tables lib/libbareoscats.so lib/libbareoscats.so.19 lib/libbareoscats.so.%%LIB_VERSION%% %%NDMP%%lib/libbareosndmp.so %%NDMP%%lib/libbareosndmp.so.19 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%% lib/libbareossd.so lib/libbareossql.so lib/libbareossql.so.19 lib/libbareossql.so.%%LIB_VERSION%% man/man1/bareos-tray-monitor.1.gz man/man1/bregex.1.gz man/man1/bsmtp.1.gz man/man1/bwild.1.gz man/man8/bareos-dbcheck.8.gz man/man8/bareos-dbcopy.8.gz man/man8/bareos-dir.8.gz man/man8/bareos-sd.8.gz man/man8/bcopy.8.gz man/man8/bextract.8.gz man/man8/bls.8.gz man/man8/bpluginfo.8.gz man/man8/bscan.8.gz man/man8/bscrypto.8.gz man/man8/btape.8.gz man/man8/btraceback.8.gz sbin/bareos-dbcheck sbin/bareos-dbcopy sbin/bareos-dir sbin/bareos-sd sbin/bcopy sbin/bextract sbin/bls sbin/bpluginfo sbin/bregex sbin/bscan sbin/bscrypto sbin/bsmtp sbin/btape sbin/btestls sbin/bwild sbin/chio-bareos sbin/timelimit @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage +@dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) %%BAREOS_DIR%%/storage @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos Index: head/sysutils/bareos-server/pkg-plist.client =================================================================== --- head/sysutils/bareos-server/pkg-plist.client (revision 558142) +++ head/sysutils/bareos-server/pkg-plist.client (revision 558143) @@ -1,63 +1,64 @@ bin/bconsole @sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample @group bareos @sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample @group bareos @sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample @group bareos @sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample @group bareos @sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample @group bareos lib/libbareos.so lib/libbareos.so.19 lib/libbareos.so.%%LIB_VERSION%% lib/libbareosfastlz.so lib/libbareosfastlz.so.19 lib/libbareosfastlz.so.%%LIB_VERSION%% lib/libbareosfind.so lib/libbareosfind.so.19 lib/libbareosfind.so.%%LIB_VERSION%% %%LMDB%%lib/libbareoslmdb.so %%LMDB%%lib/libbareoslmdb.so.19 %%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%% %%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginOvirt.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py %%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py %%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py %%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py %%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py %%PYTHON%%lib/bareos/plugins/bareos-fd-ovirt.py %%PYTHON%%lib/bareos/plugins/bareos-fd-percona-xtrabackup.py %%PYTHON%%lib/bareos/plugins/bareos-fd.py.template %%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py lib/bareos/plugins/bpipe-fd.so +%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so %%GFAPI%%lib/bareos/plugins/gfapi-fd.so %%PYTHON%%lib/bareos/plugins/python-fd.so %%RADOS%%lib/bareos/plugins/rados-fd.so lib/bareos/scripts/bareos lib/bareos/scripts/bareos-config lib/bareos/scripts/bareos-config-lib.sh lib/bareos/scripts/bareos-ctl-fd lib/bareos/scripts/bareos-ctl-funcs lib/bareos/scripts/btraceback.dbx lib/bareos/scripts/btraceback.gdb lib/bareos/scripts/btraceback.mdb man/man1/bconsole.1.gz man/man8/bareos-fd.8.gz man/man8/bareos.8.gz @group bareos sbin/bareos @group bareos sbin/bareos-fd @group bareos sbin/bconsole @group wheel sbin/btraceback @group bareos @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos