Date: Wed, 14 Feb 2024 13:35:55 +0100 From: Baptiste Daroussin <bapt@freebsd.org> To: Michael Reifenberger <mr@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: ee63c50e82f3 - main - security/vaultwarden: Update to 1.30.3 Message-ID: <uv7u7jvzsfpzxh5jgxrn6c5oe3n5bmmhpb6zmbcazseysvdpp5@cy42vku4imo3> In-Reply-To: <202402081808.418I8oLk075025@gitrepo.freebsd.org> References: <202402081808.418I8oLk075025@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Feb 08, 2024 at 06:08:50PM +0000, Michael Reifenberger wrote: > The branch main has been updated by mr: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=ee63c50e82f3c8cc5aa860bdc0791a548acf4560 > > commit ee63c50e82f3c8cc5aa860bdc0791a548acf4560 > Author: Michael Reifenberger <mr@FreeBSD.org> > AuthorDate: 2024-02-08 17:57:38 +0000 > Commit: Michael Reifenberger <mr@FreeBSD.org> > CommitDate: 2024-02-08 18:08:27 +0000 > > security/vaultwarden: Update to 1.30.3 > > While there address PR:276739 by installing the static configfile sample > to etc/rc.conf.d/vaultwarden.sample since www/vaultwarden/data/config.json > is for dynamic changes via the UI. > > PR: 276745, 276739 > --- > security/vaultwarden/Makefile | 23 +- > security/vaultwarden/Makefile.crates | 259 +++++++------- > security/vaultwarden/distinfo | 524 +++++++++++++++------------- > security/vaultwarden/files/patch-Cargo.lock | 37 -- > security/vaultwarden/files/patch-Cargo.toml | 15 - > security/vaultwarden/pkg-plist | 9 +- > 6 files changed, 434 insertions(+), 433 deletions(-) > > diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile > index 7667fe105071..b738dd7bb6ae 100644 > --- a/security/vaultwarden/Makefile > +++ b/security/vaultwarden/Makefile > @@ -1,5 +1,5 @@ > PORTNAME= vaultwarden > -DISTVERSION= 1.30.1 > +DISTVERSION= 1.30.3 > CATEGORIES= security > > MAINTAINER= mr@FreeBSD.org > @@ -48,7 +48,7 @@ CARGO_FEATURES= --no-default-features > INSTALL_TARGET= install-strip > > SUB_LIST= WWWGRP=${WWWGRP} \ > - WWWOWN=${WWWOWN} > + WWWOWN=${WWWOWN} > > .include <bsd.port.pre.mk> > > @@ -58,12 +58,27 @@ LTO_UNSAFE= yes > CARGO_ENV+= CARGO_PROFILE_RELEASE_LTO=false > .endif > > +.if !defined(WITH_DEBUG) > +CARGO_INSTALL_ARGS+= --config profile.release.strip=true > +.endif > + > #post-patch: > # ${REINPLACE_CMD} 's/^rust-version = "1.60"/rust-version = "1.59"/' \ > # ${WRKSRC}/Cargo.toml > > -post-install: > +pre-install: > ${MKDIR} ${STAGEDIR}/${WWWDIR}/data > - ${INSTALL} -m0600 ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${WWWDIR}/data/config.json.sample > + ${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}/data > + # @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} > + # @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST} > + # @${ECHO_CMD} "@mode 755" >> ${PLIST} > + # @${ECHO_CMD} "${STAGEDIR}/${WWWDIR}/data" >> ${PLIST} > + # @${ECHO_CMD} "@mode" >> ${PLIST} > + # @${ECHO_CMD} "@group" >> ${PLIST} > + # @${ECHO_CMD} "@owner" >> ${PLIST} > + ${MKDIR} ${STAGEDIR}/${ETCDIR}/rc.conf.d > + ${INSTALL} -m0600 ${FILESDIR}/${PORTNAME}_conf.in ${STAGEDIR}/${LOCALBASE}/etc/rc.conf.d/${PORTNAME}.sample > + This is completly wrong and does not even work in poudriere where by default this is run as user nobody, we do not set any ownership in the install targets! This can and should only be done in plist! cf: https://bugs.freebsd.org/276998 Best regards, Bapt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?uv7u7jvzsfpzxh5jgxrn6c5oe3n5bmmhpb6zmbcazseysvdpp5>