From owner-svn-ports-head@freebsd.org Sat Dec 26 19:10:55 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 82DD04C08C3; Sat, 26 Dec 2020 19:10:55 +0000 (UTC) (envelope-from mr@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D3D1C3LQqz4blW; Sat, 26 Dec 2020 19:10:55 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 659161A147; Sat, 26 Dec 2020 19:10:55 +0000 (UTC) (envelope-from mr@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BQJAtvb068814; Sat, 26 Dec 2020 19:10:55 GMT (envelope-from mr@FreeBSD.org) Received: (from mr@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BQJAsWK068810; Sat, 26 Dec 2020 19:10:54 GMT (envelope-from mr@FreeBSD.org) Message-Id: <202012261910.0BQJAsWK068810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mr set sender to mr@FreeBSD.org using -f From: Michael Reifenberger Date: Sat, 26 Dec 2020 19:10:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r559304 - in head/security/bitwarden_rs: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mr X-SVN-Commit-Paths: in head/security/bitwarden_rs: . files X-SVN-Commit-Revision: 559304 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 19:10:55 -0000 Author: mr Date: Sat Dec 26 19:10:54 2020 New Revision: 559304 URL: https://svnweb.freebsd.org/changeset/ports/559304 Log: Try to fix pkg builder. Add sample environment config file. PR: 252129 # Used different approach. Added: head/security/bitwarden_rs/files/bitwarden_rs_conf.in (contents, props changed) head/security/bitwarden_rs/files/pkg-message.in (contents, props changed) Modified: head/security/bitwarden_rs/Makefile head/security/bitwarden_rs/pkg-plist Modified: head/security/bitwarden_rs/Makefile ============================================================================== --- head/security/bitwarden_rs/Makefile Sat Dec 26 18:43:15 2020 (r559303) +++ head/security/bitwarden_rs/Makefile Sat Dec 26 19:10:54 2020 (r559304) @@ -3,7 +3,7 @@ PORTNAME= bitwarden_rs DISTVERSION= 1.17.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MASTER_SITES= https://github.com/dani-garcia/bw_web_builds/releases/download/v${DISTVERSION_WV}/:web DISTFILES= ${WV_DISTFILE}:web @@ -23,6 +23,7 @@ USES= cargo ssl pgsql DISTVERSION_WV= 2.17.1 WV_DISTFILE= bw_web_v${DISTVERSION_WV}.tar.gz USE_RC_SUBR= ${PORTNAME} +SUB_FILES= pkg-message # make makeplist > pkg-plist #One has to edit/review the generated plist # make generate-plist && make check-plist @@ -376,10 +377,15 @@ CARGO_CRATES= addr2line-0.13.0 \ yubico-0.9.1 post-install: + ${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d + ${CP} ${FILESDIR}/bitwarden_rs_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample ${MKDIR} ${STAGEDIR}/${WWWDIR} ${MKDIR} ${STAGEDIR}/${WWWDIR}/data - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}/data + # ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}/data (cd ${WRKDIR} && ${COPYTREE_SHARE} web-vault ${STAGEDIR}/${WWWDIR}) - @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/data' >> ${TMPPLIST} + # @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/data' >> ${TMPPLIST} + ${ECHO_CMD} \ + '@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \ + >> ${TMPPLIST} .include Added: head/security/bitwarden_rs/files/bitwarden_rs_conf.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/bitwarden_rs/files/bitwarden_rs_conf.in Sat Dec 26 19:10:54 2020 (r559304) @@ -0,0 +1,36 @@ +ROCKET_ADDRESS=127.0.0.1 +export ROCKET_ADDRESS + +ROCKET_PORT=4567 # your port here +export ROCKET_PORT + +# ROCKET_TLS='{certs = "/ssl/fullchain.pem", key = "/ssl/key.pem"}' +# LOG_FILE='/data/bitwarden.log' + +SIGNUPS_ALLOWED='false' +export SIGNUPS_ALLOWED + +# DOMAIN='https://localhost.localdomain' +# export DOMAIN + +# ADMIN_TOKEN= # generate one with ~$ openssl rand -base64 48 +# export ADMIN_TOKEN + +SMTP_HOST=localhost +export SMTP_HOST + +SMTP_FROM=noreply@localhost +export SMTP_FROM + +SMTP_PORT=25 +export SMTP_PORT + +SMTP_SSL=false +export SMTP_SSL + +# SMTP_USERNAME= +# export SMTP_USERNAME + +# SMTP_PASSWORD= +# export SMTP_PASSWORD + Added: head/security/bitwarden_rs/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/bitwarden_rs/files/pkg-message.in Sat Dec 26 19:10:54 2020 (r559304) @@ -0,0 +1,13 @@ +[ +{ type: install + message: <