From nobody Sun Nov 12 10:59:27 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 4SSqM40Kmfz50CXQ; Sun, 12 Nov 2023 10:59:28 +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 4SSqM36fy5z3Qkg; Sun, 12 Nov 2023 10:59:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699786767; 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=lGWyH2VVMjjJ85Uxln3vAjpsM5z/hmrxJJAEUTfzxI0=; b=L7oxGBT0p44nggXBgn+aQpYRxfMT0uz8FWdq6IE1ZszTWlE+8c0X3yNbyrq+LBhda/4jhC T36J9hkwI3UYyDUfZt1II5XNAoD01R7iUwryYfVc3BmcYc/Y8kdiiJ/V9l8pkqF1hOkqaH wDyAZwFQgKh13nMsYGRrUsiHcv8UiRbKV8jEEW+NnZMkcSEE8ixjlvLN9WT/PAphHbFXQO E1q0M0ythjelYv7nd7G5ymKMSw7MssBKekVFhKcZm+iO50sLJxCsofMudUYTdd27cxrhHe PAmlP3bCk9LzCZzT+O+uLKieevyuJWRXw8zqVt2k9LvXxjbp9Tt783Px9GCg5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699786767; 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=lGWyH2VVMjjJ85Uxln3vAjpsM5z/hmrxJJAEUTfzxI0=; b=SxoUeKt7jmiJLwAJRtdzNOusfhhdIqzHPxO3DyjIUSBFG3G0bWf7R6lYmwiJ19eVWNghjk Vssp4rFxfNYWnpLIfvIt1StULeTzgd7Zz7ea6sBmjahBGck/14todfEy0AdxmgZO4709BU rfd3yvy4kIU1oaH4pCdwPxxKuh1Lc3FbluQKXRGgb9aeuIBNdxQI9KCqVK9Dgsp0SbWaod xp/kJU05CJeVCl63jS9nRA460LOwuoDhfL6PPeeL2ImQCesgk2gfUL02dwV6VT+BkLFn6B nfSFA2Z0FjAT7myvD58X7CoNaill0J7UPAZomgVATAbdKc8eeK7BRUs/32Glkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699786767; a=rsa-sha256; cv=none; b=cP5KJhbUzRuCLpbU7rbCpx1bb8+5RyMcPr/ixtDl5YzG/W/yaJIxtuPGXUxfxQSKhDLiov nGM8Q3faYbXUoHyiqT/aUOcEK/0ooNcHgHy//9BleT2OaTVkGn+nhACi39tP1VASfdlktZ +R+Wnu2WuffiBhK+d5BeZz8iUuBLxXco6dIQqzVVHHOY4ebtFhveigeMvaojNMIwVOmeNu p2Cc+2+Qodv5Ft08rlMTmM2q2v9WsF4XlbXQuuUE+8wpn2pmHSOT4cNO9ebgyuktep3Fca ZxhVluqUISuH1oVWdc+6SWKfLSgtt+KGYfe15m+KAb3yefWuF6OIpg7GhipAvw== 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 4SSqM35kStz4wD; Sun, 12 Nov 2023 10:59:27 +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 3ACAxR6F008142; Sun, 12 Nov 2023 10:59:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ACAxRu0008139; Sun, 12 Nov 2023 10:59:27 GMT (envelope-from git) Date: Sun, 12 Nov 2023 10:59:27 GMT Message-Id: <202311121059.3ACAxRu0008139@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 4f5bbb33f2a2 - main - security/vaultwarden: Optionsify database backends 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: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f5bbb33f2a2ae9d0a25bc4d0ca89e15a921d16c Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f5bbb33f2a2ae9d0a25bc4d0ca89e15a921d16c commit 4f5bbb33f2a2ae9d0a25bc4d0ca89e15a921d16c Author: Bernard Spil AuthorDate: 2023-11-12 10:57:13 +0000 Commit: Bernard Spil CommitDate: 2023-11-12 10:57:13 +0000 security/vaultwarden: Optionsify database backends * redo 687ab26524e52c866295a9ff5c7956fd5f71397f [1] * was reverted with 04ea2d6456297a759d2c3a887aa2001049397d7b [2] PR: 274049 [1], 274962 [2] --- security/vaultwarden/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile index 7c06e0a92fd0..356ca42c9225 100644 --- a/security/vaultwarden/Makefile +++ b/security/vaultwarden/Makefile @@ -13,7 +13,7 @@ LIB_DEPENDS+= libcapnp.so:devel/capnproto \ libgmp.so:math/gmp \ libnettle.so:security/nettle -USES= cargo mysql:client pgsql ssl +USES= cargo ssl # make makeplist > pkg-plist #One has to edit/review the generated plist # make generate-plist && make check-plist @@ -26,15 +26,23 @@ GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} OPTIONS_DEFINE= WEBVAULT -OPTIONS_DEFAULT=WEBVAULT +OPTIONS_DEFAULT=${OPTIONS_DEFINE} ${OPTIONS_MULTI_DATABASE} +OPTIONS_MULTI= DATABASE +OPTIONS_MULTI_DATABASE= MYSQL PGSQL SQLITE +DATABASE_DESC= Database support WEBVAULT_DESC= Vaultwarden web (bw_web_builds) +MYSQL_USES= mysql:client +MYSQL_VARS= cargo_features+=mysql +PGSQL_USES= pgsql +PGSQL_VARS= cargo_features+=postgresql +SQLITE_VARS= cargo_features+=sqlite WEBVAULT_RUN_DEPENDS= ${WWWDIR}/web-vault/index.html:www/vaultwarden-web_vault # make cargo-crates > Makefile.crates -CARGO_FEATURES= mysql postgresql sqlite #vendored_openssl +CARGO_FEATURES= --no-default-features #CARGO_ENV+= RUSTC_BOOTSTRAP=1 INSTALL_TARGET= install-strip