Index: head/sysutils/bareos-client/Makefile =================================================================== --- head/sysutils/bareos-client/Makefile (revision 525238) +++ head/sysutils/bareos-client/Makefile (revision 525239) @@ -1,21 +1,26 @@ # $FreeBSD$ PORTNAME= bareos PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) BROKEN_aarch64= Fails to link: missing sbrk -CONFLICTS= bareos16-client-* bareos17-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_DEFINE= NLS PYTHON LMDB SCSICRYPTO + +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 525238) +++ head/sysutils/bareos-server/Makefile (revision 525239) @@ -1,227 +1,236 @@ # $FreeBSD$ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 18.2.7 +DISTVERSION= 19.2.5 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?= bacula17*-server-* bareos16-server-* +CONFLICTS?= bacula18*-server bacula17*-server-* bareos16-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson -USES+= cmake:insource compiler:c++11-lang pkgconfig readline:port \ +USES+= cmake compiler:c++11-lang localbase pkgconfig readline:port \ shebangfix USE_GITHUB= yes 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_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 +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 \ + -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 +GFAPI_CMAKE_ON= -Dgfapi=ON +GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs +RADOS_CMAKE_ON= -Drados=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} '69,70d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "-server" - @${REINPLACE_CMD} '25d' ${WRKSRC}/core/src/plugins/CMakeLists.txt + @${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/Makefile.common =================================================================== --- head/sysutils/bareos-server/Makefile.common (revision 525238) +++ head/sysutils/bareos-server/Makefile.common (revision 525239) @@ -1,35 +1,37 @@ # Created by: Alonso Cardenas # $FreeBSD$ +post-patch: + @${REINPLACE_CMD} '69,70d' ${WRKSRC}/CMakeLists.txt post-build: .if ${PKGNAMEPREFIX} == "nagios-check_" ${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos .endif pre-install: .if ${PKGNAMESUFFIX} == "-traymonitor" . for d in client director monitor storage ${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d} ${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \; . endfor .endif do-install: .if ${PKGNAMEPREFIX} == "nagios-check_" @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios ${INSTALL_PROGRAM} ${WRKSRC}/examples/nagios/check_bareos/check_bareos \ ${STAGEDIR}${PREFIX}/libexec/nagios .endif .if ${PKGNAMESUFFIX} == "-client-static" ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static .endif .if ${PKGNAMESUFFIX} == "-traymonitor" # Install config files and preserve existing ones .for d in client director monitor storage ${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/ .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${CONFIGURE_WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.xpm ${STAGEDIR}${PREFIX}/share/pixmaps ${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop ${STAGEDIR}${DESKTOPDIR} .endif Index: head/sysutils/bareos-server/distinfo =================================================================== --- head/sysutils/bareos-server/distinfo (revision 525238) +++ head/sysutils/bareos-server/distinfo (revision 525239) @@ -1,3 +1,3 @@ -TIMESTAMP = 1576174612 -SHA256 (bareos-bareos-Release-18.2.7_GH0.tar.gz) = 08fea6e9505188a5e585f90448d6f30befeff2fafc2c494a68e2b571c7c6637f -SIZE (bareos-bareos-Release-18.2.7_GH0.tar.gz) = 10552298 +TIMESTAMP = 1580746168 +SHA256 (bareos-bareos-Release-19.2.5_GH0.tar.gz) = 4e3ae33f04caffa313bcd12c8073d8fa5042761cee0325720a281e54ce2cfe28 +SIZE (bareos-bareos-Release-19.2.5_GH0.tar.gz) = 12578604 Index: head/sysutils/bareos-server/files/patch-core-CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-CMakeLists.txt (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-CMakeLists.txt (revision 525239) @@ -1,32 +1,34 @@ ---- 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-01-31 12:45:28.110777000 -0500 ++++ core/CMakeLists.txt 2020-01-31 12:47:41.413976000 -0500 +@@ -249,7 +249,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") +@@ -316,8 +318,11 @@ + add_definitions("-D_FILE_OFFSET_BITS=64") endif() --INCLUDE(FindIntl) +-include(FindIntl) + +IF(nls) + INCLUDE(FindIntl) +ENDIF() ++ + if(developer) + add_definitions("-DDEVELOPER=1") + endif() +@@ -746,7 +751,6 @@ - IF(developer) - add_definitions("-DDEVELOPER=1") -@@ -586,7 +590,6 @@ - add_subdirectory(scripts) add_subdirectory(manpages) -add_subdirectory(platforms) add_subdirectory(src) - STRING(TIMESTAMP NOW "%Y-%m-%d %H:%M:%S") + include(BareosLocalBuildDefinitions OPTIONAL Index: head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake =================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake (nonexistent) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake (revision 525239) @@ -0,0 +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) + 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) +-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) + # CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H) +-check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) ++ 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) Property changes on: head/sysutils/bareos-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/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake =================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake (revision 525239) @@ -1,24 +1,66 @@ ---- core/cmake/BareosFindAllLibraries.cmake 2019-05-10 00:27:21.421777000 -0500 -+++ core/cmake/BareosFindAllLibraries.cmake 2019-05-10 00:28:47.016424000 -0500 -@@ -25,13 +25,15 @@ +--- core/cmake/BareosFindAllLibraries.cmake 2020-01-31 11:21:18.000000000 -0500 ++++ core/cmake/BareosFindAllLibraries.cmake 2020-02-03 00:55:59.098603000 -0500 +@@ -23,20 +23,22 @@ + endif() + 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 not 3 ++ set( ++ Python_ADDITIONAL_VERSIONS ++ 3.5 ++ 3.6 ++ 3.7 ++ 3.8 ++ 2.9 ++ ) ++ find_package(PythonInterp) ++ include(FindPythonLibs) - 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() -- if (${PYTHONLIBS_FOUND}) -- SET(HAVE_PYTHON 1) -+ if (${PYTHONLIBS_FOUND}) -+ SET(HAVE_PYTHON 1) -+ endif() - endif() + include(FindPostgreSQL) +@@ -56,13 +58,22 @@ + include(BareosFindLibraryAndHeaders) - INCLUDE(FindPostgreSQL) + bareosfindlibraryandheaders("jansson" "jansson.h") +-bareosfindlibraryandheaders("rados" "rados/librados.h") +-bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h") +-bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h") + bareosfindlibraryandheaders("pthread" "pthread.h") + bareosfindlibraryandheaders("cap" "sys/capability.h") +-bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h") +-bareosfindlibraryandheaders("droplet" "droplet.h") ++ ++if(rados) ++ bareosfindlibraryandheaders("rados" "rados/librados.h") ++ bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h") ++endif() ++if(cephfs) ++ bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h") ++endif() ++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/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake =================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake (revision 525239) @@ -1,72 +1,117 @@ ---- core/cmake/BareosInstallConfigFiles.cmake 2019-02-13 09:25:55.000000000 -0500 -+++ core/cmake/BareosInstallConfigFiles.cmake 2019-05-08 22:47:21.128268000 -0500 -@@ -43,18 +43,9 @@ - get_filename_component(resname ${resdir} NAME) - foreach(configfile ${configfiles}) +--- core/cmake/BareosInstallConfigFiles.cmake 2020-01-31 11:21:18.000000000 -0500 ++++ core/cmake/BareosInstallConfigFiles.cmake 2020-02-03 02:15:35.557127000 -0500 +@@ -60,24 +60,12 @@ + 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") +- 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}") +- 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}") +- 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() ++ 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 @@ - get_filename_component(dir ${configfile} DIRECTORY) +@@ -114,23 +102,12 @@ + 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}") +- 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}") +- 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() ++ 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 @@ - MESSAGE(STATUS "${configfile} as ${configfile}") + file( +@@ -140,7 +117,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}") +@@ -148,9 +126,10 @@ + 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}") - endforeach() ++ file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample") + file( +- COPY "${BackendConfigSrcDir}/${configfile}" +- DESTINATION "${DESTCONFDIR}/${dir}" ++ COPY "${BackendConfigSrcDir}/${fsname}.conf.sample" ++ DESTINATION "${DESTCONFDIR}/${dir}" + ) + endforeach() - ENDFOREACH() -@@ -122,15 +108,9 @@ - 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() -+ MESSAGE(STATUS "${resname}/${fname} as ${resname}/${fname}") -+ FILE (RENAME "${configfile}" "${configfile}.sample") -+ FILE (COPY "${configfile}.sample" DESTINATION "${DESTCONFDIR}/${resname}") - else() - MESSAGE(STATUS "skipping .in file ${configfile}:${IS_INFILE}") - endif() +@@ -174,22 +153,14 @@ + ) + 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() +- else() ++ get_filename_component(fsname ${configfile} NAME_WE) ++ message(STATUS "${resname}/${fname} as ${resname}/${fname}") ++ 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() + endforeach() Index: head/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake =================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake (revision 525239) @@ -1,15 +1,15 @@ ---- core/cmake/BareosSetVariableDefaults.cmake 2019-05-10 11:53:19.620402000 -0500 -+++ core/cmake/BareosSetVariableDefaults.cmake 2019-05-10 12:13:55.910452000 -0500 -@@ -669,7 +669,11 @@ - SET(PACKAGE_URL "\"\"") - SET(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"") +--- core/cmake/BareosSetVariableDefaults.cmake 2020-01-31 16:21:15.864122000 -0500 ++++ core/cmake/BareosSetVariableDefaults.cmake 2020-01-31 16:23:58.960984000 -0500 +@@ -641,7 +641,11 @@ + set(PACKAGE_URL "\"\"") + set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"") -set(ENABLE_NLS 1) -+IF(DEFINED nls) ++if(nls) + SET(ENABLE_NLS 1) -+ELSE() ++else() + SET(ENABLE_NLS 0) -+ENDIF() ++endif() + if(HAVE_WIN32) - IF(HAVE_WIN32) Index: head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt (revision 525239) @@ -1,19 +1,14 @@ ---- core/manpages/CMakeLists.txt 2019-05-08 21:16:29.369799000 -0500 -+++ core/manpages/CMakeLists.txt 2019-05-08 21:17:28.526607000 -0500 -@@ -17,6 +17,7 @@ +--- core/manpages/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 ++++ core/manpages/CMakeLists.txt 2020-01-31 15:33:19.205416000 -0500 +@@ -17,9 +17,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -+IF(client-only) - set (MAN1 - bconsole.1 - ) -@@ -25,7 +26,7 @@ - bareos-fd.8 - bareos.8 - ) -- -+ENDIF() ++if(client-only) + set(MAN1 bconsole.1) - IF(NOT client-only) - set ( MAN1-server + set(MAN8 bareos-fd.8 bareos.8) ++endif() + + if(NOT client-only) + set(MAN1-server Index: head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt (revision 525239) @@ -1,75 +1,59 @@ ---- core/scripts/CMakeLists.txt 2019-12-12 12:04:14.000000000 -0500 -+++ core/scripts/CMakeLists.txt 2019-12-28 16:23:36.207715000 -0500 -@@ -17,36 +17,37 @@ +--- core/scripts/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 ++++ core/scripts/CMakeLists.txt 2020-01-31 15:37:16.832224000 -0500 +@@ -17,33 +17,35 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. -+IF(client-only) -+ INSTALL(FILES -+ bareos btraceback -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE -+ GROUP_READ GROUP_EXECUTE -+ WORLD_READ WORLD_EXECUTE -+ DESTINATION "${sbindir}") +-install( +- FILES bareos btraceback +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE +- WORLD_READ WORLD_EXECUTE +- DESTINATION "${sbindir}" +-) ++if(client-only) ++ install( ++ FILES bareos btraceback ++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE ++ WORLD_READ WORLD_EXECUTE ++ DESTINATION "${sbindir}" ++ ) --INSTALL(FILES -- bareos btraceback -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE -- GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE -- DESTINATION "${sbindir}") -+ INSTALL(FILES -+ bareos-ctl-fd -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE -+ GROUP_READ GROUP_EXECUTE -+ WORLD_READ WORLD_EXECUTE -+ DESTINATION "${scriptdir}" -+ COMPONENT filedaemon) +-install( +- FILES bareos-ctl-fd +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE +- WORLD_READ WORLD_EXECUTE +- DESTINATION "${scriptdir}" +- COMPONENT filedaemon +-) ++ install( ++ FILES bareos-ctl-fd ++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE ++ WORLD_READ WORLD_EXECUTE ++ DESTINATION "${scriptdir}" ++ COMPONENT filedaemon ++ ) --INSTALL(FILES -- bareos-ctl-fd -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE -- GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE -- DESTINATION "${scriptdir}" -- COMPONENT filedaemon) -+ INSTALL(FILES -+ bareos -+ btraceback.gdb -+ btraceback.dbx -+ btraceback.mdb -+ bareos-config -+ bareos-config-lib.sh -+ bareos-ctl-funcs -+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE -+ GROUP_READ GROUP_EXECUTE -+ WORLD_READ WORLD_EXECUTE -+ DESTINATION "${scriptdir}" -+ ) -+ENDIF() +-install( +- FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config +- bareos-config-lib.sh bareos-ctl-funcs +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE +- WORLD_READ WORLD_EXECUTE +- DESTINATION "${scriptdir}" +-) ++ install( ++ FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config ++ bareos-config-lib.sh bareos-ctl-funcs ++ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE ++ WORLD_READ WORLD_EXECUTE ++ DESTINATION "${scriptdir}" ++ ) ++endif() --INSTALL(FILES -- bareos -- btraceback.gdb -- btraceback.dbx -- btraceback.mdb -- bareos-config -- bareos-config-lib.sh -- bareos-ctl-funcs -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE -- GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE -- DESTINATION "${scriptdir}" -- ) -- - IF(NOT client-only) - INSTALL(FILES - mtx-changer -@@ -55,7 +56,6 @@ - bareos-glusterfind-wrapper - bareos-ctl-dir - bareos-ctl-sd -- bareos-ctl-funcs - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE - GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE + if(NOT client-only) + install( + FILES mtx-changer disk-changer bareos-explorer bareos-glusterfind-wrapper +- bareos-ctl-dir bareos-ctl-sd bareos-ctl-funcs ++ bareos-ctl-dir bareos-ctl-sd + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${scriptdir}" Index: head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt (nonexistent) +++ head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt (revision 525239) @@ -0,0 +1,12 @@ +--- core/src/dird/dbcopy/CMakeLists.txt 2020-02-01 12:39:35.841314000 -0500 ++++ core/src/dird/dbcopy/CMakeLists.txt 2020-02-01 12:39:55.280473000 -0500 +@@ -11,6 +11,9 @@ + bareossql + $<$:${PAM_LIBRARIES}> + ${LMDB_LIBS} ++ ${OPENSSL_LIBRARIES} ++ ${PTHREAD_LIBRARIES} ++ ${JANSSON_LIBRARIES} + ) + + install(TARGETS Property changes on: head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt ___________________________________________________________________ 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/bareos-server/files/patch-core-src-dird_CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt (revision 525239) @@ -1,21 +1,21 @@ ---- core/src/dird/CMakeLists.txt 2019-05-08 21:45:45.893113000 -0500 -+++ core/src/dird/CMakeLists.txt 2019-05-08 21:47:00.616203000 -0500 -@@ -77,6 +77,9 @@ - bareosfind - ${LMDB_LIBS} - ${NDMP_LIBS} -+ ${OPENSSL_LIBRARIES} -+ ${PTHREAD_LIBRARIES} -+ ${JANSSON_LIBRARIES} +--- core/src/dird/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 ++++ core/src/dird/CMakeLists.txt 2020-01-31 15:41:53.134935000 -0500 +@@ -148,7 +148,8 @@ + add_executable(bareos-dir ${DIRDSRCS}) + + set(BAREOS_DIR_LIBRARIES dird_objects bareos bareoscats bareossql bareosfind +- ${LMDB_LIBS} ${NDMP_LIBS} ++ ${LMDB_LIBS} ${NDMP_LIBS} ${OPENSSL_LIBRARIES} ++ ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES} ) - IF(HAVE_WIN32) -@@ -92,7 +95,7 @@ + if(HAVE_WIN32) +@@ -166,7 +167,7 @@ add_executable(bareos-dbcheck ${DBCHKSRCS}) - SET(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats) + set(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats) -target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES}) +target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES} ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES}) # is not built by default Index: head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h (revision 525239) @@ -1,25 +1,25 @@ ---- core/src/include/baconfig.h 2019-05-10 14:32:06.160940000 -0500 -+++ core/src/include/baconfig.h 2019-05-10 14:32:32.142847000 -0500 -@@ -120,11 +120,11 @@ - #define N_(s) (s) - #endif /* N_ */ - #else /* !ENABLE_NLS */ -+ #include - #undef _ - #undef N_ - #undef textdomain - #undef bindtextdomain -- #undef setlocale +--- core/src/include/baconfig.h 2020-02-04 15:53:01.627766000 -0500 ++++ core/src/include/baconfig.h 2020-02-04 15:53:34.762711000 -0500 +@@ -119,11 +119,11 @@ + #define N_(s) (s) + #endif /* N_ */ + #else /* !ENABLE_NLS */ ++#include + #undef _ + #undef N_ + #undef textdomain + #undef bindtextdomain +-#undef setlocale - #ifndef _ - #define _(s) (s) -@@ -137,9 +137,6 @@ - #endif - #ifndef bindtextdomain - #define bindtextdomain(p, d) -- #endif -- #ifndef setlocale -- #define setlocale(p, d) - #endif + #ifndef _ + #define _(s) (s) +@@ -136,9 +136,6 @@ + #endif + #ifndef bindtextdomain + #define bindtextdomain(p, d) +-#endif +-#ifndef setlocale +-#define setlocale(p, d) + #endif #endif /* ENABLE_NLS */ Index: head/sysutils/bareos-server/files/patch-core-src-plugins-dird_python-dir.cc =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-plugins-dird_python-dir.cc (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-dird_python-dir.cc (revision 525239) @@ -1,61 +1,61 @@ ---- core/src/plugins/dird/python-dir.cc 2019-12-12 12:04:14.000000000 -0500 -+++ core/src/plugins/dird/python-dir.cc 2019-12-29 00:20:30.334502000 -0500 -@@ -35,6 +35,13 @@ +--- core/src/plugins/dird/python-dir.cc 2020-01-31 11:21:18.000000000 -0500 ++++ core/src/plugins/dird/python-dir.cc 2020-01-31 15:50:39.024455000 -0500 +@@ -41,6 +41,13 @@ #error "Need at least Python version 2.6 or newer" #endif +#if (PY_VERSION_HEX > 0x03050000) +#define PyInt_AsLong PyLong_AsLong +#define PyInt_FromLong PyLong_FromLong +#define PyString_AsString PyUnicode_AsUTF8 +#define PyString_FromString PyUnicode_FromString +#endif + #include "python-dir.h" #include "lib/edit.h" -@@ -118,6 +125,20 @@ +@@ -121,6 +128,20 @@ */ - static PyThreadState *mainThreadState; + static PyThreadState* mainThreadState; +#if (PY_VERSION_HEX > 0x03050000) +static struct PyModuleDef BareosDIRModuleDef = { + PyModuleDef_HEAD_INIT, + "bareosdir", + NULL, + -1, + BareosDIRMethods, + NULL, + NULL, + NULL, + NULL +}; +#endif + #ifdef __cplusplus extern "C" { #endif -@@ -679,7 +700,11 @@ - /* - * Make our callback methods available for Python. - */ +@@ -660,7 +681,11 @@ + /* + * Make our callback methods available for Python. + */ +#if (PY_VERSION_HEX > 0x03050000) -+ p_ctx->pInstance = PyModule_Create(&BareosDIRModuleDef); ++ p_ctx->pInstance = PyModule_Create(&BareosDIRModuleDef); +#else - p_ctx->pInstance = Py_InitModule("bareosdir", BareosDIRMethods); + p_ctx->pInstance = Py_InitModule("bareosdir", BareosDIRMethods); +#endif - } + } - /* -@@ -959,7 +984,11 @@ - char *value; + /* +@@ -939,7 +964,11 @@ + char* value; ctx = PyGetbpContext(pyCtx); +#if (PY_VERSION_HEX > 0x03050000) -+ value = bstrdup(PyString_AsString(pyValue)); ++ value = strdup(PyString_AsString(pyValue)); +#else value = PyString_AsString(pyValue); +#endif if (value) { - retval = bfuncs->setBareosValue(ctx, (bwDirVariable)var, value); + retval = bfuncs->setBareosValue(ctx, (bwDirVariable)var, value); } Index: head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt (revision 525239) @@ -1,35 +1,49 @@ ---- core/src/plugins/filed/CMakeLists.txt 2019-12-12 12:04:14.000000000 -0500 -+++ core/src/plugins/filed/CMakeLists.txt 2019-12-28 16:26:47.855833000 -0500 -@@ -100,18 +100,18 @@ - INSTALL(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon) +--- core/src/plugins/filed/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 ++++ core/src/plugins/filed/CMakeLists.txt 2020-01-31 15:54:40.841485000 -0500 +@@ -100,24 +100,26 @@ + install(TARGETS test-plugin-fd DESTINATION ${plugindir} COMPONENT filedaemon) endif() --set (PYFILES +-set(PYFILES - bareos-fd.py.template - bareos-fd-local-fileset.py - bareos-fd-mock-test.py - BareosFdPluginBaseclass.py - BareosFdPluginLocalFileset.py - BareosFdWrapper.py - bareos_fd_consts.py - bareos-fd-ldap.py - BareosFdPluginLDAP.py -- ) -+if (python) -+ set (PYFILES +- bareos-fd-ovirt.py +- BareosFdPluginOvirt.py +- bareos-fd-percona-xtrabackup.py +- BareosFdPluginPerconaXtraBackup.py +-) ++if(python) ++ set(PYFILES + bareos-fd.py.template + bareos-fd-local-fileset.py + bareos-fd-mock-test.py + BareosFdPluginBaseclass.py + BareosFdPluginLocalFileset.py + BareosFdWrapper.py + bareos_fd_consts.py + bareos-fd-ldap.py + BareosFdPluginLDAP.py -+ ) ++ bareos-fd-ovirt.py ++ BareosFdPluginOvirt.py ++ bareos-fd-percona-xtrabackup.py ++ BareosFdPluginPerconaXtraBackup.py ++ ) --INSTALL(FILES ${PYFILES} DESTINATION ${plugindir} COMPONENT filedaemon) -- -- -+ INSTALL(FILES ${PYFILES} DESTINATION ${plugindir} COMPONENT filedaemon) +-install( +- FILES ${PYFILES} +- DESTINATION ${plugindir} +- COMPONENT filedaemon +-) ++ install( ++ FILES ${PYFILES} ++ DESTINATION ${plugindir} ++ COMPONENT filedaemon ++ ) +endif() Index: head/sysutils/bareos-server/files/patch-core-src-plugins-filed_gfapi-fd.cc =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-plugins-filed_gfapi-fd.cc (nonexistent) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-filed_gfapi-fd.cc (revision 525239) @@ -0,0 +1,24 @@ +--- core/src/plugins/filed/gfapi-fd.cc 2020-02-03 00:50:05.248044000 -0500 ++++ core/src/plugins/filed/gfapi-fd.cc 2020-02-03 00:50:35.639144000 -0500 +@@ -32,7 +32,7 @@ + #include "lib/berrno.h" + #include "lib/edit.h" + +-#include ++#include + + + /* avoid missing config.h problem on Debian 8 and Ubuntu 16: +@@ -41,10 +41,10 @@ + */ + #ifndef _CONFIG_H + #define _CONFIG_H +-#include ++#include + #undef _CONFIG_H + #else +-#include ++#include + #endif + + namespace filedaemon { Property changes on: head/sysutils/bareos-server/files/patch-core-src-plugins-filed_gfapi-fd.cc ___________________________________________________________________ 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/bareos-server/files/patch-core-src-plugins-filed_python-fd.cc =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-plugins-filed_python-fd.cc (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-filed_python-fd.cc (revision 525239) @@ -1,111 +1,111 @@ ---- core/src/plugins/filed/python-fd.cc 2019-12-12 12:04:14.000000000 -0500 -+++ core/src/plugins/filed/python-fd.cc 2019-12-29 00:41:38.985785000 -0500 -@@ -40,6 +40,14 @@ +--- core/src/plugins/filed/python-fd.cc 2020-01-31 11:21:18.000000000 -0500 ++++ core/src/plugins/filed/python-fd.cc 2020-01-31 17:58:06.370789000 -0500 +@@ -46,6 +46,14 @@ #error "Need at least Python version 2.6 or newer" #endif +#if (PY_VERSION_HEX > 0x03050000) +#define PyInt_AsLong PyLong_AsLong +#define PyInt_FromLong PyLong_FromLong +#define PyString_AsString PyUnicode_AsUTF8 +#define PyString_FromString PyUnicode_FromString +#define PyString_Check PyBytes_Check +#endif + static const int debuglevel = 150; - #define PLUGIN_LICENSE "Bareos AGPLv3" -@@ -163,6 +171,20 @@ + #define PLUGIN_LICENSE "Bareos AGPLv3" +@@ -154,6 +162,20 @@ */ - static PyThreadState *mainThreadState; + static PyThreadState* mainThreadState; +#if (PY_VERSION_HEX > 0x03050000) +static struct PyModuleDef BareosFDModuleDef = { + PyModuleDef_HEAD_INIT, + "bareosfd", + NULL, + -1, + BareosFDMethods, + NULL, + NULL, + NULL, + NULL +}; +#endif + #ifdef __cplusplus extern "C" { #endif -@@ -1226,7 +1248,11 @@ - /* - * Make our callback methods available for Python. - */ +@@ -1148,7 +1170,11 @@ + /* + * Make our callback methods available for Python. + */ +#if (PY_VERSION_HEX > 0x03050000) -+ p_ctx->pInstance = PyModule_Create(&BareosFDModuleDef); ++ p_ctx->pInstance = PyModule_Create(&BareosFDModuleDef); +#else - p_ctx->pInstance = Py_InitModule("bareosfd", BareosFDMethods); + p_ctx->pInstance = Py_InitModule("bareosfd", BareosFDMethods); +#endif - /* - * Fill in the slots of PyRestoreObject -@@ -2704,7 +2730,11 @@ - case bVarFileSeen: { - char *value; + /* + * Fill in the slots of PyRestoreObject +@@ -2587,7 +2613,11 @@ + case bVarFileSeen: { + char* value; +#if (PY_VERSION_HEX > 0x03050000) -+ value = bstrdup(PyString_AsString(pyValue)); ++ value = strdup(PyString_AsString(pyValue)); +#else value = PyString_AsString(pyValue); +#endif if (value) { - retval = bfuncs->setBareosValue(ctx, (bVariable)var, value); + retval = bfuncs->setBareosValue(ctx, (bVariable)var, value); } -@@ -3091,7 +3121,11 @@ - sp.type = pSavePkt->type; - if (pSavePkt->fname) { - if (PyString_Check(pSavePkt->fname)) { +@@ -2972,7 +3002,11 @@ + sp.type = pSavePkt->type; + if (pSavePkt->fname) { + if (PyString_Check(pSavePkt->fname)) { +#if (PY_VERSION_HEX > 0x03050000) -+ sp.fname = bstrdup(PyString_AsString(pSavePkt->fname)); ++ sp.fname = strdup(PyString_AsString(pSavePkt->fname)); +#else - sp.fname = PyString_AsString(pSavePkt->fname); + sp.fname = PyString_AsString(pSavePkt->fname); +#endif - } else { - goto bail_out; - } -@@ -3100,7 +3134,11 @@ - } - if (pSavePkt->link) { - if (PyString_Check(pSavePkt->link)) { + } else { + goto bail_out; + } +@@ -2981,7 +3015,11 @@ + } + if (pSavePkt->link) { + if (PyString_Check(pSavePkt->link)) { +#if (PY_VERSION_HEX > 0x03050000) -+ sp.link = bstrdup(PyString_AsString(pSavePkt->link)); ++ sp.link = strdup(PyString_AsString(pSavePkt->link)); +#else - sp.link = PyString_AsString(pSavePkt->link); + sp.link = PyString_AsString(pSavePkt->link); +#endif - } else { - goto bail_out; - } -@@ -3143,7 +3181,11 @@ - */ - if (pSavePkt->fname) { - if (PyString_Check(pSavePkt->fname)) { + } else { + goto bail_out; + } +@@ -3025,7 +3063,11 @@ + */ + if (pSavePkt->fname) { + if (PyString_Check(pSavePkt->fname)) { +#if (PY_VERSION_HEX > 0x03050000) -+ sp.fname = bstrdup(PyString_AsString(pSavePkt->fname)); ++ sp.fname = strdup(PyString_AsString(pSavePkt->fname)); +#else - sp.fname = PyString_AsString(pSavePkt->fname); + sp.fname = PyString_AsString(pSavePkt->fname); +#endif - } else { - goto bail_out; - } -@@ -3219,8 +3261,11 @@ - if (!object || !PyString_Check(object)) { - return (char *)""; - } + } else { + goto bail_out; + } +@@ -3101,8 +3143,11 @@ + static inline char* PyGetStringValue(PyObject* object) + { + if (!object || !PyString_Check(object)) { return (char*)""; } - +#if (PY_VERSION_HEX > 0x03050000) -+ return bstrdup(PyString_AsString(object)); ++ return strdup(PyString_AsString(object)); +#else - return PyString_AsString(object); + return PyString_AsString(object); +#endif } - static inline char *PyGetByteArrayValue(PyObject *object) + static inline char* PyGetByteArrayValue(PyObject* object) Index: head/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt (nonexistent) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt (revision 525239) @@ -0,0 +1,13 @@ +--- core/src/plugins/stored/CMakeLists.txt 2020-02-01 12:41:50.658146000 -0500 ++++ core/src/plugins/stored/CMakeLists.txt 2020-02-01 12:43:09.372433000 -0500 +@@ -27,6 +27,10 @@ + ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS} + ) + add_definitions(-DMS_WIN${WINDOWS_BITS}) ++else() ++ include_directories( ++ ${PROJECT_SOURCE_DIR}/src/fastlz/include ++ ) + endif() + + add_library(autoxflate-sd MODULE autoxflate-sd.cc) Property changes on: head/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt ___________________________________________________________________ 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/bareos-server/files/patch-core-src-plugins-stored_python-sd.cc =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-plugins-stored_python-sd.cc (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-stored_python-sd.cc (revision 525239) @@ -1,61 +1,61 @@ ---- core/src/plugins/stored/python-sd.cc 2019-12-12 12:04:14.000000000 -0500 -+++ core/src/plugins/stored/python-sd.cc 2019-12-29 00:19:19.366390000 -0500 -@@ -36,6 +36,13 @@ +--- core/src/plugins/stored/python-sd.cc 2020-01-31 11:21:18.000000000 -0500 ++++ core/src/plugins/stored/python-sd.cc 2020-01-31 16:07:55.684864000 -0500 +@@ -41,6 +41,13 @@ #error "Need at least Python version 2.6 or newer" #endif +#if (PY_VERSION_HEX > 0x03050000) +#define PyInt_AsLong PyLong_AsLong +#define PyInt_FromLong PyLong_FromLong +#define PyString_AsString PyUnicode_AsUTF8 +#define PyString_FromString PyUnicode_FromString +#endif + static const int debuglevel = 150; - #define PLUGIN_LICENSE "Bareos AGPLv3" -@@ -121,6 +128,20 @@ - extern "C" { - #endif + #define PLUGIN_LICENSE "Bareos AGPLv3" +@@ -119,6 +126,20 @@ + */ + static PyThreadState* mainThreadState; +#if (PY_VERSION_HEX > 0x03050000) +static struct PyModuleDef BareosSDModuleDef = { + PyModuleDef_HEAD_INIT, + "bareossd", + NULL, + -1, + BareosSDMethods, + NULL, + NULL, + NULL, + NULL +}; +#endif + - /** - * loadPlugin() and unloadPlugin() are entry points that are - * exported, so Bareos can directly call these two entry points -@@ -698,7 +719,11 @@ - /* - * Make our callback methods available for Python. - */ + #ifdef __cplusplus + extern "C" { + #endif +@@ -678,7 +699,11 @@ + /* + * Make our callback methods available for Python. + */ +#if (PY_VERSION_HEX > 0x03050000) -+ p_ctx->pInstance = PyModule_Create(&BareosSDModuleDef); ++ p_ctx->pInstance = PyModule_Create(&BareosSDModuleDef); +#else - p_ctx->pInstance = Py_InitModule("bareossd", BareosSDMethods); + p_ctx->pInstance = Py_InitModule("bareossd", BareosSDMethods); +#endif - } + } - /* -@@ -979,7 +1004,11 @@ - char *value; + /* +@@ -958,7 +983,11 @@ + char* value; ctx = PyGetbpContext(pyCtx); +#if (PY_VERSION_HEX > 0x03050000) -+ value = bstrdup(PyString_AsString(pyValue)); ++ value = strdup(PyString_AsString(pyValue)); +#else value = PyString_AsString(pyValue); +#endif - if (value) { - bfuncs->setBareosValue(ctx, (bsdwVariable)var, value); - } + if (value) { bfuncs->setBareosValue(ctx, (bsdwVariable)var, value); } + + break; Index: head/sysutils/bareos-server/files/patch-core-src-stored-backends_gfapi_device.h =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-stored-backends_gfapi_device.h (nonexistent) +++ head/sysutils/bareos-server/files/patch-core-src-stored-backends_gfapi_device.h (revision 525239) @@ -0,0 +1,11 @@ +--- core/src/stored/backends/gfapi_device.h 2020-02-03 01:55:43.902693000 -0500 ++++ core/src/stored/backends/gfapi_device.h 2020-02-03 01:52:28.885974000 -0500 +@@ -28,7 +28,7 @@ + #ifndef BAREOS_STORED_BACKENDS_GFAPI_DEVICE_H_ + #define BAREOS_STORED_BACKENDS_GFAPI_DEVICE_H_ + +-#include ++#include + + #if defined GLFS_FTRUNCATE_HAS_FOUR_ARGS + #define glfs_ftruncate(fd, offset) glfs_ftruncate(fd, offset, NULL, NULL) Property changes on: head/sysutils/bareos-server/files/patch-core-src-stored-backends_gfapi_device.h ___________________________________________________________________ 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/bareos-server/files/patch-core-src-stored_CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt (revision 525239) @@ -1,47 +1,39 @@ ---- core/src/stored/CMakeLists.txt 2019-12-12 12:04:14.000000000 -0500 -+++ core/src/stored/CMakeLists.txt 2019-12-28 17:19:55.461762000 -0500 -@@ -193,6 +193,8 @@ - target_link_libraries(bareos-sd - stored_objects - ${BAREOS_SD_LIBRARIES} -+ ${JANSSON_LIBRARIES} -+ ${PTHREAD_LIBRARIES} - ) +--- core/src/stored/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 ++++ core/src/stored/CMakeLists.txt 2020-01-31 16:11:45.064779000 -0500 +@@ -213,23 +213,23 @@ + list(APPEND BAREOS_SD_LIBRARIES comctl32) + endif() +-target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES}) ++target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) + add_executable(bls ${BLSSRCS}) -@@ -203,6 +205,8 @@ + target_link_libraries(bls bareos bareossd bareosfind) + add_executable(bextract ${BEXTRACTSRS}) - target_link_libraries(bextract - bareossd bareosfind bareos -+ ${JANSSON_LIBRARIES} -+ ${PTHREAD_LIBRARIES} - ) +-target_link_libraries(bextract bareossd bareosfind bareos) ++target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) add_executable(bscan ${BSCANSRCS}) -@@ -213,6 +217,8 @@ + target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats) + add_executable(btape ${BTAPESRCS}) - target_link_libraries(btape - bareossd bareos -+ ${JANSSON_LIBRARIES} -+ ${PTHREAD_LIBRARIES} - ) +-target_link_libraries(btape bareossd bareos) ++target_link_libraries(btape bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) add_executable(bcopy ${BCOPYSRCS}) -@@ -220,6 +226,8 @@ - target_link_libraries(bcopy - bareossd bareos -+ ${JANSSON_LIBRARIES} -+ ${PTHREAD_LIBRARIES} - ) +-target_link_libraries(bcopy bareossd bareos) ++target_link_libraries(bcopy bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES}) - INSTALL(TARGETS bareossd DESTINATION ${libdir}) -@@ -232,7 +240,7 @@ + install(TARGETS bareossd DESTINATION ${libdir}) + +@@ -243,7 +243,7 @@ install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")") install(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/install-stored-configfiles.cmake) --INSTALL(DIRECTORY DESTINATION "../${archivedir}") -+INSTALL(DIRECTORY DESTINATION "${archivedir}") +-install(DIRECTORY DESTINATION "../${archivedir}") ++install(DIRECTORY DESTINATION "${archivedir}") - IF(${HAVE_DYNAMIC_SD_BACKENDS}) - add_subdirectory(backends) + if(${HAVE_DYNAMIC_SD_BACKENDS}) + add_subdirectory(backends) Index: head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt =================================================================== --- head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt (revision 525238) +++ head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt (revision 525239) @@ -1,25 +1,28 @@ ---- core/src/CMakeLists.txt 2019-05-08 21:29:08.173605000 -0500 -+++ core/src/CMakeLists.txt 2019-05-08 21:42:27.597876000 -0500 -@@ -30,13 +30,16 @@ - add_subdirectory(stored) - ENDIF() +--- core/src/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500 ++++ core/src/CMakeLists.txt 2020-02-01 12:33:06.503769000 -0500 +@@ -35,15 +35,18 @@ + add_subdirectory(tests) + endif() -add_subdirectory(console) --IF(${HAVE_LMDB}) --add_subdirectory(lmdb) -+IF(client-only) +-if(${HAVE_LMDB}) +- add_subdirectory(lmdb) ++if(client-only) + add_subdirectory(console) -+ IF(${HAVE_LMDB}) -+ add_subdirectory(lmdb) -+ ENDIF() ++ if(${HAVE_LMDB}) ++ add_subdirectory(lmdb) ++ endif() + add_subdirectory(lib) + add_subdirectory(findlib) + add_subdirectory(filed) - ENDIF() ++ add_subdirectory(fastlz) + endif() -add_subdirectory(lib) -add_subdirectory(findlib) -add_subdirectory(filed) + add_subdirectory(plugins) +-add_subdirectory(fastlz) - if (${traymonitor}) + if(${traymonitor}) + add_subdirectory(qt-tray-monitor) Index: head/sysutils/bareos-server/pkg-plist =================================================================== --- head/sysutils/bareos-server/pkg-plist (revision 525238) +++ head/sysutils/bareos-server/pkg-plist (revision 525239) @@ -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 +%%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 +%%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 +%%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.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/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 -@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 +%%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.18 +lib/libbareoscats.so.19 lib/libbareoscats.so.%%LIB_VERSION%% %%NDMP%%lib/libbareosndmp.so -%%NDMP%%lib/libbareosndmp.so.18 +%%NDMP%%lib/libbareosndmp.so.19 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%% lib/libbareossd.so lib/libbareossql.so -lib/libbareossql.so.18 +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-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 525238) +++ head/sysutils/bareos-server/pkg-plist.client (revision 525239) @@ -1,56 +1,63 @@ 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.19 lib/libbareos.so.%%LIB_VERSION%% +lib/libbareosfastlz.so +lib/libbareosfastlz.so.19 +lib/libbareosfastlz.so.%%LIB_VERSION%% lib/libbareosfind.so -lib/libbareosfind.so.18 +lib/libbareosfind.so.19 lib/libbareosfind.so.%%LIB_VERSION%% %%LMDB%%lib/libbareoslmdb.so -%%LMDB%%lib/libbareoslmdb.so.18 +%%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 +%%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 Index: head/sysutils/bareos-traymonitor/Makefile =================================================================== --- head/sysutils/bareos-traymonitor/Makefile (revision 525238) +++ head/sysutils/bareos-traymonitor/Makefile (revision 525239) @@ -1,27 +1,28 @@ # $FreeBSD$ PORTNAME= bareos PKGNAMESUFFIX= -traymonitor COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos-client CONFLICTS= bacula*-bat-* bareos16-traymonitor-* -USES= pkgconfig gettext-runtime desktop-file-utils qt:5 +USES= desktop-file-utils gettext-runtime pkgconfig qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server CMAKE_ARGS+= -Dtraymonitor=yes \ -Dbuild-dird=no \ -Dbuild-stored=no \ - -Dclient-only=yes + -Dclient-only=yes \ + -Dnls=ON .include "${MASTERDIR}/Makefile"