Re: Add options to KeePassXC

[Joel Carnat <joel%carnat.net@localhost>]

On Mon, Feb 10, 2025 at 04:59:51PM GMT, Thomas Klausner wrote:
> On Mon, Feb 10, 2025 at 04:36:38PM +0100, Joel Carnat wrote:
> > This is a patch that adds options to security/keepassxc. The current
> > configure task ends this way:
> > -- Disabled features:                                          
> >  * Networking, Compile KeePassXC with network access code (e.g. for downloading website icons)
> >  * Passkeys, Passkeys support for browser integration    
> >  * SSHAgent, SSH agent integration compatible with KeeAgent
> >  * KeeShare, Sharing integration with KeeShare                 
> >  * YubiKey, YubiKey HMAC-SHA1 challenge-response               
> >  * UpdateCheck, Automatic update checking                      
> >  * FdoSecrets, Implement freedesktop.org Secret Storage Spec server side API.
> > 
> > The attached patch allows enabling any of those.
> 
> Thank you, that looks good. Can you please prefix the option names
> with 'keepassxc-', i.e. 'keepassxc-browser' etc. (since they are
> package-specific), and include a patch for
> mk/defaults/options.description, so 'make show-options' provides
> useful information for the new options?
>  Thomas

Here's the update patches.
I also modified the Makefile as I just noticed on of this option was
forced there. But the other were not present. I have turned it ON by
default in the options.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/security/keepassxc/Makefile,v
retrieving revision 1.81
diff -U2 -r1.81 Makefile
--- Makefile	29 Dec 2024 15:09:58 -0000	1.81
+++ Makefile	10 Feb 2025 16:54:26 -0000
@@ -3,5 +3,5 @@
 DISTNAME=	keepassxc-2.7.9-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GITHUB:=keepassxreboot/}
@@ -25,5 +25,4 @@
 CMAKE_CONFIGURE_ARGS+=	-DKEEPASSXC_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+=	-DWITH_XC_DOCS=OFF
-CMAKE_CONFIGURE_ARGS+=	-DWITH_XC_BROWSER=ON
 
 NOT_PAX_MPROTECT_SAFE+=	bin/keepassxc
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/security/keepassxc/options.mk,v
retrieving revision 1.2
diff -U2 -r1.2 options.mk
--- options.mk	25 Aug 2024 06:19:11 -0000	1.2
+++ options.mk	10 Feb 2025 16:54:26 -0000
@@ -2,10 +2,56 @@
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.keepassxc
-PKG_SUPPORTED_OPTIONS=		yubikey
-PKG_SUGGESTED_OPTIONS=		#
+PKG_SUPPORTED_OPTIONS=		keepassxc-browser keepassxc-browser-passkey \
+				keepassxc-fdosecrets keepassxc-keeshare \
+				keepassxc-networking keepassxc-sshagent \
+				keepassxc-yubikey
+PKG_SUGGESTED_OPTIONS=		keepassxc-browser
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Myubikey)
+# Enable/Disable KeePassXC-Browser extension support
+.if !empty(PKG_OPTIONS:Mkeepassxc-browser)
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_BROWSER=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_BROWSER=OFF
+.endif
+
+# Enable/Disable Passkeys support for browser integration
+.if !empty(PKG_OPTIONS:Mkeepassxc-browser-passkey)
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_BROWSER_PASSKEYS=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_BROWSER_PASSKEYS=OFF
+.endif
+
+# Enable/Disable Freedesktop.org Secrets Service support
+.if !empty(PKG_OPTIONS:Mkeepassxc-fdosecrets)
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_FDOSECRETS=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_FDOSECRETS=OFF
+.endif
+
+# Enable/Disable KeeShare group synchronization extension
+.if !empty(PKG_OPTIONS:Mkeepassxc-keeshare)
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_KEESHARE==ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_KEESHARE==OFF
+.endif
+
+# Enable/Disable Networking support
+.if !empty(PKG_OPTIONS:Mkeepassxc-networking)
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_NETWORKING=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_NETWORKING=OFF
+.endif
+
+# Enable/Disable SSHAgent support
+.if !empty(PKG_OPTIONS:Mkeepassxc-sshagent)
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_SSHAGENT=ON
+.else
+CMAKE_CONFIGURE_ARGS+= -DWITH_XC_SSHAGENT=OFF
+.endif
+
+# Enable/Disable YubiKey HMAC-SHA1 authentication support
+.if !empty(PKG_OPTIONS:Mkeepassxc-yubikey)
 CMAKE_CONFIGURE_ARGS+=	-DWITH_XC_YUBIKEY=ON
 .include "../../devel/libusb1/buildlink3.mk"
Index: options.description
===================================================================
RCS file: /cvsroot/pkgsrc/mk/defaults/options.description,v
retrieving revision 1.732
diff -U2 -r1.732 options.description
--- options.description	31 Jan 2025 11:45:31 -0000	1.732
+++ options.description	10 Feb 2025 16:54:31 -0000
@@ -424,4 +424,11 @@
 kde			Enable KDE support.
 kde4			Enable support for KDE 4.
+keepassxc-browser	Enable KeePassXC-Browser extension support.
+keepassxc-browser-passkey	Enable Passkeys support for browser integration.
+keepassxc-fdosecrets	Enable Freedesktop.org Secrets Service support.
+keepassxc-keeshare	Enable KeeShare group synchronization extension.
+keepassxc-networking	Enable Networking support.
+keepassxc-sshagent	Enable SSHAgent support.
+keepassxc-yubikey	Enable YubiKey HMAC-SHA1 authentication support.
 kerberos		Enable Kerberos support.
 kerberos-prefix-cmds	Enables addition of a prefix to the kerberos client commands.