<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f8b8aa628fdcd86285c930b37260f1a290490a9a">https://github.com/macports/macports-ports/commit/f8b8aa628fdcd86285c930b37260f1a290490a9a</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 f8b8aa628fd KeePassXC: fix compiliation with quazip1 & check deallocation functions presence
</span>f8b8aa628fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f8b8aa628fdcd86285c930b37260f1a290490a9a
</span>Author: tenzap <fabstz-it@yahoo.fr>
AuthorDate: Wed Nov 24 17:12:54 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: fix compiliation with quazip1 & check deallocation functions presence
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * quazip was not well detected. This fixes it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Replace "-fsized-deallocation" pre-configure reinplace of Portfile by a patch
</span><span style='display:block; white-space:pre;color:#404040;'> that detects whether the system provides requested deallocation function. Iif
</span><span style='display:block; white-space:pre;color:#404040;'> present, -fsized-deallocation will be enabled.
</span><span style='display:block; white-space:pre;color:#404040;'> This is useful for macOS < 10.12 systems which don't have all these functions
</span>---
security/KeePassXC/Portfile | 17 ++++----
security/KeePassXC/files/devel/patch-quazip.diff | 29 +++++++++++++
security/KeePassXC/files/patch-quazip.diff | 45 +++++++++++++++++++++
.../KeePassXC/files/patch-sized_deallocation.diff | 47 ++++++++++++++++++++++
4 files changed, 128 insertions(+), 10 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 335de16c776..48bcac4034b 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;'>@@ -24,7 +24,7 @@ license_noconflict openssl
</span> if {${subport} eq ${name}} {
# stable
github.setup keepassxreboot keepassxc 2.6.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span> github.tarball_from releases
distname keepassxc-${version}-src
use_xz yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,14 +46,16 @@ if {${subport} eq ${name}} {
</span> yes
patchfiles patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sized_deallocation.diff \
</span> patch-no-findpackage-path.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-quazip.diff \
</span> patch-old-mac.diff
} else {
# devel subport
github.setup keepassxreboot keepassxc d3b28f86515df73194d1102253b739b51b1909f5
set githash [string range ${github.version} 0 6]
version 20211123+git${githash}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
conflicts KeePassXC
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,8 +69,10 @@ if {${subport} eq ${name}} {
</span> depends_lib-append port:botan
patchfiles devel/patch-no-deployqt.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sized_deallocation.diff \
</span> devel/patch-no-findpackage-path.diff \
devel/patch-old-mac-other.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ devel/patch-quazip.diff \
</span> devel/patch-old-mac.diff
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,7 +105,7 @@ depends_lib-append port:argon2 \
</span> port:libsodium \
port:readline \
port:qrencode \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:quazip \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:quazip1 \
</span> port:ykpers \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -135,13 +139,6 @@ if {${os.major} >= 16} {
</span> configure.pre_args-append -DWITH_XC_TOUCHID=ON
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # error: call to unavailable function 'operator delete': introduced in macOS 10.12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-fsized-deallocation||" ${worksrcpath}/CMakeLists.txt
</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;'>-
</span> post-destroot {
xinstall -d ${destroot}${prefix}/share/doc/${name}
xinstall -W ${worksrcpath} COPYING LICENSE.BSD LICENSE.CC0 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-quazip.diff b/security/KeePassXC/files/devel/patch-quazip.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4d81ba1057f
</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-quazip.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6cfadfaabafed8d0db213044a0bd22537609381c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 13 Nov 2021 15:11:35 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] add support for QuaZip >= 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/keeshare/CMakeLists.txt | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 8 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/keeshare/CMakeLists.txt b/src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af4bc61a8d..8749c2e4ec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,14 @@ if(WITH_XC_KEESHARE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Try to find libquazip5, if found, enable secure sharing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(QuaZip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(QUAZIP_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(QuaZip-Qt5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(QuaZip-Qt5_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using QuaZip-Qt5 (quazip ${QuaZip-Qt5_VERSION})")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(keeshare SYSTEM PRIVATE QuaZip::QuaZip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(keeshare PRIVATE QuaZip::QuaZip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elseif(NOT QuaZip-Qt5_FOUND AND QUAZIP_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using QuaZip (quazip <1.0)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(keeshare SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(keeshare PRIVATE ${QUAZIP_LIBRARIES})
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-quazip.diff b/security/KeePassXC/files/patch-quazip.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a1430605b1c
</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/patch-quazip.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,45 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 6cfadfaabafed8d0db213044a0bd22537609381c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 13 Nov 2021 15:11:35 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] add support for QuaZip >= 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/keeshare/CMakeLists.txt | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 8 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/keeshare/CMakeLists.txt b/src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index af4bc61a8d..8749c2e4ec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/keeshare/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,14 @@ if(WITH_XC_KEESHARE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Try to find libquazip5, if found, enable secure sharing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(QuaZip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(QUAZIP_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(QuaZip-Qt5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(QuaZip-Qt5_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using QuaZip-Qt5 (quazip ${QuaZip-Qt5_VERSION})")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_include_directories(keeshare SYSTEM PRIVATE QuaZip::QuaZip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_link_libraries(keeshare PRIVATE QuaZip::QuaZip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ elseif(NOT QuaZip-Qt5_FOUND AND QUAZIP_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using QuaZip (quazip <1.0)")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(WITH_XC_KEESHARE_SECURE ON PARENT_SCOPE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_include_directories(keeshare SYSTEM PRIVATE ${QUAZIP_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(keeshare PRIVATE ${QUAZIP_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Find quazip.h as installed by version 0.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+quazip 0.9 has quazip.h in /opt/local/include/quazip5/quazip.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+quazip 1.1 has quazip.h in /opt/local/include/QuaZip-Qt5-1.1/quazip/quazip.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/FindQuaZip.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/FindQuaZip.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_path(QUAZIP_INCLUDE_DIRS quazip.h PATH_SUFFIXES quazip5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_library(QUAZIP_LIBRARIES quazip1-qt5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(QUAZIP_INCLUDE_DIRS quazip.h PATH_SUFFIXES quazip)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_path(QUAZIP_INCLUDE_DIRS quazip.h PATH_SUFFIXES quazip quazip5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Try pkgconfig first
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(PkgConfig QUIET)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/patch-sized_deallocation.diff b/security/KeePassXC/files/patch-sized_deallocation.diff
</span>new file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..39edbb8eb9e
</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/patch-sized_deallocation.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,47 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From fef0356d0d2b1be8ba9f6d7429314478934a6d13 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: tenzap <fabstz-it@yahoo.fr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 24 Nov 2021 19:01:00 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Enable "-fsized-deallocation" iif deallocation functions are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ present
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On some systems, although "-fsized-deallocation" compiler flag is there,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilation will fail because some deallocation functions are missing.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Typically 'operator delete ( void* ptr, std::size_t sz )' is missing on some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS systems.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This will check their presence.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+On macOS we can have this case when using a compiler that supports the flag,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+while the OS doesn't have all the deallocation functions. Typically,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+::operator delete(ptr, size) appeared in macOS 10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Reported error was:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+error: call to unavailable function 'operator delete': introduced in macOS 10.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMakeLists.txt | 13 ++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 12 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/CMakeLists.txt b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d8d0393f0..5452dc3c5 100644
</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;'>+@@ -314,7 +314,18 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_gcc_compiler_cflags("-std=c99")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_gcc_compiler_cxxflags("-std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-check_add_gcc_compiler_flag("-fsized-deallocation" CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++check_cxx_compiler_flag("-fsized-deallocation" CXX_HAS_fsized_deallocation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(CXX_HAS_fsized_deallocation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Do additional check: the deallocation functions must be there too.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_REQUIRED_FLAGS "-fsized-deallocation")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ check_cxx_source_compiles("#include <new>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int main() { void * ptr = nullptr; std::size_t size = 1; ::operator delete(ptr, size); }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HAVE_DEALLOCATION_FUNCTIONS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(HAVE_DEALLOCATION_FUNCTIONS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ check_add_gcc_compiler_flag("-fsized-deallocation" CXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unset(CMAKE_REQUIRED_FLAGS)
</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(APPLE AND CMAKE_COMPILER_IS_CLANGXX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_gcc_compiler_cxxflags("-stdlib=libc++")
</span></pre><pre style='margin:0'>
</pre>