Date: Sun, 27 Dec 2020 17:45:54 +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: r559389 - in head/sysutils: bareos-client bareos-server bareos-server/files bareos-traymonitor Message-ID: <202012271745.0BRHjs1r026181@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: acm Date: Sun Dec 27 17:45:53 2020 New Revision: 559389 URL: https://svnweb.freebsd.org/changeset/ports/559389 Log: - Update to 20.0.0 ChangeLog at: https://docs.bareos.org/Appendix/ReleaseNotes.html Deleted: head/sysutils/bareos-server/files/patch-core-src-plugins-dird_python-dir.cc head/sysutils/bareos-server/files/patch-core-src-plugins-filed_gfapi-fd.cc 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-backends_gfapi_device.h 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_BareosCheckIncludes.cmake 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-src-dird-dbcopy_CMakeLists.txt head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt 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 head/sysutils/bareos-traymonitor/pkg-plist Modified: head/sysutils/bareos-client/Makefile ============================================================================== --- head/sysutils/bareos-client/Makefile Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-client/Makefile Sun Dec 27 17:45:53 2020 (r559389) @@ -5,7 +5,7 @@ PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) -CONFLICTS= bareos18-client-* bareos17-client-* bareos16-client-* +CONFLICTS= bareos19-client-* bareos18-client-* bareos17-client-* WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd Modified: head/sysutils/bareos-server/Makefile ============================================================================== --- head/sysutils/bareos-server/Makefile Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/Makefile Sun Dec 27 17:45:53 2020 (r559389) @@ -2,7 +2,7 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 19.2.9 +DISTVERSION= 20.0.0 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # @@ -14,7 +14,7 @@ COMMENT?= Backup archiving recovery open sourced (serv LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bacula18*-server bacula17*-server-* bareos16-server-* +CONFLICTS?= bacula19*-server bacula18*-server-* bareos17-server-* LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson @@ -205,9 +205,9 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: - @${REINPLACE_CMD} '69,72d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} '76,79d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "-server" - @${REINPLACE_CMD} '24d' ${WRKSRC}/core/src/plugins/CMakeLists.txt + @${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif post-extract: Modified: head/sysutils/bareos-server/Makefile.common ============================================================================== --- head/sysutils/bareos-server/Makefile.common Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/Makefile.common Sun Dec 27 17:45:53 2020 (r559389) @@ -1,7 +1,7 @@ # Created by: Alonso Cardenas <acm@FreeBSD.org> # $FreeBSD$ post-patch: - @${REINPLACE_CMD} '69,72d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} '76,79d' ${WRKSRC}/CMakeLists.txt post-build: .if ${PKGNAMEPREFIX} == "nagios-check_" @@ -32,6 +32,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/ .endfor ${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/images/bareos_1.png ${STAGEDIR}${PREFIX}/share/pixmaps/bareos-tray-monitor.png ${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 Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/distinfo Sun Dec 27 17:45:53 2020 (r559389) @@ -1,3 +1,3 @@ -TIMESTAMP = 1607980168 -SHA256 (bareos-bareos-Release-19.2.9_GH0.tar.gz) = ea203d4bdacc8dcc86164a74f628888ce31cc90858398498137bd25900b8f723 -SIZE (bareos-bareos-Release-19.2.9_GH0.tar.gz) = 12886739 +TIMESTAMP = 1608160006 +SHA256 (bareos-bareos-Release-20.0.0_GH0.tar.gz) = c66914a19dbd75c214f559b55830ab8bf468d02f50fd85694fe190153fd5695d +SIZE (bareos-bareos-Release-20.0.0_GH0.tar.gz) = 13325939 Modified: head/sysutils/bareos-server/files/patch-core-CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-CMakeLists.txt Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-CMakeLists.txt Sun Dec 27 17:45:53 2020 (r559389) @@ -1,6 +1,6 @@ ---- 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 @@ +--- core/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 ++++ core/CMakeLists.txt 2020-12-26 21:28:44.141734000 -0500 +@@ -256,7 +256,9 @@ set(PSCMD "ps -ax -o pid,command") include_directories(/usr/local/include) link_directories(/usr/local/lib) @@ -11,7 +11,7 @@ endif() if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -@@ -316,8 +318,11 @@ +@@ -323,8 +325,11 @@ add_definitions("-D_FILE_OFFSET_BITS=64") endif() @@ -24,7 +24,16 @@ if(developer) add_definitions("-DDEVELOPER=1") endif() -@@ -746,7 +751,6 @@ +@@ -347,7 +352,7 @@ + if(NOT client-only) + # droplet does not build on solaris because of sys/cdefs.h: No such file or + # directory +- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") ++ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS|FreeBSD") + if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/droplet/CMakeLists.txt) + message( + FATAL_ERROR +@@ -771,7 +776,6 @@ add_subdirectory(scripts) add_subdirectory(manpages) Modified: head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake ============================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake Sun Dec 27 17:45:53 2020 (r559389) @@ -1,32 +1,39 @@ ---- core/cmake/BareosCheckIncludes.cmake 2020-12-11 08:44:43.000000000 -0500 -+++ core/cmake/BareosCheckIncludes.cmake 2020-12-14 19:30:00.380545000 -0500 -@@ -100,21 +100,21 @@ +--- core/cmake/BareosCheckIncludes.cmake 2020-12-16 02:46:16.000000000 -0500 ++++ core/cmake/BareosCheckIncludes.cmake 2020-12-23 22:25:00.323963000 -0500 +@@ -60,19 +60,25 @@ + 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) -+if(cephfs) - check_include_files(cephfs/libcephfs.h HAVE_CEPHFS_LIBCEPHFS_H) -+check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX) -+endif() - -include(CheckSymbolExists) -include(CMakePushCheckState) -cmake_push_check_state() -set(CMAKE_REQUIRED_LIBRARIES cephfs) -check_symbol_exists(ceph_statx "sys/stat.h;cephfs/libcephfs.h" HAVE_CEPH_STATX) -cmake_pop_check_state() -- ++if(cephfs) ++ include(CheckSymbolExists) ++ include(CMakePushCheckState) ++ cmake_push_check_state() ++ set(CMAKE_REQUIRED_LIBRARIES cephfs) ++ check_include_files("sys/stat.h;cephfs/ceph_ll_client.h" HAVE_CEPH_STATX) ++ cmake_pop_check_state() ++endif() + +-check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) +-check_include_files( +- radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H +-) +if(rados) - check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) - check_include_files(radosstriper/libradosstriper.h - HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H) ++ check_include_files(rados/librados.h HAVE_RADOS_LIBRADOS_H) ++ check_include_files( ++ radosstriper/libradosstriper.h HAVE_RADOSSTRIPER_LIBRADOSSTRIPER_H ++ ) +endif() - # CHECK_INCLUDE_FILES(glusterfs/glusterfs.h HAVE_GLUSTERFS_GLUSTERFS_H) -check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) +if(gfapi) + check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) +endif() - check_include_files(elasto/data.h HAVE_ELASTO_DATA_H) - check_include_files(elasto/file.h HAVE_ELASTO_FILE_H) + check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H) + Modified: head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake ============================================================================== --- head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake Sun Dec 27 17:45:53 2020 (r559389) @@ -1,66 +1,93 @@ ---- 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() +--- core/cmake/BareosFindAllLibraries.cmake 2020-12-16 02:46:16.000000000 -0500 ++++ core/cmake/BareosFindAllLibraries.cmake 2020-12-27 00:31:34.725219000 -0500 +@@ -37,46 +37,30 @@ + set(Python3_FOUND 0) - 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) + else() +- find_package(Python2 COMPONENTS Interpreter Development) +- find_package(Python3 COMPONENTS Interpreter Development) ++ if(python) ++ find_package(Python3 COMPONENTS Interpreter Development) -- if(${PYTHONLIBS_FOUND}) +- if(${Python2_FOUND} OR ${Python3_FOUND}) - set(HAVE_PYTHON 1) -+ if(${PYTHONLIBS_FOUND}) +- endif() ++ if(${Python3_FOUND}) + set(HAVE_PYTHON 1) + endif() + +- if(${Python2_FOUND}) +- set(PYTHON_EXECUTABLE +- ${Python2_EXECUTABLE} +- PARENT_SCOPE +- ) +- set(Python2_EXECUTABLE +- ${Python2_EXECUTABLE} +- PARENT_SCOPE +- ) +- execute_process( +- COMMAND ${Python2_EXECUTABLE} +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py +- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake +- ) +- include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake) ++ if(${Python3_FOUND}) ++ set(PYTHON_EXECUTABLE ++ ${Python3_EXECUTABLE} ++ PARENT_SCOPE ++ ) ++ set(Python3_EXECUTABLE ++ ${Python3_EXECUTABLE} ++ PARENT_SCOPE ++ ) ++ execute_process( ++ COMMAND ${Python3_EXECUTABLE} ++ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py ++ OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake ++ ) ++ include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake) ++ endif() endif() +- +- if(${Python3_FOUND}) +- set(PYTHON_EXECUTABLE +- ${Python3_EXECUTABLE} +- PARENT_SCOPE +- ) +- set(Python3_EXECUTABLE +- ${Python3_EXECUTABLE} +- PARENT_SCOPE +- ) +- execute_process( +- COMMAND ${Python3_EXECUTABLE} +- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py +- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake +- ) +- include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake) +- endif() + endif() - include(FindPostgreSQL) -@@ -56,13 +58,22 @@ - include(BareosFindLibraryAndHeaders) + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") +@@ -154,12 +138,18 @@ + endif() - 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") -+ + bareosfindlibraryandheaders("jansson" "jansson.h" "") +-bareosfindlibraryandheaders("rados" "rados/librados.h" "") +-bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "") +-bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "") +if(rados) -+ bareosfindlibraryandheaders("rados" "rados/librados.h") -+ bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h") ++ bareosfindlibraryandheaders("rados" "rados/librados.h" "") ++ bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "") +endif() +if(cephfs) -+ bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h") ++ bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "") +endif() + bareosfindlibraryandheaders("pthread" "pthread.h" "") + bareosfindlibraryandheaders("cap" "sys/capability.h" "") +-bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "") +if(gfapi) -+ bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h") ++ bareosfindlibraryandheaders("gfapi" "glusterfs/api/glfs.h" "") +endif() -+if(droplet) -+ bareosfindlibraryandheaders("droplet" "droplet.h") -+endif() - bareosfindlibraryandheaders("pam" "security/pam_appl.h") + 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 Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-cmake_BareosInstallConfigFiles.cmake Sun Dec 27 17:45:53 2020 (r559389) @@ -1,6 +1,6 @@ ---- 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 @@ +--- core/cmake/BareosInstallConfigFiles.cmake 2020-12-16 02:46:16.000000000 -0500 ++++ core/cmake/BareosInstallConfigFiles.cmake 2020-12-23 22:41:21.832081000 -0500 +@@ -55,20 +55,12 @@ get_filename_component(resname ${resdir} NAME) foreach(configfile ${configfiles}) get_filename_component(fname ${configfile} NAME) @@ -10,58 +10,54 @@ - file(RENAME "${configfile}" "${configfile}.new") - - message(STATUS "copy ${configfile}.new to ${DESTCONFDIR}/${resname}") -- file( -- INSTALL "${configfile}.new" -- DESTINATION "${DESTCONFDIR}/${resname}" -- ) +- file(COPY "${configfile}.new" DESTINATION "${DESTCONFDIR}/${resname}") - file(RENAME "${configfile}.new" "${configfile}") - else() - message( -- STATUS -- "${resname}/${fname} as ${resname}/${fname} (new installation)" +- 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}" ++ COPY "${configfile}.sample" ++ DESTINATION "${DESTCONFDIR}/${resname}" + ) endforeach() endforeach() -@@ -114,23 +102,12 @@ +@@ -104,23 +96,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}" +- "${BackendConfigSrcDir}/${configfile}.new" - ) +- file(COPY "${BackendConfigSrcDir}/${configfile}.new" +- DESTINATION "${DESTCONFDIR}/${dir}" +- ) - file(RENAME "${BackendConfigSrcDir}/${configfile}.new" -- "${BackendConfigSrcDir}/${configfile}") +- "${BackendConfigSrcDir}/${configfile}" +- ) - else() - message(STATUS "${configfile} as ${configfile}") -- file( -- COPY "${BackendConfigSrcDir}/${configfile}" -- DESTINATION "${DESTCONFDIR}/${dir}" +- 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}" ++ COPY "${BackendConfigSrcDir}/${configfile}.sample" ++ DESTINATION "${DESTCONFDIR}/${dir}" + ) endforeach() file( -@@ -140,7 +117,8 @@ +@@ -130,7 +111,8 @@ ) foreach(configfile ${configfiles}) get_filename_component(dir ${configfile} DIRECTORY) @@ -71,21 +67,23 @@ if(EXISTS ${DESTCONFDIR}/${configfile}) message(STATUS "overwriting ${configfile}") -@@ -148,9 +126,10 @@ +@@ -138,9 +120,11 @@ message(STATUS "${configfile} as ${configfile}") endif() +- file(COPY "${BackendConfigSrcDir}/${configfile}" +- DESTINATION "${DESTCONFDIR}/${dir}" +- ) + file(RENAME "${BackendConfigSrcDir}/${configfile}" "${BackendConfigSrcDir}/${fsname}.conf.sample") - file( -- COPY "${BackendConfigSrcDir}/${configfile}" -- DESTINATION "${DESTCONFDIR}/${dir}" -+ COPY "${BackendConfigSrcDir}/${fsname}.conf.sample" -+ DESTINATION "${DESTCONFDIR}/${dir}" - ) ++ file( ++ COPY "${BackendConfigSrcDir}/${fsname}.conf.sample" ++ DESTINATION "${DESTCONFDIR}/${dir}" ++ ) endforeach() -@@ -174,22 +153,14 @@ - ) + endforeach() +@@ -167,20 +151,13 @@ + string(REGEX MATCH "\\.in\$" IS_INFILE ${configfile}) if(NOT "${IS_INFILE}" STREQUAL ".in") get_filename_component(fname ${configfile} NAME) - if(EXISTS ${DESTCONFDIR}/${resname}/${fname}) @@ -94,24 +92,21 @@ - "${resname}/${fname} as ${resname}/${fname}.new (keep existing)" - ) - file(RENAME "${configfile}" "${configfile}.new") -- file( -- COPY "${configfile}.new" -- DESTINATION "${DESTCONFDIR}/${resname}" +- 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) ++ 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}" ++ COPY "${resdir}/${fsname}.conf.sample" ++ DESTINATION "${DESTCONFDIR}/${resname}" + ) -+ else() + else() message(STATUS "skipping .in file ${configfile}:${IS_INFILE}") endif() - endforeach() Modified: head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-src-dird-dbcopy_CMakeLists.txt Sun Dec 27 17:45:53 2020 (r559389) @@ -1,12 +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} +--- core/src/dird/dbcopy/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 ++++ core/src/dird/dbcopy/CMakeLists.txt 2020-12-23 22:44:13.161935000 -0500 +@@ -33,7 +33,8 @@ ) + target_link_libraries( + bareos-dbcopy bareos dird_objects bareosfind bareoscats bareossql +- $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> ${LMDB_LIBS} ++ $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> ${LMDB_LIBS} ++ ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES} + ) - install(TARGETS + install(TARGETS bareos-dbcopy DESTINATION "${sbindir}") Modified: head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-src-include_baconfig.h Sun Dec 27 17:45:53 2020 (r559389) @@ -1,25 +1,25 @@ ---- 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 +--- core/src/include/baconfig.h 2020-12-16 02:46:16.000000000 -0500 ++++ core/src/include/baconfig.h 2020-12-23 22:47:40.992698000 -0500 +@@ -103,11 +103,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) -@@ -136,9 +136,6 @@ - #endif - #ifndef bindtextdomain - #define bindtextdomain(p, d) --#endif --#ifndef setlocale --#define setlocale(p, d) - #endif + # ifndef _ + # define _(s) (s) +@@ -120,9 +120,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-filed_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt Sun Dec 27 17:45:53 2020 (r559389) @@ -1,49 +1,13 @@ ---- 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() +--- core/src/plugins/filed/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 ++++ core/src/plugins/filed/CMakeLists.txt 2020-12-23 22:56:13.843714000 -0500 +@@ -41,7 +41,9 @@ --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 --) -+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 -+ ) + include_directories(${OPENSSL_INCLUDE_DIR}) --install( -- FILES ${PYFILES} -- DESTINATION ${plugindir} -- COMPONENT filedaemon --) -+ install( -+ FILES ${PYFILES} -+ DESTINATION ${plugindir} -+ COMPONENT filedaemon -+ ) +-add_subdirectory(python) ++if(python) ++ add_subdirectory(python) +endif() + + add_library(bpipe-fd MODULE bpipe/bpipe-fd.cc) + set_target_properties(bpipe-fd PROPERTIES PREFIX "") Modified: head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-src-stored_CMakeLists.txt Sun Dec 27 17:45:53 2020 (r559389) @@ -1,6 +1,6 @@ ---- 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 @@ +--- core/src/stored/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 ++++ core/src/stored/CMakeLists.txt 2020-12-23 23:06:49.516519000 -0500 +@@ -226,23 +226,23 @@ list(APPEND BAREOS_SD_LIBRARIES comctl32) endif() @@ -28,12 +28,3 @@ 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}") - - if(${HAVE_DYNAMIC_SD_BACKENDS}) - add_subdirectory(backends) Modified: head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt ============================================================================== --- head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt Sun Dec 27 17:45:53 2020 (r559389) @@ -1,6 +1,17 @@ ---- 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 @@ +--- core/src/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500 ++++ core/src/CMakeLists.txt 2020-12-27 00:51:12.356192000 -0500 +@@ -18,7 +18,9 @@ + # 02110-1301, USA. + message("Entering ${CMAKE_CURRENT_SOURCE_DIR}") + +-add_subdirectory(filed) ++if(client-only) ++ add_subdirectory(filed) ++endif() + + if(NOT client-only) + add_subdirectory(tools) +@@ -43,14 +45,18 @@ add_subdirectory(tests) endif() @@ -8,21 +19,20 @@ -if(${HAVE_LMDB}) - add_subdirectory(lmdb) +if(client-only) -+ add_subdirectory(console) -+ if(${HAVE_LMDB}) -+ add_subdirectory(lmdb) -+ endif() -+ add_subdirectory(lib) -+ add_subdirectory(findlib) -+ add_subdirectory(filed) -+ add_subdirectory(fastlz) ++ add_subdirectory(console) ++ if(${HAVE_LMDB}) ++ add_subdirectory(lmdb) ++ endif() ++ add_subdirectory(lib) ++ add_subdirectory(findlib) ++ add_subdirectory(fastlz) endif() -add_subdirectory(lib) -add_subdirectory(findlib) --add_subdirectory(filed) + add_subdirectory(plugins) -add_subdirectory(fastlz) - ++ if(${traymonitor}) add_subdirectory(qt-tray-monitor) + endif() Modified: head/sysutils/bareos-server/pkg-plist ============================================================================== --- head/sysutils/bareos-server/pkg-plist Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/pkg-plist Sun Dec 27 17:45:53 2020 (r559389) @@ -1,7 +1,6 @@ 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 @@ -20,8 +19,8 @@ bin/timelimit %%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCephfs.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.conf.sample %%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupRados.conf.sample -@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreFiles.conf.sample %%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/RestoreCephfs.conf.sample +@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 @@ -41,12 +40,14 @@ bin/timelimit @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample +%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Rados.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample +%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/RadosStorage.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 @@ -55,9 +56,9 @@ bin/timelimit %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample etc/logrotate.d/bareos-dir lib/bareos/backends/libbareoscats-%%DBTYPE%%.so +%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so lib/bareos/backends/libbareossd-fifo.so lib/bareos/backends/libbareossd-gentape.so -%%CEPHFS%%lib/bareos/backends/libbareossd-cephfs.so %%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so %%RADOS%%lib/bareos/backends/libbareossd-rados.so lib/bareos/backends/libbareossd-tape.so @@ -67,13 +68,9 @@ lib/bareos/backends/libbareossd-tape.so %%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 +%%PYTHON%%lib/bareos/plugins/python3-dir.so +%%PYTHON%%lib/bareos/plugins/python3-sd.so %%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so %%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so lib/bareos/scripts/bareos-ctl-dir @@ -113,15 +110,20 @@ lib/bareos/scripts/mtx-changer lib/bareos/scripts/query.sql lib/bareos/scripts/update_bareos_tables lib/libbareoscats.so -lib/libbareoscats.so.19 +lib/libbareoscats.so.20 lib/libbareoscats.so.%%LIB_VERSION%% +lib/libbareosfastlz.so +lib/libbareosfastlz.so.20 +lib/libbareosfastlz.so.%%LIB_VERSION%% %%NDMP%%lib/libbareosndmp.so -%%NDMP%%lib/libbareosndmp.so.19 +%%NDMP%%lib/libbareosndmp.so.20 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%% lib/libbareossd.so lib/libbareossql.so -lib/libbareossql.so.19 +lib/libbareossql.so.20 lib/libbareossql.so.%%LIB_VERSION%% +%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd.so man/man1/bareos-tray-monitor.1.gz man/man1/bregex.1.gz man/man1/bsmtp.1.gz @@ -154,7 +156,6 @@ 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 @@ -170,15 +171,8 @@ sbin/timelimit @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user -@dir(,bareos,750) %%ETCDIR%%/bareos-dir-export @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client -@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d -@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/autochanger -@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/device -@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/director -@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/messages @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp -@dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/storage @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) %%BAREOS_DIR%%/storage @dir(bareos,bareos,) /var/log/bareos Modified: head/sysutils/bareos-server/pkg-plist.client ============================================================================== --- head/sysutils/bareos-server/pkg-plist.client Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-server/pkg-plist.client Sun Dec 27 17:45:53 2020 (r559389) @@ -9,35 +9,37 @@ bin/bconsole @group bareos @sample %%ETCDIR%%/bconsole.d/bconsole.conf.sample @group bareos -lib/libbareos.so -lib/libbareos.so.19 -lib/libbareos.so.%%LIB_VERSION%% -lib/libbareosfastlz.so -lib/libbareosfastlz.so.19 -lib/libbareosfastlz.so.%%LIB_VERSION%% -lib/libbareosfind.so -lib/libbareosfind.so.19 -lib/libbareosfind.so.%%LIB_VERSION%% -%%LMDB%%lib/libbareoslmdb.so -%%LMDB%%lib/libbareoslmdb.so.19 -%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%% %%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLDAP.py +%%PYTHON%%lib/bareos/plugins/BareosFdPluginLibcloud.py +%%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFileset.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginOvirt.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginPerconaXtraBackup.py +%%PYTHON%%lib/bareos/plugins/BareosFdPluginPostgres.py +%%PYTHON%%lib/bareos/plugins/BareosFdPluginVMware.py %%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py +%%PYTHON%%lib/bareos/plugins/BareosLibcloudApi.py %%PYTHON%%lib/bareos/plugins/bareos-fd-ldap.py +%%PYTHON%%lib/bareos/plugins/bareos-fd-libcloud.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 +%%PYTHON%%lib/bareos/plugins/bareos-fd-postgres.py +%%PYTHON%%lib/bareos/plugins/bareos-fd-vmware.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/__init__.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/bucket_explorer.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/debug.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/get_libcloud_driver.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/mtime.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/process_base.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/queue_message.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/utils.py +%%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/worker.py lib/bareos/plugins/bpipe-fd.so %%CEPHFS%%lib/bareos/plugins/cephfs-fd.so %%GFAPI%%lib/bareos/plugins/gfapi-fd.so -%%PYTHON%%lib/bareos/plugins/python-fd.so +%%PYTHON%%lib/bareos/plugins/python3-fd.so %%RADOS%%lib/bareos/plugins/rados-fd.so lib/bareos/scripts/bareos lib/bareos/scripts/bareos-config @@ -47,6 +49,19 @@ lib/bareos/scripts/bareos-ctl-funcs lib/bareos/scripts/btraceback.dbx lib/bareos/scripts/btraceback.gdb lib/bareos/scripts/btraceback.mdb +lib/libbareos.so +lib/libbareos.so.20 +lib/libbareos.so.%%LIB_VERSION%% +lib/libbareosfastlz.so +lib/libbareosfastlz.so.20 +lib/libbareosfastlz.so.%%LIB_VERSION%% +lib/libbareosfind.so +lib/libbareosfind.so.20 +lib/libbareosfind.so.%%LIB_VERSION%% +%%LMDB%%lib/libbareoslmdb.so +%%LMDB%%lib/libbareoslmdb.so.20 +%%LMDB%%lib/libbareoslmdb.so.%%LIB_VERSION%% +%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd.so man/man1/bconsole.1.gz man/man8/bareos-fd.8.gz man/man8/bareos.8.gz @@ -58,6 +73,8 @@ sbin/bareos-fd sbin/bconsole @group wheel sbin/btraceback +@group bareos +@dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset @group bareos @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) /var/log/bareos Modified: head/sysutils/bareos-traymonitor/Makefile ============================================================================== --- head/sysutils/bareos-traymonitor/Makefile Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-traymonitor/Makefile Sun Dec 27 17:45:53 2020 (r559389) @@ -8,7 +8,7 @@ COMMENT= Backup archiving recovery open sourced (traym LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ libbareos.so:sysutils/bareos-client -CONFLICTS= bacula*-bat-* bareos16-traymonitor-* +CONFLICTS= bareos17-traymonitor-* bareos18-traymonitor-* bareos19-traymonitor-* USES= desktop-file-utils gettext-runtime pkgconfig qt:5 USE_QT= buildtools_build qmake_build uitools_build gui core Modified: head/sysutils/bareos-traymonitor/pkg-plist ============================================================================== --- head/sysutils/bareos-traymonitor/pkg-plist Sun Dec 27 17:44:25 2020 (r559388) +++ head/sysutils/bareos-traymonitor/pkg-plist Sun Dec 27 17:45:53 2020 (r559389) @@ -4,4 +4,4 @@ bin/bareos-tray-monitor @sample %%ETCDIR%%/tray-monitor.d/monitor/bareos-mon.conf.sample @sample %%ETCDIR%%/tray-monitor.d/storage/StorageDaemon-local.conf.sample share/applications/bareos-tray-monitor.desktop -share/pixmaps/bareos-tray-monitor.xpm +share/pixmaps/bareos-tray-monitor.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012271745.0BRHjs1r026181>