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)
Index: Makefile
===================================================================
RCS file: /data/cvs/ports/security/keepassxc/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile 12 Jul 2019 20:49:03 -0000 1.23
+++ Makefile 4 Nov 2019 18:36:15 -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
Index: distinfo
===================================================================
RCS file: /data/cvs/ports/security/keepassxc/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo 15 Jun 2019 08:55:26 -0000 1.13
+++ distinfo 4 Nov 2019 18:37:25 -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: /data/cvs/ports/security/keepassxc/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 4 Jun 2019 18:42:08 -0000 1.1
+++ patches/patch-CMakeLists_txt 4 Nov 2019 18:41:55 -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: /data/cvs/ports/security/keepassxc/patches/patch-src_core_Alloc_cpp,v
retrieving revision 1.1
diff -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 4 Nov 2019 18:41:58 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_core_Alloc_cpp,v 1.1 2019/06/04 18:42:08 rsadowski Exp $
+$OpenBSD$
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
#endif
#if defined(NDEBUG) && !defined(__cpp_sized_deallocation)
-@@ -61,7 +63,7 @@ void operator delete(void* ptr) noexcept
+@@ -64,7 +66,7 @@ void operator delete(void* ptr) noexcept
::operator delete(ptr, _msize(ptr));
#elif defined(Q_OS_MACOS)
::operator delete(ptr, malloc_size(ptr));
--- error
[404/433] /usr/ports/pobj/keepassxc-2.5.0/bin/c++ -DQT_CONCURRENT_LIB
-DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_CAST_TO_ASCII
-DQT_NO_DEBUG -DQT_NO_EXCEPTIONS -DQT_STRICT_ITERATORS -DQT_SVG_LIB
-DQT_TESTCASE_BUILDDIR=\"/data/build/usr/ports/pobj/keepassxc-2.5.0/build-amd64\"
-DQT_TESTLIB_LIB -DQT_TEST_LIB -DQT_WIDGETS_LIB -DUSE_READLINE
-DWITH_APP_BUNDLE -Itests/testcli_autogen/include
-I/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/tests -Itests
-I/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/src -Itests/../src -isystem
/usr/local/include -isystem /usr/local/include/X11/qt5 -isystem
/usr/local/include/X11/qt5/QtCore -isystem
/usr/local/lib/qt5/./mkspecs/openbsd-clang -isystem
/usr/local/include/X11/qt5/QtConcurrent -isystem
/usr/local/include/X11/qt5/QtWidgets -isystem /usr/local/include/X11/qt5/QtGui
-isystem /usr/X11R6/include -isystem /usr/local/include/X11/qt5/QtTest -isystem
/usr/local/include/X11/qt5/QtSvg -isystem /usr/local/include/X11/qt5/QtNetwork
-isystem /usr/local/include/X11/qt5/QtDBus -O2 -pipe -fno-common -Wall -Wextra
-Wundef -Wpointer-arith -Wno-long-long -Wformat=2 -Wmissing-format-attribute
-fvisibility=hidden -fvisibility-inlines-hidden -fstack-protector-strong
-fno-exceptions -fno-rtti -Wnon-virtual-dtor -Wold-style-cast
-Woverloaded-virtual -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-Werror=format-security -std=c++11 -fsized-deallocation -DNDEBUG -fPIC -MD
-MT tests/CMakeFiles/testcli.dir/TestCli.cpp.o -MF
tests/CMakeFiles/testcli.dir/TestCli.cpp.o.d -o
tests/CMakeFiles/testcli.dir/TestCli.cpp.o -c
/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/tests/TestCli.cpp
FAILED: tests/CMakeFiles/testcli.dir/TestCli.cpp.o
/usr/ports/pobj/keepassxc-2.5.0/bin/c++ -DQT_CONCURRENT_LIB -DQT_CORE_LIB
-DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_CAST_TO_ASCII -DQT_NO_DEBUG
-DQT_NO_EXCEPTIONS -DQT_STRICT_ITERATORS -DQT_SVG_LIB
-DQT_TESTCASE_BUILDDIR=\"/data/build/usr/ports/pobj/keepassxc-2.5.0/build-amd64\"
-DQT_TESTLIB_LIB -DQT_TEST_LIB -DQT_WIDGETS_LIB -DUSE_READLINE
-DWITH_APP_BUNDLE -Itests/testcli_autogen/include
-I/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/tests -Itests
-I/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/src -Itests/../src -isystem
/usr/local/include -isystem /usr/local/include/X11/qt5 -isystem
/usr/local/include/X11/qt5/QtCore -isystem
/usr/local/lib/qt5/./mkspecs/openbsd-clang -isystem
/usr/local/include/X11/qt5/QtConcurrent -isystem
/usr/local/include/X11/qt5/QtWidgets -isystem /usr/local/include/X11/qt5/QtGui
-isystem /usr/X11R6/include -isystem /usr/local/include/X11/qt5/QtTest -isystem
/usr/local/include/X11/qt5/QtSvg -isystem /usr/local/include/X11/qt5/QtNetwork
-isystem /usr/local/include/X11/qt5/QtDBus -O2 -pipe -fno-common -Wall -Wextra
-Wundef -Wpointer-arith -Wno-long-long -Wformat=2 -Wmissing-format-attribute
-fvisibility=hidden -fvisibility-inlines-hidden -fstack-protector-strong
-fno-exceptions -fno-rtti -Wnon-virtual-dtor -Wold-style-cast
-Woverloaded-virtual -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-Werror=format-security -std=c++11 -fsized-deallocation -DNDEBUG -fPIC -MD
-MT tests/CMakeFiles/testcli.dir/TestCli.cpp.o -MF
tests/CMakeFiles/testcli.dir/TestCli.cpp.o.d -o
tests/CMakeFiles/testcli.dir/TestCli.cpp.o -c
/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/tests/TestCli.cpp
/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/tests/TestCli.cpp:1794:10:
error: use of undeclared identifier 'YubiKey'
if (!YubiKey::instance()->init()) {
^
/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/tests/TestCli.cpp:1799:23:
error: use of undeclared identifier 'YubiKey'
bool isBlocking = YubiKey::instance()->checkSlotIsBlocking(2, errorMessage);
^
/usr/ports/pobj/keepassxc-2.5.0/keepassxc-2.5.0/tests/TestCli.cpp:1806:5:
error: use of undeclared identifier 'YubiKey'
YubiKey::instance()->challenge(2, false, challenge, response);
^
3 errors generated.
ninja: build stopped: subcommand failed.
*** Error 1 in . (/usr/ports/devel/cmake/cmake.port.mk:34 'do-build')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2783
'/usr/ports/pobj/keepassxc-2.5.0/build-amd64/.build_done')
*** Error 1 in /usr/ports/security/keepassxc
(/usr/ports/infrastructure/mk/bsd.port.mk:2453 'all')
