From f8bbc28c4040edafe99a2672808247a72b473165 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Wed, 14 Feb 2024 13:37:58 +0100 Subject: [PATCH] security/vaultwarden: fix packaging The ownership can and should only be done in the plist never directly in the make targets, make package should be executable as a regular user and this is the case in the cluster) PR: 276998 Reported by: freebsd@rail.eu.org --- security/vaultwarden/Makefile | 1 - security/vaultwarden/pkg-plist | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/security/vaultwarden/Makefile b/security/vaultwarden/Makefile index b738dd7bb6ae..a9bf2e5b66d1 100644 --- a/security/vaultwarden/Makefile +++ b/security/vaultwarden/Makefile @@ -68,7 +68,6 @@ CARGO_INSTALL_ARGS+= --config profile.release.strip=true pre-install: ${MKDIR} ${STAGEDIR}/${WWWDIR}/data - ${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}/${WWWDIR}/data # @${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST} # @${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST} # @${ECHO_CMD} "@mode 755" >> ${PLIST} diff --git a/security/vaultwarden/pkg-plist b/security/vaultwarden/pkg-plist index 4646c5a8a573..7255bbe8daa1 100644 --- a/security/vaultwarden/pkg-plist +++ b/security/vaultwarden/pkg-plist @@ -2,7 +2,4 @@ bin/vaultwarden etc/rc.conf.d/vaultwarden.sample etc/rc.d/vaultwarden @dir %%ETCDIR%%/rc.conf.d -@owner www -@group www -@mode 755 -@dir %%WWWDIR%%/data +@dir(www,www,755) %%WWWDIR%%/data