mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-28 05:29:48 +00:00
sysutils/bareos-*: update to 21.0.0
ChangeLog at: https://github.com/bareos/bareos/blob/Release/21.0.0/CHANGELOG.md
This commit is contained in:
Jose Alonso Cardenas Marquez
parent
47675a85e7
commit
11a983cdb0
@ -3,7 +3,7 @@ PKGNAMESUFFIX= -client
|
||||
|
||||
COMMENT= Backup archiving recovery open sourced (client)
|
||||
|
||||
CONFLICTS= bareos19-client bareos18-client bareos17-client
|
||||
CONFLICTS= bareos20-client bareos19-client bareos18-client
|
||||
|
||||
WITH_CLIENT_ONLY=yes
|
||||
USE_RC_SUBR= bareos-fd
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
PORTNAME= bareos
|
||||
DISTVERSIONPREFIX= Release/
|
||||
DISTVERSION= 20.0.3
|
||||
DISTVERSION= 21.0.0
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES?= sysutils
|
||||
PKGNAMEPREFIX?= #
|
||||
@ -12,7 +12,7 @@ COMMENT?= Backup archiving recovery open sourced (server)
|
||||
LICENSE= AGPLv3 LGPL3
|
||||
LICENSE_COMB= multi
|
||||
|
||||
CONFLICTS?= bareos19-server bareos18-server bareos17-server
|
||||
CONFLICTS?= bareos20-server bareos19-server bareos18-server
|
||||
|
||||
LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
|
||||
libjansson.so:devel/jansson
|
||||
@ -48,7 +48,7 @@ OPTIONS_GROUP= BACKENDS
|
||||
OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
|
||||
OPTIONS_DEFINE= MTX PYTHON LMDB NDMP NLS SCSICRYPTO
|
||||
OPTIONS_DEFAULT+= LMDB PGSQL SCSICRYPTO
|
||||
OPTIONS_SINGLE_DATABASE= SQLITE3 MYSQL PGSQL
|
||||
OPTIONS_SINGLE_DATABASE= PGSQL
|
||||
OPTIONS_SINGLE+= DATABASE
|
||||
BACKENDS_DESC= Storage backends
|
||||
DATABASE_DESC= Database support
|
||||
@ -170,10 +170,6 @@ CMAKE_ARGS+= -Dbuild-dird=ON \
|
||||
-Dbuild_client_only=OFF
|
||||
# Server default database
|
||||
|
||||
MYSQL_CMAKE_ON= -Dmysql=ON
|
||||
MYSQL_USES= mysql
|
||||
SQLITE3_CMAKE_ON= -Dsqlite3=ON
|
||||
SQLITE3_LIB_DEPENDS= libsqlite3.so:databases/sqlite3
|
||||
PGSQL_CMAKE_ON= -Dpostgresql=ON
|
||||
PGSQL_USES= pgsql
|
||||
|
||||
@ -206,7 +202,7 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1
|
||||
MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"
|
||||
|
||||
post-patch:
|
||||
@${REINPLACE_CMD} '76,79d' ${WRKSRC}/CMakeLists.txt
|
||||
@${REINPLACE_CMD} '120,123d' ${WRKSRC}/CMakeLists.txt
|
||||
.if ${PKGNAMESUFFIX} == "-server"
|
||||
@${REINPLACE_CMD} '45d' ${WRKSRC}/core/src/CMakeLists.txt
|
||||
@${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
|
||||
@ -232,7 +228,7 @@ post-install:
|
||||
${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
|
||||
${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample
|
||||
# ${MV} ${STAGEDIR}${ETCDIR}/bareos-regress.conf ${STAGEDIR}${ETCDIR}//bareos-regress.conf.sample
|
||||
.endif
|
||||
@${MKDIR} ${STAGEDIR}/var/run/bareos
|
||||
.endif
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1636154330
|
||||
SHA256 (bareos-bareos-Release-20.0.3_GH0.tar.gz) = 261be0f4b2843ccdf7593b627a479673a51cd3e8c7484c74ea963548f5f1b696
|
||||
SIZE (bareos-bareos-Release-20.0.3_GH0.tar.gz) = 13335390
|
||||
TIMESTAMP = 1640125659
|
||||
SHA256 (bareos-bareos-Release-21.0.0_GH0.tar.gz) = 20ff1f691552ea27c86c3d4687e02ebcbb346f332ee4db9d90fc4d852b806c02
|
||||
SIZE (bareos-bareos-Release-21.0.0_GH0.tar.gz) = 11306618
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
--- core/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500
|
||||
+++ core/CMakeLists.txt 2020-12-26 21:28:44.141734000 -0500
|
||||
@@ -256,7 +256,9 @@
|
||||
set(PSCMD "ps -ax -o pid,command")
|
||||
--- core/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500
|
||||
+++ core/CMakeLists.txt 2021-12-21 20:45:08.474921000 -0500
|
||||
@@ -283,7 +283,9 @@
|
||||
set(HAVE_FREEBSD_OS 1)
|
||||
include_directories(/usr/local/include)
|
||||
link_directories(/usr/local/lib)
|
||||
- link_libraries(intl)
|
||||
@ -11,29 +11,27 @@
|
||||
endif()
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
||||
@@ -323,8 +325,11 @@
|
||||
@@ -347,7 +349,9 @@
|
||||
add_definitions("-D_FILE_OFFSET_BITS=64")
|
||||
endif()
|
||||
|
||||
-include(FindIntl)
|
||||
|
||||
+IF(nls)
|
||||
+ INCLUDE(FindIntl)
|
||||
+ include(FindIntl)
|
||||
+ENDIF()
|
||||
+
|
||||
|
||||
if(developer)
|
||||
add_definitions("-DDEVELOPER=1")
|
||||
endif()
|
||||
@@ -347,7 +352,7 @@
|
||||
if(NOT client-only)
|
||||
@@ -365,7 +369,7 @@
|
||||
include(BareosFindStaticCodeAnalysisTools)
|
||||
|
||||
if(NOT client-only
|
||||
- AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS"
|
||||
+ AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS|FreeBSD"
|
||||
AND CMAKE_SIZEOF_VOID_P EQUAL 8
|
||||
)
|
||||
# droplet does not build on solaris because of sys/cdefs.h: No such file or
|
||||
# directory
|
||||
- if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
|
||||
+ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "SunOS|FreeBSD")
|
||||
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/droplet/CMakeLists.txt)
|
||||
message(
|
||||
FATAL_ERROR
|
||||
@@ -771,7 +776,6 @@
|
||||
@@ -779,7 +783,6 @@
|
||||
|
||||
add_subdirectory(scripts)
|
||||
add_subdirectory(manpages)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- core/cmake/BareosFindAllLibraries.cmake 2021-06-10 10:37:18.000000000 -0500
|
||||
+++ core/cmake/BareosFindAllLibraries.cmake 2021-07-09 21:07:45.799522000 -0500
|
||||
@@ -37,55 +37,39 @@
|
||||
--- core/cmake/BareosFindAllLibraries.cmake 2021-12-21 06:00:49.000000000 -0500
|
||||
+++ core/cmake/BareosFindAllLibraries.cmake 2021-12-22 00:16:58.093078000 -0500
|
||||
@@ -42,56 +42,39 @@
|
||||
set(Python3_FOUND 0)
|
||||
|
||||
else()
|
||||
@ -40,6 +40,7 @@
|
||||
- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake
|
||||
- )
|
||||
- include(${CMAKE_CURRENT_BINARY_DIR}/py2settings.cmake)
|
||||
- set(Python2_CCSHARED ${Python2_CC_FLAGS} -Wno-register)
|
||||
- endif()
|
||||
|
||||
- if(${Python3_FOUND})
|
||||
@ -83,10 +84,10 @@
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -164,12 +148,18 @@
|
||||
@@ -169,12 +152,18 @@
|
||||
)
|
||||
endif()
|
||||
|
||||
bareosfindlibraryandheaders("jansson" "jansson.h" "")
|
||||
-bareosfindlibraryandheaders("rados" "rados/librados.h" "")
|
||||
-bareosfindlibraryandheaders("radosstriper" "radosstriper/libradosstriper.h" "")
|
||||
-bareosfindlibraryandheaders("cephfs" "cephfs/libcephfs.h" "")
|
||||
|
||||
@ -1,14 +1,16 @@
|
||||
--- core/manpages/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500
|
||||
+++ core/manpages/CMakeLists.txt 2020-01-31 15:33:19.205416000 -0500
|
||||
@@ -17,9 +17,11 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
--- 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 @@
|
||||
# 02110-1301, USA.
|
||||
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
-set(MAN1 bconsole.1 bsmtp.1)
|
||||
+if(client-only)
|
||||
set(MAN1 bconsole.1)
|
||||
+ set(MAN1 bconsole.1 bsmtp.1)
|
||||
|
||||
set(MAN8 bareos-fd.8 bareos.8)
|
||||
-set(MAN8 bareos-fd.8 bareos.8 btraceback.8)
|
||||
+ set(MAN8 bareos-fd.8 bareos.8 btraceback.8)
|
||||
+endif()
|
||||
|
||||
if(NOT client-only)
|
||||
set(MAN1-server
|
||||
set(MAN1-server bareos-tray-monitor.1 bwild.1 bregex.1)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
--- core/scripts/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500
|
||||
+++ core/scripts/CMakeLists.txt 2020-01-31 15:37:16.832224000 -0500
|
||||
@@ -17,33 +17,35 @@
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
--- 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 @@
|
||||
# 02110-1301, USA.
|
||||
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
|
||||
-install(
|
||||
- FILES bareos btraceback
|
||||
@ -11,12 +11,12 @@
|
||||
- DESTINATION "${sbindir}"
|
||||
-)
|
||||
+if(client-only)
|
||||
+ install(
|
||||
+ FILES bareos btraceback
|
||||
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
|
||||
+ WORLD_READ WORLD_EXECUTE
|
||||
+ DESTINATION "${sbindir}"
|
||||
+ )
|
||||
+ install(
|
||||
+ FILES bareos btraceback
|
||||
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
|
||||
+ WORLD_READ WORLD_EXECUTE
|
||||
+ DESTINATION "${sbindir}"
|
||||
+ )
|
||||
|
||||
-install(
|
||||
- FILES bareos-ctl-fd
|
||||
@ -25,35 +25,40 @@
|
||||
- DESTINATION "${scriptdir}"
|
||||
- COMPONENT filedaemon
|
||||
-)
|
||||
+ install(
|
||||
+ FILES bareos-ctl-fd
|
||||
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
|
||||
+ WORLD_READ WORLD_EXECUTE
|
||||
+ DESTINATION "${scriptdir}"
|
||||
+ COMPONENT filedaemon
|
||||
+ )
|
||||
+ install(
|
||||
+ FILES bareos-ctl-fd
|
||||
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
|
||||
+ WORLD_READ WORLD_EXECUTE
|
||||
+ DESTINATION "${scriptdir}"
|
||||
+ COMPONENT filedaemon
|
||||
+ )
|
||||
|
||||
-install(
|
||||
- FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config
|
||||
- bareos-config-lib.sh bareos-ctl-funcs
|
||||
- FILES bareos bareos-config
|
||||
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
|
||||
- WORLD_READ WORLD_EXECUTE
|
||||
- DESTINATION "${scriptdir}"
|
||||
-)
|
||||
+ install(
|
||||
+ FILES bareos btraceback.gdb btraceback.dbx btraceback.mdb bareos-config
|
||||
+ bareos-config-lib.sh bareos-ctl-funcs
|
||||
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
|
||||
+ WORLD_READ WORLD_EXECUTE
|
||||
+ DESTINATION "${scriptdir}"
|
||||
+ )
|
||||
+ 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}"
|
||||
-)
|
||||
+ 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(NOT client-only)
|
||||
install(
|
||||
FILES mtx-changer disk-changer bareos-explorer bareos-glusterfind-wrapper
|
||||
- bareos-ctl-dir bareos-ctl-sd bareos-ctl-funcs
|
||||
+ bareos-ctl-dir bareos-ctl-sd
|
||||
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
|
||||
WORLD_READ WORLD_EXECUTE
|
||||
DESTINATION "${scriptdir}"
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
--- core/src/dird/dbcopy/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500
|
||||
+++ core/src/dird/dbcopy/CMakeLists.txt 2020-12-23 22:44:13.161935000 -0500
|
||||
@@ -33,7 +33,8 @@
|
||||
)
|
||||
target_link_libraries(
|
||||
bareos-dbcopy bareos dird_objects bareosfind bareoscats bareossql
|
||||
- $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> ${LMDB_LIBS}
|
||||
+ $<$<BOOL:HAVE_PAM>:${PAM_LIBRARIES}> ${LMDB_LIBS}
|
||||
+ ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES}
|
||||
)
|
||||
|
||||
install(TARGETS bareos-dbcopy DESTINATION "${sbindir}")
|
||||
@ -1,21 +1,20 @@
|
||||
--- core/src/dird/CMakeLists.txt 2020-01-31 11:21:18.000000000 -0500
|
||||
+++ core/src/dird/CMakeLists.txt 2020-01-31 15:41:53.134935000 -0500
|
||||
@@ -148,7 +148,8 @@
|
||||
add_executable(bareos-dir ${DIRDSRCS})
|
||||
--- 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)
|
||||
target_sources(bareos-dir PRIVATE dird.cc)
|
||||
|
||||
set(BAREOS_DIR_LIBRARIES dird_objects bareos bareoscats bareossql bareosfind
|
||||
- ${LMDB_LIBS} ${NDMP_LIBS}
|
||||
+ ${LMDB_LIBS} ${NDMP_LIBS} ${OPENSSL_LIBRARIES}
|
||||
+ ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES}
|
||||
)
|
||||
-target_link_libraries(bareos-dir PRIVATE dird_objects bareossql bareosfind)
|
||||
+target_link_libraries(bareos-dir PRIVATE dird_objects bareossql bareosfind ${JANSSON_LIBRARIES})
|
||||
|
||||
if(HAVE_WIN32)
|
||||
@@ -166,7 +167,7 @@
|
||||
target_sources(
|
||||
@@ -184,7 +184,7 @@
|
||||
add_executable(bareos-dbcheck ${DBCHKSRCS})
|
||||
set(DBCHECK_LIBRARIES bareossql bareos bareosfind bareoscats)
|
||||
|
||||
-target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES})
|
||||
+target_link_libraries(bareos-dbcheck ${DBCHECK_LIBRARIES} ${OPENSSL_LIBRARIES} ${PTHREAD_LIBRARIES} ${JANSSON_LIBRARIES})
|
||||
target_link_libraries(
|
||||
- bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES}
|
||||
+ bareos-dbcheck PRIVATE bareossql bareos bareosfind ${OPENSSL_LIBRARIES} ${JANSSON_LIBRARIES}
|
||||
)
|
||||
|
||||
# is not built by default
|
||||
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
--- core/src/plugins/stored/CMakeLists.txt 2020-02-01 12:41:50.658146000 -0500
|
||||
+++ core/src/plugins/stored/CMakeLists.txt 2020-02-01 12:43:09.372433000 -0500
|
||||
@@ -27,6 +27,10 @@
|
||||
${PROJECT_SOURCE_DIR}/src/win32/plugins/python/lib/${WINDOWS_BITS}
|
||||
)
|
||||
add_definitions(-DMS_WIN${WINDOWS_BITS})
|
||||
+else()
|
||||
--- 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
|
||||
@@ -33,6 +33,12 @@
|
||||
endif()
|
||||
endif()
|
||||
|
||||
+if(HAVE_FREEBSD_OS)
|
||||
+ include_directories(
|
||||
+ ${PROJECT_SOURCE_DIR}/src/fastlz/include
|
||||
+ )
|
||||
endif()
|
||||
+endif()
|
||||
+
|
||||
add_subdirectory(python)
|
||||
|
||||
add_library(autoxflate-sd MODULE autoxflate-sd.cc)
|
||||
add_library(autoxflate-sd MODULE autoxflate/autoxflate-sd.cc)
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
--- core/src/stored/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500
|
||||
+++ core/src/stored/CMakeLists.txt 2021-02-19 16:15:32.925944000 -0500
|
||||
@@ -226,23 +226,23 @@
|
||||
list(APPEND BAREOS_SD_LIBRARIES comctl32)
|
||||
endif()
|
||||
|
||||
-target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES})
|
||||
+target_link_libraries(bareos-sd stored_objects ${BAREOS_SD_LIBRARIES} ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
|
||||
|
||||
add_executable(bls ${BLSSRCS})
|
||||
-target_link_libraries(bls bareos bareossd bareosfind)
|
||||
+target_link_libraries(bls bareos bareossd bareosfind ${PTHREAD_LIBRARIES})
|
||||
|
||||
add_executable(bextract ${BEXTRACTSRS})
|
||||
-target_link_libraries(bextract bareossd bareosfind bareos)
|
||||
+target_link_libraries(bextract bareossd bareosfind bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
|
||||
|
||||
add_executable(bscan ${BSCANSRCS})
|
||||
-target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats)
|
||||
+target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${PTHREAD_LIBRARIES})
|
||||
|
||||
add_executable(btape ${BTAPESRCS})
|
||||
-target_link_libraries(btape bareossd bareos)
|
||||
+target_link_libraries(btape bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
|
||||
|
||||
add_executable(bcopy ${BCOPYSRCS})
|
||||
|
||||
-target_link_libraries(bcopy bareossd bareos)
|
||||
+target_link_libraries(bcopy bareossd bareos ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
|
||||
|
||||
install(TARGETS bareossd DESTINATION ${libdir})
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- core/src/CMakeLists.txt 2020-12-16 02:46:16.000000000 -0500
|
||||
+++ core/src/CMakeLists.txt 2020-12-27 00:51:12.356192000 -0500
|
||||
--- core/src/CMakeLists.txt 2021-12-21 06:00:49.000000000 -0500
|
||||
+++ core/src/CMakeLists.txt 2022-01-15 09:38:46.009798000 -0500
|
||||
@@ -18,7 +18,9 @@
|
||||
# 02110-1301, USA.
|
||||
message("Entering ${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
@ -11,15 +11,20 @@
|
||||
|
||||
if(NOT client-only)
|
||||
add_subdirectory(tools)
|
||||
@@ -43,14 +45,18 @@
|
||||
add_subdirectory(tests)
|
||||
@@ -47,17 +49,21 @@
|
||||
add_subdirectory(benchmarks)
|
||||
endif()
|
||||
|
||||
-add_subdirectory(console)
|
||||
-if(ENABLE_BCONSOLE)
|
||||
- add_subdirectory(console)
|
||||
-endif()
|
||||
+if(client-only)
|
||||
+ if(ENABLE_BCONSOLE)
|
||||
+ add_subdirectory(console)
|
||||
+ endif()
|
||||
|
||||
-if(${HAVE_LMDB})
|
||||
- add_subdirectory(lmdb)
|
||||
+if(client-only)
|
||||
+ add_subdirectory(console)
|
||||
+ if(${HAVE_LMDB})
|
||||
+ add_subdirectory(lmdb)
|
||||
+ endif()
|
||||
|
||||
@ -42,7 +42,7 @@ bin/bwild
|
||||
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/NULL.conf.sample
|
||||
%%RADOS%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Rados.conf.sample
|
||||
@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Tape.conf.sample
|
||||
@sample(,bareos,640) %%ETCDIR%%/bareos-regress.conf.sample
|
||||
@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
|
||||
@ -78,14 +78,10 @@ lib/bareos/scripts/bareos-ctl-sd
|
||||
lib/bareos/scripts/bareos-explorer
|
||||
lib/bareos/scripts/bareos-glusterfind-wrapper
|
||||
lib/bareos/scripts/create_bareos_database
|
||||
%%MYSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
|
||||
%%PGSQL%%lib/bareos/scripts/ddl/creates/%%DBTYPE%%.sql
|
||||
%%MYSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
|
||||
%%PGSQL%%lib/bareos/scripts/ddl/drops/%%DBTYPE%%.sql
|
||||
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-change_owner.dbconfig-template.sql
|
||||
%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
|
||||
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%-readonly.sql
|
||||
%%MYSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
|
||||
%%PGSQL%%lib/bareos/scripts/ddl/grants/%%DBTYPE%%.sql
|
||||
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.10_11.sql
|
||||
lib/bareos/scripts/ddl/updates/%%DBTYPE%%.11_12.sql
|
||||
@ -96,6 +92,7 @@ lib/bareos/scripts/ddl/updates/%%DBTYPE%%.2002_2003.sql
|
||||
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
|
||||
%%PGSQL%%lib/bareos/scripts/ddl/updates/%%DBTYPE%%.bee.1017_2004.sql
|
||||
lib/bareos/scripts/ddl/versions.map
|
||||
lib/bareos/scripts/delete_catalog_backup
|
||||
@ -110,23 +107,23 @@ lib/bareos/scripts/mtx-changer
|
||||
lib/bareos/scripts/query.sql
|
||||
lib/bareos/scripts/update_bareos_tables
|
||||
lib/libbareoscats.so
|
||||
lib/libbareoscats.so.20
|
||||
lib/libbareoscats.so.21
|
||||
lib/libbareoscats.so.%%LIB_VERSION%%
|
||||
%%NDMP%%lib/libbareosndmp.so
|
||||
%%NDMP%%lib/libbareosndmp.so.20
|
||||
%%NDMP%%lib/libbareosndmp.so.21
|
||||
%%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%%
|
||||
lib/libbareossd.so
|
||||
lib/libbareossd.so.21
|
||||
lib/libbareossd.so.%%LIB_VERSION%%
|
||||
lib/libbareossql.so
|
||||
lib/libbareossql.so.20
|
||||
lib/libbareossql.so.21
|
||||
lib/libbareossql.so.%%LIB_VERSION%%
|
||||
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_EXT_SUFFIX%%.so
|
||||
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_EXT_SUFFIX%%.so
|
||||
man/man1/bareos-tray-monitor.1.gz
|
||||
man/man1/bregex.1.gz
|
||||
man/man1/bsmtp.1.gz
|
||||
man/man1/bwild.1.gz
|
||||
man/man8/bareos-dbcheck.8.gz
|
||||
man/man8/bareos-dbcopy.8.gz
|
||||
man/man8/bareos-dir.8.gz
|
||||
man/man8/bareos-sd.8.gz
|
||||
man/man8/bcopy.8.gz
|
||||
@ -136,9 +133,7 @@ man/man8/bpluginfo.8.gz
|
||||
man/man8/bscan.8.gz
|
||||
man/man8/bscrypto.8.gz
|
||||
man/man8/btape.8.gz
|
||||
man/man8/btraceback.8.gz
|
||||
sbin/bareos-dbcheck
|
||||
sbin/bareos-dbcopy
|
||||
sbin/bareos-dir
|
||||
sbin/bareos-sd
|
||||
sbin/bcopy
|
||||
|
||||
@ -14,6 +14,7 @@ bin/bconsole
|
||||
%%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
|
||||
@ -23,6 +24,7 @@ bin/bconsole
|
||||
%%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
|
||||
@ -50,21 +52,23 @@ lib/bareos/scripts/btraceback.dbx
|
||||
lib/bareos/scripts/btraceback.gdb
|
||||
lib/bareos/scripts/btraceback.mdb
|
||||
lib/libbareos.so
|
||||
lib/libbareos.so.20
|
||||
lib/libbareos.so.21
|
||||
lib/libbareos.so.%%LIB_VERSION%%
|
||||
lib/libbareosfastlz.so
|
||||
lib/libbareosfastlz.so.20
|
||||
lib/libbareosfastlz.so.21
|
||||
lib/libbareosfastlz.so.%%LIB_VERSION%%
|
||||
lib/libbareosfind.so
|
||||
lib/libbareosfind.so.20
|
||||
lib/libbareosfind.so.21
|
||||
lib/libbareosfind.so.%%LIB_VERSION%%
|
||||
lib/libbareoslmdb.so
|
||||
lib/libbareoslmdb.so.20
|
||||
lib/libbareoslmdb.so.21
|
||||
lib/libbareoslmdb.so.%%LIB_VERSION%%
|
||||
%%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_EXT_SUFFIX%%.so
|
||||
man/man1/bconsole.1.gz
|
||||
man/man1/bsmtp.1.gz
|
||||
man/man8/bareos-fd.8.gz
|
||||
man/man8/bareos.8.gz
|
||||
man/man8/btraceback.8.gz
|
||||
@group bareos
|
||||
sbin/bareos
|
||||
@group bareos
|
||||
|
||||
@ -6,7 +6,7 @@ COMMENT= Backup archiving recovery open sourced (traymonitor)
|
||||
LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \
|
||||
libbareos.so:sysutils/bareos-client
|
||||
|
||||
CONFLICTS= bareos17-traymonitor bareos18-traymonitor bareos19-traymonitor
|
||||
CONFLICTS= bareos18-traymonitor bareos19-traymonitor bareos20-traymonitor
|
||||
|
||||
USES= desktop-file-utils gettext-runtime pkgconfig qt:5
|
||||
USE_QT= buildtools_build qmake_build uitools_build gui core
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
PORTNAME= bareos
|
||||
DISTVERSIONPREFIX= Release/
|
||||
DISTVERSION= 20.0.3
|
||||
DISTVERSION= 21.0.0
|
||||
CATEGORIES?= www sysutils
|
||||
PKGNAMESUFFIX= -webui
|
||||
|
||||
@ -28,10 +28,9 @@ SUB_FILES= pkg-message
|
||||
SUB_LIST+= ETCDIRWEBUI=${PREFIX}/${ETCDIRWEBUI}
|
||||
PLIST_SUB+= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} ETCDIRWEBUI=${ETCDIRWEBUI}
|
||||
|
||||
OPTIONS_DEFINE= MYSQL PGSQL
|
||||
OPTIONS_DEFINE= PGSQL
|
||||
OPTIONS_DEFAULT= PGSQL
|
||||
|
||||
MYSQL_USE= PHP=pdo_mysql
|
||||
PGSQL_USE= PHP=pdo_pgsql
|
||||
|
||||
ETCDIRWEBUI= etc/${PORTNAME}${PKGNAMESUFFIX}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1636162056
|
||||
SHA256 (bareos-bareos-Release-20.0.3_GH0.tar.gz) = 261be0f4b2843ccdf7593b627a479673a51cd3e8c7484c74ea963548f5f1b696
|
||||
SIZE (bareos-bareos-Release-20.0.3_GH0.tar.gz) = 13335390
|
||||
TIMESTAMP = 1642368462
|
||||
SHA256 (bareos-bareos-Release-21.0.0_GH0.tar.gz) = 20ff1f691552ea27c86c3d4687e02ebcbb346f332ee4db9d90fc4d852b806c02
|
||||
SIZE (bareos-bareos-Release-21.0.0_GH0.tar.gz) = 11306618
|
||||
|
||||
@ -132,6 +132,7 @@
|
||||
%%WWWDIR%%/module/Job/view/job/job/details.phtml
|
||||
%%WWWDIR%%/module/Job/view/job/job/index.phtml
|
||||
%%WWWDIR%%/module/Job/view/job/job/run.phtml
|
||||
%%WWWDIR%%/module/Job/view/job/job/timeline.phtml
|
||||
%%WWWDIR%%/module/Media/Module.php
|
||||
%%WWWDIR%%/module/Media/autoload_classmap.php
|
||||
%%WWWDIR%%/module/Media/config/module.config.php
|
||||
@ -228,6 +229,8 @@
|
||||
%%WWWDIR%%/public/img/icons/os/univention.png
|
||||
%%WWWDIR%%/public/img/icons/os/windows.png
|
||||
%%WWWDIR%%/public/index.php
|
||||
%%WWWDIR%%/public/js/apexcharts.js
|
||||
%%WWWDIR%%/public/js/apexcharts.min.js
|
||||
%%WWWDIR%%/public/js/bootstrap-datetimepicker.min.js
|
||||
%%WWWDIR%%/public/js/bootstrap-select.js
|
||||
%%WWWDIR%%/public/js/bootstrap-select.js.map
|
||||
@ -293,6 +296,42 @@
|
||||
%%WWWDIR%%/public/js/locale/tr_TR/LC_MESSAGES/tr_TR.po
|
||||
%%WWWDIR%%/public/js/locale/uk_UA/LC_MESSAGES/uk_UA.mo
|
||||
%%WWWDIR%%/public/js/locale/uk_UA/LC_MESSAGES/uk_UA.po
|
||||
%%WWWDIR%%/public/js/locales/ar.json
|
||||
%%WWWDIR%%/public/js/locales/ca.json
|
||||
%%WWWDIR%%/public/js/locales/cs.json
|
||||
%%WWWDIR%%/public/js/locales/de.json
|
||||
%%WWWDIR%%/public/js/locales/el.json
|
||||
%%WWWDIR%%/public/js/locales/en.json
|
||||
%%WWWDIR%%/public/js/locales/es.json
|
||||
%%WWWDIR%%/public/js/locales/fi.json
|
||||
%%WWWDIR%%/public/js/locales/fr.json
|
||||
%%WWWDIR%%/public/js/locales/he.json
|
||||
%%WWWDIR%%/public/js/locales/hi.json
|
||||
%%WWWDIR%%/public/js/locales/hr.json
|
||||
%%WWWDIR%%/public/js/locales/hu.json
|
||||
%%WWWDIR%%/public/js/locales/hy.json
|
||||
%%WWWDIR%%/public/js/locales/id.json
|
||||
%%WWWDIR%%/public/js/locales/it.json
|
||||
%%WWWDIR%%/public/js/locales/ja.json
|
||||
%%WWWDIR%%/public/js/locales/ka.json
|
||||
%%WWWDIR%%/public/js/locales/ko.js
|
||||
%%WWWDIR%%/public/js/locales/ko.json
|
||||
%%WWWDIR%%/public/js/locales/lt.json
|
||||
%%WWWDIR%%/public/js/locales/nb.json
|
||||
%%WWWDIR%%/public/js/locales/nl.json
|
||||
%%WWWDIR%%/public/js/locales/pl.json
|
||||
%%WWWDIR%%/public/js/locales/pt-br.json
|
||||
%%WWWDIR%%/public/js/locales/pt.json
|
||||
%%WWWDIR%%/public/js/locales/rs.json
|
||||
%%WWWDIR%%/public/js/locales/ru.json
|
||||
%%WWWDIR%%/public/js/locales/se.json
|
||||
%%WWWDIR%%/public/js/locales/sk.json
|
||||
%%WWWDIR%%/public/js/locales/sl.json
|
||||
%%WWWDIR%%/public/js/locales/sq.json
|
||||
%%WWWDIR%%/public/js/locales/th.json
|
||||
%%WWWDIR%%/public/js/locales/tr.json
|
||||
%%WWWDIR%%/public/js/locales/ua.json
|
||||
%%WWWDIR%%/public/js/locales/zh-cn.json
|
||||
%%WWWDIR%%/public/js/moment-timezone-with-data.js
|
||||
%%WWWDIR%%/public/js/moment-timezone-with-data.min.js
|
||||
%%WWWDIR%%/public/js/moment-with-locales.js
|
||||
|
||||
Loading…
Reference in New Issue
Block a user