<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0358e43da1c49c4eb93df25c0715b01d8f865b9f">https://github.com/macports/macports-ports/commit/0358e43da1c49c4eb93df25c0715b01d8f865b9f</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 0358e43da1c KeePassXC-devel: fix compilation on macOS <= 10.10
</span>0358e43da1c is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 0358e43da1c49c4eb93df25c0715b01d8f865b9f
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Mon Oct 24 11:35:55 2022 +0200

<span style='display:block; white-space:pre;color:#404040;'>    KeePassXC-devel: fix compilation on macOS <= 10.10
</span>---
 security/KeePassXC/Portfile                        |   3 +-
 security/KeePassXC/files/devel/patch-touch-id.diff | 145 +++++++++++++++++++++
 2 files changed, 147 insertions(+), 1 deletion(-)

<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 65987b98f8f..f3f9e98efde 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;'>@@ -78,7 +78,8 @@ if {${subport} eq ${name}} {
</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:#e0ffe0;'>+    patchfiles-append    devel/patch-no-findpackage-path.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                         devel/patch-touch-id.diff
</span> }
 
 if {[option gpg_verify.use_gpg_verification]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-touch-id.diff b/security/KeePassXC/files/devel/patch-touch-id.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..75d9edfdbce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/KeePassXC/files/devel/patch-touch-id.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,145 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,6 +81,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${CMAKE_CURRENT_BINARY_DIR}/tiometry_test/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_watch_support.mm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     message(STATUS "Apple watch compiler support: ${XC_APPLE_COMPILER_SUPPORT_WATCH}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    try_compile(XC_APPLE_COMPILER_SUPPORT_LocalAuthentication
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_BINARY_DIR}/LocalAuthentication_test/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_LocalAuthentication_support.mm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    message(STATUS "LocalAuthentication compiler support: ${XC_APPLE_COMPILER_SUPPORT_LocalAuthentication}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    try_compile(XC_APPLE_COMPILER_SUPPORT_kSecAttrSynchronizable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_BINARY_DIR}/kSecAttrSynchronizable_test/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_kSecAttrSynchronizable_support.mm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    message(STATUS "kSecAttrSynchronizable compiler support: ${XC_APPLE_COMPILER_SUPPORT_kSecAttrSynchronizable}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    try_compile(XC_APPLE_COMPILER_SUPPORT_kSecUseAuthenticationUI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_BINARY_DIR}/kSecUseAuthenticationUI_test/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_kSecUseAuthenticationUI_support.mm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    message(STATUS "kSecUseAuthenticationUI compiler support: ${XC_APPLE_COMPILER_SUPPORT_kSecUseAuthenticationUI}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    try_compile(XC_APPLE_COMPILER_SUPPORT_kSecAttrAccessControl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_BINARY_DIR}/kSecAttrAccessControl_test/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_kSecAttrAccessControl_support.mm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    message(STATUS "kSecAttrAccessControl compiler support: ${XC_APPLE_COMPILER_SUPPORT_kSecAttrAccessControl}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    try_compile(XC_APPLE_COMPILER_SUPPORT_kSecUseOperationPrompt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_BINARY_DIR}/kSecUseOperationPrompt_test/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++       ${CMAKE_CURRENT_SOURCE_DIR}/cmake/compiler-checks/macos/control_kSecUseOperationPrompt_support.mm)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    message(STATUS "kSecUseOperationPrompt compiler support: ${XC_APPLE_COMPILER_SUPPORT_kSecUseOperationPrompt}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(WITH_CCACHE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur cmake/compiler-checks/macos/control_kSecAttrAccessControl_support.mm cmake/compiler-checks/macos/control_kSecAttrAccessControl_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compiler-checks/macos/control_kSecAttrAccessControl_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compiler-checks/macos/control_kSecAttrAccessControl_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Security/Security.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   kSecAttrAccessControl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur cmake/compiler-checks/macos/control_kSecAttrSynchronizable_support.mm cmake/compiler-checks/macos/control_kSecAttrSynchronizable_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compiler-checks/macos/control_kSecAttrSynchronizable_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compiler-checks/macos/control_kSecAttrSynchronizable_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Security/Security.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   kSecAttrSynchronizable;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur cmake/compiler-checks/macos/control_kSecUseAuthenticationUI_support.mm cmake/compiler-checks/macos/control_kSecUseAuthenticationUI_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compiler-checks/macos/control_kSecUseAuthenticationUI_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compiler-checks/macos/control_kSecUseAuthenticationUI_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Security/Security.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   kSecUseAuthenticationUI;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur cmake/compiler-checks/macos/control_kSecUseOperationPrompt_support.mm cmake/compiler-checks/macos/control_kSecUseOperationPrompt_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compiler-checks/macos/control_kSecUseOperationPrompt_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compiler-checks/macos/control_kSecUseOperationPrompt_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Security/Security.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   kSecUseOperationPrompt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++   return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur cmake/compiler-checks/macos/control_localAuthentication_support.mm cmake/compiler-checks/macos/control_localAuthentication_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/compiler-checks/macos/control_localAuthentication_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/compiler-checks/macos/control_localAuthentication_support.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <LocalAuthentication/LocalAuthentication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main() { return 0; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur src/config-keepassx.h.cmake src/config-keepassx.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/config-keepassx.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/config-keepassx.h.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,10 +41,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_BIOMETRY()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_TOUCH_ID()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cmakedefine01 XC_APPLE_COMPILER_SUPPORT_WATCH()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_LocalAuthentication()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_kSecAttrSynchronizable()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_kSecUseAuthenticationUI()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_kSecAttrAccessControl()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#cmakedefine01 XC_APPLE_COMPILER_SUPPORT_kSecUseOperationPrompt()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XC_COMPILER_SUPPORT(X) XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_##X()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_APPLE_BIOMETRY() XC_APPLE_COMPILER_SUPPORT_BIOMETRY()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_TOUCH_ID() XC_APPLE_COMPILER_SUPPORT_TOUCH_ID()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_WATCH_UNLOCK() XC_APPLE_COMPILER_SUPPORT_WATCH()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_LocalAuthentication() XC_APPLE_COMPILER_SUPPORT_LocalAuthentication()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_kSecAttrSynchronizable() XC_APPLE_COMPILER_SUPPORT_kSecAttrSynchronizable()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_kSecUseAuthenticationUI() XC_APPLE_COMPILER_SUPPORT_kSecUseAuthenticationUI()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_kSecAttrAccessControl() XC_APPLE_COMPILER_SUPPORT_kSecAttrAccessControl()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define XC_COMPILER_SUPPORT_PRIVATE_DEFINITION_kSecUseOperationPrompt() XC_APPLE_COMPILER_SUPPORT_kSecUseOperationPrompt()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif // KEEPASSX_CONFIG_KEEPASSX_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur src/touchid/TouchID.mm src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/touchid/TouchID.mm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,7 +9,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Foundation/Foundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <CoreFoundation/CoreFoundation.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if XC_COMPILER_SUPPORT(LocalAuthentication)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <LocalAuthentication/LocalAuthentication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <Security/Security.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QCoreApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -164,9 +166,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(attributes, kSecClass, kSecClassGenericPassword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(attributes, kSecAttrAccount, (__bridge CFStringRef) accountName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(attributes, kSecValueData, (__bridge CFDataRef) keychainValueData);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if XC_COMPILER_SUPPORT(kSecAttrSynchronizable)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(attributes, kSecAttrSynchronizable, kCFBooleanFalse);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if XC_COMPILER_SUPPORT(kSecUseAuthenticationUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(attributes, kSecUseAuthenticationUI, kSecUseAuthenticationUIAllow);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if XC_COMPILER_SUPPORT(kSecAttrAccessControl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(attributes, kSecAttrAccessControl, sacObject);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     // add to KeyChain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     OSStatus status = SecItemAdd(attributes, NULL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,7 +226,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(query, kSecClass, kSecClassGenericPassword);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(query, kSecAttrAccount, (__bridge CFStringRef) accountName);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(query, kSecReturnData, kCFBooleanTrue);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if XC_COMPILER_SUPPORT(kSecUseOperationPrompt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFDictionarySetValue(query, kSecUseOperationPrompt, (__bridge CFStringRef) touchPromptMessage);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     // get data from the KeyChain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     CFTypeRef dataTypeRef = NULL;
</span></pre><pre style='margin:0'>

</pre>