<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/33a2db78e69079000dfb6e2020620fe290631bc7">https://github.com/macports/macports-ports/commit/33a2db78e69079000dfb6e2020620fe290631bc7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 33a2db78e69 KeePassXC: update to 2.7.4
</span>33a2db78e69 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 33a2db78e69079000dfb6e2020620fe290631bc7
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Tue Nov 22 09:29:10 2022 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: update to 2.7.4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> and update keepassxc-devel to latest commit of "develop" branch
</span>---
security/KeePassXC/Portfile | 41 ++---
.../{devel => }/add_support_for_old_macos.diff | 0
.../files/{devel => }/add_support_for_qt5.6.diff | 0
.../files/devel/patch-no-findpackage-path.diff | 21 ---
.../KeePassXC/files/patch-no-findpackage-path.diff | 23 ++-
security/KeePassXC/files/patch-touch-id.diff | 183 ---------------------
6 files changed, 27 insertions(+), 241 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/Portfile b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05cb9bec571..fb6356cf751 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,8 +32,8 @@ license_noconflict openssl openssl10 openssl11 openssl3
</span>
if {${subport} eq ${name}} {
# stable
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 2.7.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 2.7.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> github.tarball_from releases
distname keepassxc-${version}-src
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,44 +43,33 @@ if {${subport} eq ${name}} {
</span>
# See keepassxc-${version}-src.tar.xz.DIGEST on upstream GitHub releases page for SHA256 sums
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e5adf2843c99391f5fdd150caee4cdc4254ab155 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6001ba626c35c316dbda6de35736f012a2264f95139fcb4a094b8eb49b15d3e7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 8804436 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8370c30c621512817c30517a13c0c14e00121526 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 560052961da0389327e759171f660230dfa4e0f4e1fab6139600fb85c6e5dece \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 8957372 \
</span> ${distname}${extract.suffix}.sig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8faa589c6d808630d38a0da0ad0fe2c69aab070b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 197a206c10a0c51e9e50aef7a245cc6a99955d928ac3dfb549998953a614bf04 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a4e2dc1f2f7a85d6e34207681e4adcf5217a8c60 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4f2b2b3c7c809668e4b3529bd07a74364d9dba56508f6f65e93801301729429e \
</span> size 488
gpg_verify.use_gpg_verification \
yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-touch-id.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # In the future the Touch ID feature may require Darwin 17 (10.13)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/keepassxreboot/keepassxc/issues/2484
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append -DWITH_XC_TOUCHID=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } else {
# devel subport
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 9ba88e2f13695add13f0391badf49aedae115b6f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup keepassxreboot keepassxc 12be175d583fbfac5a7b6b250a3bb5f792925285
</span> set githash [string range ${github.version} 0 6]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20221102.git${githash}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20221120.git${githash}
</span> revision 0
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 6b8b9a94b886e3062553b14ec1507324e7f7ec15 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 13a870d347837c6c8769dbf3f9ea9f074d0a9d039e4e7b11ac65187eb1520c66 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11421690
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 031fee017468df9410f58cdca2841d0c7d01cfbe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9e81c92baefe7adafbd3f1caee927ef9a55c02b2d7f8f4efb70b6f1390ad963a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11245059
</span>
gpg_verify.use_gpg_verification \
no
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append devel/patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/add_support_for_old_macos.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/add_support_for_qt5.6.diff
</span> }
if {[option gpg_verify.use_gpg_verification]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,8 +101,10 @@ depends_lib-append port:argon2 \
</span> port:ykpers \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-no-deployqt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_support_for_old_macos.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_support_for_qt5.6.diff
</span>
# KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
# available until clang 602 [2] or upstream clang 3.5 [3]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/add_support_for_old_macos.diff b/security/KeePassXC/files/add_support_for_old_macos.diff
</span>similarity index 100%
rename from security/KeePassXC/files/devel/add_support_for_old_macos.diff
rename to security/KeePassXC/files/add_support_for_old_macos.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/add_support_for_qt5.6.diff b/security/KeePassXC/files/add_support_for_qt5.6.diff
</span>similarity index 100%
rename from security/KeePassXC/files/devel/add_support_for_qt5.6.diff
rename to security/KeePassXC/files/add_support_for_qt5.6.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-no-findpackage-path.diff b/security/KeePassXC/files/devel/patch-no-findpackage-path.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c25ce7462c1..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -478,16 +478,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/Cellar/qt@5/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/homebrew/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(Qt5 COMPONENTS MacExtras HINTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/Cellar/qt@5/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/homebrew/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Qt5 COMPONENTS MacExtras)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-no-findpackage-path.diff b/security/KeePassXC/files/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 36cbb1cb0ce..c25ce7462c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/patch-no-findpackage-path.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +1,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes: https://trac.macports.org/ticket/61740
</span> --- CMakeLists.txt
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -442,16 +442,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus X11Extras REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -478,16 +478,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
</span> elseif(APPLE)
- find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/Cellar/qt/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/homebrew/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/Cellar/qt@5/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/homebrew/opt/qt@5/lib/cmake
</span> - ENV PATH)
- find_package(Qt5 COMPONENTS MacExtras HINTS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/Cellar/qt/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/homebrew/opt/qt/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/opt/qt@5/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/Cellar/qt@5/*/lib/cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/homebrew/opt/qt@5/lib/cmake
</span> - ENV PATH)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(Qt5 COMPONENTS MacExtras)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(Qt5 COMPONENTS MacExtras)
</span> else()
find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
endif()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-touch-id.diff b/security/KeePassXC/files/patch-touch-id.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c4df5f8173d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/patch-touch-id.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,183 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Author: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- restore WITH_XC_TOUCHID configure option
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- To be able to compile on macOS versions that don't support TouchID and related APIs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index db732d67..40a1c95e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,6 +60,9 @@ option(WITH_XC_UPDATECHECK "Include automatic update checks; disable for control
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(WITH_XC_FDOSECRETS "Implement freedesktop.org Secret Storage Spec server side API." OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ option(WITH_XC_TOUCHID "Include TouchID support for macOS." ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- option(WITH_XC_DOCS "Enable building of documentation" ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_CCACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,6 +86,9 @@ if(WITH_XC_ALL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(WITH_XC_FDOSECRETS ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WITH_XC_TOUCHID ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Prefer WITH_XC_NETWORKING setting over WITH_XC_UPDATECHECK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c4f66e71..b35bfc18 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -239,6 +239,9 @@ add_feature_info(UpdateCheck WITH_XC_UPDATECHECK "Automatic update checking")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_feature_info(FdoSecrets WITH_XC_FDOSECRETS "Implement freedesktop.org Secret Storage Spec server side API.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_feature_info(TouchID WITH_XC_TOUCHID "TouchID integration")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(browser)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_subdirectory(proxy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -350,10 +353,13 @@ if(WITH_XC_KEESHARE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- target_link_libraries(keepassx_core "-framework Foundation -framework AppKit -framework Carbon -framework Security -framework LocalAuthentication")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(keepassx_core "-framework Foundation -framework AppKit -framework Carbon")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(Qt5MacExtras_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(keepassx_core Qt5::MacExtras)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_link_libraries(keepassx_core "-framework Security -framework LocalAuthentication")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(HAIKU)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(keepassx_core network)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6caa89d8..5ba60860 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/config-keepassx.h.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/config-keepassx.h.cmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine WITH_XC_SSHAGENT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine WITH_XC_KEESHARE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine WITH_XC_UPDATECHECK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#cmakedefine WITH_XC_TOUCHID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine WITH_XC_FDOSECRETS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cmakedefine WITH_XC_DOCS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/DatabaseOpenWidget.cpp b/src/gui/DatabaseOpenWidget.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index d5c9707f..3de214a2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/DatabaseOpenWidget.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/DatabaseOpenWidget.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +59,7 @@ namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (isQuickUnlockAvailable()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_CC_MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return getWindowsHello()->hasKey(filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(Q_OS_MACOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(Q_OS_MACOS) && defined (WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return TouchID::getInstance().containsKey(filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -280,7 +280,7 @@ void DatabaseOpenWidget::openDatabase()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_CC_MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Store the password using Windows Hello
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getWindowsHello()->storeKey(m_filename, keyData);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(Q_OS_MACOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(Q_OS_MACOS) && defined(WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Store the password using TouchID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TouchID::getInstance().storeKey(m_filename, keyData);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -337,7 +337,7 @@ QSharedPointer<CompositeKey> DatabaseOpenWidget::buildDatabaseKey()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ui->messageWidget->showMessage(tr("Failed to authenticate with Windows Hello"), MessageWidget::Error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(Q_OS_MACOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(Q_OS_MACOS) && defined(WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!TouchID::getInstance().getKey(m_filename, keyData)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Failed to retrieve Quick Unlock data
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_ui->messageWidget->showMessage(tr("Failed to authenticate with Touch ID"), MessageWidget::Error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -541,7 +541,7 @@ void DatabaseOpenWidget::resetQuickUnlock()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(Q_CC_MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getWindowsHello()->reset(m_filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(Q_OS_MACOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(Q_OS_MACOS) && defined(WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TouchID::getInstance().reset(m_filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- load(m_filename);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2dae5cbb..e5c5cff9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -200,7 +200,7 @@ bool DatabaseSettingsWidgetDatabaseKey::save()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_db->setKey(newKey, true, false, false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(Q_OS_MACOS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(Q_OS_MACOS) && defined(WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TouchID::getInstance().reset(m_db->filePath());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(Q_CC_MSVC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getWindowsHello()->reset(m_db->filePath());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/touchid/TouchID.mm b/src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index e7539262..c6d127ce 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define SECURITY_ACCOUNT_PREFIX QString("KeepassXC_TouchID_Keys_")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "touchid/TouchID.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "config-keepassx.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef WITH_XC_TOUCHID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "crypto/Random.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "crypto/SymmetricCipher.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "crypto/CryptoHash.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +26,7 @@ inline QString hash(const QString& value)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QByteArray result = CryptoHash::hash(value.toUtf8(), CryptoHash::Sha256).toHex();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return QString(result);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif //defined(WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Singleton
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,6 +38,7 @@ TouchID& TouchID::getInstance()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return instance;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef WITH_XC_TOUCHID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Generates a random AES 256bit key and uses it to encrypt the PasswordKey that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * protects the database. The encrypted PasswordKey is kept in memory while the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -232,13 +236,14 @@ bool TouchID::containsKey(const QString& dbPath) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return m_encryptedMasterKeys.contains(dbPath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif //defined(WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Dynamic check if TouchID is available on the current machine.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool TouchID::isAvailable()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if MAC_OS_X_VERSION_MIN_REQUIRED < 101201
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101201 || !defined(WITH_XC_TOUCHID)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // cache result
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,6 +277,7 @@ bool TouchID::isAvailable()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef WITH_XC_TOUCHID
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef enum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- kTouchIDResultNone,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -337,3 +343,4 @@ void TouchID::reset(const QString& databasePath)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this->m_encryptedMasterKeys.remove(databasePath);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif //defined(WITH_XC_TOUCHID)
</span></pre><pre style='margin:0'>
</pre>