Date: Tue, 4 Feb 2020 21:52:46 +0000 (UTC) From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525239 - in head/sysutils: bareos-client bareos-server bareos-server/files bareos-traymonitor Message-ID: <202002042152.014LqkOZ043941@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Tue Feb 4 21:52:45 2020 New Revision: 525239 URL: https://svnweb.freebsd.org/changeset/ports/525239 Log: - Update to 19.2.5 - Add support for RADOS and GFAPI (plugins and storage) [1] - Bareos ports are compiled with fastlz (compress file with LZ4/LZ4HC/FastLZ) by default - Add python3 support [1] https://docs.bareos.org/TasksAndConcepts/Plugins.html [1] https://docs.bareos.org/TasksAndConcepts/StorageBackends.html ChangeLog at: https://docs.bareos.org/Appendix/ReleaseNotes.html Added: head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake (contents, props changed) head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt (contents, props changed) head/sysutils/bareos-server/files/patch-core-src-plugins-filed_gfapi-fd.cc (contents, props changed) head/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt (contents, props changed) head/sysutils/bareos-server/files/patch-core-src-stored-backends_gfapi_device.h (contents, props changed) Modified: head/sysutils/bareos-client/Makefile head/sysutils/bareos-server/Makefile head/sysutils/bareos-server/Makefile.common head/sysutils/bareos-server/distinfo head/sysutils/bareos-server/files/patch-core-CMakeLists.txt head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake head/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h head/sysutils/bareos-server/files/patch-core-src-plugins-dird_python-dir.cc head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt head/sysutils/bareos-server/files/patch-core-src-plugins-filed_python-fd.cc head/sysutils/bareos-server/files/patch-core-src-plugins-stored_python-sd.cc head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt head/sysutils/bareos-server/pkg-plist head/sysutils/bareos-server/pkg-plist.client head/sysutils/bareos-traymonitor/Makefile Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-client/Makefile Tue Feb 4 21:52:45 2020 (r525239) @@ -7,7 +7,7 @@ COMMENT= Backup archiving recovery open sourced (clien 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 @@ -15,7 +15,12 @@ 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" Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/Makefile Tue Feb 4 21:52:45 2020 (r525239) @@ -2,7 +2,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 18.2.7 +DISTVERSION= 19.2.5 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # @@ -14,12 +14,12 @@ COMMENT?= Backup archiving recovery open sourced (serv 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 @@ -45,11 +45,16 @@ 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 @@ -104,7 +109,7 @@ CMAKE_ARGS+= -Dtcp-wrappers=ON \ -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 @@ -140,6 +145,10 @@ SUB_LIST= BAREOS_USER=${BAREOS_USER} \ 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) @@ -192,9 +201,9 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 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: Modified: head/sysutils/bareos-server/Makefile.common ============================================================================== --- head/sysutils/bareos-server/Makefile.common Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/Makefile.common Tue Feb 4 21:52:45 2020 (r525239) @@ -1,5 +1,7 @@ # Created by: Alonso Cardenas <acm@FreeBSD.org> # $FreeBSD$ +post-patch: + @${REINPLACE_CMD} '69,70d' ${WRKSRC}/CMakeLists.txt post-build: .if ${PKGNAMEPREFIX} == "nagios-check_" @@ -29,7 +31,7 @@ do-install: .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 Modified: head/sysutils/bareos-server/distinfo ============================================================================== --- head/sysutils/bareos-server/distinfo Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/distinfo Tue Feb 4 21:52:45 2020 (r525239) @@ -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 Modified: head/sysutils/bareos-server/files/patch-core-CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-CMakeLists.txt Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-CMakeLists.txt Tue Feb 4 21:52:45 2020 (r525239) @@ -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 Added: head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake Tue Feb 4 21:52:45 2020 (r525239) @@ -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) Modified: head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake ============================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake Tue Feb 4 21:52:45 2020 (r525239) @@ -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") + Modified: head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake ============================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake Tue Feb 4 21:52:45 2020 (r525239) @@ -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() Modified: head/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake ============================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake Tue Feb 4 21:52:45 2020 (r525239) @@ -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) Modified: head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt Tue Feb 4 21:52:45 2020 (r525239) @@ -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 Modified: head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt Tue Feb 4 21:52:45 2020 (r525239) @@ -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}" Added: head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt Tue Feb 4 21:52:45 2020 (r525239) @@ -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 + $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> + ${LMDB_LIBS} ++ ${OPENSSL_LIBRARIES} ++ ${PTHREAD_LIBRARIES} ++ ${JANSSON_LIBRARIES} + ) + + install(TARGETS Modified: head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt Tue Feb 4 21:52:45 2020 (r525239) @@ -1,18 +1,18 @@ ---- 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}) Modified: head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h Tue Feb 4 21:52:45 2020 (r525239) @@ -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 <locale.h> - #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 <locale.h> + #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 */ Modified: 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 Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-dird_python-dir.cc Tue Feb 4 21:52:45 2020 (r525239) @@ -1,6 +1,6 @@ ---- 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 @@ -14,9 +14,9 @@ #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 = { @@ -35,27 +35,27 @@ #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); } Modified: head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt Tue Feb 4 21:52:45 2020 (r525239) @@ -1,10 +1,10 @@ ---- 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 @@ -14,9 +14,13 @@ - 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 @@ -26,10 +30,20 @@ + 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() Added: head/sysutils/bareos-server/files/patch-core-src-plugins-filed_gfapi-fd.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-filed_gfapi-fd.cc Tue Feb 4 21:52:45 2020 (r525239) @@ -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 <api/glfs.h> ++#include <glusterfs/api/glfs.h> + + + /* avoid missing config.h problem on Debian 8 and Ubuntu 16: +@@ -41,10 +41,10 @@ + */ + #ifndef _CONFIG_H + #define _CONFIG_H +-#include <compat-errno.h> ++#include <glusterfs/compat-errno.h> + #undef _CONFIG_H + #else +-#include <compat-errno.h> ++#include <glusterfs/compat-errno.h> + #endif + + namespace filedaemon { Modified: 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 Tue Feb 4 21:45:21 2020 (r525238) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-filed_python-fd.cc Tue Feb 4 21:52:45 2020 (r525239) @@ -1,6 +1,6 @@ ---- 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 @@ -14,10 +14,10 @@ + 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 = { @@ -36,76 +36,76 @@ #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) { *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002042152.014LqkOZ043941>