git: 7d2a520b4ef7 - main - sysutils/bareos-*: update to 23.0.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 19 Jan 2024 23:41:24 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7d2a520b4ef753dc23752250a047be404ab21f33
commit 7d2a520b4ef753dc23752250a047be404ab21f33
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2024-01-19 23:39:59 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2024-01-19 23:41:04 +0000
sysutils/bareos-*: update to 23.0.1
- sysutils/bareos-traymonitor: add qt5 and qt6 flavors
---
sysutils/bareos-server/Makefile | 11 +++---
sysutils/bareos-server/Makefile.common | 6 +--
sysutils/bareos-server/distinfo | 6 +--
.../bareos-server/files/patch-core-CMakeLists.txt | 24 ++++++------
.../files/patch-core-scripts_CMakeLists.txt | 35 ++++++++++++------
.../files/patch-core-src-dird_CMakeLists.txt | 14 ++-----
.../files/patch-core-src-include_baconfig.h | 25 -------------
.../patch-core-src-qt-tray-monitor_CMakeLists.txt | 32 ++++++++++++++++
.../files/patch-core-src-tools_CMakeLists.txt | 43 ++++++++++++++++++++++
...e_cmake_bareos-symlink-default-db-backend.cmake | 36 ------------------
sysutils/bareos-server/pkg-plist | 9 +++--
sysutils/bareos-server/pkg-plist.client | 18 +++------
sysutils/bareos-traymonitor/Makefile | 29 ++++++++++++---
www/bareos-webui/Makefile | 3 +-
www/bareos-webui/distinfo | 6 +--
www/bareos-webui/pkg-plist | 34 ++++++++++-------
16 files changed, 182 insertions(+), 149 deletions(-)
diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index b3df0a11aec7..11feeafb9f78 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
-DISTVERSION= 22.1.3
+DISTVERSION= 23.0.1
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
@@ -13,7 +13,7 @@ WWW= https://www.bareos.org/
LICENSE= AGPLv3 LGPL3
LICENSE_COMB= multi
-CONFLICTS?= bareos20-server bareos19-server bareos18-server
+CONFLICTS?= bareos20-server bareos21-server bareos22-server
LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
libjansson.so:devel/jansson
@@ -31,8 +31,7 @@ PLIST_SUB+= LIB_VERSION=${PORTVERSION}
USE_LDCONFIG= yes
SHEBANG_LANG= perl python
SHEBANG_GLOB= *.py
-SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in \
- ${WRKSRC}/contrib/misc/bsmc/bin/bsmc
+SHEBANG_FILES= ${WRKSRC}/contrib/misc/bsmc/bin/bsmc
CPPFLAGS+= -I${LOCALBASE}/readline
@@ -191,9 +190,9 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"
post-patch:
- @${REINPLACE_CMD} '124,129d' ${WRKSRC}/CMakeLists.txt
+ @${REINPLACE_CMD} '133,138d' ${WRKSRC}/CMakeLists.txt
.if ${PKGNAMESUFFIX} == "-server"
- @${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
+ @${REINPLACE_CMD} '50d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
.endif
.if ${PKGNAMESUFFIX} == "-client"
@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
diff --git a/sysutils/bareos-server/Makefile.common b/sysutils/bareos-server/Makefile.common
index efd76eea1dfe..f8e58fa5b024 100644
--- a/sysutils/bareos-server/Makefile.common
+++ b/sysutils/bareos-server/Makefile.common
@@ -1,6 +1,6 @@
post-patch:
@${REINPLACE_CMD} '76,79d' ${WRKSRC}/CMakeLists.txt
-.if ${PKGNAMESUFFIX} == "-traymonitor"
+.if (${PKGNAMESUFFIX} == "-traymonitor-qt5") || (${PKGNAMESUFFIX} == "-traymonitor-qt6")
@${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt
.endif
@@ -10,7 +10,7 @@ post-build:
.endif
pre-install:
-.if ${PKGNAMESUFFIX} == "-traymonitor"
+.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 \;
@@ -27,7 +27,7 @@ do-install:
${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"
+.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}/
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index e6ac2baf20d2..19f38d8726ce 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704433438
-SHA256 (bareos-bareos-Release-22.1.3_GH0.tar.gz) = 765bf250a34296756051e896b28130b2ca3965cebaf310116c50e3e6c63d7d52
-SIZE (bareos-bareos-Release-22.1.3_GH0.tar.gz) = 14745204
+TIMESTAMP = 1705640908
+SHA256 (bareos-bareos-Release-23.0.1_GH0.tar.gz) = ab35e0be81c11913c42e62829daa3228c1ae94ad96d76b829cab0d3eb6f2ef6c
+SIZE (bareos-bareos-Release-23.0.1_GH0.tar.gz) = 14728566
diff --git a/sysutils/bareos-server/files/patch-core-CMakeLists.txt b/sysutils/bareos-server/files/patch-core-CMakeLists.txt
index b7e291bf0d60..136514c20b69 100644
--- a/sysutils/bareos-server/files/patch-core-CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-CMakeLists.txt
@@ -1,6 +1,6 @@
---- core/CMakeLists.txt 2022-11-09 08:14:10.000000000 -0500
-+++ core/CMakeLists.txt 2022-11-18 00:11:43.670601000 -0500
-@@ -283,7 +283,9 @@
+--- core/CMakeLists.txt 2023-12-13 17:44:47.000000000 -0500
++++ core/CMakeLists.txt 2024-01-10 01:25:40.807505000 -0500
+@@ -333,7 +333,9 @@
set(HAVE_FREEBSD_OS 1)
include_directories(/usr/local/include)
link_directories(/usr/local/lib)
@@ -11,7 +11,7 @@
check_cxx_compiler_flag(
-Wunused-but-set-variable compiler_will_warn_of_unused_but_set_variable
)
-@@ -350,7 +352,9 @@
+@@ -386,7 +388,9 @@
add_definitions("-D_FILE_OFFSET_BITS=64")
endif()
@@ -20,9 +20,9 @@
+ include(FindIntl)
+endif()
- if(developer)
- add_definitions("-DDEVELOPER=1")
-@@ -368,7 +372,7 @@
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -Wextra")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wall -Wextra")
+@@ -400,7 +404,7 @@
include(BareosFindStaticCodeAnalysisTools)
if(NOT client-only
@@ -31,11 +31,11 @@
AND CMAKE_SIZEOF_VOID_P EQUAL 8
)
# droplet does not build on solaris because of sys/cdefs.h: No such file or
-@@ -782,7 +786,6 @@
+@@ -777,7 +781,6 @@
+
+ include(BareosConfigureFile)
- add_subdirectory(scripts)
- add_subdirectory(manpages)
-add_subdirectory(platforms)
add_subdirectory(src)
-
- include(BareosLocalBuildDefinitions OPTIONAL
+ add_subdirectory(scripts)
+ add_subdirectory(manpages)
diff --git a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
index 9d10e0a79552..99c9c79bacc0 100644
--- a/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
---- core/scripts/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500
-+++ core/scripts/CMakeLists.txt 2021-12-22 00:23:34.270541000 -0500
-@@ -18,34 +18,36 @@
+--- 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}")
@@ -39,26 +39,37 @@
- WORLD_READ WORLD_EXECUTE
- DESTINATION "${scriptdir}"
-)
-+ install(
-+ FILES bareos 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(TARGET python3-fd)
+ install(
+- FILES bareos_encode_string.py
++ FILES bareos 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}"
+ )
-+endif()
++
++ 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)
- install(
diff --git a/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
index ec5313eaab2c..92b3686b93db 100644
--- a/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
+++ b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt
@@ -1,5 +1,5 @@
---- core/src/dird/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500
-+++ core/src/dird/CMakeLists.txt 2023-04-07 16:16:48.539301000 -0500
+--- core/src/dird/CMakeLists.txt 2023-12-13 17:44:47.000000000 -0500
++++ core/src/dird/CMakeLists.txt 2024-01-10 01:43:08.391137000 -0500
@@ -160,7 +160,7 @@
target_sources(bareos-dir PRIVATE dird.cc)
@@ -9,7 +9,7 @@
)
if(HAVE_WIN32)
-@@ -187,14 +187,14 @@
+@@ -185,7 +185,7 @@
add_executable(bareos-dbcheck ${DBCHKSRCS})
target_link_libraries(
@@ -18,11 +18,3 @@
CLI11::CLI11
)
- # is not built by default
- if(NOT client-only)
- add_executable(testfind ${TSTFNDSRCS})
-- target_link_libraries(testfind dird_objects bareosfind)
-+ target_link_libraries(testfind ${JANSSON_LIBRARIES} dird_objects bareosfind)
- endif()
- install(TARGETS bareos-dir bareos-dbcheck testfind DESTINATION "${sbindir}")
-
diff --git a/sysutils/bareos-server/files/patch-core-src-include_baconfig.h b/sysutils/bareos-server/files/patch-core-src-include_baconfig.h
deleted file mode 100644
index 21afd978730d..000000000000
--- a/sysutils/bareos-server/files/patch-core-src-include_baconfig.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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)
-@@ -120,9 +120,6 @@
- # endif
- # ifndef bindtextdomain
- # define bindtextdomain(p, d)
--# endif
--# ifndef setlocale
--# define setlocale(p, d)
- # endif
- #endif /* ENABLE_NLS */
-
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
new file mode 100644
index 000000000000..45be09684e1d
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core-src-qt-tray-monitor_CMakeLists.txt
@@ -0,0 +1,32 @@
+--- 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 @@
+ 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()
+ 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")
+- endif()
++ message(STATUS "QT5Widgets NOT found, cannot build tray-monitor")
+ endif()
+ endif()
+
diff --git a/sysutils/bareos-server/files/patch-core-src-tools_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src-tools_CMakeLists.txt
new file mode 100644
index 000000000000..d1646a91b45f
--- /dev/null
+++ b/sysutils/bareos-server/files/patch-core-src-tools_CMakeLists.txt
@@ -0,0 +1,43 @@
+--- core/src/tools/CMakeLists.txt 2023-12-13 17:44:47.000000000 -0500
++++ core/src/tools/CMakeLists.txt 2024-01-18 23:59:23.120490000 -0500
+@@ -69,10 +69,39 @@
+ endif()
+
+ if(NOT client-only)
++ set(FDSRCS
++ ../filed/accurate.cc
++ ../filed/authenticate.cc
++ ../filed/crypto.cc
++ ../filed/evaluate_job_command.cc
++ ../filed/fd_plugins.cc
++ ../filed/fileset.cc
++ ../filed/sd_cmds.cc
++ ../filed/verify.cc
++ ../filed/accurate_htable.cc
++ ../filed/backup.cc
++ ../filed/dir_cmd.cc
++ ../filed/filed_globals.cc
++ ../filed/heartbeat.cc
++ ../filed/socket_server.cc
++ ../filed/verify_vol.cc
++ ../filed/accurate_lmdb.cc
++ ../filed/compression.cc
++ ../filed/estimate.cc
++ ../filed/filed_conf.cc
++ ../filed/restore.cc
++ ../filed/status.cc
++ ../filed/filed_utils.cc
++ )
++
++ include_directories(../fastlz/include)
++ add_library(fd_objects STATIC ${FDSRCS})
++ target_link_libraries(fd_objects PRIVATE bareos bareosfastlz ${ZLIB_LIBRARIES})
++
+ set(TSTFNDSRCS testfind.cc testfind_fd.cc dummysockets.cc)
+ add_executable(testfind ${TSTFNDSRCS})
+ target_link_libraries(
+- testfind dird_objects fd_objects bareosfind CLI11::CLI11
++ testfind dird_objects fd_objects bareosfind CLI11::CLI11 ${JANSSON_LIBRARIES}
+ )
+ list(APPEND TOOLS_SBIN testfind)
+ endif()
diff --git a/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake b/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
deleted file mode 100644
index bf079968d9d4..000000000000
--- a/sysutils/bareos-server/files/patch-core_cmake_bareos-symlink-default-db-backend.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
---- core/cmake/bareos-symlink-default-db-backend.cmake.orig 2020-12-11 13:44:43 UTC
-+++ core/cmake/bareos-symlink-default-db-backend.cmake
-@@ -16,13 +16,31 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- # 02110-1301, USA.
-+
-+# The ${libdir} and ${backenddir} are absolute, so figure out
-+# a relative path (${backenddir} lives under ${libdir}) instead.
-+# Make the link relative, placing the libbareoscats.so in ${libdir}.
-+# Within this script, VERSION is set to BAREOS_NUMERIC_VERSION (see
-+# core/src/cats/CMakeLists.txt).
- message(
- STATUS
- "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- )
-+file(
-+ RELATIVE_PATH
-+ _rel
-+ ${libdir}
-+ ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
-+)
-+message(
-+ STATUS
-+ ".. actually ${_rel} in $ENV{DESTDIR} v ${VERSION}"
-+)
-+
- execute_process(
- COMMAND
- ${CMAKE_COMMAND} -E create_symlink
-- ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
-- ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
-+ ${_rel}
-+ libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${VERSION}
-+ WORKING_DIRECTORY $ENV{DESTDIR}${libdir} COMMAND_ECHO STDOUT
- )
diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist
index 5fe4dcb666e8..6e0a87161b03 100644
--- a/sysutils/bareos-server/pkg-plist
+++ b/sysutils/bareos-server/pkg-plist
@@ -85,6 +85,7 @@ lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2003_2004.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2004_2171.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2171_2192.sql
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2192_2210.sql
+lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2210_2230.sql
%%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql
lib/bareos/scripts/ddl/versions.map
lib/bareos/scripts/delete_catalog_backup
@@ -99,16 +100,16 @@ lib/bareos/scripts/mtx-changer
lib/bareos/scripts/query.sql
lib/bareos/scripts/update_bareos_tables
lib/libbareoscats.so
-lib/libbareoscats.so.22
+lib/libbareoscats.so.23
lib/libbareoscats.so.%%LIB_VERSION%%
%%NDMP%%lib/libbareosndmp.so
-%%NDMP%%lib/libbareosndmp.so.22
+%%NDMP%%lib/libbareosndmp.so.23
%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
lib/libbareossd.so
-lib/libbareossd.so.22
+lib/libbareossd.so.23
lib/libbareossd.so.%%LIB_VERSION%%
lib/libbareossql.so
-lib/libbareossql.so.22
+lib/libbareossql.so.23
lib/libbareossql.so.%%LIB_VERSION%%
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_EXT_SUFFIX%%.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_EXT_SUFFIX%%.so
diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client
index 7d20044f4b48..ee5d87305f83 100644
--- a/sysutils/bareos-server/pkg-plist.client
+++ b/sysutils/bareos-server/pkg-plist.client
@@ -13,24 +13,17 @@ bin/bconsole
@group bareos
%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bsmc.conf.sample
%%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/BareosFdPluginMariabackup.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-mariabackup.py
-%%PYTHON%%lib/bareos/plugins/bareos-fd-ovirt.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
@@ -71,20 +64,21 @@ 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
lib/libbareos.so
-lib/libbareos.so.22
+lib/libbareos.so.23
lib/libbareos.so.%%LIB_VERSION%%
lib/libbareosfastlz.so
-lib/libbareosfastlz.so.22
+lib/libbareosfastlz.so.23
lib/libbareosfastlz.so.%%LIB_VERSION%%
lib/libbareosfind.so
-lib/libbareosfind.so.22
+lib/libbareosfind.so.23
lib/libbareosfind.so.%%LIB_VERSION%%
lib/libbareoslmdb.so
-lib/libbareoslmdb.so.22
+lib/libbareoslmdb.so.23
lib/libbareoslmdb.so.%%LIB_VERSION%%
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_EXT_SUFFIX%%.so
share/man/man1/bconsole.1.gz
diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile
index c7cc4e25b317..b83024a634a5 100644
--- a/sysutils/bareos-traymonitor/Makefile
+++ b/sysutils/bareos-traymonitor/Makefile
@@ -1,16 +1,33 @@
-PORTNAME= bareos
PORTREVISION= 0
-PKGNAMESUFFIX= -traymonitor
COMMENT= Backup archiving recovery open sourced (traymonitor)
-LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
- libbareos.so:sysutils/bareos-client
+LIB_DEPENDS+= libbareos.so:sysutils/bareos-client
-CONFLICTS= bareos18-traymonitor bareos19-traymonitor bareos20-traymonitor
+CONFLICTS= bareos20-traymonitor bareos21-traymonitor bareos22-traymonitor
-USES= desktop-file-utils gettext-runtime pkgconfig qt:5
+USES= desktop-file-utils gettext-runtime pkgconfig
+
+FLAVORS= qt5 qt6
+FLAVOR?= ${FLAVORS:[1]}
+
+qt5_CONFLICTS= bareos-traymonitor-qt6
+qt6_CONFLICTS= bareos-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
diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index 00a41fdf1469..843fdc7b552f 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
-DISTVERSION= 22.1.3
+DISTVERSION= 23.0.1
CATEGORIES?= www sysutils
PKGNAMESUFFIX= -webui
@@ -54,7 +54,6 @@ do-install:
${STAGEDIR}${WWWDIR}
${INSTALL_DATA} ${WRKSRC}/webui/*.php ${STAGEDIR}${WWWDIR}
${INSTALL_DATA} ${WRKSRC}/webui/composer* ${STAGEDIR}${WWWDIR}
- ${INSTALL_DATA} ${WRKSRC}/webui/phpunit.xml ${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
diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo
index fe4153fead46..49002a9e97ef 100644
--- a/www/bareos-webui/distinfo
+++ b/www/bareos-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704486712
-SHA256 (bareos-bareos-Release-22.1.3_GH0.tar.gz) = 765bf250a34296756051e896b28130b2ca3965cebaf310116c50e3e6c63d7d52
-SIZE (bareos-bareos-Release-22.1.3_GH0.tar.gz) = 14745204
+TIMESTAMP = 1705703894
+SHA256 (bareos-bareos-Release-23.0.1_GH0.tar.gz) = ab35e0be81c11913c42e62829daa3228c1ae94ad96d76b829cab0d3eb6f2ef6c
+SIZE (bareos-bareos-Release-23.0.1_GH0.tar.gz) = 14728566
diff --git a/www/bareos-webui/pkg-plist b/www/bareos-webui/pkg-plist
index 05d8142e6ccf..bd20bcfdcaf3 100644
--- a/www/bareos-webui/pkg-plist
+++ b/www/bareos-webui/pkg-plist
@@ -17,9 +17,28 @@
%%WWWDIR%%/module/Analytics/autoload_classmap.php
%%WWWDIR%%/module/Analytics/config/module.config.php
%%WWWDIR%%/module/Analytics/src/Analytics/Controller/AnalyticsController.php
-%%WWWDIR%%/module/Analytics/src/Analytics/Model/Analytics.php
%%WWWDIR%%/module/Analytics/src/Analytics/Model/AnalyticsModel.php
+%%WWWDIR%%/module/Analytics/view/analytics/analytics/configuration.phtml
%%WWWDIR%%/module/Analytics/view/analytics/analytics/index.phtml
+%%WWWDIR%%/module/Api/Module.php
+%%WWWDIR%%/module/Api/autoload_classmap.php
+%%WWWDIR%%/module/Api/config/module.config.php
+%%WWWDIR%%/module/Api/src/Api/Controller/AnalyticsController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/ApiController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/ClientController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/ConsoleController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/DirectorController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/DotJobController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/ExecuteOnDirController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/FilesetController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/JobController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/JobLogController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/JobTotalsController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/MediaController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/PoolController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/ScheduleController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/StorageController.php
+%%WWWDIR%%/module/Api/src/Api/Controller/TimelineController.php
%%WWWDIR%%/module/Application/Module.php
%%WWWDIR%%/module/Application/autoload_classmap.php
%%WWWDIR%%/module/Application/config/commands.csv
@@ -86,7 +105,6 @@
%%WWWDIR%%/module/Client/autoload_classmap.php
%%WWWDIR%%/module/Client/config/module.config.php
%%WWWDIR%%/module/Client/src/Client/Controller/ClientController.php
-%%WWWDIR%%/module/Client/src/Client/Model/Client.php
%%WWWDIR%%/module/Client/src/Client/Model/ClientModel.php
%%WWWDIR%%/module/Client/view/client/client/details.phtml
%%WWWDIR%%/module/Client/view/client/client/index.phtml
@@ -96,26 +114,22 @@
%%WWWDIR%%/module/Console/autoload_classmap.php
%%WWWDIR%%/module/Console/config/module.config.php
%%WWWDIR%%/module/Console/src/Console/Controller/ConsoleController.php
-%%WWWDIR%%/module/Console/src/Console/Model/Console.php
%%WWWDIR%%/module/Console/src/Console/Model/ConsoleModel.php
%%WWWDIR%%/module/Console/view/console/console/index.phtml
%%WWWDIR%%/module/Dashboard/Module.php
%%WWWDIR%%/module/Dashboard/autoload_classmap.php
%%WWWDIR%%/module/Dashboard/config/module.config.php
%%WWWDIR%%/module/Dashboard/src/Dashboard/Controller/DashboardController.php
-%%WWWDIR%%/module/Dashboard/src/Dashboard/Model/Dashboard.php
%%WWWDIR%%/module/Dashboard/src/Dashboard/Model/DashboardModel.php
%%WWWDIR%%/module/Dashboard/view/dashboard/dashboard/index.phtml
%%WWWDIR%%/module/Dashboard/view/partial/JobTotals.phtml
%%WWWDIR%%/module/Dashboard/view/partial/JobsLastStatus.phtml
%%WWWDIR%%/module/Dashboard/view/partial/JobsPast24h.phtml
-%%WWWDIR%%/module/Dashboard/view/partial/LastDirectorMessages.phtml
%%WWWDIR%%/module/Dashboard/view/partial/RunningJobs.phtml
%%WWWDIR%%/module/Director/Module.php
%%WWWDIR%%/module/Director/autoload_classmap.php
%%WWWDIR%%/module/Director/config/module.config.php
%%WWWDIR%%/module/Director/src/Director/Controller/DirectorController.php
-%%WWWDIR%%/module/Director/src/Director/Model/Director.php
%%WWWDIR%%/module/Director/src/Director/Model/DirectorModel.php
%%WWWDIR%%/module/Director/view/director/director/index.phtml
%%WWWDIR%%/module/Director/view/director/director/messages.phtml
@@ -124,7 +138,6 @@
%%WWWDIR%%/module/Fileset/autoload_classmap.php
%%WWWDIR%%/module/Fileset/config/module.config.php
%%WWWDIR%%/module/Fileset/src/Fileset/Controller/FilesetController.php
-%%WWWDIR%%/module/Fileset/src/Fileset/Model/Fileset.php
%%WWWDIR%%/module/Fileset/src/Fileset/Model/FilesetModel.php
%%WWWDIR%%/module/Fileset/view/fileset/fileset/details.phtml
%%WWWDIR%%/module/Fileset/view/fileset/fileset/index.phtml
@@ -147,7 +160,6 @@
%%WWWDIR%%/module/Media/autoload_classmap.php
%%WWWDIR%%/module/Media/config/module.config.php
%%WWWDIR%%/module/Media/src/Media/Controller/MediaController.php
-%%WWWDIR%%/module/Media/src/Media/Model/Media.php
%%WWWDIR%%/module/Media/src/Media/Model/MediaModel.php
%%WWWDIR%%/module/Media/view/media/media/details.phtml
%%WWWDIR%%/module/Media/view/media/media/index.phtml
@@ -155,7 +167,6 @@
%%WWWDIR%%/module/Pool/autoload_classmap.php
%%WWWDIR%%/module/Pool/config/module.config.php
%%WWWDIR%%/module/Pool/src/Pool/Controller/PoolController.php
-%%WWWDIR%%/module/Pool/src/Pool/Model/Pool.php
%%WWWDIR%%/module/Pool/src/Pool/Model/PoolModel.php
%%WWWDIR%%/module/Pool/view/pool/pool/details.phtml
%%WWWDIR%%/module/Pool/view/pool/pool/index.phtml
@@ -173,7 +184,6 @@
%%WWWDIR%%/module/Schedule/autoload_classmap.php
%%WWWDIR%%/module/Schedule/config/module.config.php
%%WWWDIR%%/module/Schedule/src/Schedule/Controller/ScheduleController.php
-%%WWWDIR%%/module/Schedule/src/Schedule/Model/Schedule.php
%%WWWDIR%%/module/Schedule/src/Schedule/Model/ScheduleModel.php
%%WWWDIR%%/module/Schedule/view/schedule/schedule/details.phtml
%%WWWDIR%%/module/Schedule/view/schedule/schedule/index.phtml
@@ -189,7 +199,6 @@
%%WWWDIR%%/module/Storage/view/storage/storage/details.phtml
%%WWWDIR%%/module/Storage/view/storage/storage/index.phtml
%%WWWDIR%%/module/Storage/view/storage/storage/status.phtml
-%%WWWDIR%%/phpunit.xml
%%WWWDIR%%/public/css/32px.png
%%WWWDIR%%/public/css/40px.png
%%WWWDIR%%/public/css/Bootstrap-3.3.7/fonts/glyphicons-halflings-regular.ttf
@@ -352,8 +361,6 @@
%%WWWDIR%%/public/js/partials/i_core.min.js.map
%%WWWDIR%%/public/js/partials/i_gettext.min.js.map
%%WWWDIR%%/public/js/respond.min.js
-%%WWWDIR%%/public/js/responsive.bootstrap.js
-%%WWWDIR%%/public/js/responsive.bootstrap.min.js
%%WWWDIR%%/public/js/timeline.js
%%WWWDIR%%/public/themes/default/css/login.css
%%WWWDIR%%/public/themes/default/img/bareos-logo-small.png
@@ -365,7 +372,6 @@
%%WWWDIR%%/public/themes/sunflower/img/bareos.png
%%WWWDIR%%/public/themes/sunflower/img/favicon.ico
%%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
-%%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSockAbstractServiceFactory.php
%%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSockInterface.php
%%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSockServiceFactory.php
%%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBase64.php