<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/3e02ba8aba7da6444f09b53d7d3b1b12781398ca">https://github.com/macports/macports-ports/commit/3e02ba8aba7da6444f09b53d7d3b1b12781398ca</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 3e02ba8 KeePassXC: update to 2.5.1
</span>3e02ba8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3e02ba8aba7da6444f09b53d7d3b1b12781398ca
</span>Author: Chih-Hsuan Yen <yan12125@gmail.com>
AuthorDate: Wed Nov 13 11:09:33 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> KeePassXC: update to 2.5.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also obsoletes KeePassXC-devel
</span>---
security/KeePassXC-devel/Portfile | 12 +++
security/KeePassXC/Portfile | 95 ++++++++--------------
.../KeePassXC/files/devel/patch-no-deployqt.diff | 41 ----------
.../files/{stable => }/keyid-CFB4C2166397D0D2.txt | 0
.../files/{stable => }/patch-no-deployqt.diff | 0
5 files changed, 45 insertions(+), 103 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC-devel/Portfile b/security/KeePassXC-devel/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..1bc93c9
</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-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name KeePassXC-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories security aqua
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 20191026
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by KeePassXC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove after 2020-11-13
</span><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 c82712f..6a6eca9 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;'>@@ -8,24 +8,48 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup gpg_verify 1.0
name KeePassXC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport KeePassXC-devel {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> categories security aqua
maintainers {yan12125 @yan12125} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> description KeePassXC is a cross-platform community-driven port \
of the Windows application “Keepass Password Safe”.
long_description KeePassXC is a community fork of KeePassX with the \
goal to extend and improve it with new features and \
bugfixes to provide a feature-rich, fully \
cross-platform and modern open-source password manager.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> platforms darwin
license GPL-2+
license_noconflict openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://keepassxc.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup keepassxreboot keepassxc 2.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname keepassxc-${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distfiles-append ${distname}${extract.suffix}.sig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See keepassxc-${version}-src.tar.xz.DIGEST on upstream GitHub releases page for SHA256 sums
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4b3c639ec001fec15f16560f795dbbfd9a79ab9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ef33258b859a7b996af007113613b0f6210f2341e8f5fb3a005564262c2caf30 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6798880 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}${extract.suffix}.sig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gpg_verify.use_gpg_verification \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[option gpg_verify.use_gpg_verification]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-checksum {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # The public key is downloaded from [1], and the key ID is listed on [2].
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # [1] https://keepassxc.org/keepassxc_master_signing_key.asc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # [2] https://keepassxc.org/verifying-signatures/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gpg_keyid CFB4C2166397D0D2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gpg_verify.verify_gpg_signature \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${filespath}/keyid-${gpg_keyid}.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distpath}/[lindex ${distfiles} 0].sig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distpath}/[lindex ${distfiles} 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
qt5.depends_component qtmacextras qtsvg
qt5.depends_build_component \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +66,8 @@ depends_lib-append port:argon2 \
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # KeePassXC uses -fstack-protector-strong on Clang [1]. That flag is not
# available until clang 602 [2] or upstream clang 3.5 [3]
# [1] https://github.com/keepassxreboot/keepassxc/blob/develop/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,6 +85,7 @@ pre-configure {
</span> configure.pre_args-append \
-DCMAKE_INSTALL_PREFIX=${applications_dir} \
-DCMAKE_INSTALL_MANDIR=${prefix}/share/man \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DKEEPASSXC_BUILD_TYPE=Release \
</span> -DWITH_XC_BROWSER=ON \
-DWITH_XC_KEESHARE=ON \
-DWITH_XC_KEESHARE_SECURE=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,62 +107,6 @@ if {${os.major} < 16} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # stable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 2.5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts KeePassXC-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname keepassxc-${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distfiles-append ${distname}${extract.suffix}.sig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See keepassxc-${version}-src.tar.xz.DIGEST on upstream GitHub releases page for SHA256 sums
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 a0b7f407c13c1241e9526dc320c28479bd12863d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6359ce972b720a8bce1e8ba54000666e9c58f9164f2e9e52bef2e24e46127881 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6752776 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distname}${extract.suffix}.sig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 488
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gpg_verify.use_gpg_verification \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[option gpg_verify.use_gpg_verification]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-checksum {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The public key is downloaded from [1], and the key ID is listed on [2].
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # [1] https://keepassxc.org/keepassxc_master_signing_key.asc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # [2] https://keepassxc.org/verifying-signatures/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gpg_keyid CFB4C2166397D0D2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gpg_verify.verify_gpg_signature \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${filespath}/stable/keyid-${gpg_keyid}.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distpath}/[lindex ${distfiles} 0].sig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${distpath}/[lindex ${distfiles} 0]
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles stable/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DKEEPASSXC_BUILD_TYPE=Release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup keepassxreboot keepassxc 9b5a46f4b01112e9930c7f17f457e2daaad31505
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191026
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts KeePassXC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 55ff7f6e7fd385472c2cca5da23944f744397d45 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 66b7b27e4ff670d1991d7fff37157163740a33c2bb5692d57f2c24b3aaa9add6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9756901
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles devel/patch-no-deployqt.diff
</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.BOOST-1.0 LICENSE.BSD \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/devel/patch-no-deployqt.diff b/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3565644..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/KeePassXC/files/devel/patch-no-deployqt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt 2018-02-28 05:38:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-03-02 16:51:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -306,12 +306,6 @@
</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;'>- set(CMAKE_MACOSX_RPATH TRUE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_program(MACDEPLOYQT_EXE macdeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT MACDEPLOYQT_EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(FATAL_ERROR "macdeployqt is required to build on macOS")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "Using macdeployqt: ${MACDEPLOYQT_EXE}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(MINGW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_program(WINDEPLOYQT_EXE windeployqt HINTS ${Qt5_PREFIX}/bin ENV PATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT WINDEPLOYQT_EXE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/CMakeLists.txt 2018-02-28 05:38:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/CMakeLists.txt 2018-03-02 16:47:48.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -319,11 +319,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include(CPack)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_custom_command(TARGET ${PROGNAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMENT "Deploying app bundle")
</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;'>- install(TARGETS ${PROGNAME}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/autotype/mac/CMakeLists.txt 2018-02-28 05:38:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/autotype/mac/CMakeLists.txt 2018-03-02 16:48:26.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,8 +13,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WITH_APP_BUNDLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_custom_command(TARGET keepassx-autotype-cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- POST_BUILD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND ${CMAKE_COMMAND} -E make_directory ${PLUGIN_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/libkeepassx-autotype-cocoa.so ${PLUGIN_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- COMMAND ${MACDEPLOYQT_EXE} ${PROGNAME}.app -executable=${PLUGIN_INSTALL_DIR}/libkeepassx-autotype-cocoa.so -no-plugins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMENT "Deploying autotype plugin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/stable/keyid-CFB4C2166397D0D2.txt b/security/KeePassXC/files/keyid-CFB4C2166397D0D2.txt
</span>similarity index 100%
rename from security/KeePassXC/files/stable/keyid-CFB4C2166397D0D2.txt
rename to security/KeePassXC/files/keyid-CFB4C2166397D0D2.txt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/stable/patch-no-deployqt.diff b/security/KeePassXC/files/patch-no-deployqt.diff
</span>similarity index 100%
rename from security/KeePassXC/files/stable/patch-no-deployqt.diff
rename to security/KeePassXC/files/patch-no-deployqt.diff
</pre><pre style='margin:0'>
</pre>