diff --git a/keepassxc-2.7.6-botan-3.3.0.patch b/keepassxc-2.7.6-botan-3.3.0.patch new file mode 100644 index 0000000..49506eb --- /dev/null +++ b/keepassxc-2.7.6-botan-3.3.0.patch @@ -0,0 +1,31 @@ +From cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22 Mon Sep 17 00:00:00 2001 +From: Dan Church +Date: Sun, 19 Nov 2023 11:05:21 -0600 +Subject: [PATCH] Fix Botan 2/3 include + +Botan::secure_scrub_memory -> defined in mem_ops.h +Botan::secure_vector -> defined in secmem.h + +The reason only including secmem.h worked in previous (<3.0) versions of +Botan was because secmem.h included mem_ops.h. This is no longer the +case since commit +randombit/botan@49dbbcb2bfda05ef9d3f09848c9ba22fcbcd5066 (2023-10-11; +"Split out allocator helpers to allocator.h") + +Fixes #10038 +--- + src/keys/FileKey.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/keys/FileKey.h b/src/keys/FileKey.h +index 795f03bdbc..65cd955a7c 100644 +--- a/src/keys/FileKey.h ++++ b/src/keys/FileKey.h +@@ -19,6 +19,7 @@ + #ifndef KEEPASSX_FILEKEY_H + #define KEEPASSX_FILEKEY_H + ++#include + #include + + #include "keys/Key.h" diff --git a/keepassxc.spec b/keepassxc.spec index 4805ad7..61582ae 100644 --- a/keepassxc.spec +++ b/keepassxc.spec @@ -1,6 +1,6 @@ Name: keepassxc Version: 2.7.6 -Release: 2mamba +Release: 3mamba Summary: A modern, secure, and open-source password manager that stores and manages your most sensitive information Group: Graphical Desktop/Applications/Security Vendor: openmamba @@ -8,6 +8,7 @@ Distribution: openmamba Packager: Silvan Calarco URL: https://keepassxc.org/ Source: https://github.com/keepassxreboot/keepassxc.git/%{version}/keepassxc-%{version}.tar.bz2 +Patch0: keepassxc-2.7.6-botan-3.3.0.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -27,7 +28,7 @@ BuildRequires: libusb-devel BuildRequires: libz-devel BuildRequires: qt5-qtbase-devel ## AUTOBUILDREQ-END -BuildRequires: libbotan-devel >= 3.2.0-1mamba +BuildRequires: libbotan-devel >= 3.3.0-1mamba BuildRequires: cmake %description @@ -37,6 +38,7 @@ KeePassXC is a modern, secure, and open-source password manager that stores and %prep %setup -q +%patch 0 -p1 -b .botan-3.3.0 %build %cmake -d build \ @@ -78,6 +80,9 @@ KeePassXC is a modern, secure, and open-source password manager that stores and %doc COPYING %changelog +* Sun Feb 25 2024 Automatic Build System 2.7.6-3mamba +- rebuilt by autoport with build requirements: libbotan-devel>=3.3.0-1mamba + * Sun Nov 12 2023 Automatic Build System 2.7.6-2mamba - rebuilt by autoport with build requirements: libbotan-devel>=3.2.0-1mamba