diff --git a/sysutils/bareos23-client/Makefile b/sysutils/bareos23-client/Makefile index d72249f62b74..d6c34aefc727 100644 --- a/sysutils/bareos23-client/Makefile +++ b/sysutils/bareos23-client/Makefile @@ -1,21 +1,16 @@ PORTNAME= bareos -PORTREVISION= 0 PKGNAMESUFFIX= 23-client COMMENT= Backup archiving recovery open sourced (client) -CONFLICTS= bareos22-client bareos21-client bareos20-client bareos-client +CONFLICTS= bareos24-client bareos22-client bareos-client WITH_CLIENT_ONLY=yes USE_RC_SUBR= bareos-fd PLIST= ${PKGDIR}/pkg-plist.client MASTERDIR= ${.CURDIR}/../../sysutils/bareos23-server -OPTIONS_GROUP= PLUGINS -OPTIONS_GROUP_PLUGINS= GFAPI OPTIONS_DEFINE= NLS PYTHON SCSICRYPTO -GFAPI_DESC= GFAPI fd plugin support - .include "${MASTERDIR}/Makefile" diff --git a/sysutils/bareos23-server/Makefile b/sysutils/bareos23-server/Makefile index 445756bbf80d..e070c019da53 100644 --- a/sysutils/bareos23-server/Makefile +++ b/sysutils/bareos23-server/Makefile @@ -1,231 +1,226 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 23.1.4 -PORTREVISION?= 1 +DISTVERSION= 23.1.5 +PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # PKGNAMESUFFIX?= 23-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 bareos21-server bareos22-server bareos-server BUILD_DEPENDS+= utf8cpp>0:devel/utf8cpp LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ libjansson.so:devel/jansson \ libfmt.so:devel/libfmt USES+= cmake compiler:c++11-lang cpe localbase:ldflags 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 python SHEBANG_GLOB= *.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} == "23-server" -OPTIONS_GROUP= BACKENDS -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 -GFAPI_DESC= GFAPI backend 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} == "23-client" || ${PKGNAMESUFFIX} == "23-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/bareos23-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 -GFAPI_CMAKE_ON= -Dgfapi=ON -GFAPI_LIB_DEPENDS= libglusterfs.so:net/glusterfs # 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 # 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: @${REINPLACE_CMD} '136,141d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "23-server" @${REINPLACE_CMD} '50d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif .if ${PKGNAMESUFFIX} == "23-client" @${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/CMakeLists.txt @${REINPLACE_CMD} -e 's|enable_testing()||g' ${WRKSRC}/CMakeLists.txt .endif post-patch-PYTHON-off: @${REINPLACE_CMD} 's/set(python ON)/set(python OFF)/' ${WRKSRC}/cmake/BareosSetVariableDefaults.cmake 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/bsmc/etc/bareos/bsmc.conf \ ${WRKSRC}/contrib/misc/bsmc/etc/bareos/bsmc.conf.sample .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 # 23-client and 23-server are defined .include diff --git a/sysutils/bareos23-server/distinfo b/sysutils/bareos23-server/distinfo index 024a17fe61eb..1700f3eaea66 100644 --- a/sysutils/bareos23-server/distinfo +++ b/sysutils/bareos23-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759976047 -SHA256 (bareos-bareos-Release-23.1.4_GH0.tar.gz) = 5e1570034ff9dc1a772ca8de78ebe1c1c44d80ca15a77c94ff924497a6a2ab08 -SIZE (bareos-bareos-Release-23.1.4_GH0.tar.gz) = 14014536 +TIMESTAMP = 1766892918 +SHA256 (bareos-bareos-Release-23.1.5_GH0.tar.gz) = 470458640fb25f1710449eb91461f954956f12c97d3a1fe901b92f1c10369595 +SIZE (bareos-bareos-Release-23.1.5_GH0.tar.gz) = 14037537 diff --git a/sysutils/bareos23-server/files/bareos-dir.in b/sysutils/bareos23-server/files/bareos-dir.in index 658865b50b67..5bf8feaa7644 100644 --- a/sysutils/bareos23-server/files/bareos-dir.in +++ b/sysutils/bareos23-server/files/bareos-dir.in @@ -1,55 +1,57 @@ #!/bin/sh # PROVIDE: bareos_dir # REQUIRE: DAEMON %%REQ_PGSQL%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # bareos_dir_enable (bool): Set to NO by default. # Set it to YES to enable bareos_dir. # bareos_dir_flags (params): Set params used to start bareos_dir. # bareos_dir_config (params): Path to the config file/directory # . /etc/rc.subr name="bareos_dir" rcvar=${name}_enable load_rc_config $name +export PATH="${PATH}:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin" + : ${bareos_dir_enable="NO"} : ${bareos_dir_flags="-u bareos -g bareos -v"} : ${bareos_dir_config="%%PREFIX%%/etc/bareos/"} : ${bareos_dir_pidfile="/var/run/bareos/bareos-dir.9101.pid"} command=%%PREFIX%%/sbin/bareos-dir command_args="-c ${bareos_dir_config} -p ${bareos_dir_pidfile}" pidfile="${bareos_dir_pidfile}" bconsole_command=/usr/local/bin/bconsole start_precmd="bareos_start_precmd" restart_precmd="bareos_dir_configtest" reload_precmd="bareos_dir_configtest" reload_cmd="bareos_dir_reload" configtest_cmd="bareos_dir_configtest" bareos_start_precmd() { [ -d "${pidfile%/*}" ] || install -d -o bareos -g bareos ${pidfile%/*} bareos_dir_configtest } bareos_dir_configtest() { echo "Performing sanity check on ${bareos_dir_config} configuration:" eval ${command} -t } bareos_dir_reload() { echo "Performing a graceful reload" # bconsole always exits with 0, so we can't check the return status for success. echo "reload" | ${bconsole_command} } extra_commands="reload configtest" run_rc_command "$1" diff --git a/sysutils/bareos23-server/pkg-plist b/sysutils/bareos23-server/pkg-plist index 8f410646e55c..3b4fb72fe227 100644 --- a/sysutils/bareos23-server/pkg-plist +++ b/sysutils/bareos23-server/pkg-plist @@ -1,161 +1,154 @@ bin/bregex bin/bsmtp bin/bwild @sample(,bareos,640) %%ETCDIR%%/bareos-barcodes.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/catalog/MyCatalog.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/client/bareos-fd.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/console/bareos-mon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/director/bareos-dir.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/fileset/Catalog.conf.sample @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 -%%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/job/BackupCatalog.conf.sample -%%GFAPI%%@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/job/BackupGFAPI.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 @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/restore-ldap.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/jobdefs/DefaultJob.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Daemon.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/messages/Standard.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Differential.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Full.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Incremental.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/pool/Scratch.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/profile/operator.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycle.conf.sample @sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/schedule/WeeklyCycleAfterBackup.conf.sample -%%ETCDIR%%/bareos-dir.d/storage/dedup.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-dir.d/storage/Dedupable.conf.sample @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 @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 @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 -@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/dedup.conf.sample +@sample(,bareos,640) %%ETCDIR%%/bareos-sd.d/device/Dedupable.conf.sample %%MTX%%@sample(,bareos,640) %%ETCDIR%%/mtx-changer.conf.sample etc/logrotate.d/bareos-dir lib/bareos/backends/libbareossd-dedupable.so lib/bareos/backends/libbareossd-fifo.so lib/bareos/backends/libbareossd-file.so -%%GFAPI%%lib/bareos/backends/libbareossd-gfapi.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 %%SCSICRYPTO%%lib/bareos/plugins/scsicrypto-sd.so %%SCSICRYPTO%%lib/bareos/plugins/scsitapealert-sd.so lib/bareos/scripts/bareos-ctl-dir lib/bareos/scripts/bareos-ctl-sd lib/bareos/scripts/bareos-explorer lib/bareos/scripts/bareos-glusterfind-wrapper lib/bareos/scripts/create_bareos_database %%PGSQL%%lib/bareos/scripts/ddl/creates/postgresql.sql %%PGSQL%%lib/bareos/scripts/ddl/drops/postgresql.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-change_owner.dbconfig-template.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql-readonly.sql %%PGSQL%%lib/bareos/scripts/ddl/grants/postgresql.sql lib/bareos/scripts/ddl/updates/postgresql.10_11.sql lib/bareos/scripts/ddl/updates/postgresql.11_12.sql lib/bareos/scripts/ddl/updates/postgresql.12_14.sql lib/bareos/scripts/ddl/updates/postgresql.14_2001.sql lib/bareos/scripts/ddl/updates/postgresql.2001_2002.sql lib/bareos/scripts/ddl/updates/postgresql.2002_2003.sql lib/bareos/scripts/ddl/updates/postgresql.2003_2004.sql lib/bareos/scripts/ddl/updates/postgresql.2004_2171.sql lib/bareos/scripts/ddl/updates/postgresql.2171_2192.sql lib/bareos/scripts/ddl/updates/postgresql.2192_2210.sql lib/bareos/scripts/ddl/updates/postgresql.2210_2230.sql %%PGSQL%%lib/bareos/scripts/ddl/updates/postgresql.bee.1017_2004.sql lib/bareos/scripts/ddl/versions.map lib/bareos/scripts/delete_catalog_backup lib/bareos/scripts/disk-changer lib/bareos/scripts/drop_bareos_database lib/bareos/scripts/drop_bareos_tables lib/bareos/scripts/grant_bareos_privileges lib/bareos/scripts/make_bareos_tables lib/bareos/scripts/make_catalog_backup lib/bareos/scripts/mtx-changer lib/bareos/scripts/query.sql lib/bareos/scripts/update_bareos_tables %%NDMP%%lib/libbareosndmp.so %%NDMP%%lib/libbareosndmp.so.23 %%NDMP%%lib/libbareosndmp.so.%%LIB_VERSION%% lib/libbareossd.so lib/libbareossd.so.23 lib/libbareossd.so.%%LIB_VERSION%% lib/libbareossql.so lib/libbareossql.so.23 lib/libbareossql.so.%%LIB_VERSION%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosdir%%PYTHON_TAG%%.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareossd%%PYTHON_TAG%%.so share/man/man1/bareos-tray-monitor.1.gz share/man/man1/bregex.1.gz share/man/man1/bwild.1.gz share/man/man8/bareos-dbcheck.8.gz share/man/man8/bareos-dir.8.gz share/man/man8/bareos-sd.8.gz share/man/man8/bcopy.8.gz share/man/man8/bextract.8.gz share/man/man8/bls.8.gz share/man/man8/bpluginfo.8.gz share/man/man8/bscan.8.gz share/man/man8/bscrypto.8.gz share/man/man8/btape.8.gz sbin/bareos-dbcheck sbin/bareos-dir sbin/bareos-sd sbin/bcopy sbin/bextract sbin/bls sbin/bpluginfo sbin/bregex sbin/bscan sbin/bscrypto sbin/bsmtp 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 @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/console @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/counter @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/director @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/fileset @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/job @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/jobdefs @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/messages @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/pool @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/profile @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/schedule @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/storage @dir(,bareos,750) %%ETCDIR%%/bareos-dir.d/user @dir(,bareos,750) %%ETCDIR%%/bareos-dir-export/client @dir(,bareos,750) %%ETCDIR%%/bareos-sd.d/ndmp @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) %%BAREOS_DIR%%/storage @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos diff --git a/sysutils/bareos23-server/pkg-plist.client b/sysutils/bareos23-server/pkg-plist.client index e4352b348bd4..b757a3bcceff 100644 --- a/sysutils/bareos23-server/pkg-plist.client +++ b/sysutils/bareos23-server/pkg-plist.client @@ -1,103 +1,102 @@ %%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 @group bareos @sample %%ETCDIR%%/bareos-fd.d/director/bareos-mon.conf.sample @group bareos @sample %%ETCDIR%%/bareos-fd.d/messages/Standard.conf.sample @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/BareosFdPluginLibcloud.py %%PYTHON%%lib/bareos/plugins/BareosFdPluginLocalFilesBaseclass.py %%PYTHON%%lib/bareos/plugins/BareosFdWrapper.py %%PYTHON%%lib/bareos/plugins/BareosLibcloudApi.py %%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-percona-xtrabackup.py %%PYTHON%%lib/bareos/plugins/bareos-fd-postgres.py %%PYTHON%%lib/bareos/plugins/bareos-fd-postgresql.py %%PYTHON%%lib/bareos/plugins/bareos-fd-vmware.py %%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/__init__.py %%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/bucket_explorer.py %%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/debug.py %%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/get_libcloud_driver.py %%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/mtime.py %%PYTHON%%lib/bareos/plugins/bareos_libcloud_api/process_base.py %%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 -%%GFAPI%%lib/bareos/plugins/gfapi-fd.so %%PYTHON%%lib/bareos/plugins/python3-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 lib/bareos/scripts/bareos-ctl-fd lib/bareos/scripts/bareos-ctl-funcs %%PYTHON%%lib/bareos/scripts/bareos_encode_string.py lib/bareos/scripts/btraceback.dbx lib/bareos/scripts/btraceback.gdb lib/bareos/scripts/btraceback.mdb lib/libbareos.so lib/libbareos.so.23 lib/libbareos.so.%%LIB_VERSION%% lib/libbareosfastlz.so lib/libbareosfastlz.so.23 lib/libbareosfastlz.so.%%LIB_VERSION%% lib/libbareosfind.so lib/libbareosfind.so.23 lib/libbareosfind.so.%%LIB_VERSION%% lib/libbareoslmdb.so lib/libbareoslmdb.so.23 lib/libbareoslmdb.so.%%LIB_VERSION%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/bareosfd%%PYTHON_TAG%%.so share/man/man1/bconsole.1.gz share/man/man1/bsmtp.1.gz share/man/man8/bareos-fd.8.gz share/man/man8/bareos.8.gz share/man/man8/btraceback.8.gz @group bareos sbin/bareos @group bareos sbin/bareos-fd @group bareos sbin/bconsole @group wheel sbin/btraceback @group bareos @dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/fileset @dir(,bareos,750) %%ETCDIR%%/python-ldap-conf.d/bareos-dir.d/job @group bareos @dir(bareos,bareos,) %%BAREOS_DIR%% @dir(bareos,bareos,) /var/log/bareos @dir(bareos,bareos,) /var/run/bareos diff --git a/sysutils/bareos23-traymonitor/Makefile b/sysutils/bareos23-traymonitor/Makefile index 5dc3b1e07172..f3bc8111bebd 100644 --- a/sysutils/bareos23-traymonitor/Makefile +++ b/sysutils/bareos23-traymonitor/Makefile @@ -1,47 +1,46 @@ PORTREVISION= 0 COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libbareos.so:sysutils/bareos23-client -CONFLICTS= bareos20-traymonitor bareos21-traymonitor bareos22-traymonitor \ - bareos-traymonitor +CONFLICTS= bareos22-traymonitor bareos24-traymonitor bareos-traymonitor USES= desktop-file-utils gettext-runtime pkgconfig FLAVORS= qt5 qt6 FLAVOR?= ${FLAVORS:[1]} CFLAGS+= -Wno-unused-parameter -qt5_CONFLICTS= bareos-traymonitor-qt6 -qt6_CONFLICTS= bareos-traymonitor-qt5 +qt5_CONFLICTS= bareos23-traymonitor-qt6 +qt6_CONFLICTS= bareos23-traymonitor-qt5 .if ${FLAVOR} == qt6 PKGNAMESUFFIX= 23-traymonitor-qt6 USES+= qt:6 USE_QT= base:run declarative:build tools:build CMAKE_ARGS+= -Dbat-qt6=yes .else PKGNAMESUFFIX= 23-traymonitor-qt5 LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 USES+= qt:5 USE_QT= buildtools:build qmake:build uitools:build gui core widgets .endif WITH_BAT= yes PLIST= ${.CURDIR}/pkg-plist CFLAGS+= -DMDB_DSYNC=O_SYNC -DMDB_USE_POSIX_SEM=1 MASTERDIR= ${.CURDIR}/../../sysutils/bareos23-server CMAKE_ARGS+= -Dtraymonitor=yes \ -Dbuild-dird=no \ -Dbuild-stored=no \ -Dclient-only=yes \ -Dnls=ON .include "${MASTERDIR}/Makefile" diff --git a/www/bareos23-webui/Makefile b/www/bareos23-webui/Makefile index 7af64849e3c6..1319f85a6cc7 100644 --- a/www/bareos23-webui/Makefile +++ b/www/bareos23-webui/Makefile @@ -1,66 +1,66 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 23.1.4 +DISTVERSION= 23.1.5 CATEGORIES?= www sysutils PKGNAMESUFFIX= 23-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 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-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/bareos23-webui/distinfo b/www/bareos23-webui/distinfo index 2302eda90013..f221d4e67db0 100644 --- a/www/bareos23-webui/distinfo +++ b/www/bareos23-webui/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1759977930 -SHA256 (bareos-bareos-Release-23.1.4_GH0.tar.gz) = 5e1570034ff9dc1a772ca8de78ebe1c1c44d80ca15a77c94ff924497a6a2ab08 -SIZE (bareos-bareos-Release-23.1.4_GH0.tar.gz) = 14014536 +TIMESTAMP = 1766894035 +SHA256 (bareos-bareos-Release-23.1.5_GH0.tar.gz) = 470458640fb25f1710449eb91461f954956f12c97d3a1fe901b92f1c10369595 +SIZE (bareos-bareos-Release-23.1.5_GH0.tar.gz) = 14037537