Re: help for updating security/keepassxc

On Mon Nov 04, 2019 at 07:53:03PM +0100, Solene Rapenne wrote:
> I managed to update the patch so it applies on keepassxc 2.5.0 (2.4.3 is no
> longer compatible with firefox extension, I wanted to try keepassxc)
>
> I get an error about yubikey (error at the bottom of the mail)
>

I have a working version and all my patches mergred upstream. I think it
will be a 2.5.1 soon but we can go in with the following diff.

I also enabled WITH_XC_FDOSECRET:
"Implement freedesktop.org Secret Storage Spec server side API."

I haven't tested yet but it compiles fine, so let's try in the wild.

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/keepassxc/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- Makefile 12 Jul 2019 20:49:03 -0000 1.23
+++ Makefile 30 Oct 2019 05:48:03 -0000
@@ -2,7 +2,7 @@

COMMENT = management tool for password and sensitive data

-V = 2.4.3
+V = 2.5.0
DISTNAME = keepassxc-${V}

CATEGORIES = security
@@ -16,7 +16,8 @@ PERMIT_PACKAGE = Yes

WANTLIB += ${COMPILER_LIBCXX} Qt5Concurrent Qt5Core Qt5DBus Qt5Gui
WANTLIB += Qt5Network Qt5Svg Qt5Widgets Qt5X11Extras X11 Xi Xtst
-WANTLIB += argon2 c gcrypt gpg-error m qrencode sodium z
+WANTLIB += argon2 c gcrypt gpg-error m qrencode readline sodium
+WANTLIB += z

MASTER_SITES = https://github.com/keepassxreboot/keepassxc/releases/download/${V}/
EXTRACT_SUFX = -src.tar.xz
@@ -38,7 +39,8 @@ RUN_DEPENDS = devel/desktop-file-utils \
CONFIGURE_ARGS= -DCMAKE_INSTALL_MANDIR="man" \
-DWITH_GUI_TESTS=ON \
-DWITH_XC_AUTOTYPE=ON \
- -DWITH_XC_SSHAGENT=ON
+ -DWITH_XC_SSHAGENT=ON \
+ -DWITH_XC_FDOSECRETS=ON

TEST_IS_INTERACTIVE = X11

Index: distinfo
===================================================================
RCS file: /cvs/ports/security/keepassxc/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 15 Jun 2019 08:55:26 -0000 1.13
+++ distinfo 30 Oct 2019 05:48:03 -0000
@@ -1,2 +1,2 @@
-SHA256 (keepassxc-2.4.3-src.tar.xz) = 18lSGSExBHaJw/j7cnXfDg378glKVU277pptbPqPJzQ=
-SIZE (keepassxc-2.4.3-src.tar.xz) = 3301944
+SHA256 (keepassxc-2.5.0-src.tar.xz) = Y1nOlytyCovOHoulQABmbpxY+RZPLp5SvvLiTkYSeIE=
+SIZE (keepassxc-2.5.0-src.tar.xz) = 6752776
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/security/keepassxc/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 4 Jun 2019 18:42:08 -0000 1.1
+++ patches/patch-CMakeLists_txt 30 Oct 2019 05:48:03 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1 201
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -415,6 +415,14 @@ if(UNIX)
+@@ -438,6 +438,14 @@ if(UNIX)
int main() { prctl(PR_SET_DUMPABLE, 0); return 0; }"
HAVE_PR_SET_DUMPABLE)

Index: patches/patch-src_core_Alloc_cpp
===================================================================
RCS file: /cvs/ports/security/keepassxc/patches/patch-src_core_Alloc_cpp,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_Alloc_cpp
--- patches/patch-src_core_Alloc_cpp 4 Jun 2019 18:42:08 -0000 1.1
+++ patches/patch-src_core_Alloc_cpp 30 Oct 2019 05:48:03 -0000
@@ -3,10 +3,10 @@ $OpenBSD: patch-src_core_Alloc_cpp,v 1.1
Index: src/core/Alloc.cpp
--- src/core/Alloc.cpp.orig
+++ src/core/Alloc.cpp
-@@ -20,8 +20,10 @@
- #include <sodium.h>
- #ifdef Q_OS_MACOS
+@@ -23,8 +23,10 @@
#include <malloc/malloc.h>
+ #elif defined(Q_OS_FREEBSD)
+ #include <malloc_np.h>
-#else
+#elif defined(HAVE_MALLOC_H)
#include <malloc.h>
@@ -15,7 +15,7 @@ Index: src/core/Alloc.cpp