diff options
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | cc0530ba.patch | 31 |
2 files changed, 42 insertions, 4 deletions
@@ -12,7 +12,7 @@ _NETBUILD=OFF pkgname=keepassxc pkgver=2.7.6 -pkgrel=2 +pkgrel=3 pkgdesc="Cross-platform community-driven port of Keepass password manager" arch=(x86_64) url="https://keepassxc.org/" @@ -25,11 +25,14 @@ optdepends=('xclip: keepassxc-cli clipboard support under X server' 'wl-clipboard: keepassxc-cli clipboard support under Wayland') checkdepends=(xclip xorg-server-xvfb) provides=(org.freedesktop.secrets) -source=(https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/keepassxc-$pkgver-src.tar.xz{,.sig}) +source=(https://github.com/keepassxreboot/keepassxc/releases/download/$pkgver/keepassxc-$pkgver-src.tar.xz{,.sig} + cc0530ba.patch) sha256sums=('a58074509fa8e90f152c6247f73e75e126303081f55eedb4ea0cbb6fa980d670' - 'SKIP') + 'SKIP' + '7884a0425a5bf7e67d389d6b2545b06ee28b6d77e9164df13a8e78b5719d11ce') b2sums=('2ecdd387a7bc70aeeaef6eeabdfeed6aaf1d779056580375c011aa71d62459d38258617a4cb46fc3b215a2b6e1e3326cc8c62b228bee0be674923399421b0cbe' - 'SKIP') + 'SKIP' + 'de04cc88f3829dd9183126c6ec014dab808ea6be8ddb96eb29ef1192510bb1ff421d4ddcab5e69faf8b8be0dc75864fdb276973484a5be83b3e94730204f87a9') # List of signing keys can be found at https://keepassxc.org/verifying-signatures/ validpgpkeys=(BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2 71D4673D73C7F83C17DAE6A2D8538E98A26FD9C4 @@ -37,6 +40,10 @@ validpgpkeys=(BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2 C1E4CBA3AD78D3AFD894F9E0B7A66F03B59076A8) prepare() { + + # Fix build with botan 3.3 + patch -d $pkgname-$pkgver -p1 < cc0530ba.patch + sed -i 's|Exec=keepassxc %f|Exec=keepassxc --localconfig ~/.config/keepassxc/keepassxc.ini %f|' $srcdir/$pkgname-$pkgver/share/linux/org.keepassxc.KeePassXC.desktop.in } diff --git a/cc0530ba.patch b/cc0530ba.patch new file mode 100644 index 0000000..49506eb --- /dev/null +++ b/cc0530ba.patch @@ -0,0 +1,31 @@ +From cc0530ba4671a7e2b6ac4a6c00cd097f4114fd22 Mon Sep 17 00:00:00 2001 +From: Dan Church <amphetamachine@gmail.com> +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 <botan/mem_ops.h> + #include <botan/secmem.h> + + #include "keys/Key.h" |