git: 8216b944a418 - main - sysutils/bareos-*: update to 23.1.1

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Sun, 22 Dec 2024 06:23:57 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8216b944a418914ac2b94cbec8b4ed0ac13ad94c

commit 8216b944a418914ac2b94cbec8b4ed0ac13ad94c
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2024-12-22 06:22:45 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2024-12-22 06:22:45 +0000

    sysutils/bareos-*: update to 23.1.1
    
    ChangeLog at:   https://github.com/bareos/bareos/blob/Release/23.1.1/CHANGELOG.md
---
 sysutils/bareos-server/Makefile | 6 ++++--
 sysutils/bareos-server/distinfo | 6 +++---
 www/bareos-webui/Makefile       | 2 +-
 www/bareos-webui/distinfo       | 6 +++---
 www/bareos-webui/pkg-plist      | 1 +
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile
index 4fd3dd5bc710..ccc8281ec72d 100644
--- a/sysutils/bareos-server/Makefile
+++ b/sysutils/bareos-server/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	23.1.0
+DISTVERSION=	23.1.1
 PORTREVISION?=	0
 CATEGORIES?=	sysutils
 PKGNAMEPREFIX?=	#
@@ -154,7 +154,8 @@ 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
+CMAKE_ARGS+=	-Dclient-only=ON \
+		-DENABLE_WEBUI=OFF
 
 PKGDEINSTALL=	${FILESDIR}/pkg-deinstall.client
 PKGINSTALL=	${FILESDIR}/pkg-install.client
@@ -191,6 +192,7 @@ post-patch:
 .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
 .endif
 
 post-patch-PYTHON-off:
diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo
index 52244486359d..dda6c3c835a2 100644
--- a/sysutils/bareos-server/distinfo
+++ b/sysutils/bareos-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732913559
-SHA256 (bareos-bareos-Release-23.1.0_GH0.tar.gz) = 8a4ae832317de4c160deaf378fa783ab3e259c92b16e961f93fc8d0ffbb59d5a
-SIZE (bareos-bareos-Release-23.1.0_GH0.tar.gz) = 14002357
+TIMESTAMP = 1733553941
+SHA256 (bareos-bareos-Release-23.1.1_GH0.tar.gz) = 468fbe12a509b65ca3de5041a901eb0cf1da5c9a4f1729ca57ed39f45fd428e7
+SIZE (bareos-bareos-Release-23.1.1_GH0.tar.gz) = 14010988
diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index e540133f7c9e..7834cfcb3462 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	bareos
 DISTVERSIONPREFIX=	Release/
-DISTVERSION=	23.0.2
+DISTVERSION=	23.1.1
 CATEGORIES?=	www sysutils
 PKGNAMESUFFIX=	-webui
 
diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo
index ff77959d57ef..8ae86b6dfec4 100644
--- a/www/bareos-webui/distinfo
+++ b/www/bareos-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714631949
-SHA256 (bareos-bareos-Release-23.0.2_GH0.tar.gz) = 88df0b281d0c23c4991e227126b2df263f13a89329aaaaa67e84e804cafc793c
-SIZE (bareos-bareos-Release-23.0.2_GH0.tar.gz) = 14724410
+TIMESTAMP = 1734847145
+SHA256 (bareos-bareos-Release-23.1.1_GH0.tar.gz) = 468fbe12a509b65ca3de5041a901eb0cf1da5c9a4f1729ca57ed39f45fd428e7
+SIZE (bareos-bareos-Release-23.1.1_GH0.tar.gz) = 14010988
diff --git a/www/bareos-webui/pkg-plist b/www/bareos-webui/pkg-plist
index bd20bcfdcaf3..9ab6ea046f0b 100644
--- a/www/bareos-webui/pkg-plist
+++ b/www/bareos-webui/pkg-plist
@@ -375,6 +375,7 @@
 %%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSockInterface.php
 %%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBSockServiceFactory.php
 %%WWWDIR%%/vendor/Bareos/library/Bareos/BSock/BareosBase64.php
+%%WWWDIR%%/vendor/Bareos/library/Bareos/Util.php
 %%WWWDIR%%/vendor/README.md
 %%WWWDIR%%/vendor/autoload.php
 %%WWWDIR%%/vendor/composer/ClassLoader.php