diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 3169247de1dd..b337c01882d6 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,241 +1,241 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 21.1.3 +DISTVERSION= 21.1.4 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 bareos19-server bareos18-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson USES+= cmake compiler:c++11-lang cpe localbase 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 SHEBANG_FILES= ${WRKSRC}/core/src/cats/make_catalog_backup.pl.in CPPFLAGS+= -I${LOCALBASE}/readline -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib 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= CEPHFS GFAPI RADOS 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 .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= -Dpython=ON -PYTHON_CMAKE_OFF= -Dpython=OFF +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 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) CONFFILES= fd CMAKE_ARGS+= -Dclient-only=ON 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 # Server default database PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include .if ${PORT_OPTIONS:MMYSQL} DBTYPE= mysql SUB_LIST+= REQ_MYSQL=mysql REQ_PGSQL="" .elif ${PORT_OPTIONS:MSQLITE3} DBTYPE= sqlite3 .else DBTYPE= postgresql SUB_LIST+= REQ_MYSQL="" REQ_PGSQL=postgresql .endif PLIST_SUB+= DBTYPE=${DBTYPE} .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} '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 .endif .if ${PKGNAMESUFFIX} == "-client" @${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt .endif 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' .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf ${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/distinfo b/sysutils/bareos-server/distinfo index 12ce9bd74752..b62e16c5e22d 100644 --- a/sysutils/bareos-server/distinfo +++ b/sysutils/bareos-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653200782 -SHA256 (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 3fc1241981f095c5e3db4e7476cdb273633b630820b1e1eff792b2c4d99b3d11 -SIZE (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 11639758 +TIMESTAMP = 1667251095 +SHA256 (bareos-bareos-Release-21.1.4_GH0.tar.gz) = ed898221182f2dbca712d0e85715cb5f9dd9d2c78f0e20eb7a13ae35d08701bb +SIZE (bareos-bareos-Release-21.1.4_GH0.tar.gz) = 11647699 diff --git a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake index f15a4678c330..e3ff7074a02f 100644 --- a/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake +++ b/sysutils/bareos-server/files/patch-core-cmake_BareosFindAllLibraries.cmake @@ -1,109 +1,25 @@ ---- 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() -- find_package(Python2 COMPONENTS Interpreter Development) -- find_package(Python3 COMPONENTS Interpreter Development) -+ if(python) -+ find_package(Python3 COMPONENTS Interpreter Development) - -- set(Python3_VERSION_MAJOR -- ${Python3_VERSION_MAJOR} -- PARENT_SCOPE -- ) -- -- set(Python3_VERSION_MINOR -- ${Python3_VERSION_MINOR} -- PARENT_SCOPE -- ) -- -- if(${Python2_FOUND} OR ${Python3_FOUND}) -- set(HAVE_PYTHON 1) -- endif() -- -- if(${Python2_FOUND}) -- set(PYTHON_EXECUTABLE -- ${Python2_EXECUTABLE} -+ set(Python3_VERSION_MAJOR -+ ${Python3_VERSION_MAJOR} - PARENT_SCOPE - ) -- set(Python2_EXECUTABLE -- ${Python2_EXECUTABLE} -- PARENT_SCOPE -- ) -- execute_process( -- COMMAND ${Python2_EXECUTABLE} -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py -- 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}) -- set(PYTHON_EXECUTABLE -- ${Python3_EXECUTABLE} -+ set(Python3_VERSION_MINOR -+ ${Python3_VERSION_MINOR} - PARENT_SCOPE - ) -- set(Python3_EXECUTABLE -- ${Python3_EXECUTABLE} -- PARENT_SCOPE -- ) -- execute_process( -- COMMAND ${Python3_EXECUTABLE} -- ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py -- OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake -- ) -- include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake) -+ -+ if(${Python3_FOUND}) -+ set(HAVE_PYTHON 1) -+ endif() -+ -+ if(${Python3_FOUND}) -+ set(PYTHON_EXECUTABLE -+ ${Python3_EXECUTABLE} -+ PARENT_SCOPE -+ ) -+ set(Python3_EXECUTABLE -+ ${Python3_EXECUTABLE} -+ PARENT_SCOPE -+ ) -+ execute_process( -+ COMMAND ${Python3_EXECUTABLE} -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/get_python_compile_settings.py -+ OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake -+ ) -+ include(${CMAKE_CURRENT_BINARY_DIR}/py3settings.cmake) -+ endif() - endif() - endif() - -@@ -169,12 +152,18 @@ +--- 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() -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" "") +endif() bareosfindlibraryandheaders("pam" "security/pam_appl.h" "") diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile index 7f18df2180b0..c7cc4e25b317 100644 --- a/sysutils/bareos-traymonitor/Makefile +++ b/sysutils/bareos-traymonitor/Makefile @@ -1,27 +1,27 @@ PORTNAME= bareos -PORTREVISION= 1 +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 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 widgets 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 .include "${MASTERDIR}/Makefile" diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile index 1aff77dab6f9..3eb0014a61bb 100644 --- a/www/bareos-webui/Makefile +++ b/www/bareos-webui/Makefile @@ -1,67 +1,67 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 21.1.3 +DISTVERSION= 21.1.4 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= openssl gettext ctype hash json 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 data module public vendor" \ ${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 ${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 8ffc5a7973f3..5607b68d699a 100644 --- a/www/bareos-webui/distinfo +++ b/www/bareos-webui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653201609 -SHA256 (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 3fc1241981f095c5e3db4e7476cdb273633b630820b1e1eff792b2c4d99b3d11 -SIZE (bareos-bareos-Release-21.1.3_GH0.tar.gz) = 11639758 +TIMESTAMP = 1667253078 +SHA256 (bareos-bareos-Release-21.1.4_GH0.tar.gz) = ed898221182f2dbca712d0e85715cb5f9dd9d2c78f0e20eb7a13ae35d08701bb +SIZE (bareos-bareos-Release-21.1.4_GH0.tar.gz) = 11647699