Index: head/sysutils/bareos18-client/Makefile =================================================================== --- head/sysutils/bareos18-client/Makefile (revision 558145) +++ head/sysutils/bareos18-client/Makefile (revision 558146) @@ -1,21 +1,27 @@ # $FreeBSD$ PORTNAME= bareos PKGNAMESUFFIX= 18-client COMMENT= Backup archiving recovery open sourced (client) BROKEN_aarch64= Fails to link: missing sbrk CONFLICTS= bareos17-client-* bareos16-client-* bareos-client-* WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos18-server +OPTIONS_GROUP= PLUGINS +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/bareos18-server/Makefile =================================================================== --- head/sysutils/bareos18-server/Makefile (revision 558145) +++ head/sysutils/bareos18-server/Makefile (revision 558146) @@ -1,227 +1,243 @@ # $FreeBSD$ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 18.2.8 +DISTVERSION= 18.2.10 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= 18-server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi CONFLICTS?= bacula17*-server-* bareos16-server-* bareos-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= cmake:insource compiler:c++11-lang pkgconfig readline:port \ - shebangfix +USES+= cmake:insource 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} == "18-server" +OPTIONS_GROUP= BACKENDS +OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS OPTIONS_DEFINE= MTX PYTHON NDMP NLS SCSICRYPTO OPTIONS_DEFAULT+= PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL OPTIONS_SINGLE+= DATABASE DATABASE_DESC= Database support +CEPHFS_DESC= CEPHFS backend support +GFAPI_DESC= GFAPI backend support +RADOS_DESC= RADOS backend support NDMP_CMAKE_ON= -Dndmp=ON NDMP_CMAKE_OFF= -Dndmp=OFF .endif GNUTLS_CONFIGURE_WITH= gnutls=${LOCALBASE} GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls OPENSSL_USES= ssl OPENSSL_CMAKE_ON= -Dopenssl=ON OPENSSL_CMAKE_OFF= -Dopenssl=OFF SCSICRYPTO_CMAKE_ON= -Dscsi-crypto=ON SCSICRYPTO_CMAKE_OFF= -Dscsi-crypto=OFF .if ${PKGNAMESUFFIX} == "18-client" || ${PKGNAMESUFFIX} == "18-server" #Till end of the file PYTHON_USES= python PYTHON_CMAKE_ON= -Dpython=ON PYTHON_CMAKE_OFF= -Dpython=OFF PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbareos.so:sysutils/bareos18-client USE_RC_SUBR?= bareos-dir bareos-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else SUB_FILES+= pkg-message.server .endif CMAKE_ARGS+= -Dtcp-wrappers=ON \ - -Dsmartalloc=ON \ + -Dsmartalloc=OFF \ -Dsysconfdir=${PREFIX}/etc \ -Darchivedir=${BAREOS_DIR}/storage \ -Dworkingdir=${BAREOS_DIR} \ -Dconfdir=${PREFIX}/etc/bareos \ -Dlibdir=${PREFIX}/lib \ -Dlogdir=/var/log/bareos \ -Dincludedir=${PREFIX}/include/bareos \ -Dreadline=ON \ -Ddisable-conio=ON \ -Dbatch-insert=ON \ -Dhave_plugins=ON \ -Dplugindir=${PREFIX}/lib/bareos/plugins \ -Dscriptdir=${PREFIX}/lib/bareos/scripts \ -Dbackenddir=${PREFIX}/lib/bareos/backends \ -Ddump_email=root@localhost \ -Djob_email=root@localhost \ -Ddb_name=bareos \ -Dsbin-perm=755 \ -Ddb_user=bareos \ -Dbaseport=9101 \ -Dpiddir=/var/run/bareos \ .if defined(WITH_CLIENT_ONLY) LMDB_CMAKE_ON= -Dlmdb=ON LMDB_CMAKE_OFF= -Dlmdb=OFF LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 CMAKE_ARGS+= -Dfd-user=root \ -Dfd-group=wheel .else CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \ -Ddir-group=${BAREOS_GROUP} \ -Dsd-user=${BAREOS_USER} \ -Dsd-group=operator \ -Dlmdb=OFF .endif # The user/group IDs below are registered, see # http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/book.html#DADS-UID # BAREOS_USER?= bareos BAREOS_GROUP?= ${BAREOS_USER} BAREOS_UID?= 997 BAREOS_GID?= ${BAREOS_UID} BAREOS_DIR?= /var/db/bareos PLIST_SUB+= BAREOS_DIR=${BAREOS_DIR} SUB_LIST= BAREOS_USER=${BAREOS_USER} \ BAREOS_GROUP=${BAREOS_GROUP} \ BAREOS_UID=${BAREOS_UID} \ BAREOS_GID=${BAREOS_GID} \ BAREOS_DIR=${BAREOS_DIR} NLS_USES= gettext NLS_CMAKE_ON= -Dnls=ON +CEPHFS_CMAKE_ON= -Dcephfs=ON +CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 +GFAPI_CMAKE_ON= -Dgfapi=ON +GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs +RADOS_CMAKE_ON= -Drados=ON -Dcephfs=ON +RADOS_LIB_DEPENDS= librados.so:net/ceph14 # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CMAKE_ARGS+= -Dclient-only=ON PKGDEINSTALL= ${FILESDIR}/pkg-deinstall.client PKGINSTALL= ${FILESDIR}/pkg-install.client .else # Server only Options CONFFILES= sd dir CMAKE_ARGS+= -Dbuild-dird=ON \ -Dbuild-stored=ON \ -Dbuild_client_only=OFF # Server default database MYSQL_CMAKE_ON= -Dmysql=ON MYSQL_USES= mysql SQLITE3_CMAKE_ON= -Dsqlite3=ON SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include .if ${PORT_OPTIONS:MMYSQL} DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} DBTYPE= sqlite3 .else DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} .endif .if defined(WITH_CLIENT_ONLY) MP1+= bconsole.1 MP8+= bareos-fd.8 .else MP8+= bareos.8 bareos-dir.8 bareos-sd.8 bcopy.8 bextract.8 bls.8 bscan.8 \ btape.8 btraceback.8 bareos-dbcheck.8 MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 .endif MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: @${REINPLACE_CMD} '42d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|api/glfs.h|glusterfs/api/glfs.h|g' \ + ${WRKSRC}/core/src/stored/backends/gfapi_device.h + @${REINPLACE_CMD} -e 's|sm_dump(false)|sm_dump(jcr,false)|g' \ + ${WRKSRC}/core/src/tools/btestls.cc .if ${PKGNAMESUFFIX} == "18-server" @${REINPLACE_CMD} '25d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif post-extract: .if defined(WITH_CLIENT_ONLY) . if defined(PYTHON_PLUGIN) @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/fileset @${MKDIR} ${STAGEDIR}${ETCDIR}/python-ldap-conf.d/bareos-dir.d/job . endif .endif @${MV} ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'Windows All Drives.conf' \ ${WRKSRC}/core/src/defaultconfigs/bareos-dir.d/fileset/'WindowsAllDrives.conf' .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${STAGEDIR}${ETCDIR}/bconsole.d/bconsole.conf.sample .else ${INSTALL_SCRIPT} ${FILESDIR}/chio-bareos ${STAGEDIR}${PREFIX}/sbin ${INSTALL_DATA} ${FILESDIR}/bareos-barcodes ${STAGEDIR}${ETCDIR}/bareos-barcodes.sample ${CHMOD} o+x ${STAGEDIR}${PREFIX}/bin/bsmtp ${MV} ${STAGEDIR}${ETCDIR}/mtx-changer.conf ${STAGEDIR}${ETCDIR}/mtx-changer.conf.sample ${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample .endif @${MKDIR} ${STAGEDIR}/var/run/bareos .endif .else .include "${MASTERDIR}/Makefile.common" .endif # 18-client and 18-server are defined .include Index: head/sysutils/bareos18-server/distinfo =================================================================== --- head/sysutils/bareos18-server/distinfo (revision 558145) +++ head/sysutils/bareos18-server/distinfo (revision 558146) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589241653 -SHA256 (bareos-bareos-Release-18.2.8_GH0.tar.gz) = 705e15d3f30e8f656c805e3051e429c26217ffefde8900d1fdd0f2a25b7698f6 -SIZE (bareos-bareos-Release-18.2.8_GH0.tar.gz) = 10552800 +TIMESTAMP = 1608000734 +SHA256 (bareos-bareos-Release-18.2.10_GH0.tar.gz) = 55ef90b2efaa8cb665ef0f9b89e8155e05fcc73da97addfb74f3b7aa57218f63 +SIZE (bareos-bareos-Release-18.2.10_GH0.tar.gz) = 10558902 Index: head/sysutils/bareos18-server/files/patch-core-CMakeLists.txt =================================================================== --- head/sysutils/bareos18-server/files/patch-core-CMakeLists.txt (revision 558145) +++ head/sysutils/bareos18-server/files/patch-core-CMakeLists.txt (revision 558146) @@ -1,32 +1,32 @@ ---- core/CMakeLists.txt 2019-12-12 12:04:14.000000000 -0500 -+++ core/CMakeLists.txt 2019-12-28 16:17:19.843397000 -0500 -@@ -117,7 +117,9 @@ - set(PSCMD "ps -ax -o pid,command") - include_directories(/usr/local/include) - link_directories(/usr/local/lib) -- link_libraries(intl) -+ IF(nls) -+ link_libraries(intl) -+ ENDIF() +--- core/CMakeLists.txt 2020-12-11 10:27:01.000000000 -0500 ++++ core/CMakeLists.txt 2020-12-14 21:56:05.412121000 -0500 +@@ -115,7 +115,9 @@ + set(PSCMD "ps -ax -o pid,command") + include_directories(/usr/local/include) + link_directories(/usr/local/lib) +- link_libraries(intl) ++ IF(nls) ++ link_libraries(intl) ++ ENDIF() endif() - IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -@@ -176,7 +178,9 @@ - add_definitions("-D_FILE_OFFSET_BITS=64") + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +@@ -187,7 +189,9 @@ + add_definitions("-D_FILE_OFFSET_BITS=64") endif() --INCLUDE(FindIntl) +-include(FindIntl) +IF(nls) -+ INCLUDE(FindIntl) ++ include(FindIntl) +ENDIF() - IF(developer) - add_definitions("-DDEVELOPER=1") -@@ -586,7 +590,6 @@ + if(developer) + add_definitions("-DDEVELOPER=1") +@@ -600,7 +604,6 @@ add_subdirectory(scripts) add_subdirectory(manpages) -add_subdirectory(platforms) add_subdirectory(src) - STRING(TIMESTAMP NOW "%Y-%m-%d %H:%M:%S") + string(TIMESTAMP NOW "%Y-%m-%d %H:%M:%S") Index: head/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake =================================================================== --- head/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake (nonexistent) +++ head/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake (revision 558146) @@ -0,0 +1,34 @@ +--- core/cmake/BareosCheckIncludes.cmake 2020-12-14 22:02:44.192311000 -0500 ++++ core/cmake/BareosCheckIncludes.cmake 2020-12-14 22:06:25.053879000 -0500 +@@ -103,20 +103,20 @@ + CHECK_INCLUDE_FILES(sys/xattr.h HAVE_SYS_XATTR_H) + CHECK_INCLUDE_FILES(api/glfs.h HAVE_API_GLFS_H) + +-CHECK_INCLUDE_FILES(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_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_CEPHFS_CEPH_STATX_H) ++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_CEPHFS_CEPH_STATX_H) +-cmake_pop_check_state() ++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(rados/librados.h HAVE_RADOS_LIBRADOS_H) +-CHECK_INCLUDE_FILES(radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) +- + #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() + + CHECK_INCLUDE_FILES(elasto/data.h HAVE_ELASTO_DATA_H) + CHECK_INCLUDE_FILES(elasto/file.h HAVE_ELASTO_FILE_H) Property changes on: head/sysutils/bareos18-server/files/patch-core-cmake_BareosCheckIncludes.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake =================================================================== --- head/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake (revision 558145) +++ head/sysutils/bareos18-server/files/patch-core-cmake_BareosFindAllLibraries.cmake (revision 558146) @@ -1,24 +1,51 @@ ---- core/cmake/BareosFindAllLibraries.cmake 2019-05-10 00:27:21.421777000 -0500 -+++ core/cmake/BareosFindAllLibraries.cmake 2019-05-10 00:28:47.016424000 -0500 +--- core/cmake/BareosFindAllLibraries.cmake 2020-12-11 10:27:01.000000000 -0500 ++++ core/cmake/BareosFindAllLibraries.cmake 2020-12-14 22:52:06.210892000 -0500 @@ -25,13 +25,15 @@ if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") - # make sure we get python 2 not 3 - set(Python_ADDITIONAL_VERSIONS 2.5 2.6 2.7 2.8 2.9) - find_package(PythonInterp) - INCLUDE(FindPythonLibs) + if (python) + # make sure we get python 2 or 3 + set(Python_ADDITIONAL_VERSIONS 3.5 3.6 3.7 3.8 2.7) + find_package(PythonInterp) + INCLUDE(FindPythonLibs) - if (${PYTHONLIBS_FOUND}) - SET(HAVE_PYTHON 1) + if (${PYTHONLIBS_FOUND}) + SET(HAVE_PYTHON 1) + endif() endif() INCLUDE(FindPostgreSQL) +@@ -52,13 +54,21 @@ + + BareosFindLibraryAndHeaders("fastlz" "fastlzlib.h") + BareosFindLibraryAndHeaders("jansson" "jansson.h") +-BareosFindLibraryAndHeaders("rados" "rados/librados.h") +-BareosFindLibraryAndHeaders("radosstriper" "radosstriper/libradosstriper.h") +-BareosFindLibraryAndHeaders("cephfs" "cephfs/libcephfs.h") ++if(rados) ++ BareosFindLibraryAndHeaders("rados" "rados/librados.h") ++ BareosFindLibraryAndHeaders("radosstriper" "radosstriper/libradosstriper.h") ++endif() ++if(cephfs) ++ BareosFindLibraryAndHeaders("cephfs" "cephfs/libcephfs.h") ++endif() + BareosFindLibraryAndHeaders("pthread" "pthread.h") + BareosFindLibraryAndHeaders("cap" "sys/capability.h") +-BareosFindLibraryAndHeaders("gfapi" "glusterfs/api/glfs.h") +-BareosFindLibraryAndHeaders("droplet" "droplet.h") ++if(gfapi) ++ BareosFindLibraryAndHeaders("gfapi" "glusterfs/api/glfs.h") ++endif() ++if(droplet) ++ BareosFindLibraryAndHeaders("droplet" "droplet.h") ++endif() + + BareosFindLibraryAndHeaders("pam" "security/pam_appl.h") + Index: head/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake =================================================================== --- head/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake (revision 558145) +++ head/sysutils/bareos18-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake (revision 558146) @@ -1,72 +1,84 @@ ---- core/cmake/BareosInstallConfigFiles.cmake 2019-02-13 09:25:55.000000000 -0500 -+++ core/cmake/BareosInstallConfigFiles.cmake 2019-05-08 22:47:21.128268000 -0500 +--- core/cmake/BareosInstallConfigFiles.cmake 2020-12-11 10:27:01.000000000 -0500 ++++ core/cmake/BareosInstallConfigFiles.cmake 2020-12-15 01:25:25.641687000 -0500 @@ -43,18 +43,9 @@ get_filename_component(resname ${resdir} NAME) foreach(configfile ${configfiles}) get_filename_component(fname ${configfile} NAME) - if (EXISTS ${DESTCONFDIR}/${resname}/${fname}) - MESSAGE(STATUS "${DESTCONFDIR}/${resname}/${fname} exists") - MESSAGE(STATUS "rename ${configfile} to ${configfile}.new") - FILE (RENAME "${configfile}" "${configfile}.new") - - MESSAGE(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}") - FILE (INSTALL "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}") - FILE (RENAME "${configfile}.new" "${configfile}") - else() - MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname} (new installation)") - FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") - endif() + MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.sample (new installation)") + FILE (RENAME "${configfile}" "${configfile}.sample") + FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}") endforeach() endforeach() -@@ -82,15 +73,9 @@ +@@ -82,21 +73,16 @@ get_filename_component(dir ${configfile} DIRECTORY) get_filename_component(fname ${configfile} NAME) - if (EXISTS ${DESTCONFDIR}/${configfile}) - MESSAGE(STATUS "${configfile} as ${configfile}.new (keep existing)") - FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.new") - FILE(COPY "${BackendConfigSrcDir}/${configfile}.new" DESTINATION "${DESTCONFDIR}/${dir}") - FILE(RENAME "${BackendConfigSrcDir}/${configfile}.new" "${BackendConfigSrcDir}/${configfile}") - else() - MESSAGE(STATUS "${configfile} as ${configfile}") - FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}") - endif() + MESSAGE(STATUS "${configfile} as ${configfile}") + FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample") + FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}") endforeach() file(GLOB_RECURSE configfiles RELATIVE "${BackendConfigSrcDir}" "${BackendConfigSrcDir}/*.example") -@@ -104,7 +89,8 @@ + foreach(configfile ${configfiles}) + get_filename_component(dir ${configfile} DIRECTORY) +- #get_filename_component(fname ${configfile} NAME) ++ get_filename_component(fname ${configfile} NAME) ++ get_filename_component(fsname ${configfile} NAME_WE) + + if (EXISTS ${DESTCONFDIR}/${configfile}) + MESSAGE(STATUS "overwriting ${configfile}") +@@ -104,7 +90,8 @@ MESSAGE(STATUS "${configfile} as ${configfile}") endif() - FILE(COPY "${BackendConfigSrcDir}/${configfile}" DESTINATION "${DESTCONFDIR}/${dir}") -+ FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${configfile}.sample") -+ FILE(COPY "${BackendConfigSrcDir}/${configfile}.sample" DESTINATION "${DESTCONFDIR}/${dir}") ++ FILE(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample") ++ FILE(COPY "${BackendConfigSrcDir}/${fsname}.conf.sample" DESTINATION "${DESTCONFDIR}/${dir}") endforeach() ENDFOREACH() -@@ -122,15 +108,9 @@ +@@ -122,15 +109,13 @@ STRING(REGEX MATCH "\\.in\$" IS_INFILE ${configfile}) if (NOT "${IS_INFILE}" STREQUAL ".in") get_filename_component(fname ${configfile} NAME) - if (EXISTS ${DESTCONFDIR}/${resname}/${fname}) - MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}.new (keep existing)") - FILE (RENAME "${configfile}" "${configfile}.new") - FILE (COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}") - FILE (RENAME "${configfile}.new" "${configfile}") - else() - MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}") - FILE (COPY "${configfile}" DESTINATION "${DESTCONFDIR}/${resname}") - endif() ++ get_filename_component(fsname ${configfile} NAME_WE) + MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}") -+ FILE (RENAME "${configfile}" "${configfile}.sample") -+ FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}") ++ FILE(RENAME "${configfile}" "${resdir}/${fsname}.conf.sample") ++ FILE( ++ COPY "${resdir}/${fsname}.conf.sample" ++ DESTINATION "${DESTCONFDIR}/${resname}" ++ ) else() MESSAGE(STATUS "skipping .in file ${configfile}:${IS_INFILE}") endif() Index: head/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc =================================================================== --- head/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc (nonexistent) +++ head/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc (revision 558146) @@ -0,0 +1,24 @@ +--- core/src/plugins/filed/gfapi-fd.cc 2020-12-14 23:47:04.832213000 -0500 ++++ core/src/plugins/filed/gfapi-fd.cc 2020-12-14 23:47:56.824952000 -0500 +@@ -30,7 +30,7 @@ + #include "lib/path_list.h" + #include "lib/edit.h" + +-#include ++#include + + + /* avoid missing config.h problem on Debian 8 and Ubuntu 16: +@@ -39,10 +39,10 @@ + */ + #ifndef _CONFIG_H + #define _CONFIG_H +-#include ++#include + #undef _CONFIG_H + #else +-#include ++#include + #endif + + namespace filedaemon { Property changes on: head/sysutils/bareos18-server/files/patch-core-src-plugins-filed_gfapi-fd.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +ON \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/sysutils/bareos18-server/pkg-plist =================================================================== --- head/sysutils/bareos18-server/pkg-plist (revision 558145) +++ head/sysutils/bareos18-server/pkg-plist (revision 558146) @@ -1,165 +1,180 @@ 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 -@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.example.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 +%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample +%%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.sampl @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.example.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.example.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/restore-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.example.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.example.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.example.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.example.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/tapedrive-0.conf.example.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 %%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.18 lib/libbareoscats.so.%%LIB_VERSION%% %%NDMP%%lib/libbareosndmp.so %%NDMP%%lib/libbareosndmp.so.18 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%% lib/libbareossd.so lib/libbareossql.so lib/libbareossql.so.18 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-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-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-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/bareos18-server/pkg-plist.client =================================================================== --- head/sysutils/bareos18-server/pkg-plist.client (revision 558145) +++ head/sysutils/bareos18-server/pkg-plist.client (revision 558146) @@ -1,56 +1,59 @@ bin/bconsole @sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample @group bareos @sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample @group bareos @sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample @group bareos @sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample @group bareos @sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample @group bareos lib/libbareos.so lib/libbareos.so.18 lib/libbareos.so.%%LIB_VERSION%% lib/libbareosfind.so lib/libbareosfind.so.18 lib/libbareosfind.so.%%LIB_VERSION%% %%LMDB%%lib/libbareoslmdb.so %%LMDB%%lib/libbareoslmdb.so.18 %%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%% %%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py %%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py %%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py %%PYTHON%%lib/bareos/plugins/bareos-fd-local-fileset.py %%PYTHON%%lib/bareos/plugins/bareos-fd-mock-test.py %%PYTHON%%lib/bareos/plugins/bareos-fd.py.template %%PYTHON%%lib/bareos/plugins/bareos_fd_consts.py lib/bareos/plugins/bpipe-fd.so +%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so +%%GFAPI%%lib/bareos/plugins/gfapi-fd.so %%PYTHON%%lib/bareos/plugins/python-fd.so +%%RADOS%%lib/bareos/plugins/rados-fd.so lib/bareos/scripts/bareos lib/bareos/scripts/bareos-config lib/bareos/scripts/bareos-config-lib.sh lib/bareos/scripts/bareos-ctl-fd lib/bareos/scripts/bareos-ctl-funcs lib/bareos/scripts/btraceback.dbx lib/bareos/scripts/btraceback.gdb lib/bareos/scripts/btraceback.mdb man/man1/bconsole.1.gz man/man8/bareos-fd.8.gz man/man8/bareos.8.gz @group bareos sbin/bareos @group bareos sbin/bareos-fd @group bareos sbin/bconsole @group wheel sbin/btraceback @group bareos %%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset %%PYTHON%%@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos