From nobody Mon Dec 02 20:13:46 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y2FNW142Pz5gMp0; Mon, 02 Dec 2024 20:13:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y2FNV6H0Mz4tGF; Mon, 2 Dec 2024 20:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733170426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NqngZzxkm36Rt4esa5uIHIdgcop3rbYkMuH8RkLBxKE=; b=XUZ817chDM1PF6ZYveJ8mlWH0BVnBWgND/Ddcm/4lYVPFMGNdVE3JnQ7bppKfAk0SqPlnN nG0Pr1O279qGdGrkdSuNkMpSVAJYFaogEVpWPVj5JdqttoD1Xyg9Uw6g+8earLOOzDm2ZX xLFcYOALjIgAMZBIXQYI2df6Rfsqj+7vbK6jHIKfJ4xz/e70RRCimiVSU4MR/LiM6n4pkX ummY9dSGda6MZ+MDwYvnBndDjORTZJtUPfa+J9T4CVOrDEZBBE4o/sEHjV/YYk911vVr3h epJnTa9imfb4mZ5X6T4riaLSdWI8xm4KpqNiwWW7kIXEXgEkmLfRl4UzmblbgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733170426; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NqngZzxkm36Rt4esa5uIHIdgcop3rbYkMuH8RkLBxKE=; b=ZftReLU+lk1+CC8jfXomS6OIIp1KrZoFdrGfte90Zz2O4FVYDS3HKNjSqUFHAokgrHxyOj 9tVzeh9SOjXB2myEX+MFjhnmnHabrECajilHj4CxBefdBlnTM5amRm1K6yjOYftnTuhPaZ Sb6YzIaqmZCUVnA2nD4OgqYZCvbfDw9/l8FAg1SeGHu9WVcHGik1hqDU8eXZVpUR7GCdMo yXkGpqUX3MrC1ChLPDYvXvElIoQL4PbfbGro69iKhIS9Ch4QRkiaieeDYCGXcF88X1Nckx v6a7Nxg/rrdP6kvpmr5FalXTTTlLg9EjitHvORvIluXB6LYJcipCIEo4gtzlng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733170426; a=rsa-sha256; cv=none; b=rNp6ZIlQyEtTHxr7kimhHDP+0QtVsVo5UcHWvu2otsE6Luc3+4Ery+78BJIhpzIG0MaLez O5+AjHfggyeWeqH/XaKdrKCQMvWMzvDjCltdD4lLlB7Qgwi+mjQb2Vk6wF3AhVnKG66Jlt 3Dm4HHfHbqSp05I4goqsYYXxgNvCP+fSOqkW1SLgD+wEvBUHK2ff746AZBmUrDyoVul9Pf aSxFi12UveSHvblPZHi7tG7MuHzSEEB01aY3OcQnB2ZJ3NSUDhRGWto6jr8AkdV+pVe2zD ZPo0WhpmnAlK6k06oovKvY/FTZwV8RIRiepUhJmKQfTuKVbvkMxOgOg6s2fYdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y2FNV5tFRzsMf; Mon, 2 Dec 2024 20:13:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B2KDk7v098673; Mon, 2 Dec 2024 20:13:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B2KDkhk098670; Mon, 2 Dec 2024 20:13:46 GMT (envelope-from git) Date: Mon, 2 Dec 2024 20:13:46 GMT Message-Id: <202412022013.4B2KDkhk098670@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 848e10ca6a87 - main - sysutils/bareos-server: Update to 23.1.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 848e10ca6a87ad5520d4f130c24a44dd23301dd3 Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=848e10ca6a87ad5520d4f130c24a44dd23301dd3 commit 848e10ca6a87ad5520d4f130c24a44dd23301dd3 Author: Guido Falsi AuthorDate: 2024-12-02 20:12:52 +0000 Commit: Guido Falsi CommitDate: 2024-12-02 20:12:52 +0000 sysutils/bareos-server: Update to 23.1.0 - Fix build on recent releases [1] - Fix rc script REQUIRE substitutions - Remove unused %%REQ_MYSQL%% in rc script - Do not install new sample dedup.conf file because it is invalid and causes the director to fail to start as is. PR: 283052, 278948 [1] Approved by: acm (maintainer) --- sysutils/bareos-server/Makefile | 14 ++++++++++---- sysutils/bareos-server/distinfo | 6 +++--- sysutils/bareos-server/files/bareos-dir.in | 2 +- sysutils/bareos-server/pkg-plist | 3 +++ 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/sysutils/bareos-server/Makefile b/sysutils/bareos-server/Makefile index 4f790610c6a7..4fd3dd5bc710 100644 --- a/sysutils/bareos-server/Makefile +++ b/sysutils/bareos-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bareos DISTVERSIONPREFIX= Release/ -DISTVERSION= 23.0.2 +DISTVERSION= 23.1.0 PORTREVISION?= 0 CATEGORIES?= sysutils PKGNAMEPREFIX?= # @@ -16,7 +16,8 @@ LICENSE_COMB= multi CONFLICTS?= bareos20-server bareos21-server bareos22-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2 \ - libjansson.so:devel/jansson + libjansson.so:devel/jansson \ + libfmt.so:devel/libfmt USES+= cmake compiler:c++11-lang cpe localbase:ldflags perl5 pkgconfig readline \ shebangfix @@ -167,7 +168,9 @@ CMAKE_ARGS+= -Dbuild-dird=ON \ MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx PGSQL_CMAKE_ON= -Dpostgresql=ON -PGSQL_USES= pgsql +PGSQL_USES= pgsql +PGSQL_SUB_LIST= REQ_PGSQL=postgresql +PGSQL_SUB_LIST_OFF= REQ_PGSQL="" .endif .if defined(WITH_CLIENT_ONLY) @@ -182,7 +185,7 @@ MP1+= bsmtp.1 bregex.1 bwild.1 bareos-tray-monitor.1 MAKE_ENV+= MAN8="${MP8}" MAN1="${MP1}" post-patch: - @${REINPLACE_CMD} '133,138d' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} '136,141d' ${WRKSRC}/CMakeLists.txt .if ${PKGNAMESUFFIX} == "-server" @${REINPLACE_CMD} '50d' ${WRKSRC}/core/src/plugins/CMakeLists.txt .endif @@ -190,6 +193,9 @@ post-patch: @${REINPLACE_CMD} -e 's|-Werror -Wall|-Wall|g' ${PATCH_WRKSRC}/core/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) diff --git a/sysutils/bareos-server/distinfo b/sysutils/bareos-server/distinfo index 51e0b1d2f9d6..52244486359d 100644 --- a/sysutils/bareos-server/distinfo +++ b/sysutils/bareos-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1714631763 -SHA256 (bareos-bareos-Release-23.0.2_GH0.tar.gz) = 88df0b281d0c23c4991e227126b2df263f13a89329aaaaa67e84e804cafc793c -SIZE (bareos-bareos-Release-23.0.2_GH0.tar.gz) = 14724410 +TIMESTAMP = 1732913559 +SHA256 (bareos-bareos-Release-23.1.0_GH0.tar.gz) = 8a4ae832317de4c160deaf378fa783ab3e259c92b16e961f93fc8d0ffbb59d5a +SIZE (bareos-bareos-Release-23.1.0_GH0.tar.gz) = 14002357 diff --git a/sysutils/bareos-server/files/bareos-dir.in b/sysutils/bareos-server/files/bareos-dir.in index 22272cf86231..658865b50b67 100644 --- a/sysutils/bareos-server/files/bareos-dir.in +++ b/sysutils/bareos-server/files/bareos-dir.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: bareos_dir -# REQUIRE: DAEMON %%REQ_MYSQL%% %%REQ_PGSQL%% +# REQUIRE: DAEMON %%REQ_PGSQL%% # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf diff --git a/sysutils/bareos-server/pkg-plist b/sysutils/bareos-server/pkg-plist index fa172534f55e..f9470ede3232 100644 --- a/sysutils/bareos-server/pkg-plist +++ b/sysutils/bareos-server/pkg-plist @@ -29,6 +29,7 @@ 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/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 @@ -43,8 +44,10 @@ bin/bwild @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 %%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