git: 1c9f52630680 - main - sysutils/bareos23-*: Update to 23.1.5

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Sun, 28 Dec 2025 03:57:59 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1c9f5263068064761138efc3b1a69b50f9fe848e

commit 1c9f5263068064761138efc3b1a69b50f9fe848e
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2025-12-28 03:56:40 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2025-12-28 03:56:40 +0000

    sysutils/bareos23-*: Update to 23.1.5
    
    Changelog at:   https://github.com/bareos/bareos/releases/tag/Release%2F23.1.5
---
 sysutils/bareos23-client/Makefile            |  7 +------
 sysutils/bareos23-server/Makefile            |  9 ++-------
 sysutils/bareos23-server/distinfo            |  6 +++---
 sysutils/bareos23-server/files/bareos-dir.in |  2 ++
 sysutils/bareos23-server/pkg-plist           | 11 ++---------
 sysutils/bareos23-server/pkg-plist.client    |  1 -
 sysutils/bareos23-traymonitor/Makefile       |  7 +++----
 www/bareos23-webui/Makefile                  |  2 +-
 www/bareos23-webui/distinfo                  |  6 +++---
 9 files changed, 17 insertions(+), 34 deletions(-)

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,10 +1,9 @@
 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
@@ -12,10 +11,6 @@ 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,7 +1,7 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	23.1.4
-PORTREVISION?=	1
+DISTVERSION=	23.1.5
+PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
 PKGNAMESUFFIX?=	23-server
@@ -47,15 +47,12 @@ 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
@@ -149,8 +146,6 @@ SUB_LIST=	BAREOS_USER=${BAREOS_USER} \
 
 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)
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
@@ -20,6 +20,8 @@ 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/"}
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
@@ -10,12 +10,9 @@ bin/bwild
 @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
@@ -29,28 +26,24 @@ bin/bwild
 @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
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
@@ -54,7 +54,6 @@ bin/bconsole
 %%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
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
@@ -4,8 +4,7 @@ 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
 
@@ -14,8 +13,8 @@ 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
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,6 +1,6 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	23.1.4
+DISTVERSION=	23.1.5
 CATEGORIES?=	www sysutils
 PKGNAMESUFFIX=	23-webui
 
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