diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index c47c443856ff..746ad3064aa7 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,246 +1,246 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 25.0.1 -PORTREVISION?= 1 +DISTVERSION= 25.0.3 +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?= bareos22-server bareos23-server bareos24-server BUILD_DEPENDS+= utf8cpp>0:devel/utf8cpp \ microsoft-gsl>0:devel/microsoft-gsl \ xxhash>0:devel/xxhash \ tl-expected>0:devel/tl-expected \ cli11>0:devel/cli11 RUN_DEPENDS= bash:shells/bash LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson \ libfmt.so:devel/libfmt \ libxxhash.so:devel/xxhash USES+= cmake compiler:c++20-lang cpe localbase:ldflags perl5 pkgconfig readline \ shebangfix USE_GITHUB= yes USE_PERL5= run USE_CXXSTD?= c++20 USERS= bareos GROUPS= ${USERS} PLIST_SUB+= LIB_VERSION=${PORTVERSION} USE_LDCONFIG= yes SHEBANG_LANG= bash perl python SHEBANG_GLOB= *.sh *.py SHEBANG_FILES= ${WRKSRC}/contrib/misc/bsmc/bin/bsmc CPPFLAGS+= -I${LOCALBASE}/readline 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" IGNORE_i386= time_t too narrow on i386 FreeBSD, "core/src/dird/date_time.cc:79:76: error: format specifies type 'unsigned long' but the argument has type 'time_t'" 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 LMDB_DESC= Enable faster accurate backup 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= -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 \ -Dlocalbase=${LOCALBASE} .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 \ -DENABLE_NLS=ON NLS_CMAKE_OFF= -DENABLE_NLS=OFF # Client only or full server version .if defined(WITH_CLIENT_ONLY) CONFFILES= fd CMAKE_ARGS+= -Dclient-only=ON \ -DENABLE_WEBUI=OFF 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 \ -DENABLE_WEBUI=OFF # Server default database MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx PGSQL_CMAKE_ON= -Dpostgresql=ON PGSQL_USES= pgsql PGSQL_SUB_LIST= REQ_PGSQL=postgresql PGSQL_SUB_LIST_OFF= REQ_PGSQL="" .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: .if ${PKGNAMESUFFIX} == "-server" @${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 @${REINPLACE_CMD} -e 's|enable_testing()||g' ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e 's|CMAKE_CXX_STANDARD 20|CMAKE_CXX_STANDARD 17|g' ${WRKSRC}/core/CMakeLists.txt .endif @${REINPLACE_CMD} -e 's/CMAKE_INSTALL_FULL_DATAROOTDIR/CMAKE_INSTALL_DATAROOTDIR/g' \ ${WRKSRC}/cmake/BareosSetVariableDefaults.cmake \ ${WRKSRC}/webui/CMakeLists.txt 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' @${MV} ${WRKSRC}/contrib/misc/media_vault/media_vault.ini.example.in \ ${WRKSRC}/contrib/misc/media_vault/media_vault.ini.in @${MV} ${WRKSRC}/contrib/misc/media_vault/job_admin-media_vault.conf.example.in \ ${WRKSRC}/contrib/misc/media_vault/job_admin-media_vault.conf.in @${MV} ${WRKSRC}/contrib/misc/media_vault/console_media_vault.conf.example \ ${WRKSRC}/contrib/misc/media_vault/console_media_vault.conf @${MV} ${WRKSRC}/contrib/misc/media_vault/profile_media_vault.conf.example \ ${WRKSRC}/contrib/misc/media_vault/profile_media_vault.conf .if !target(post-install) post-install: .if defined(WITH_CLIENT_ONLY) ${MKDIR} ${STAGEDIR}${ETCDIR}/bconsole.d/ ${MV} ${STAGEDIR}${ETCDIR}/bconsole.conf.sample ${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 e0c15bad5003..2dbf81f1c6f4 100644 --- a/sysutils/bareos-server/distinfo +++ b/sysutils/bareos-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1766038737 -SHA256 (bareos-bareos-Release-25.0.1_GH0.tar.gz) = b44c481ddf1cfdf603e1b1fc1c4e4a120d5a0e9f34f781c90b1c487fc4716f27 -SIZE (bareos-bareos-Release-25.0.1_GH0.tar.gz) = 12308189 +TIMESTAMP = 1782179486 +SHA256 (bareos-bareos-Release-25.0.3_GH0.tar.gz) = 3c4d942612dde94b0bc36a339049c90650c846837f1c035c96bb71cc7b40d9b2 +SIZE (bareos-bareos-Release-25.0.3_GH0.tar.gz) = 13136734 diff --git a/sysutils/bareos-traymonitor/Makefile b/sysutils/bareos-traymonitor/Makefile index 8ac3cac29e0d..95d45557411f 100644 --- a/sysutils/bareos-traymonitor/Makefile +++ b/sysutils/bareos-traymonitor/Makefile @@ -1,30 +1,30 @@ PORTREVISION= 0 PKGNAMESUFFIX= -traymonitor COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libbareos.so:sysutils/bareos-client -CONFLICTS= bareos22-traymonitor bareos23-traymonitor-qt5 bareos23-traymonitor-qt6 \ +CONFLICTS= bareos23-traymonitor-qt5 bareos23-traymonitor-qt6 \ bareos24-traymonitor USES= desktop-file-utils gettext-runtime pkgconfig qt:6 USE_QT= base:run declarative:build tools:build CMAKE_ARGS+= -Dbat-qt6=yes 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 \ -DENABLE_WEBUI=OFF .include "${MASTERDIR}/Makefile" diff --git a/sysutils/py-python-bareos/Makefile b/sysutils/py-python-bareos/Makefile index 33f1e1e5ca43..0a1358fe5e8f 100644 --- a/sysutils/py-python-bareos/Makefile +++ b/sysutils/py-python-bareos/Makefile @@ -1,17 +1,17 @@ PORTNAME= python-bareos -PORTVERSION= 25.0.1 +PORTVERSION= 25.0.3 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME:S/-/_/}-${PORTVERSION} MAINTAINER= acm@FreeBSD.org COMMENT= client library and tools for Bareos console access WWW= https://github.com/bareos/bareos LICENSE= AGPLv3 USES= python USE_PYTHON= autoplist distutils .include diff --git a/sysutils/py-python-bareos/distinfo b/sysutils/py-python-bareos/distinfo index aa0a320738fb..76716357867c 100644 --- a/sysutils/py-python-bareos/distinfo +++ b/sysutils/py-python-bareos/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1766876429 -SHA256 (python_bareos-25.0.1.tar.gz) = ad2ebb10b0451a9ee10f632c99f688a55caddfe849fd065fbd117bf7a5935217 -SIZE (python_bareos-25.0.1.tar.gz) = 37365 +TIMESTAMP = 1782182537 +SHA256 (python_bareos-25.0.3.tar.gz) = 0e2bb98becc9416242d654cdcbca2ec6566179bbcf096eacab7b3e55e1b4555e +SIZE (python_bareos-25.0.3.tar.gz) = 37374 diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile index 7bbf53567808..2798a7477ce5 100644 --- a/www/bareos-webui/Makefile +++ b/www/bareos-webui/Makefile @@ -1,68 +1,68 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 25.0.1 +DISTVERSION= 25.0.3 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= gettext ctype 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 post-patch: @${REINPLACE_CMD} -e 's/CMAKE_INSTALL_FULL_DATAROOTDIR/CMAKE_INSTALL_DATAROOTDIR/g' \ ${WRKSRC}/webui/CMakeLists.txt 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 module public vendor" \ ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/webui/*.php ${STAGEDIR}${WWWDIR} ${INSTALL_DATA} ${WRKSRC}/webui/composer* ${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-limited.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-limited.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 081c4e7bd7ca..dc236688231c 100644 --- a/www/bareos-webui/distinfo +++ b/www/bareos-webui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1766827657 -SHA256 (bareos-bareos-Release-25.0.1_GH0.tar.gz) = b44c481ddf1cfdf603e1b1fc1c4e4a120d5a0e9f34f781c90b1c487fc4716f27 -SIZE (bareos-bareos-Release-25.0.1_GH0.tar.gz) = 12308189 +TIMESTAMP = 1782182081 +SHA256 (bareos-bareos-Release-25.0.3_GH0.tar.gz) = 3c4d942612dde94b0bc36a339049c90650c846837f1c035c96bb71cc7b40d9b2 +SIZE (bareos-bareos-Release-25.0.3_GH0.tar.gz) = 13136734