CVS commit: pkgsrc/security/vaultwarden

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Dec  5 14:33:00 UTC 2024

Modified Files:
        pkgsrc/security/vaultwarden: Makefile

Log Message:
vaultwarden: Ensure openssl is linked correctly.

Some minor cleanups while here.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/vaultwarden/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/vaultwarden/Makefile
diff -u pkgsrc/security/vaultwarden/Makefile:1.8 pkgsrc/security/vaultwarden/Makefile:1.9
--- pkgsrc/security/vaultwarden/Makefile:1.8    Sun Dec  1 00:04:58 2024
+++ pkgsrc/security/vaultwarden/Makefile        Thu Dec  5 14:33:00 2024
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2024/12/01 00:04:58 pin Exp $
+# $NetBSD: Makefile,v 1.9 2024/12/05 14:33:00 jperkin Exp $
 
-DISTNAME=      vaultwarden-${PKGVER}
-PKGVER=                1.32.5
+DISTNAME=      vaultwarden-1.32.5
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=dani-garcia/}
-EXTRACT_SUFX=  .tar.gz
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=    hauke%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/dani-garcia/vaultwarden
 COMMENT=       Bitwarden compatible backend server
 LICENSE=       gnu-agpl-v3
 
+DISTFILES=     ${DEFAULT_DISTFILES}
+
 .include "cargo-depends.mk"
 
 USE_TOOLS+=    perl
@@ -20,6 +19,8 @@ DEPENDS+=     daemonize>=1.7.8:../../sysutil
 
 MAKE_ENV+=     OPENSSL_DIR=${SSLBASE:Q}
 
+RUSTFLAGS+=    -C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "options.mk"
@@ -78,10 +79,8 @@ do-install:
                 ${DESTDIR}${PREFIX}/sbin/vaultwarden
 
 .include "../../devel/capnproto/buildlink3.mk"
-.include "../../security/nettle/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-
 .include "../../lang/rust/cargo.mk"
-
+.include "../../security/nettle/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"