Attachment #225172 for bug #256081

View | Details | Raw Unified | Return to bug 256081
Collapse All | Expand All





PORTNAME=	vaultwarden
DISTVERSION=	1.21.0
PORTREVISION=	2
CATEGORIES=	security
MASTER_SITES=	https://github.com/dani-garcia/bw_web_builds/releases/download/v${DISTVERSION_WV}/:web
DISTFILES=	${WV_DISTFILE}:web

WV_DISTFILE=	bw_web_v${DISTVERSION_WV}.tar.gz
USE_RC_SUBR=	${PORTNAME}
SUB_FILES=	pkg-message
SUB_LIST=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}

# make makeplist > pkg-plist #One has to edit/review the generated plist
# make generate-plist && make check-plist

		opaque-debug-0.3.0 \
		openssl-0.10.34 \
		openssl-probe-0.1.2 \
		openssl-src-111.15.0+1.1.1k \
		openssl-sys-0.9.62 \
		owning_ref-0.3.3 \
		parity-ws-0.10.0 \

		yubico-0.10.0
CARGO_USE_GITHUB=	yes

post-patch:
	${REINPLACE_CMD} 's/^vendored_openssl/#&/' ${WRKSRC}/Cargo.toml

post-install:
	${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d
	${CP} ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample
	${MKDIR} ${STAGEDIR}/${WWWDIR}
	${MKDIR} ${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} \
		'@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \
		>> ${TMPPLIST}

Lines 327-334 SHA256 (rust/crates/openssl-0.10.34.crate) = 6d7830286ad6a3973c0f1d9b73738f69c76 Link Here

(-)b/security/vaultwarden/distinfo (-2 lines)
327	SIZE (rust/crates/openssl-0.10.34.crate) = 203996	327	SIZE (rust/crates/openssl-0.10.34.crate) = 203996
328	SHA256 (rust/crates/openssl-probe-0.1.2.crate) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de	328	SHA256 (rust/crates/openssl-probe-0.1.2.crate) = 77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de
329	SIZE (rust/crates/openssl-probe-0.1.2.crate) = 6427	329	SIZE (rust/crates/openssl-probe-0.1.2.crate) = 6427
330	SHA256 (rust/crates/openssl-src-111.15.0+1.1.1k.crate) = b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a
331	SIZE (rust/crates/openssl-src-111.15.0+1.1.1k.crate) = 5087962
332	SHA256 (rust/crates/openssl-sys-0.9.62.crate) = fa52160d45fa2e7608d504b7c3a3355afed615e6d8b627a74458634ba21b69bd	330	SHA256 (rust/crates/openssl-sys-0.9.62.crate) = fa52160d45fa2e7608d504b7c3a3355afed615e6d8b627a74458634ba21b69bd
333	SIZE (rust/crates/openssl-sys-0.9.62.crate) = 52116	331	SIZE (rust/crates/openssl-sys-0.9.62.crate) = 52116
334	SHA256 (rust/crates/owning_ref-0.3.3.crate) = cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37	332	SHA256 (rust/crates/owning_ref-0.3.3.crate) = cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37




{ type: install
  message: <<EOM

Setup vaultwarden environment:

Adapt %%PREFIX%%/etc/rc.conf.d/vaultwarden to your needs.
EOM
}
{ type: upgrade
  message: <<EOM

Note to former bitwarden_rs user to update from bitwarden_rs to vaulwarden : 

Stop and disable bitwarden_rs service 


Copy %%PREFIX%%/www/bitwarden_rs/data to %%PREFIX%%/www/vaultwarden/data

Enable and start vaultwarden service

---------------------------------------------------------------------------------------
 
Setup vaultwarden environment:

Copy %%PREFIX%%/etc/rc.conf.d/vaultwarden.sample to  %%PREFIX%%/etc/rc.conf.d/vaultwarden

Adapt %%PREFIX%%/etc/rc.conf.d/vaultwarden to your needs.

Enable and start vaultwarden service
EOM
}

Lines 16-23 rcvar=vaultwarden_enable Link Here

(-)b/security/vaultwarden/files/vaultwarden.in (-2 / +2 lines)
16	load_rc_config ${name}	16	load_rc_config ${name}
17		17
18	: ${vaultwarden_chdir=%%PREFIX%%/www/vaultwarden}	18	: ${vaultwarden_chdir=%%PREFIX%%/www/vaultwarden}
19	: ${vaultwarden_user:=www}	19	: ${vaultwarden_user:=%%WWWOWN%%}
20	: ${vaultwarden_group:=www}	20	: ${vaultwarden_group:=%%WWWGRP%%}
21		21
22	# This is the tool init launches	22	# This is the tool init launches
23	command="/usr/sbin/daemon"	23	command="/usr/sbin/daemon"

Lines 1-6 Link Here

(-)b/security/vaultwarden/pkg-plist (-2 / +1 lines)
1	bin/vaultwarden	1	bin/vaultwarden
2	etc/rc.conf.d/vaultwarden.sample	2	@sample etc/rc.conf.d/vaultwarden.sample
3	etc/rc.d/vaultwarden
4	%%WWWDIR%%/web-vault/.nojekyll	3	%%WWWDIR%%/web-vault/.nojekyll
5	%%WWWDIR%%/web-vault/404.html	4	%%WWWDIR%%/web-vault/404.html
6	%%WWWDIR%%/web-vault/404/bootstrap.min.css	5	%%WWWDIR%%/web-vault/404/bootstrap.min.css

Return to bug 256081

Lines 2-8 Link Here

(-)b/security/vaultwarden/Makefile (-5 / +6 lines)
2		2
3	PORTNAME= vaultwarden	3	PORTNAME= vaultwarden
4	DISTVERSION= 1.21.0	4	DISTVERSION= 1.21.0
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= security	6	CATEGORIES= security
7	MASTER_SITES= https://github.com/dani-garcia/bw_web_builds/releases/download/v${DISTVERSION_WV}/:web	7	MASTER_SITES= https://github.com/dani-garcia/bw_web_builds/releases/download/v${DISTVERSION_WV}/:web
8	DISTFILES= ${WV_DISTFILE}:web	8	DISTFILES= ${WV_DISTFILE}:web
Lines 23-28 DISTVERSION_WV= 2.20.1 Link Here
23	WV_DISTFILE= bw_web_v${DISTVERSION_WV}.tar.gz	23	WV_DISTFILE= bw_web_v${DISTVERSION_WV}.tar.gz
24	USE_RC_SUBR= ${PORTNAME}	24	USE_RC_SUBR= ${PORTNAME}
25	SUB_FILES= pkg-message	25	SUB_FILES= pkg-message
		26	SUB_LIST= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
26		27
27	# make makeplist > pkg-plist #One has to edit/review the generated plist	28	# make makeplist > pkg-plist #One has to edit/review the generated plist
28	# make generate-plist && make check-plist	29	# make generate-plist && make check-plist
Lines 202-208 CARGO_CRATES= addr2line-0.14.1 \ Link Here
202	opaque-debug-0.3.0 \	203	opaque-debug-0.3.0 \
203	openssl-0.10.34 \	204	openssl-0.10.34 \
204	openssl-probe-0.1.2 \	205	openssl-probe-0.1.2 \
205	openssl-src-111.15.0+1.1.1k \
206	openssl-sys-0.9.62 \	206	openssl-sys-0.9.62 \
207	owning_ref-0.3.3 \	207	owning_ref-0.3.3 \
208	parity-ws-0.10.0 \	208	parity-ws-0.10.0 \
Lines 379-392 CARGO_CRATES= addr2line-0.14.1 \ Link Here
379	yubico-0.10.0	379	yubico-0.10.0
380	CARGO_USE_GITHUB= yes	380	CARGO_USE_GITHUB= yes
381		381
		382	post-patch:
		383	${REINPLACE_CMD} 's/^vendored_openssl/#&/' ${WRKSRC}/Cargo.toml
		384
382	post-install:	385	post-install:
383	${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d	386	${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d
384	${CP} ${FILESDIR}/vaultwarden_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample	387	${CP} ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample
385	${MKDIR} ${STAGEDIR}/${WWWDIR}	388	${MKDIR} ${STAGEDIR}/${WWWDIR}
386	${MKDIR} ${STAGEDIR}/${WWWDIR}/data	389	${MKDIR} ${STAGEDIR}/${WWWDIR}/data
387	# ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}/data
388	(cd ${WRKDIR} && ${COPYTREE_SHARE} web-vault ${STAGEDIR}/${WWWDIR})	390	(cd ${WRKDIR} && ${COPYTREE_SHARE} web-vault ${STAGEDIR}/${WWWDIR})
389	# @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/data' >> ${TMPPLIST}
390	${ECHO_CMD} \	391	${ECHO_CMD} \
391	'@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \	392	'@postexec chown -R ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/data' \
392	>> ${TMPPLIST}	393	>> ${TMPPLIST}

Lines 2-7 Link Here

(-)b/security/vaultwarden/files/pkg-message.in (-10 / +8 lines)
2	{ type: install	2	{ type: install
3	message: <<EOM	3	message: <<EOM
4		4
		5	Setup vaultwarden environment:
		6
		7	Adapt %%PREFIX%%/etc/rc.conf.d/vaultwarden to your needs.
		8	EOM
		9	}
		10	{ type: upgrade
		11	message: <<EOM
		12
5	Note to former bitwarden_rs user to update from bitwarden_rs to vaulwarden :	13	Note to former bitwarden_rs user to update from bitwarden_rs to vaulwarden :
6		14
7	Stop and disable bitwarden_rs service	15	Stop and disable bitwarden_rs service
Lines 10-25 Copy %%PREFIX%%/etc/rc.conf.d/bitwarden_rs to %%PREFIX%%/etc/rc.conf.d/vaultward Link Here
10		18
11	Copy %%PREFIX%%/www/bitwarden_rs/data to %%PREFIX%%/www/vaultwarden/data	19	Copy %%PREFIX%%/www/bitwarden_rs/data to %%PREFIX%%/www/vaultwarden/data
12		20
13	Enable and start vaultwarden service
14
15	---------------------------------------------------------------------------------------
16
17	Setup vaultwarden environment:
18
19	Copy %%PREFIX%%/etc/rc.conf.d/vaultwarden.sample to %%PREFIX%%/etc/rc.conf.d/vaultwarden
20
21	Adapt %%PREFIX%%/etc/rc.conf.d/vaultwarden to your needs.
22
23	Enable and start vaultwarden service	21	Enable and start vaultwarden service
24	EOM	22	EOM
25	}	23	}