From nobody Sun Sep 10 14:14:10 2023 X-Original-To: dev-commits-ports-all@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 4RkBfq0Grrz4sx3N; Sun, 10 Sep 2023 14:14:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RkBfp6qqmz4CX3; Sun, 10 Sep 2023 14:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694355251; 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=w67YmZSdFv/Yu9hSrWXj0m6tzqojlYCh8mW783bahEU=; b=yHwN7Y+clKN8GosQ/0fdaGkxIviq8/ADW6gvMJOESOxtH9YQ/1jHu9fGLlQFsf28aUE1HL 94pvV2BDUAQcfyOkCVses7aPBSuEkK6eQBpXBay1DhrSvtdSJM8UMoF7quSJlCIip7jsX6 IZviPsq0VXt1koSCNPcQ03UctWm2VlKpOh3A+pWSeyCeENWcURLrOpIpAXiBSh3ZhddNiE SMZiCsGykQxZMUMO8jSScVR2PjIV/r718IGWgshIP3v7V8fK0xL9KzGrp3+apqNe65CsGN x6ddPHBX/eDJj9UcmJdALaBD+DbwzQ231eLcgeXlUQcAa7wXY9XhIIsDCbl0EA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694355251; a=rsa-sha256; cv=none; b=nZMp+DSBIRMsUPpEn9OaSH+PhjxL7QjPRYQdWFiBOXV82MmcZVCEormE8QwT4BYMDR0MV8 fCYDj/zB13mugKfknpkYfHaB4FUll9UOJh9+IPeuIYbOJWXGRy9l5bGtin9bnGrXRC54Kh GlKWubWHqTII3+JyztuA3acsSjKOp3QOdVNPG+k9QsBIkt4iFqgvtp8JNaG4F/ciM1Lwxv eG2NALZsqpKvXrjtK2O52+WqqFOJyT959T/95eMm4q2cELdyLNKj8qtd+1ui7GtTeJDEcs x5xQ4ztd7upXoevrN+hEUFZvDmCb1tgtpgSNA/TAHPJHzFC6aIHBdpOSWdhVAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694355251; 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=w67YmZSdFv/Yu9hSrWXj0m6tzqojlYCh8mW783bahEU=; b=uM/z6/JRpuSi0yEI4IMBdMbYh1++XgnAQ/c0tua0Izh+ToOxBdE0FpbzuCAFftVI0Ei7Ee W+9MGw/Tm34WwLpCJuShM+kzZY1880Rp+BAdXkRQGDuz+94ZH1xmIo+6FlAjqYGFp6+xc8 buyZntTIFmJtVAArwTWb+0kAG1r0sF6wnTKJnjHmDau6oI/cZ308+E9VYzf7DwkDUP/sEQ 7EMwn/BzrWOlBxl2jv6tzbRu0KCM1Vm83zyTfSdOJUdwh/HFamRu05wD00Egc8nDVBElM8 EltzHLw+O/IZeE89/sS4uZmt0UuLPvGGbxtKzhpSvA/nrv280w5ge1bWurWqGQ== 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 4RkBfp5wZcz18fv; Sun, 10 Sep 2023 14:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38AEEAjB024485; Sun, 10 Sep 2023 14:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38AEEA8B024482; Sun, 10 Sep 2023 14:14:10 GMT (envelope-from git) Date: Sun, 10 Sep 2023 14:14:10 GMT Message-Id: <202309101414.38AEEA8B024482@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 18f5c0eb55c3 - main - sysutils/bacula11-server: Add S3 cloud option List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18f5c0eb55c34fc7ecdd422b7c323746ea797a0e Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=18f5c0eb55c34fc7ecdd422b7c323746ea797a0e commit 18f5c0eb55c34fc7ecdd422b7c323746ea797a0e Author: Dan Langille AuthorDate: 2023-09-10 14:10:50 +0000 Commit: Dan Langille CommitDate: 2023-09-10 14:14:00 +0000 sysutils/bacula11-server: Add S3 cloud option Allow a bacula-sd node to use S3 for storage This uses the recently added sysutils/bacula-libs3 port While here, also add S3 to bacula13-server PR: 260171 --- sysutils/bacula11-server/Makefile | 10 ++++++++-- sysutils/bacula11-server/pkg-plist | 4 ++++ sysutils/bacula13-server/Makefile | 10 ++++++++-- sysutils/bacula13-server/pkg-plist | 4 ++++ 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 5c7477f91d59..dd19d42526a4 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula PORTVERSION= 11.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -31,8 +31,9 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE?= MTX NLS IPV6 +OPTIONS_DEFINE?= MTX NLS IPV6 S3 MTX_DESC= Install mtx for control of autochanger devices +S3_DESC= Install S3 plugin .if ${PKGNAMESUFFIX} == "11-server" OPTIONS_MULTI= BACKEND @@ -130,6 +131,11 @@ MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include +.if ${PORT_OPTIONS:MS3} +CONFIGURE_ARGS+= --enable-s3 +LIB_DEPENDS+= libs3.so:sysutils/bacula-libs3 +.endif + # if IPv6 is not in the kernel, it generates many errors .if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 diff --git a/sysutils/bacula11-server/pkg-plist b/sysutils/bacula11-server/pkg-plist index 363305c0b7b1..ee9a5ad31966 100644 --- a/sysutils/bacula11-server/pkg-plist +++ b/sysutils/bacula11-server/pkg-plist @@ -13,6 +13,10 @@ lib/libbacsd-%%LIB_VERSION%%.so lib/libbacsd.so lib/libbacsql-%%LIB_VERSION%%.so lib/libbacsql.so +%%S3%%lib/bacula-sd-cloud-driver-%%LIB_VERSION%%.so +%%S3%%lib/bacula-sd-cloud-driver.so +%%S3%%lib/bacula-sd-cloud-s3-driver-%%LIB_VERSION%%.so +%%S3%%lib/bacula-sd-cloud-s3-driver.so sbin/bacula sbin/bacula-dir sbin/bacula-sd diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile index 4c35f797c0da..768a0a284a12 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-server/Makefile @@ -1,6 +1,6 @@ PORTNAME= bacula DISTVERSION= 13.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= sysutils MASTER_SITES= SF/bacula/bacula/${PORTVERSION} PKGNAMEPREFIX?= # @@ -31,8 +31,9 @@ USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE?= MTX NLS IPV6 +OPTIONS_DEFINE?= MTX NLS IPV6 S3 MTX_DESC= Install mtx for control of autochanger devices +S3_DESC= Install S3 plugin .if ${PKGNAMESUFFIX} == "13-server" OPTIONS_MULTI= BACKEND @@ -130,6 +131,11 @@ MTX_RUN_DEPENDS= ${LOCALBASE}/sbin/mtx:misc/mtx .include +.if ${PORT_OPTIONS:MS3} +CONFIGURE_ARGS+= --enable-s3 +LIB_DEPENDS+= libs3.so:sysutils/bacula-libs3 +.endif + # if IPv6 is not in the kernel, it generates many errors .if ! ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --disable-ipv6 diff --git a/sysutils/bacula13-server/pkg-plist b/sysutils/bacula13-server/pkg-plist index 363305c0b7b1..ee9a5ad31966 100644 --- a/sysutils/bacula13-server/pkg-plist +++ b/sysutils/bacula13-server/pkg-plist @@ -13,6 +13,10 @@ lib/libbacsd-%%LIB_VERSION%%.so lib/libbacsd.so lib/libbacsql-%%LIB_VERSION%%.so lib/libbacsql.so +%%S3%%lib/bacula-sd-cloud-driver-%%LIB_VERSION%%.so +%%S3%%lib/bacula-sd-cloud-driver.so +%%S3%%lib/bacula-sd-cloud-s3-driver-%%LIB_VERSION%%.so +%%S3%%lib/bacula-sd-cloud-s3-driver.so sbin/bacula sbin/bacula-dir sbin/bacula-sd