diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile index d898a1aed4bf..d14ed9c74edb 100644 --- a/sysutils/bareos-client/Makefile +++ b/sysutils/bareos-client/Makefile @@ -1,20 +1,20 @@ PORTNAME= bareos PKGNAMESUFFIX= -client COMMENT= Backup archiving recovery open sourced (client) -CONFLICTS= bareos20-client bareos19-client bareos18-client +CONFLICTS= bareos20-client bareos21-client bareos22-client bareos23-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 OPTIONS_DEFINE= NLS PYTHON SCSICRYPTO GFAPI_DESC= GFAPI fd plugin support .include "${MASTERDIR}/Makefile" diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index ccc8281ec72d..c4c241809c0d 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,230 +1,231 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 23.1.1 +DISTVERSION= 24.0.0 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= -server MAINTAINER= acm@FreeBSD.org COMMENT?= Backup archiving recovery open sourced (server) WWW= https://www.bareos.org/ LICENSE= AGPLv3 LGPL3 LICENSE_COMB= multi -CONFLICTS?= bareos20-server bareos21-server bareos22-server +CONFLICTS?= bareos20-server bareos21-server bareos22-server bareos23-server +BUILD_DEPENDS+= tl-expected>0:devel/tl-expected \ + cli11>0:devel/cli11 LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson \ libfmt.so:devel/libfmt USES+= cmake compiler:c++11-lang cpe localbase:ldflags perl5 pkgconfig readline \ shebangfix USE_GITHUB= yes USE_PERL5= run USERS= bareos GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} USE_LDCONFIG= yes SHEBANG_LANG= perl python SHEBANG_GLOB= *.py SHEBANG_FILES= ${WRKSRC}/contrib/misc/bsmc/bin/bsmc CPPFLAGS+= -I${LOCALBASE}/readline 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 OPTIONS_DEFINE= MTX PYTHON LMDB NDMP NLS SCSICRYPTO OPTIONS_DEFAULT+= LMDB PGSQL SCSICRYPTO OPTIONS_SINGLE_DATABASE= PGSQL OPTIONS_SINGLE+= DATABASE BACKENDS_DESC= Storage backends DATABASE_DESC= Database support GFAPI_DESC= GFAPI backend support LMDB_DESC= Enable faster accurate backup 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= -DENABLE_PYTHON=ON PYTHON_CMAKE_OFF= -DENABLE_PYTHON=OFF PYTHON_PLUGIN= yes .if !defined(WITH_CLIENT_ONLY) LIB_DEPENDS+= libbareos.so:sysutils/bareos-client USE_RC_SUBR?= bareos-dir bareos-sd .endif .if defined(WITH_CLIENT_ONLY) SUB_FILES+= pkg-install.client pkg-deinstall.client pkg-message.client .else SUB_FILES+= pkg-message.server .endif CMAKE_ARGS+= -Dtcp-wrappers=ON \ -Dsmartalloc=ON \ -Dsysconfdir=${PREFIX}/etc \ -Darchivedir=${BAREOS_DIR}/storage \ -Dworkingdir=${BAREOS_DIR} \ -Dconfdir=${PREFIX}/etc/bareos \ -Dlibdir=${PREFIX}/lib \ -Dlogdir=/var/log/bareos \ -Dincludedir=${PREFIX}/include/bareos \ -Dreadline=ON \ -Ddisable-conio=ON \ -Dbatch-insert=ON \ -Dhave_plugins=ON \ -Dplugindir=${PREFIX}/lib/bareos/plugins \ -Dscriptdir=${PREFIX}/lib/bareos/scripts \ -Dbackenddir=${PREFIX}/lib/bareos/backends \ -Ddump_email=root@localhost \ -Djob_email=root@localhost \ -Ddb_name=bareos \ -Dsbin-perm=755 \ -Ddb_user=bareos \ -Dbaseport=9101 \ -Dpiddir=/var/run/bareos .if defined(WITH_CLIENT_ONLY) CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 CMAKE_ARGS+= -Dfd-user=root \ -Dfd-group=wheel \ -Dlmdb=ON .else LMDB_CMAKE_ON= -Dlmdb=ON LMDB_CMAKE_OFF= -Dlmdb=OFF LMDB_CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 CMAKE_ARGS+= -Ddir-user=${BAREOS_USER} \ -Ddir-group=${BAREOS_GROUP} \ -Dsd-user=${BAREOS_USER} \ -Dsd-group=operator .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 # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CMAKE_ARGS+= -Dclient-only=ON \ -DENABLE_WEBUI=OFF 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 + -Dbuild_client_only=OFF \ + -DENABLE_WEBUI=OFF # Server default database MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql PGSQL_SUB_LIST= REQ_PGSQL=postgresql PGSQL_SUB_LIST_OFF= REQ_PGSQL="" .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} '136,141d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} '202d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "-server" - @${REINPLACE_CMD} '50d' ${WRKSRC}/core/src/plugins/CMakeLists.txt + @${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif .if ${PKGNAMESUFFIX} == "-client" @${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt @${REINPLACE_CMD} -e 's|enable_testing()||g' ${WRKSRC}/CMakeLists.txt .endif -post-patch-PYTHON-off: - @${REINPLACE_CMD} 's/set(python ON)/set(python OFF)/' ${WRKSRC}/cmake/BareosSetVariableDefaults.cmake - 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' @${MV} ${WRKSRC}/contrib/misc/bsmc/etc/bareos/bsmc.conf \ ${WRKSRC}/contrib/misc/bsmc/etc/bareos/bsmc.conf.sample .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf.sample ${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 .endif @${MKDIR} ${STAGEDIR}/var/run/bareos .endif .else .include "${MASTERDIR}/Makefile.common" .endif # -client and -server are defined .include diff --git a/sysutils/bareos-server/Makefile.common b/sysutils/bareos-server/Makefile.common index f8e58fa5b024..4988a3fdd2e6 100644 --- a/sysutils/bareos-server/Makefile.common +++ b/sysutils/bareos-server/Makefile.common @@ -1,38 +1,51 @@ post-patch: - @${REINPLACE_CMD} '76,79d' ${WRKSRC}/CMakeLists.txt .if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6") @${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt + @${REINPLACE_CMD} -e 's|\@bindir\@|${LOCALBASE}/bin|g' ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop.in + @${REINPLACE_CMD} '208d' ${WRKSRC}/CMakeLists.txt +.endif + +post-extract: +.if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6") + @${MV} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/client/FileDaemon-local.conf.in \ + ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/client/FileDaemon-local.conf + @${MV} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/director/Director-local.conf.in \ + ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/director/Director-local.conf + @${MV} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/monitor/bareos-mon.conf.in \ + ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/monitor/bareos-mon.conf + @${MV} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf.in \ + ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/storage/StorageDaemon-local.conf .endif post-build: .if ${PKGNAMEPREFIX} == "nagios-check_" ${MAKE_CMD} -C ${WRKSRC}/examples/nagios/check_bareos .endif pre-install: .if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6") . 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-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6") # 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} ${CONFIGURE_WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor ${STAGEDIR}${PREFIX}/bin ${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} + ${INSTALL_DATA} ${WRKSRC}/core/src/qt-tray-monitor/bareos-tray-monitor.desktop.in ${STAGEDIR}${DESKTOPDIR}/bareos-tray-monitor.desktop .endif diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo index dda6c3c835a2..45b4c29b009c 100644 --- a/sysutils/bareos-server/distinfo +++ b/sysutils/bareos-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1733553941 -SHA256 (bareos-bareos-Release-23.1.1_GH0.tar.gz) = 468fbe12a509b65ca3de5041a901eb0cf1da5c9a4f1729ca57ed39f45fd428e7 -SIZE (bareos-bareos-Release-23.1.1_GH0.tar.gz) = 14010988 +TIMESTAMP = 1734849535 +SHA256 (bareos-bareos-Release-24.0.0_GH0.tar.gz) = 3cfc7e4b13143a9c39173d9e970476c3ba322761504513458552248700b8162d +SIZE (bareos-bareos-Release-24.0.0_GH0.tar.gz) = 13328535 diff --git a/sysutils/bareos-server/files/patch-CMakeLists.txt b/sysutils/bareos-server/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..ecd8676b7841 --- /dev/null +++ b/sysutils/bareos-server/files/patch-CMakeLists.txt @@ -0,0 +1,18 @@ +--- CMakeLists.txt.orig 2024-12-22 22:53:59.736189000 -0800 ++++ CMakeLists.txt 2024-12-22 22:54:34.147041000 -0800 +@@ -202,12 +202,10 @@ + if(ENABLE_WEBUI) + add_subdirectory(webui) + endif() +- if(NOT client-only) +- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") +- add_subdirectory(contrib) +- endif() +- add_subdirectory(systemtests) ++ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows") ++ add_subdirectory(contrib) + endif() ++ add_subdirectory(systemtests) + endif() + + if(docs diff --git a/sysutils/bareos-server/files/patch-contrib_CMakeLists.txt b/sysutils/bareos-server/files/patch-contrib_CMakeLists.txt index 6c923920a7a5..0c896142edfe 100644 --- a/sysutils/bareos-server/files/patch-contrib_CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-contrib_CMakeLists.txt @@ -1,27 +1,27 @@ --- contrib/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500 +++ contrib/CMakeLists.txt 2023-04-07 17:52:51.095371000 -0500 @@ -24,10 +24,18 @@ include(GNUInstallDirs) include(BareosSetVariableDefaults) -add_subdirectory(fd-plugins) -if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") - add_subdirectory(misc) -endif() -if(NOT client-only) - add_subdirectory(dir-plugins) -+if(python) ++if(ENABLE_PYTHON) + if(client-only) + add_subdirectory(fd-plugins) + endif() + + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS") + if(client-only) + add_subdirectory(misc) + endif() + endif() + + if(NOT client-only) + add_subdirectory(dir-plugins) + endif() endif() diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake index fbf8074b380e..c43a68df2c25 100644 --- a/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake +++ b/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake @@ -1,12 +1,12 @@ ---- core/cmake/BareosCheckIncludes.cmake 2023-03-24 08:05:20.000000000 -0500 -+++ core/cmake/BareosCheckIncludes.cmake 2023-04-05 16:17:56.933566000 -0500 +--- core/cmake/BareosCheckIncludes.cmake.orig 2024-12-16 09:10:50.000000000 -0800 ++++ core/cmake/BareosCheckIncludes.cmake 2024-12-22 19:21:38.094235000 -0800 @@ -62,7 +62,9 @@ - include(CheckSymbolExists) + include(CheckSymbolExists) +if(gfapi) - 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() - check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H) + check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H) diff --git a/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt index 5774b72f2740..212dc15fc1f5 100644 --- a/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-core-manpages_CMakeLists.txt @@ -1,16 +1,26 @@ ---- core/manpages/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500 -+++ core/manpages/CMakeLists.txt 2021-12-22 00:19:52.189513000 -0500 -@@ -18,9 +18,11 @@ +--- core/manpages/CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800 ++++ cire/manpages/CMakeLists.txt 2024-12-22 23:07:01.552605000 -0800 +@@ -18,10 +18,8 @@ # 02110-1301, USA. message("Entering ${CMAKE_CURRENT_SOURCE_DIR}") --set(MAN1 bconsole.1 bsmtp.1) -+if(client-only) -+ set(MAN1 bconsole.1 bsmtp.1) +-set(MAN8 bareos-fd.8 btraceback.8) +- + if(NOT client-only) +- set(MAN1-server bconsole.1 bsmtp.1 bareos-tray-monitor.1 bwild.1 bregex.1) ++ set(MAN1-server bwild.1 bregex.1) --set(MAN8 bareos-fd.8 bareos.8 btraceback.8) -+ set(MAN8 bareos-fd.8 bareos.8 btraceback.8) -+endif() + set(MAN8-server + bareos-dir.8 +@@ -39,7 +37,10 @@ - if(NOT client-only) - set(MAN1-server bareos-tray-monitor.1 bwild.1 bregex.1) + set(MAN1 "${MAN1-server}") + set(MAN8 "${MAN8};${MAN8-server}") +- ++else() ++ set(MAN8 bareos-fd.8 btraceback.8) ++ set(MAN1 bconsole.1 bsmtp.1 bareos-tray-monitor.1) + endif() ++ + install(FILES ${MAN1} DESTINATION "${mandir}/man1") + install(FILES ${MAN8} DESTINATION "${mandir}/man8") diff --git a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt index 99c9c79bacc0..3dba2a2e1430 100644 --- a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt @@ -1,75 +1,76 @@ ---- core/scripts/CMakeLists.txt 2023-12-13 17:44:47.000000000 -0500 -+++ core/scripts/CMakeLists.txt 2024-01-10 01:38:45.931532000 -0500 -@@ -18,41 +18,44 @@ - # 02110-1301, USA. - message("Entering ${CMAKE_CURRENT_SOURCE_DIR}") +--- core/scripts/CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800 ++++ core/scripts/CMakeLists.txt 2024-12-22 19:45:34.147106000 -0800 +@@ -34,14 +34,14 @@ + mtx-changer.in + ) -install( -- FILES bareos btraceback +- FILES ${CMAKE_CURRENT_BINARY_DIR}/btraceback - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${sbindir}" -) +-if(NOT client-only) +if(client-only) -+ install( -+ FILES bareos btraceback + install( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/btraceback + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${sbindir}" + ) - ++ install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE +@@ -61,32 +61,34 @@ + WORLD_READ WORLD_EXECUTE + DESTINATION "${scriptdir}" + ) +-endif() -install( -- FILES bareos-ctl-fd -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE -- WORLD_READ WORLD_EXECUTE +- FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos-config-lib.sh btraceback.gdb +- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ - 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 bareos-config +- FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos-config - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE - WORLD_READ WORLD_EXECUTE - DESTINATION "${scriptdir}" -) -- --install( -- FILES bareos-config-lib.sh bareos-ctl-funcs btraceback.gdb btraceback.dbx -- btraceback.mdb -- PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ -- DESTINATION "${scriptdir}" --) +-if(NOT client-only) ++ + install( +- FILES bareos-ctl-funcs btraceback.dbx btraceback.mdb ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos-config-lib.sh btraceback.gdb + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + DESTINATION "${scriptdir}" + ) +-endif() -if(TARGET python3-fd) ++ install( - FILES bareos_encode_string.py -+ FILES bareos bareos-config ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/bareos-config PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION "${scriptdir}" ) + + install( -+ FILES bareos-config-lib.sh bareos-ctl-funcs btraceback.gdb btraceback.dbx -+ btraceback.mdb ++ FILES bareos-ctl-funcs btraceback.dbx btraceback.mdb + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ + DESTINATION "${scriptdir}" + ) + + if(TARGET python3-fd) + install( + FILES bareos_encode_string.py + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE + WORLD_READ WORLD_EXECUTE + DESTINATION "${scriptdir}" + ) + endif() endif() if(NOT client-only) diff --git a/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt deleted file mode 100644 index ccb41fb15e8c..000000000000 --- a/sysutils/bareos-server/files/patch-core-src-plugins-filed_CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 @@ - - include_directories(${OPENSSL_INCLUDE_DIR}) - --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 "") diff --git a/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt index a693d11d6b6a..35853f9c59bf 100644 --- a/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-core-src-plugins-stored_CMakeLists.txt @@ -1,15 +1,15 @@ ---- core/src/plugins/stored/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500 -+++ core/src/plugins/stored/CMakeLists.txt 2022-01-15 09:28:41.225020000 -0500 +--- core/src/plugins/stored/CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800 ++++ core/src/plugins/stored/CMakeLists.txt 2024-12-22 19:50:39.154511000 -0800 @@ -33,6 +33,12 @@ endif() endif() +if(HAVE_FREEBSD_OS) + include_directories( + ${PROJECT_SOURCE_DIR}/src/fastlz/include + ) +endif() + - add_subdirectory(python) - - add_library(autoxflate-sd MODULE autoxflate/autoxflate-sd.cc) + if(ENABLE_PYTHON) + add_subdirectory(python) + endif() diff --git a/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt index 45be09684e1d..ae40c590a923 100644 --- a/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt @@ -1,32 +1,33 @@ ---- core/src/qt-tray-monitor/CMakeLists.txt 2024-01-19 16:46:50.252975000 -0500 -+++ core/src/qt-tray-monitor/CMakeLists.txt 2024-01-19 16:52:05.137955000 -0500 -@@ -27,20 +27,19 @@ +--- core/src/qt-tray-monitor/CMakeLists.txt 2024-12-16 09:10:50.000000000 -0800 ++++ core/src/qt-tray-monitor/CMakeLists.txt 2024-12-22 23:44:53.885128000 -0800 +@@ -28,22 +28,19 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -find_package(Qt6 COMPONENTS Core Widgets) -if(Qt6Widgets_FOUND) - message(STATUS "Found QT6Widgets") --else() -- message(STATUS "QT6Widgets NOT found, checking for Qt5 ...") +if(bat-qt6) + find_package(Qt6 COMPONENTS Core Widgets) + if(Qt6Widgets_FOUND) + message(STATUS "Found QT6Widgets") + else() + message(FATAL_ERROR "QT6Widgets NOT found, cannot build tray-monitor") + endif() -+else() + else() +- message(STATUS "QT6Widgets NOT found, checking for Qt5 ...") find_package(Qt5 COMPONENTS Core Widgets) if(Qt5Widgets_FOUND) message(STATUS "Found QT5Widgets") else() - message(STATUS "QT5Widgets NOT found, checking for Qt4 ...") - find_package(Qt4) - if(NOT Qt4_FOUND) -- message(FATAL_ERROR "Both Qt5 and Qt4 not found, cannot build tray-monitor") +- message( +- FATAL_ERROR "Both Qt5 and Qt4 not found, cannot build tray-monitor" +- ) - endif() + message(STATUS "QT5Widgets NOT found, cannot build tray-monitor") endif() endif() diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist index f9470ede3232..2d4c5de8c4bc 100644 --- a/sysutils/bareos-server/pkg-plist +++ b/sysutils/bareos-server/pkg-plist @@ -1,161 +1,165 @@ bin/bregex bin/bsmtp bin/bwild @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 %%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/job/BackupCatalog.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.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 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-bareos-fd.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/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 -%%ETCDIR%%/bareos-dir.d/storage/dedup.conf.sample +%%ETCDIR%%/bareos-dir.d/storage/Dedupable.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/File.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Gluster.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/dplcompat.conf.sample @comment @sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/autochanger/autochanger-0.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/FileStorage.conf.sample %%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/GlusterStorage.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/NULL.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/dplcompat.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 -@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/dedup.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/Dedupable.conf.sample %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample etc/logrotate.d/bareos-dir lib/bareos/backends/libbareossd-dedupable.so +lib/bareos/backends/libbareossd-dplcompat.so lib/bareos/backends/libbareossd-fifo.so lib/bareos/backends/libbareossd-file.so %%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so lib/bareos/backends/libbareossd-tape.so %%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosDirPluginNscaSender.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-nsca-sender.py %%PYTHON%%lib/bareos/plugins/bareos-sd-class-plugin.py %%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 lib/bareos/scripts/bareos-ctl-sd -lib/bareos/scripts/bareos-explorer lib/bareos/scripts/bareos-glusterfind-wrapper lib/bareos/scripts/create_bareos_database %%PGSQL%%lib/bareos/scripts/ddl/creates/postgresql.sql %%PGSQL%%lib/bareos/scripts/ddl/drops/postgresql.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-readonly.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql.sql lib/bareos/scripts/ddl/updates/postgresql.10_11.sql lib/bareos/scripts/ddl/updates/postgresql.11_12.sql lib/bareos/scripts/ddl/updates/postgresql.12_14.sql lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql lib/bareos/scripts/ddl/updates/postgresql.2192_2210.sql lib/bareos/scripts/ddl/updates/postgresql.2210_2230.sql -%%PGSQL%%lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql +lib/bareos/scripts/ddl/updates/postgresql.2230_2240.sql +lib/bareos/scripts/ddl/updates/postgresql.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/mtx-changer lib/bareos/scripts/query.sql +lib/bareos/scripts/s3cmd-wrapper.sh lib/bareos/scripts/update_bareos_tables %%NDMP%%lib/libbareosndmp.so -%%NDMP%%lib/libbareosndmp.so.23 +%%NDMP%%lib/libbareosndmp.so.24 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%% lib/libbareossd.so -lib/libbareossd.so.23 +lib/libbareossd.so.24 lib/libbareossd.so.%%LIB_VERSION%% lib/libbareossql.so -lib/libbareossql.so.23 +lib/libbareossql.so.24 lib/libbareossql.so.%%LIB_VERSION%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_EXT_SUFFIX%%.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_EXT_SUFFIX%%.so -share/man/man1/bareos-tray-monitor.1.gz share/man/man1/bregex.1.gz share/man/man1/bwild.1.gz share/man/man8/bareos-dbcheck.8.gz share/man/man8/bareos-dir.8.gz share/man/man8/bareos-sd.8.gz share/man/man8/bcopy.8.gz share/man/man8/bextract.8.gz share/man/man8/bls.8.gz share/man/man8/bpluginfo.8.gz share/man/man8/bscan.8.gz share/man/man8/bscrypto.8.gz share/man/man8/btape.8.gz sbin/bareos-dbcheck sbin/bareos-dir sbin/bareos-sd sbin/bcopy +sbin/bdedupestimate sbin/bextract sbin/bls sbin/bpluginfo sbin/bregex sbin/bscan sbin/bscrypto sbin/bsmtp sbin/btape sbin/btestls sbin/bwild sbin/chio-bareos sbin/testfind @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/catalog @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/client @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) %%BAREOS_DIR%%/storage @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client index ee5d87305f83..0192aa3dc158 100644 --- a/sysutils/bareos-server/pkg-plist.client +++ b/sysutils/bareos-server/pkg-plist.client @@ -1,103 +1,104 @@ %%PYTHON%%bin/bareos-triggerjob.py bin/bconsole %%PYTHON%%bin/bsmc +%%PYTHON%%bin/chunk_check.py @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 %%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bsmc.conf.sample %%PYTHON%%lib/bareos/plugins/BareosFdPluginBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLibcloud.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.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-mariabackup.py %%PYTHON%%lib/bareos/plugins/bareos-fd-percona-xtrabackup.py -%%PYTHON%%lib/bareos/plugins/bareos-fd-postgres.py %%PYTHON%%lib/bareos/plugins/bareos-fd-postgresql.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 %%PYTHON%%lib/bareos/plugins/bareos_mysql_dump/BareosFdMySQLclass.py %%PYTHON%%lib/bareos/plugins/bareos_mysql_dump/README.md %%PYTHON%%lib/bareos/plugins/bareos_mysql_dump/__init__.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/BareosFdTaskClass.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/LICENSE.md %%PYTHON%%lib/bareos/plugins/bareos_tasks/README.md %%PYTHON%%lib/bareos/plugins/bareos_tasks/__init__.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/mysql/BareosFdMySQLClass.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/mysql/README.md %%PYTHON%%lib/bareos/plugins/bareos_tasks/mysql/__init__.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/oracle/BareosFdOracleClass.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/oracle/README.md %%PYTHON%%lib/bareos/plugins/bareos_tasks/oracle/__init__.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/pgsql/BareosFdPgSQLClass.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/pgsql/README.md %%PYTHON%%lib/bareos/plugins/bareos_tasks/pgsql/__init__.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/xenserver/BareosFdXenServerClass.py %%PYTHON%%lib/bareos/plugins/bareos_tasks/xenserver/README.md %%PYTHON%%lib/bareos/plugins/bareos_tasks/xenserver/__init__.py lib/bareos/plugins/bpipe-fd.so %%GFAPI%%lib/bareos/plugins/gfapi-fd.so -%%PYTHON%%lib/bareos/plugins/python3-fd.so %%PYTHON%%lib/bareos/plugins/openvz7/BareosFdPluginVz7CtFs.py %%PYTHON%%lib/bareos/plugins/openvz7/README.md %%PYTHON%%lib/bareos/plugins/openvz7/bareos-fd-vz7_ct_fs.py +%%PYTHON%%lib/bareos/plugins/python3-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 %%PYTHON%%lib/bareos/scripts/bareos_encode_string.py lib/bareos/scripts/btraceback.dbx lib/bareos/scripts/btraceback.gdb lib/bareos/scripts/btraceback.mdb +%%PYTHON%%lib/bareos/scripts/reschedule_job_as_full.sh lib/libbareos.so -lib/libbareos.so.23 +lib/libbareos.so.24 lib/libbareos.so.%%LIB_VERSION%% lib/libbareosfastlz.so -lib/libbareosfastlz.so.23 +lib/libbareosfastlz.so.24 lib/libbareosfastlz.so.%%LIB_VERSION%% lib/libbareosfind.so -lib/libbareosfind.so.23 +lib/libbareosfind.so.24 lib/libbareosfind.so.%%LIB_VERSION%% lib/libbareoslmdb.so -lib/libbareoslmdb.so.23 +lib/libbareoslmdb.so.24 lib/libbareoslmdb.so.%%LIB_VERSION%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_EXT_SUFFIX%%.so +share/man/man1/bareos-tray-monitor.1.gz share/man/man1/bconsole.1.gz share/man/man1/bsmtp.1.gz share/man/man8/bareos-fd.8.gz -share/man/man8/bareos.8.gz share/man/man8/btraceback.8.gz @group bareos sbin/bareos @group bareos sbin/bareos-fd @group bareos sbin/bconsole @group wheel sbin/btraceback @group bareos @dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset @dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job @group bareos @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile index b83024a634a5..ebbd801f9eb0 100644 --- a/sysutils/bareos-traymonitor/Makefile +++ b/sysutils/bareos-traymonitor/Makefile @@ -1,44 +1,46 @@ PORTREVISION= 0 COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libbareos.so:sysutils/bareos-client -CONFLICTS= bareos20-traymonitor bareos21-traymonitor bareos22-traymonitor +CONFLICTS= bareos20-traymonitor bareos21-traymonitor bareos22-traymonitor \ + bareos23-traymonitor USES= desktop-file-utils gettext-runtime pkgconfig FLAVORS= qt5 qt6 FLAVOR?= ${FLAVORS:[1]} -qt5_CONFLICTS= bareos-traymonitor-qt6 -qt6_CONFLICTS= bareos-traymonitor-qt5 +qt5_CONFLICTS= bareos23-traymonitor-qt6 +qt6_CONFLICTS= bareos23-traymonitor-qt5 .if ${FLAVOR} == qt6 PKGNAMESUFFIX= -traymonitor-qt6 USES+= qt:6 USE_QT= base:run declarative:build tools:build CMAKE_ARGS+= -Dbat-qt6=yes .else PKGNAMESUFFIX= -traymonitor-qt5 LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 USES+= qt:5 USE_QT= buildtools:build qmake:build uitools:build gui core widgets .endif 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 \ - -Dnls=ON + -Dnls=ON \ + -DENABLE_WEBUI=OFF .include "${MASTERDIR}/Makefile" diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile index 7834cfcb3462..b978135ba504 100644 --- a/www/bareos-webui/Makefile +++ b/www/bareos-webui/Makefile @@ -1,66 +1,66 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 23.1.1 +DISTVERSION= 24.0.0 CATEGORIES?= www sysutils PKGNAMESUFFIX= -webui MAINTAINER= acm@FreeBSD.org COMMENT= PHP-Frontend to manage Bareos over the web WWW= https://www.bareos.org/ LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/webui/LICENSE USE_GITHUB= yes USES= cpe php:build cmake gettext USE_PHP= gettext ctype session iconv NO_BUILD= yes NO_ARCH= yes CMAKE_SOURCE_PATH= ${WRKSRC}/webui CMAKE_INSTALL_PREFIX= ${STAGEDIR} CMAKE_ARGS+= -DSHARE_INSTALL_PREFIX:PATH=${PREFIX}/www \ -DCMAKE_INSTALL_FULL_SYSCONFDIR:PATH=${PREFIX}/etc \ -Dsysconfdir=${PREFIX}/etc \ -Dwebuiconfdir=${PREFIX}/${ETCDIRWEBUI} \ -DVERSION_STRING=${DISTVERSION} \ -DBAREOS_FULL_VERSION:STRING=${DISTVERSION} SUB_FILES= pkg-message SUB_LIST+= ETCDIRWEBUI=${PREFIX}/${ETCDIRWEBUI} PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} ETCDIRWEBUI=${ETCDIRWEBUI} OPTIONS_DEFINE= PGSQL OPTIONS_DEFAULT= PGSQL PGSQL_USE= PHP=pdo_pgsql ETCDIRWEBUI= etc/${PORTNAME}${PKGNAMESUFFIX} post-extract: ${FIND} ${WRKSRC}/webui -name .gitignore -delete pre-install: ${FIND} ${WRKSRC}/webui -name *.in -delete do-install: @${ECHO} "Installing in ${WWWDIR}" @${MKDIR} ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI} @${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console @${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile @${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME} cd ${WRKSRC}/webui && ${COPYTREE_SHARE} "config module public vendor" \ ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/webui/*.php ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/webui/composer* ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/directors.ini ${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/configuration.ini ${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample ${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample ${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-limited.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-limited.conf.sample ${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-readonly.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-readonly.conf.sample ${INSTALL_DATA} ${WRKSRC}/webui/install/apache/bareos-webui.conf ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/apache-bareos-webui.conf ${INSTALL_DATA} ${WRKSRC}/webui/install/nginx/bareos-webui.conf ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/nginx-bareos-webui.conf .include diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo index 8ae86b6dfec4..63c771d790e3 100644 --- a/www/bareos-webui/distinfo +++ b/www/bareos-webui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734847145 -SHA256 (bareos-bareos-Release-23.1.1_GH0.tar.gz) = 468fbe12a509b65ca3de5041a901eb0cf1da5c9a4f1729ca57ed39f45fd428e7 -SIZE (bareos-bareos-Release-23.1.1_GH0.tar.gz) = 14010988 +TIMESTAMP = 1734939598 +SHA256 (bareos-bareos-Release-24.0.0_GH0.tar.gz) = 3cfc7e4b13143a9c39173d9e970476c3ba322761504513458552248700b8162d +SIZE (bareos-bareos-Release-24.0.0_GH0.tar.gz) = 13328535