From nobody Wed Feb 14 12:35:55 2024 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 4TZd3156RMz59j4Q; Wed, 14 Feb 2024 12:35:57 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TZd314ZXQz4ZqN; Wed, 14 Feb 2024 12:35:57 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707914157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ba4iff3g0ANrrAz0rYhBZ4NgDKjWpx2blUK1AHVlVq4=; b=xjHor8cqtoP5bzgaoCLhD/B+UCxNp3UaRNZiEYsNWeW0gWo1EbvjZSd2LgTo/zKNqMpXrk uWG2UdLGniWPF/8/8dbWnScSlALDUSXNJGJftbnQtiNR6/iYUBmJZH9MCl6JVo+f/AlPqL 5GtlyBqzzpe091FTL2zJPuLLn0dK5vTUXyjJoUzTvpXf9uz1IZplQVzR+I/MimIiAbzRGh vVKI27v/Vk4u63EWCeo7utxWeL7IBmSS5GIOL23E/JYTKHveZD8KkfvHejYHEJKDOquur7 lCaiRspF8H35W1Ry80DqWwtnMXh8NpmvjqETxr6vXi63qLrYA7/jkEozEuaEtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707914157; a=rsa-sha256; cv=none; b=EKr0R5CnUToUdmpLKgPo+UjGjZ4OHTmxgwWm1C0AuXovaLXlVUC7JJ0cRh9d+OzO2izREF 2yKt2gs6xuKFq0f+gaKhAxDGNK2bbCUz3XrzKu9hbOL6GSBfAWEEuAvos7ePjbLb3DhtZf 9P8VwkCBWSOrFmUYdxCN8vTWa8BGcGvHHtag6Jvpww/sktF7+Wgn54dJhNGh+msYLHc/H2 Poy+0jMNEBuKw2oez1uRgnoEK3jxQBYOMXk8+iJZhSyR8s5+m/PqhYoqhFvvxOi4ag9+hl EGkWW3WFPShh0F6Y8jNIeQKyn7hnU9mvFBhqDmpPuIdjnBBNM+Pf6Z19Aw9RBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707914157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ba4iff3g0ANrrAz0rYhBZ4NgDKjWpx2blUK1AHVlVq4=; b=hfeALsCKBZHzN3MoISQ9AXyWUcCJrReBskufXnh+UpFTWXxhoDr/58Bye4lAfscYaRCIPi MrIxbmAQyK6VPqfMl+CLo1zWB+cFkFlVMrLZ8BiSLU+jc159hrpWSqqpxA0g9Q27BvbuA9 pUqF9CDLUeBge2vTwCJ5no3XqZxUZoEwPDwD26YRyAczzya171SksFGc+hegmA4kPsL8ph gyoSVrGLYHAKX1RGYIbOllW/bhjNXJfP5XiRsgMoWUaDyr8RLgNWcpei5Lrm+hjwPNfJ12 glXw+qntYvDntG5l1XscwWb6FFH2ep/al9JUWPUo47hksHnd3Gr31xKoAMK2yA== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TZd312wytzKkN; Wed, 14 Feb 2024 12:35:57 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id EB27FA5A7F; Wed, 14 Feb 2024 13:35:55 +0100 (CET) Date: Wed, 14 Feb 2024 13:35:55 +0100 From: Baptiste Daroussin To: Michael Reifenberger 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: References: <202402081808.418I8oLk075025@gitrepo.freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <202402081808.418I8oLk075025@gitrepo.freebsd.org> 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 > AuthorDate: 2024-02-08 17:57:38 +0000 > Commit: Michael Reifenberger > 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 > > @@ -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