Attachment 240827 Details for Bug 270182 – git diff for security/vaultwarden

[patch] git diff for security/vaultwarden

file_270182.txt (text/plain), 13.70 KB, created by Bernard Spil on 2023-03-13 18:31:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2023-03-13 18:31:47 UTC

Size: 13.70 KB

patch

obsolete

>diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile
>index 57cd2fbdf15a..05a758f66b3a 100644
>--- a/security/vaultwarden/Makefile
>+++ b/security/vaultwarden/Makefile
>@@ -1,9 +1,7 @@
> PORTNAME=	vaultwarden
> DISTVERSION=	1.27.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	security
>-MASTER_SITES=	https://github.com/dani-garcia/bw_web_builds/releases/download/v${DISTVERSION_WV}/:web
>-DISTFILES=	${WV_DISTFILE}:web
> 
> MAINTAINER=	mr@FreeBSD.org
> COMMENT=	Bitwarden compatible backend server
>@@ -18,15 +16,19 @@ LIB_DEPENDS+=	libcapnp.so:devel/capnproto \
> 
> USES=		cargo mysql:client pgsql ssl
> 
>-DISTVERSION_WV=	2022.12.0
>-WV_DISTFILE=	bw_web_v${DISTVERSION_WV}.tar.gz
>-
> # make makeplist > pkg-plist #One has to edit/review the generated plist
> # make generate-plist && make check-plist
> USE_GITHUB=	yes
> GH_ACCOUNT=	dani-garcia
> USE_RC_SUBR=	${PORTNAME}
> 
>+OPTIONS_DEFINE=	WEBVAULT
>+OPTIONS_DEFAULT=WEBVAULT
>+
>+WEBVAULT_DESC=	Vaultwarden web (bw_web_builds)
>+
>+WEBVAULT_RUN_DEPENDS=	${WWWDIR}/web-vault:www/vaultwarden_web-vault
>+
> # make cargo-crates
> CARGO_CRATES=   addr2line-0.19.0 \
>                 adler-1.0.2 \
>@@ -401,10 +403,5 @@ SUB_LIST=	WWWGRP=${WWWGRP} \
> post-install:
> 	${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d
> 	${INSTALL} -m0600 ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample
>-	${MKDIR} ${STAGEDIR}/${WWWDIR}/data
>-	(cd ${WRKDIR} && ${COPYTREE_SHARE} web-vault ${STAGEDIR}/${WWWDIR})
>-	${ECHO_CMD} \
>-		'@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \
>-		>> ${TMPPLIST}
> 
> .include <bsd.port.mk>
>diff --git a/security/vaultwarden/distinfo b/security/vaultwarden/distinfo
>index ee9af4b839f6..b615f94b5b8a 100644
>--- a/security/vaultwarden/distinfo
>+++ b/security/vaultwarden/distinfo
>@@ -1,6 +1,4 @@
> TIMESTAMP = 1672093966
>-SHA256 (bw_web_v2022.12.0.tar.gz) = 402dff6aa205d8d7493c79b051bbc947adb0b14181ae0b07242caa049ff480c7
>-SIZE (bw_web_v2022.12.0.tar.gz) = 9299031
> SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97
> SIZE (rust/crates/addr2line-0.19.0.crate) = 33210
> SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe
>diff --git a/security/vaultwarden/pkg-plist b/security/vaultwarden/pkg-plist
>index a6129cba12f7..5b58fb6f1c36 100644
>--- a/security/vaultwarden/pkg-plist
>+++ b/security/vaultwarden/pkg-plist
>@@ -1,221 +1,3 @@
> bin/vaultwarden
> etc/rc.conf.d/vaultwarden.sample
>-%%WWWDIR%%/web-vault/.nojekyll
>-%%WWWDIR%%/web-vault/182.ef118a836aae4f655003.js
>-%%WWWDIR%%/web-vault/182.ef118a836aae4f655003.js.map
>-%%WWWDIR%%/web-vault/404.html
>-%%WWWDIR%%/web-vault/404/bootstrap.min.css
>-%%WWWDIR%%/web-vault/404/styles.css
>-%%WWWDIR%%/web-vault/584.238f402a694e2a33f299.js
>-%%WWWDIR%%/web-vault/584.238f402a694e2a33f299.js.LICENSE.txt
>-%%WWWDIR%%/web-vault/584.238f402a694e2a33f299.js.map
>-%%WWWDIR%%/web-vault/650.62b87073d6547a6b7fd4.js
>-%%WWWDIR%%/web-vault/650.62b87073d6547a6b7fd4.js.map
>-%%WWWDIR%%/web-vault/754.1655b970c4e9dab5fc90.js
>-%%WWWDIR%%/web-vault/754.1655b970c4e9dab5fc90.js.map
>-%%WWWDIR%%/web-vault/812.59ccc0f03ed365576697.js
>-%%WWWDIR%%/web-vault/812.59ccc0f03ed365576697.js.map
>-%%WWWDIR%%/web-vault/933.6ce03ae789e31b21134d.js
>-%%WWWDIR%%/web-vault/933.6ce03ae789e31b21134d.js.LICENSE.txt
>-%%WWWDIR%%/web-vault/933.6ce03ae789e31b21134d.js.map
>-%%WWWDIR%%/web-vault/977.30cfdbe38986b8ddb470.js
>-%%WWWDIR%%/web-vault/977.30cfdbe38986b8ddb470.js.map
>-%%WWWDIR%%/web-vault/app-id.json
>-%%WWWDIR%%/web-vault/app/main.5f8690f5c03a207c390a.js
>-%%WWWDIR%%/web-vault/app/main.5f8690f5c03a207c390a.js.map
>-%%WWWDIR%%/web-vault/app/main.82096a4e78d5d3f7b01b.css
>-%%WWWDIR%%/web-vault/app/main.82096a4e78d5d3f7b01b.css.map
>-%%WWWDIR%%/web-vault/app/polyfills.428c25638840333a09ee.js
>-%%WWWDIR%%/web-vault/app/polyfills.428c25638840333a09ee.js.LICENSE.txt
>-%%WWWDIR%%/web-vault/app/polyfills.428c25638840333a09ee.js.map
>-%%WWWDIR%%/web-vault/app/vendor.7c30c6e2b5ba56506ea9.js
>-%%WWWDIR%%/web-vault/app/vendor.7c30c6e2b5ba56506ea9.js.LICENSE.txt
>-%%WWWDIR%%/web-vault/app/vendor.7c30c6e2b5ba56506ea9.js.map
>-%%WWWDIR%%/web-vault/browserconfig.xml
>-%%WWWDIR%%/web-vault/ca8f66ed7fccfcd0809f.json
>-%%WWWDIR%%/web-vault/captcha-connector.html
>-%%WWWDIR%%/web-vault/captcha-mobile-connector.html
>-%%WWWDIR%%/web-vault/connectors/captcha.921e95e8f847c9aa9ad4.css
>-%%WWWDIR%%/web-vault/connectors/captcha.921e95e8f847c9aa9ad4.css.map
>-%%WWWDIR%%/web-vault/connectors/captcha.e2f543930127fcb95585.js
>-%%WWWDIR%%/web-vault/connectors/captcha.e2f543930127fcb95585.js.map
>-%%WWWDIR%%/web-vault/connectors/duo.03d3232066d89682b1ee.css
>-%%WWWDIR%%/web-vault/connectors/duo.03d3232066d89682b1ee.css.map
>-%%WWWDIR%%/web-vault/connectors/duo.ea24746ddbb6ac2bf5cd.js
>-%%WWWDIR%%/web-vault/connectors/duo.ea24746ddbb6ac2bf5cd.js.map
>-%%WWWDIR%%/web-vault/connectors/sso.1b902be61e235185bf41.css
>-%%WWWDIR%%/web-vault/connectors/sso.1b902be61e235185bf41.css.map
>-%%WWWDIR%%/web-vault/connectors/sso.d88c527da5ac4ab2e950.js
>-%%WWWDIR%%/web-vault/connectors/sso.d88c527da5ac4ab2e950.js.map
>-%%WWWDIR%%/web-vault/connectors/webauthn-fallback.3692c5cfac073ad12263.js
>-%%WWWDIR%%/web-vault/connectors/webauthn-fallback.3692c5cfac073ad12263.js.map
>-%%WWWDIR%%/web-vault/connectors/webauthn-fallback.cc837e9c9d56fcf4ef60.css
>-%%WWWDIR%%/web-vault/connectors/webauthn-fallback.cc837e9c9d56fcf4ef60.css.map
>-%%WWWDIR%%/web-vault/connectors/webauthn.b50e3a9527b3e4de41eb.js
>-%%WWWDIR%%/web-vault/connectors/webauthn.b50e3a9527b3e4de41eb.js.map
>-%%WWWDIR%%/web-vault/connectors/webauthn.cc837e9c9d56fcf4ef60.css
>-%%WWWDIR%%/web-vault/connectors/webauthn.cc837e9c9d56fcf4ef60.css.map
>-%%WWWDIR%%/web-vault/duo-connector.html
>-%%WWWDIR%%/web-vault/encrypt-worker.fec52db855ae6d6aca09.js
>-%%WWWDIR%%/web-vault/encrypt-worker.fec52db855ae6d6aca09.js.map
>-%%WWWDIR%%/web-vault/favicon.ico
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-italic-300.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-italic-400.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-italic-600.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-italic-700.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-italic-800.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-normal-300.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-normal-400.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-normal-600.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-normal-700.woff
>-%%WWWDIR%%/web-vault/fonts/Open_Sans-normal-800.woff
>-%%WWWDIR%%/web-vault/fonts/bwi-font.svg
>-%%WWWDIR%%/web-vault/fonts/bwi-font.ttf
>-%%WWWDIR%%/web-vault/fonts/bwi-font.woff
>-%%WWWDIR%%/web-vault/fonts/bwi-font.woff2
>-%%WWWDIR%%/web-vault/images/0.png
>-%%WWWDIR%%/web-vault/images/1-w.png
>-%%WWWDIR%%/web-vault/images/1.png
>-%%WWWDIR%%/web-vault/images/2.png
>-%%WWWDIR%%/web-vault/images/3.png
>-%%WWWDIR%%/web-vault/images/4.png
>-%%WWWDIR%%/web-vault/images/404.png
>-%%WWWDIR%%/web-vault/images/6.png
>-%%WWWDIR%%/web-vault/images/7-w.png
>-%%WWWDIR%%/web-vault/images/7.png
>-%%WWWDIR%%/web-vault/images/amex-dark.png
>-%%WWWDIR%%/web-vault/images/amex-light.png
>-%%WWWDIR%%/web-vault/images/apple-touch-icon.png
>-%%WWWDIR%%/web-vault/images/bwi-globe.png
>-%%WWWDIR%%/web-vault/images/cards.png
>-%%WWWDIR%%/web-vault/images/diners_club-dark.png
>-%%WWWDIR%%/web-vault/images/diners_club-light.png
>-%%WWWDIR%%/web-vault/images/discover-dark.png
>-%%WWWDIR%%/web-vault/images/discover-light.png
>-%%WWWDIR%%/web-vault/images/favicon-16x16.png
>-%%WWWDIR%%/web-vault/images/favicon-32x32.png
>-%%WWWDIR%%/web-vault/images/icon-white.png
>-%%WWWDIR%%/web-vault/images/icons/android-chrome-192x192.png
>-%%WWWDIR%%/web-vault/images/icons/android-chrome-512x512.png
>-%%WWWDIR%%/web-vault/images/icons/apple-touch-icon.png
>-%%WWWDIR%%/web-vault/images/icons/favicon-16x16.png
>-%%WWWDIR%%/web-vault/images/icons/favicon-32x32.png
>-%%WWWDIR%%/web-vault/images/icons/mstile-150x150.png
>-%%WWWDIR%%/web-vault/images/icons/safari-pinned-tab.svg
>-%%WWWDIR%%/web-vault/images/jcb-dark.png
>-%%WWWDIR%%/web-vault/images/jcb-light.png
>-%%WWWDIR%%/web-vault/images/loading-white.svg
>-%%WWWDIR%%/web-vault/images/loading.svg
>-%%WWWDIR%%/web-vault/images/logo-dark@2x.png
>-%%WWWDIR%%/web-vault/images/logo-white@2x.png
>-%%WWWDIR%%/web-vault/images/maestro-dark.png
>-%%WWWDIR%%/web-vault/images/maestro-light.png
>-%%WWWDIR%%/web-vault/images/mastercard-dark.png
>-%%WWWDIR%%/web-vault/images/mastercard-light.png
>-%%WWWDIR%%/web-vault/images/mir-dark.png
>-%%WWWDIR%%/web-vault/images/mir-light.png
>-%%WWWDIR%%/web-vault/images/rc-w.png
>-%%WWWDIR%%/web-vault/images/rc.png
>-%%WWWDIR%%/web-vault/images/register-layout/cnet-logo.svg
>-%%WWWDIR%%/web-vault/images/register-layout/forbes-logo.svg
>-%%WWWDIR%%/web-vault/images/register-layout/logo-horizontal-white.png
>-%%WWWDIR%%/web-vault/images/register-layout/logo-horizontal-white.svg
>-%%WWWDIR%%/web-vault/images/register-layout/usnews-360-badge.svg
>-%%WWWDIR%%/web-vault/images/register-layout/wired-logo.png
>-%%WWWDIR%%/web-vault/images/ru_pay-dark.png
>-%%WWWDIR%%/web-vault/images/ru_pay-light.png
>-%%WWWDIR%%/web-vault/images/safari-pinned-tab.svg
>-%%WWWDIR%%/web-vault/images/two-factor/0.png
>-%%WWWDIR%%/web-vault/images/two-factor/1-w.png
>-%%WWWDIR%%/web-vault/images/two-factor/1.png
>-%%WWWDIR%%/web-vault/images/two-factor/2.png
>-%%WWWDIR%%/web-vault/images/two-factor/3.png
>-%%WWWDIR%%/web-vault/images/two-factor/4.png
>-%%WWWDIR%%/web-vault/images/two-factor/6.png
>-%%WWWDIR%%/web-vault/images/two-factor/7-w.png
>-%%WWWDIR%%/web-vault/images/two-factor/7.png
>-%%WWWDIR%%/web-vault/images/two-factor/rc-w.png
>-%%WWWDIR%%/web-vault/images/two-factor/rc.png
>-%%WWWDIR%%/web-vault/images/u2fkey-mobile.avif
>-%%WWWDIR%%/web-vault/images/u2fkey-mobile.jpg
>-%%WWWDIR%%/web-vault/images/u2fkey-mobile.webp
>-%%WWWDIR%%/web-vault/images/u2fkey.avif
>-%%WWWDIR%%/web-vault/images/u2fkey.jpg
>-%%WWWDIR%%/web-vault/images/u2fkey.webp
>-%%WWWDIR%%/web-vault/images/union_pay-dark.png
>-%%WWWDIR%%/web-vault/images/union_pay-light.png
>-%%WWWDIR%%/web-vault/images/visa-dark.png
>-%%WWWDIR%%/web-vault/images/visa-light.png
>-%%WWWDIR%%/web-vault/images/yubikey.avif
>-%%WWWDIR%%/web-vault/images/yubikey.jpg
>-%%WWWDIR%%/web-vault/images/yubikey.webp
>-%%WWWDIR%%/web-vault/index.html
>-%%WWWDIR%%/web-vault/locales/af/messages.json
>-%%WWWDIR%%/web-vault/locales/ar/messages.json
>-%%WWWDIR%%/web-vault/locales/az/messages.json
>-%%WWWDIR%%/web-vault/locales/be/messages.json
>-%%WWWDIR%%/web-vault/locales/bg/messages.json
>-%%WWWDIR%%/web-vault/locales/bn/messages.json
>-%%WWWDIR%%/web-vault/locales/bs/messages.json
>-%%WWWDIR%%/web-vault/locales/ca/messages.json
>-%%WWWDIR%%/web-vault/locales/cs/messages.json
>-%%WWWDIR%%/web-vault/locales/da/messages.json
>-%%WWWDIR%%/web-vault/locales/de/messages.json
>-%%WWWDIR%%/web-vault/locales/el/messages.json
>-%%WWWDIR%%/web-vault/locales/en/messages.json
>-%%WWWDIR%%/web-vault/locales/en_GB/messages.json
>-%%WWWDIR%%/web-vault/locales/en_IN/messages.json
>-%%WWWDIR%%/web-vault/locales/eo/messages.json
>-%%WWWDIR%%/web-vault/locales/es/messages.json
>-%%WWWDIR%%/web-vault/locales/et/messages.json
>-%%WWWDIR%%/web-vault/locales/eu/messages.json
>-%%WWWDIR%%/web-vault/locales/fi/messages.json
>-%%WWWDIR%%/web-vault/locales/fil/messages.json
>-%%WWWDIR%%/web-vault/locales/fr/messages.json
>-%%WWWDIR%%/web-vault/locales/he/messages.json
>-%%WWWDIR%%/web-vault/locales/hi/messages.json
>-%%WWWDIR%%/web-vault/locales/hr/messages.json
>-%%WWWDIR%%/web-vault/locales/hu/messages.json
>-%%WWWDIR%%/web-vault/locales/id/messages.json
>-%%WWWDIR%%/web-vault/locales/it/messages.json
>-%%WWWDIR%%/web-vault/locales/ja/messages.json
>-%%WWWDIR%%/web-vault/locales/ka/messages.json
>-%%WWWDIR%%/web-vault/locales/km/messages.json
>-%%WWWDIR%%/web-vault/locales/kn/messages.json
>-%%WWWDIR%%/web-vault/locales/ko/messages.json
>-%%WWWDIR%%/web-vault/locales/lv/messages.json
>-%%WWWDIR%%/web-vault/locales/ml/messages.json
>-%%WWWDIR%%/web-vault/locales/nb/messages.json
>-%%WWWDIR%%/web-vault/locales/nl/messages.json
>-%%WWWDIR%%/web-vault/locales/nn/messages.json
>-%%WWWDIR%%/web-vault/locales/pl/messages.json
>-%%WWWDIR%%/web-vault/locales/pt_BR/messages.json
>-%%WWWDIR%%/web-vault/locales/pt_PT/messages.json
>-%%WWWDIR%%/web-vault/locales/ro/messages.json
>-%%WWWDIR%%/web-vault/locales/ru/messages.json
>-%%WWWDIR%%/web-vault/locales/si/messages.json
>-%%WWWDIR%%/web-vault/locales/sk/messages.json
>-%%WWWDIR%%/web-vault/locales/sl/messages.json
>-%%WWWDIR%%/web-vault/locales/sr/messages.json
>-%%WWWDIR%%/web-vault/locales/sr_CS/messages.json
>-%%WWWDIR%%/web-vault/locales/sr_CY/messages.json
>-%%WWWDIR%%/web-vault/locales/sv/messages.json
>-%%WWWDIR%%/web-vault/locales/tr/messages.json
>-%%WWWDIR%%/web-vault/locales/uk/messages.json
>-%%WWWDIR%%/web-vault/locales/vi/messages.json
>-%%WWWDIR%%/web-vault/locales/zh_CN/messages.json
>-%%WWWDIR%%/web-vault/locales/zh_TW/messages.json
>-%%WWWDIR%%/web-vault/manifest.json
>-%%WWWDIR%%/web-vault/scripts/dropin.js
>-%%WWWDIR%%/web-vault/scripts/qrious.min.js
>-%%WWWDIR%%/web-vault/scripts/qrious.min.js.LICENSE.txt
>-%%WWWDIR%%/web-vault/sso-connector.html
>-%%WWWDIR%%/web-vault/theme_head.5f24ba8d7aa944e6f52b.js
>-%%WWWDIR%%/web-vault/theme_head.5f24ba8d7aa944e6f52b.js.map
>-%%WWWDIR%%/web-vault/version.json
>-%%WWWDIR%%/web-vault/vw-version.json
>-%%WWWDIR%%/web-vault/webauthn-connector.html
>-%%WWWDIR%%/web-vault/webauthn-fallback-connector.html
>-%%WWWDIR%%/web-vault/webauthn-mobile-connector.html
> @dir %%ETCDIR%%/rc.conf.d
>-@dir %%WWWDIR%%/data
>diff --git a/www/Makefile b/www/Makefile
>index 8edba62f495b..56bab9e813b0 100644
>--- a/www/Makefile
>+++ b/www/Makefile
>@@ -2376,6 +2376,7 @@
>     SUBDIR += varnish6
>     SUBDIR += varnish7
>     SUBDIR += varnish_exporter
>+    SUBDIR += vaultwarden_web-vault
>     SUBDIR += vdr-plugin-live
>     SUBDIR += vdradmin-am
>     SUBDIR += vertx

Actions: View | Diff

Attachments on bug 270182: 240825 | 240826 | 240827 | 241066 | 241067 | 241146 | 241147