From nobody Wed Nov 08 13:26:59 2023 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 4SQQq76D07z50XVy; Wed, 8 Nov 2023 13:26:59 +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 4SQQq75Pkfz4CXP; Wed, 8 Nov 2023 13:26:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699450019; 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=qBjF39O/z6i4CNrl3T8zc4NOlp8Rv/Axlor6BTMjuc8=; b=pqkeE63e4Uzz6fAovJ92+T+zvi8I6BRmWaB73++eXcF4xvKcpKnmWNcp7g1llGQCcaBG4W VC2+eJbgR810ljAb9EziQrfdW4XasefHi0igCFYzw4hQAh0HydQm5SPcFPz8ttllqyGk6T m2PmKzeIndvNY0lPTH2ndwXqiX+qzo8aMUYWjzZgG2iAYegkDXotW6x1kE/Iz4XaufB2+P IImfINL1SXoZ+mns/u+Wgw2hVwQJL668Ttd/fmfTCR/bnwD5T23fUGFRcQGZOF05DTs+KT WXCnyg0kG/NSnM8IXxJ9Z8HVZVGbgTAmvOkWMiMieLy4et7vb4uOTNL1yAOO1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699450019; 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=qBjF39O/z6i4CNrl3T8zc4NOlp8Rv/Axlor6BTMjuc8=; b=bzGotF2xKUSRIFINfvNlSsSiAj2T06EZ8Aj6uE2u0zZPw4LblxRbfFkEAXZDS922kOew0I LpFOg5yV6yI1sa02AT+dn2ZO22uF+IUe1dsTEkN5yI1dnxsxox5nYFyrKZ7u0BG/L69JuM dieGcRTmxO3X+aLR0BlTZGJ54aDiL76pRlMbX8xE2GnMyooLpQHhL9+cxOyi0sEfS2auGc 0uoeww1pkYBl/nR/w65Nr7/3A9hkdBr07ZYKw2mPAQf3HoV3eHaqLTwj4eURymJ2aWFmNR UF+iGlhqvFzVuFCGsDa3DNYcNXiYB8mpBxaRiZ2zXUnyfHD2p0yauA1fvnyMtg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699450019; a=rsa-sha256; cv=none; b=p7iZnQe9f08rlToH7kD4LJAjMaih1Q3B4TjSosJqyonnLd0r2jItdTq6dyauaAd8jnfKr2 g82BCAD0arj2H+EYIq7gqqKQBN+mw05K3gX/X9QJC+s5Zg2dWHW921zlAvXmW4sW8kNXyw rMrB6GvkRh/WECJvs0z7saFfUkQB49h/IsIXYoD3N+2O8PqIP5/UzKenZa9nAig7K9yOrd OBW58QLEY/ct2CuKV+oKD0/+twUibABKCTpOcKqq1kyJ/id4kF25AMj/HY2bhTg5rI7j6X UYz8GekZzt69oOfaVDJPVnfiis2zwXd6ACNDA6wL+vFymWozaS9J7ozOF+r7lg== 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 4SQQq74Sz5zb2y; Wed, 8 Nov 2023 13:26:59 +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 3A8DQxiP042964; Wed, 8 Nov 2023 13:26:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A8DQxDH042961; Wed, 8 Nov 2023 13:26:59 GMT (envelope-from git) Date: Wed, 8 Nov 2023 13:26:59 GMT Message-Id: <202311081326.3A8DQxDH042961@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: 687ab26524e5 - main - security/vaultwarden: Optionsize database backends 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 687ab26524e52c866295a9ff5c7956fd5f71397f Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=687ab26524e52c866295a9ff5c7956fd5f71397f commit 687ab26524e52c866295a9ff5c7956fd5f71397f Author: Bernard Spil AuthorDate: 2023-11-08 13:25:53 +0000 Commit: Bernard Spil CommitDate: 2023-11-08 13:25:53 +0000 security/vaultwarden: Optionsize database backends PR: 274049 Approved by: maintainer timeout --- security/vaultwarden/Makefile | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile index 5bfd4a965a44..4b5ff8f8e64a 100644 --- a/security/vaultwarden/Makefile +++ b/security/vaultwarden/Makefile @@ -14,7 +14,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 @@ -27,15 +27,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