<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/46919e48fc3166083c101b56aedd4a5f9365de20">https://github.com/macports/macports-ports/commit/46919e48fc3166083c101b56aedd4a5f9365de20</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 46919e4 KeePassXC-devel: more fixes for <= 10.11
</span>46919e4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 46919e48fc3166083c101b56aedd4a5f9365de20
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Thu Oct 24 16:40:08 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC-devel: more fixes for <= 10.11
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * compiler.blacklist is still needed :/
</span><span style='display:block; white-space:pre;color:#404040;'> * Add a patch to workaround C++ defect report 253
</span>---
security/KeePassXC/Portfile | 13 ++++++++++++-
security/KeePassXC/files/devel/patch-dr253.diff | 12 ++++++++++++
2 files changed, 24 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 034b77a..60f2fea 100644
</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;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup qt5 1.0
PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
name KeePassXC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +40,15 @@ depends_lib-append port:argon2 \
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# available until clang 602 [2] or upstream clang 3.5 [3]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# [1] https://github.com/keepassxreboot/keepassxc/blob/develop/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# [2] https://opensource.apple.com/source/clang/clang-600.0.57/src/tools/clang/lib/CodeGen/CodeGenModule.cpp.auto.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://opensource.apple.com/source/clang/clang-602.0.53/src/tools/clang/lib/CodeGen/CodeGenModule.cpp.auto.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# [3] https://github.com/llvm-project/clang/blob/release_34/lib/CodeGen/CodeGenModule.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/llvm-project/clang/blob/release_35/lib/CodeGen/CodeGenModule.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang < 602}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
reinplace "s#/usr/local/bin#${prefix}/bin#" \
${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,7 +116,8 @@ if {${subport} eq ${name}} {
</span> depends_lib-append port:readline
patchfiles devel/patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- devel/patch-missing-include.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ devel/patch-missing-include.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ devel/patch-dr253.diff
</span> }
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-dr253.diff b/security/KeePassXC/files/devel/patch-dr253.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e19e030
</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-dr253.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keeshare/ShareExport.cpp.orig 2019-10-24 16:26:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/keeshare/ShareExport.cpp 2019-10-24 16:27:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -149,8 +149,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KeeShareSettings::Sign sign;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto sshKey = own.key.sshKey();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sshKey.openKey(QString());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const Signature signer;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sign.signature = signer.create(bytes, sshKey);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sign.signature = Signature::create(bytes, sshKey);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sign.certificate = own.certificate;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream << KeeShareSettings::Sign::serialize(sign);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stream.flush();
</span></pre><pre style='margin:0'>
</pre>