sysutils/bareos20-*: update to 20.0.4

ChangeLog at:	https://github.com/bareos/bareos/blob/Release/20.0.4/CHANGELOG.md
This commit is contained in:
Jose Alonso Cardenas Marquez 2022-01-16 17:18:01 -05:00
parent 51d12f2341
commit 0f6df5cb66
7 changed files with 25 additions and 25 deletions

View file

@ -1,15 +1,15 @@
PORTNAME= bareos
PKGNAMESUFFIX= -client
PKGNAMESUFFIX= 20-client
COMMENT= Backup archiving recovery open sourced (client)
CONFLICTS= bareos19-client bareos18-client bareos17-client
CONFLICTS= bareos19-client bareos18-client bareos-client
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bareos-fd
PLIST= ${PKGDIR}/pkg-plist.client
MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server
MASTERDIR= ${.CURDIR}/../../sysutils/bareos20-server
OPTIONS_GROUP= PLUGINS
OPTIONS_GROUP_PLUGINS= CEPHFS GFAPI RADOS

View file

@ -1,10 +1,10 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
DISTVERSION= 20.0.3
DISTVERSION= 20.0.4
PORTREVISION?= 0
CATEGORIES?= sysutils
PKGNAMEPREFIX?= #
PKGNAMESUFFIX?= -server
PKGNAMESUFFIX?= 20-server
MAINTAINER= acm@FreeBSD.org
COMMENT?= Backup archiving recovery open sourced (server)
@ -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?= bareos19-server bareos18-server bareos-server
LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \
libjansson.so:devel/jansson
@ -43,7 +43,7 @@ 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"
.if ${PKGNAMESUFFIX} == "20-server"
OPTIONS_GROUP= BACKENDS
OPTIONS_GROUP_BACKENDS= CEPHFS GFAPI RADOS
OPTIONS_DEFINE= MTX PYTHON LMDB NDMP NLS SCSICRYPTO
@ -71,14 +71,14 @@ 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
.if ${PKGNAMESUFFIX} == "20-client" || ${PKGNAMESUFFIX} == "20-server" #Till end of the file
PYTHON_USES= python
PYTHON_CMAKE_ON= -Dpython=ON
PYTHON_CMAKE_OFF= -Dpython=OFF
PYTHON_PLUGIN= yes
.if !defined(WITH_CLIENT_ONLY)
LIB_DEPENDS+= libbareos.so:sysutils/bareos-client
LIB_DEPENDS+= libbareos.so:sysutils/bareos20-client
USE_RC_SUBR?= bareos-dir bareos-sd
.endif
@ -207,7 +207,7 @@ MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}"
post-patch:
@${REINPLACE_CMD} '76,79d' ${WRKSRC}/CMakeLists.txt
.if ${PKGNAMESUFFIX} == "-server"
.if ${PKGNAMESUFFIX} == "20-server"
@${REINPLACE_CMD} '45d' ${WRKSRC}/core/src/CMakeLists.txt
@${REINPLACE_CMD} '51d' ${WRKSRC}/core/src/plugins/CMakeLists.txt
.endif

View file

@ -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 = 1638838349
SHA256 (bareos-bareos-Release-20.0.4_GH0.tar.gz) = 843f7dd4bbf14ffa2842cba61c48e442b7040da1eefe13a76afceca03d98ab21
SIZE (bareos-bareos-Release-20.0.4_GH0.tar.gz) = 13341880

View file

@ -1,5 +1,5 @@
--- 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
--- core/src/stored/CMakeLists.txt 2021-11-22 05:52:19.000000000 -0500
+++ core/src/stored/CMakeLists.txt 2022-01-15 09:50:59.125922000 -0500
@@ -226,23 +226,23 @@
list(APPEND BAREOS_SD_LIBRARIES comctl32)
endif()
@ -9,7 +9,7 @@
add_executable(bls ${BLSSRCS})
-target_link_libraries(bls bareos bareossd bareosfind)
+target_link_libraries(bls bareos bareossd bareosfind ${PTHREAD_LIBRARIES})
+target_link_libraries(bls bareos bareossd bareosfind ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
add_executable(bextract ${BEXTRACTSRS})
-target_link_libraries(bextract bareossd bareosfind bareos)
@ -17,7 +17,7 @@
add_executable(bscan ${BSCANSRCS})
-target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats)
+target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${PTHREAD_LIBRARIES})
+target_link_libraries(bscan bareos bareossd bareosfind bareossql bareoscats ${JANSSON_LIBRARIES} ${PTHREAD_LIBRARIES})
add_executable(btape ${BTAPESRCS})
-target_link_libraries(btape bareossd bareos)

View file

@ -1,12 +1,12 @@
PORTNAME= bareos
PKGNAMESUFFIX= -traymonitor
PKGNAMESUFFIX= 20-traymonitor
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= bareos-traymonitor bareos18-traymonitor bareos19-traymonitor
USES= desktop-file-utils gettext-runtime pkgconfig qt:5
USE_QT= buildtools_build qmake_build uitools_build gui core
@ -15,7 +15,7 @@ WITH_BAT= yes
PLIST= ${.CURDIR}/pkg-plist
CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1
MASTERDIR= ${.CURDIR}/../../sysutils/bareos-server
MASTERDIR= ${.CURDIR}/../../sysutils/bareos20-server
CMAKE_ARGS+= -Dtraymonitor=yes \
-Dbuild-dird=no \

View file

@ -1,8 +1,8 @@
PORTNAME= bareos
DISTVERSIONPREFIX= Release/
DISTVERSION= 20.0.3
DISTVERSION= 20.0.4
CATEGORIES?= www sysutils
PKGNAMESUFFIX= -webui
PKGNAMESUFFIX= 20-webui
MAINTAINER= acm@FreeBSD.org
COMMENT= PHP-Frontend to manage Bareos over the web

View file

@ -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 = 1642364205
SHA256 (bareos-bareos-Release-20.0.4_GH0.tar.gz) = 843f7dd4bbf14ffa2842cba61c48e442b7040da1eefe13a76afceca03d98ab21
SIZE (bareos-bareos-Release-20.0.4_GH0.tar.gz) = 13341880