Date: Mon, 10 Apr 2023 20:29:27 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: e106c20f3190 - main - sysutils/bareos-*: update to 22.0.3 Message-ID: <202304102029.33AKTRhw037535@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e106c20f319068e97a59f6fec7aa543b63cf42c5 commit e106c20f319068e97a59f6fec7aa543b63cf42c5 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2023-04-10 20:27:13 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2023-04-10 20:28:59 +0000 sysutils/bareos-*: update to 22.0.3 - Remove obsolete patch files - Remove obsolete options --- sysutils/bareos-client/Makefile | 4 +-- sysutils/bareos-server/Makefile | 21 ++++++------ sysutils/bareos-server/distinfo | 6 ++-- .../files/patch-contrib-misc-bsmc_CMakeLists.txt | 11 +++++++ .../files/patch-contrib_CMakeLists.txt | 27 ++++++++++++++++ .../patch-core-cmake_BareosCheckIncludes.cmake | 37 +++------------------- .../patch-core-cmake_BareosFindAllLibraries.cmake | 21 +++--------- ...atch-core-cmake_BareosSetVariableDefaults.cmake | 15 --------- .../files/patch-core-src-dird_CMakeLists.txt | 26 +++++++++------ .../files/patch-core-src-dird_catreq.cc | 29 ----------------- .../files/patch-core-src-dird_vbackup.cc | 11 +++++++ .../files/patch-core-src-stored_CMakelists.txt | 16 +++++----- .../files/patch-core-src_CMakeLists.txt | 14 ++++++-- sysutils/bareos-server/pkg-plist | 23 ++++++-------- sysutils/bareos-server/pkg-plist.client | 35 ++++++++++++++++---- 15 files changed, 145 insertions(+), 151 deletions(-) diff --git a/sysutils/bareos-client/Makefile b/sysutils/bareos-client/Makefile index 6d5d766f5532..d898a1aed4bf 100644 --- a/sysutils/bareos-client/Makefile +++ b/sysutils/bareos-client/Makefile @@ -12,11 +12,9 @@ PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server OPTIONS_GROUP= PLUGINS -OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS +OPTIONS_GROUP_PLUGINS= GFAPI OPTIONS_DEFINE= NLS PYTHON SCSICRYPTO -CEPHFS_DESC= CEPHFS fd plugin support GFAPI_DESC= GFAPI fd plugin support -RADOS_DESC= RADOS fd plugin support .include "${MASTERDIR}/Makefile" diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 105ccaab712c..eb58c5994d9d 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 21.1.5 +DISTVERSION= 22.0.3 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # @@ -29,8 +29,10 @@ GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} USE_LDCONFIG= yes -SHEBANG_LANG= perl -SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in +SHEBANG_LANG= perl python +SHEBANG_GLOB= *.py +SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in \ + ${WRKSRC}/contrib/misc/bsmc/bin/bsmc CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -46,17 +48,15 @@ SCSICRYPTO_DESC= Build LTO AME crypto plugin .if ${PKGNAMESUFFIX} == "-server" OPTIONS_GROUP= BACKENDS -OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS +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 -CEPHFS_DESC= CEPHFS backend support GFAPI_DESC= GFAPI backend support LMDB_DESC= Enable faster accurate backup support -RADOS_DESC= RADOS backend support NDMP_CMAKE_ON= -Dndmp=ON NDMP_CMAKE_OFF= -Dndmp=OFF @@ -149,12 +149,8 @@ SUB_LIST= BAREOS_USER=${BAREOS_USER} \ NLS_USES= gettext NLS_CMAKE_ON= -Dnls=ON -CEPHFS_CMAKE_ON= -Dcephfs=ON -CEPHFS_LIB_DEPENDS= libcephfs.so:net/ceph14 GFAPI_CMAKE_ON= -Dgfapi=ON GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs -RADOS_CMAKE_ON= -Drados=ON -Dcephfs=ON -RADOS_LIB_DEPENDS= librados.so:net/ceph14 # Client only or full server version .if defined(WITH_CLIENT_ONLY) @@ -203,9 +199,8 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: - @${REINPLACE_CMD} '120,123d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} '124,129d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "-server" - @${REINPLACE_CMD} '45d' ${WRKSRC}/core/src/CMakeLists.txt @${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif .if ${PKGNAMESUFFIX} == "-client" @@ -221,6 +216,8 @@ post-extract: .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: diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo index d006826f451f..5663ab3f8511 100644 --- a/sysutils/bareos-server/distinfo +++ b/sysutils/bareos-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668638096 -SHA256 (bareos-bareos-Release-21.1.5_GH0.tar.gz) = 2bdae1c7b0667e49b62cea236c96c108a5b663b379170ab273a96f07494b01f0 -SIZE (bareos-bareos-Release-21.1.5_GH0.tar.gz) = 11655244 +TIMESTAMP = 1680719160 +SHA256 (bareos-bareos-Release-22.0.3_GH0.tar.gz) = 3ea98d4ca78e4451ce4f4e2990547de0872330ab115eb27e1471c3af34380404 +SIZE (bareos-bareos-Release-22.0.3_GH0.tar.gz) = 14529338 diff --git a/sysutils/bareos-server/files/patch-contrib-misc-bsmc_CMakeLists.txt b/sysutils/bareos-server/files/patch-contrib-misc-bsmc_CMakeLists.txt new file mode 100644 index 000000000000..2074cf886be9 --- /dev/null +++ b/sysutils/bareos-server/files/patch-contrib-misc-bsmc_CMakeLists.txt @@ -0,0 +1,11 @@ +--- contrib/misc/bsmc/CMakeLists.txt 2023-04-07 17:32:44.243346000 -0500 ++++ contrib/misc/bsmc/CMakeLists.txt 2023-04-07 17:33:04.594841000 -0500 +@@ -27,7 +27,7 @@ + ) + + install( +- FILES etc/bareos/bsmc.conf ++ FILES etc/bareos/bsmc.conf.sample + PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ + DESTINATION "${confdir}" + ) diff --git a/sysutils/bareos-server/files/patch-contrib_CMakeLists.txt b/sysutils/bareos-server/files/patch-contrib_CMakeLists.txt new file mode 100644 index 000000000000..6c923920a7a5 --- /dev/null +++ b/sysutils/bareos-server/files/patch-contrib_CMakeLists.txt @@ -0,0 +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(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 e439a0254191..fbf8074b380e 100644 --- a/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake +++ b/sysutils/bareos-server/files/patch-core-cmake_BareosCheckIncludes.cmake @@ -1,38 +1,11 @@ ---- 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) +--- core/cmake/BareosCheckIncludes.cmake 2023-03-24 08:05:20.000000000 -0500 ++++ core/cmake/BareosCheckIncludes.cmake 2023-04-05 16:17:56.933566000 -0500 +@@ -62,7 +62,9 @@ --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 -+ ) -+endif() + include(CheckSymbolExists) --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) + check_include_files(glusterfs/api/glfs.h HAVE_GLUSTERFS_API_GLFS_H) +endif() check_include_files(sys/prctl.h HAVE_SYS_PRCTL_H) diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake index e3ff7074a02f..40bcee0e6b50 100644 --- a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake +++ b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake @@ -1,24 +1,11 @@ ---- core/cmake/BareosFindAllLibraries.cmake 2022-08-05 04:40:11.000000000 -0500 -+++ core/cmake/BareosFindAllLibraries.cmake 2022-10-31 16:28:14.422391000 -0500 -@@ -175,12 +175,18 @@ - ) - endif() +--- core/cmake/BareosFindAllLibraries.cmake 2023-03-24 08:05:20.000000000 -0500 ++++ core/cmake/BareosFindAllLibraries.cmake 2023-04-05 16:21:00.503424000 -0500 +@@ -177,7 +177,9 @@ --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" "") -+endif() -+if(cephfs) -+ 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() bareosfindlibraryandheaders("pam" "security/pam_appl.h" "") diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake deleted file mode 100644 index 935c5a5b3177..000000000000 --- a/sysutils/bareos-server/files/patch-core-cmake_BareosSetVariableDefaults.cmake +++ /dev/null @@ -1,15 +0,0 @@ ---- core/cmake/BareosSetVariableDefaults.cmake 2020-01-31 16:21:15.864122000 -0500 -+++ core/cmake/BareosSetVariableDefaults.cmake 2020-01-31 16:23:58.960984000 -0500 -@@ -641,7 +641,11 @@ - set(PACKAGE_URL "\"\"") - set(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"") - --set(ENABLE_NLS 1) -+if(nls) -+ SET(ENABLE_NLS 1) -+else() -+ SET(ENABLE_NLS 0) -+endif() - - if(HAVE_WIN32) - 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 688519f35afe..ec5313eaab2c 100644 --- a/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-core-src-dird_CMakeLists.txt @@ -1,20 +1,28 @@ ---- core/src/dird/CMakeLists.txt 2022-01-16 10:44:41.285876000 -0500 -+++ core/src/dird/CMakeLists.txt 2022-01-16 10:46:30.370557000 -0500 -@@ -158,7 +158,7 @@ - add_executable(bareos-dir) +--- 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 +@@ -160,7 +160,7 @@ target_sources(bareos-dir PRIVATE dird.cc) --target_link_libraries(bareos-dir PRIVATE dird_objects bareossql bareosfind) -+target_link_libraries(bareos-dir PRIVATE dird_objects bareossql bareosfind ${JANSSON_LIBRARIES}) + target_link_libraries( +- bareos-dir PRIVATE dird_objects bareossql bareosfind CLI11::CLI11 ++ bareos-dir PRIVATE ${JANSSON_LIBRARIES} dird_objects bareossql bareosfind CLI11::CLI11 + ) if(HAVE_WIN32) - target_sources( -@@ -184,7 +184,7 @@ +@@ -187,14 +187,14 @@ add_executable(bareos-dbcheck ${DBCHKSRCS}) target_link_libraries( - bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES} -+ bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES} ${JANSSON_LIBRARIES} ++ bareos-dbcheck PRIVATE ${JANSSON_LIBRARIES} bareossql bareos bareosfind ${OPENSSL_LIBRARIES} + 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-dird_catreq.cc b/sysutils/bareos-server/files/patch-core-src-dird_catreq.cc deleted file mode 100644 index e16e259a9ffa..000000000000 --- a/sysutils/bareos-server/files/patch-core-src-dird_catreq.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- core/src/dird/catreq.cc 2022-01-21 09:00:16.883799000 -0500 -+++ core/src/dird/catreq.cc 2022-01-21 09:02:08.619060000 -0500 -@@ -656,7 +656,7 @@ - bool retval = false; - int32_t pktsiz; - size_t nbytes; -- ssize_t size = 0; -+// ssize_t size = 0; - int32_t message_length; /* message length */ - int spool_fd = -1; - POOLMEM* msg = GetPoolMemory(PM_MESSAGE); -@@ -680,7 +680,7 @@ - - while ((nbytes = read(spool_fd, (char*)&pktsiz, sizeof(int32_t))) - == sizeof(int32_t)) { -- size += sizeof(int32_t); -+ //size += sizeof(int32_t); - message_length = ntohl(pktsiz); - - if (message_length > 0) { -@@ -697,7 +697,7 @@ - goto bail_out; - } - msg[nbytes] = '\0'; -- size += nbytes; -+ //size += nbytes; - } - - if (!jcr->IsJobCanceled()) { diff --git a/sysutils/bareos-server/files/patch-core-src-dird_vbackup.cc b/sysutils/bareos-server/files/patch-core-src-dird_vbackup.cc new file mode 100644 index 000000000000..3711634ba505 --- /dev/null +++ b/sysutils/bareos-server/files/patch-core-src-dird_vbackup.cc @@ -0,0 +1,11 @@ +--- core/src/dird/vbackup.cc 2023-04-07 16:02:23.780510000 -0500 ++++ core/src/dird/vbackup.cc 2023-04-07 16:10:20.351116000 -0500 +@@ -77,7 +77,7 @@ + std::vector<std::string> JobList; + std::vector<std::string> JobsWithPurgedFiles; + +- bool operator()(int num_fields, char** row) ++ bool operator()([[maybe_unused]] int num_fields, char** row) + { + assert(num_fields == 5); + JobList.push_back(row[col_JobId]); diff --git a/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt b/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt index 64ee102c21f5..1c64699cf173 100644 --- a/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt +++ b/sysutils/bareos-server/files/patch-core-src-stored_CMakelists.txt @@ -1,20 +1,20 @@ ---- core/src/stored/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500 -+++ core/src/stored/CMakeLists.txt 2022-03-04 20:56:52.809609000 -0500 -@@ -219,7 +219,7 @@ - add_executable(bareos-sd stored.cc) +--- core/src/stored/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500 ++++ core/src/stored/CMakeLists.txt 2023-04-05 16:36:35.928423000 -0500 +@@ -168,7 +168,7 @@ + target_link_libraries(stored_objects PRIVATE Threads::Threads) target_link_libraries( -- bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads -+ bareos-sd PRIVATE stored_objects bareos bareossd bareosfind Threads::Threads ${JANSSON_LIBRARIES} +- bareos-sd PRIVATE stored_objects bareos bareossd bareosfind CLI11::CLI11 ++ bareos-sd PRIVATE ${JANSSON_LIBRARIES} stored_objects bareos bareossd bareosfind CLI11::CLI11 ) if(HAVE_WIN32) -@@ -228,7 +228,7 @@ +@@ -177,7 +177,7 @@ endif() if(HAVE_NDMP) target_link_libraries(stored_objects PRIVATE bareosndmp) - target_link_libraries(bareos-sd PRIVATE bareosndmp) -+ target_link_libraries(bareos-sd PRIVATE bareosndmp ${JANSSON_LIBRARIES}) ++ target_link_libraries(bareos-sd PRIVATE ${JANSSON_LIBRARIES} bareosndmp) endif() add_executable(bls ${BLSSRCS}) diff --git a/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt b/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt index b36747ce5725..014d82c162fb 100644 --- a/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt +++ b/sysutils/bareos-server/files/patch-core-src_CMakeLists.txt @@ -1,5 +1,5 @@ ---- core/src/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500 -+++ core/src/CMakeLists.txt 2022-01-15 09:38:46.009798000 -0500 +--- core/src/CMakeLists.txt 2023-03-24 08:05:20.000000000 -0500 ++++ core/src/CMakeLists.txt 2023-04-07 16:15:16.297335000 -0500 @@ -18,7 +18,9 @@ # 02110-1301, USA. message("Entering ${CMAKE_CURRENT_SOURCE_DIR}") @@ -11,7 +11,15 @@ if(NOT client-only) add_subdirectory(tools) -@@ -47,17 +49,21 @@ +@@ -40,24 +42,28 @@ + elseif(NOT GTest_FOUND) + message(STATUS "Skipping unit tests as gtest was not found") + else() +- add_subdirectory(tests) ++# add_subdirectory(tests) + endif() + + if(BUILD_BENCHMARKS) add_subdirectory(benchmarks) endif() diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist index 92d36471b076..b9f5687e3ee7 100644 --- a/sysutils/bareos-server/pkg-plist +++ b/sysutils/bareos-server/pkg-plist @@ -10,19 +10,14 @@ bin/bwild @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 -%%CEPHFS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-cephfs.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/fileset/plugin-ovirt.conf.sample %%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/plugin-rados.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupCatalog.conf.sample -%%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 -%%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 @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/backup-ovirt.conf.sample @@ -40,34 +35,33 @@ bin/bwild @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 @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 -%%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 @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/messages/Standard.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/storage/bareos-sd.conf.sample +%%PYTHON%%@sample(,bareos,640) %%ETCDIR%%/bsmc.conf %%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 +lib/bareos/backends/libbareossd-file.so %%GFAPI%%lib/bareos/backends/libbareossd-gfapi.so -%%RADOS%%lib/bareos/backends/libbareossd-rados.so lib/bareos/backends/libbareossd-tape.so %%PYTHON%%lib/bareos/plugins/BareosDirPluginBaseclass.py +%%PYTHON%%lib/bareos/plugins/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 @@ -107,16 +101,16 @@ lib/bareos/scripts/mtx-changer lib/bareos/scripts/query.sql lib/bareos/scripts/update_bareos_tables lib/libbareoscats.so -lib/libbareoscats.so.21 +lib/libbareoscats.so.22 lib/libbareoscats.so.%%LIB_VERSION%% %%NDMP%%lib/libbareosndmp.so -%%NDMP%%lib/libbareosndmp.so.21 +%%NDMP%%lib/libbareosndmp.so.22 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%% lib/libbareossd.so -lib/libbareossd.so.21 +lib/libbareossd.so.22 lib/libbareossd.so.%%LIB_VERSION%% lib/libbareossql.so -lib/libbareossql.so.21 +lib/libbareossql.so.22 lib/libbareossql.so.%%LIB_VERSION%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_EXT_SUFFIX%%.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_EXT_SUFFIX%%.so @@ -148,6 +142,7 @@ 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 diff --git a/sysutils/bareos-server/pkg-plist.client b/sysutils/bareos-server/pkg-plist.client index 910df16ea4e0..7d20044f4b48 100644 --- a/sysutils/bareos-server/pkg-plist.client +++ b/sysutils/bareos-server/pkg-plist.client @@ -1,4 +1,6 @@ +%%PYTHON%%bin/bareos-triggerjob.py bin/bconsole +%%PYTHON%%bin/bsmc @sample %%ETCDIR%%/bareos-fd.d/client/myself.conf.sample @group bareos @sample %%ETCDIR%%/bareos-fd.d/director/bareos-dir.conf.sample @@ -9,6 +11,7 @@ bin/bconsole @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/BareosFdPluginLDAP.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLibcloud.py @@ -38,11 +41,31 @@ bin/bconsole %%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 -%%CEPHFS%%lib/bareos/plugins/cephfs-fd.so %%GFAPI%%lib/bareos/plugins/gfapi-fd.so %%PYTHON%%lib/bareos/plugins/python3-fd.so -%%RADOS%%lib/bareos/plugins/rados-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 lib/bareos/scripts/bareos lib/bareos/scripts/bareos-config lib/bareos/scripts/bareos-config-lib.sh @@ -52,16 +75,16 @@ lib/bareos/scripts/btraceback.dbx lib/bareos/scripts/btraceback.gdb lib/bareos/scripts/btraceback.mdb lib/libbareos.so -lib/libbareos.so.21 +lib/libbareos.so.22 lib/libbareos.so.%%LIB_VERSION%% lib/libbareosfastlz.so -lib/libbareosfastlz.so.21 +lib/libbareosfastlz.so.22 lib/libbareosfastlz.so.%%LIB_VERSION%% lib/libbareosfind.so -lib/libbareosfind.so.21 +lib/libbareosfind.so.22 lib/libbareosfind.so.%%LIB_VERSION%% lib/libbareoslmdb.so -lib/libbareoslmdb.so.21 +lib/libbareoslmdb.so.22 lib/libbareoslmdb.so.%%LIB_VERSION%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_EXT_SUFFIX%%.so share/man/man1/bconsole.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304102029.33AKTRhw037535>