<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3f5a3a2fb2c6c19c35501f83f259128d3e1b2b22">https://github.com/macports/macports-ports/commit/3f5a3a2fb2c6c19c35501f83f259128d3e1b2b22</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 3f5a3a2  KeePassXC: Update to 2.2.1
</span>3f5a3a2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 3f5a3a2fb2c6c19c35501f83f259128d3e1b2b22
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Oct 2 23:22:17 2017 -0500

<span style='display:block; white-space:pre;color:#404040;'>    KeePassXC: Update to 2.2.1
</span>---
 security/KeePassXC/Portfile             |  9 ++++--
 security/KeePassXC/files/qt-5.9.1.patch | 55 +++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 3 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 c6e36f8..f391b99 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;'>@@ -5,7 +5,7 @@ PortGroup               qt5 1.0
</span> PortGroup               github 1.0
 PortGroup               cmake 1.0
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup            keepassxreboot keepassxc 2.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup            keepassxreboot keepassxc 2.2.1
</span> name                    KeePassXC
 categories              security aqua
 maintainers             @yan12125 openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,13 +27,16 @@ use_xz                  yes
</span> distname                ${github.project}-${version}-src
 worksrcdir              ${github.project}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums               rmd160  7b7011ba8131f45f11ec0302f2ab6a908f15d132 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                        sha256  71c47ebd9a661fc439c61566e4a4aa482e4d463c0eaa4f7562e7216eb0327e59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums               rmd160  b80273fe95502d183529b28c03e9f8d1d283203d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        sha256  6761cdcef482941d958557466bb113be2c514b9847b0d0a65c7f5ef2c6d67dbe \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        size    3249420
</span> 
 depends_lib-append      port:libgcrypt \
                         port:zlib
 depends_build-append    port:qt5-qttools
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles              qt-5.9.1.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cmake.out_of_source     yes
 configure.pre_args-append \
     -DCMAKE_INSTALL_PREFIX=${applications_dir} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/KeePassXC/files/qt-5.9.1.patch b/security/KeePassXC/files/qt-5.9.1.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b187f7f
</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/qt-5.9.1.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,55 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build on macOS with Qt 5.9.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/keepassxreboot/keepassxc/commit/b95eaa5843df41964e93c6734bda3c6f215e306e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/crypto/SymmetricCipher.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/crypto/SymmetricCipher.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,11 +59,11 @@ class SymmetricCipher
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return m_backend->process(data, ok);
</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;'>+-    inline bool processInPlace(QByteArray& data) Q_REQUIRED_RESULT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Q_REQUIRED_RESULT inline bool processInPlace(QByteArray& data) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return m_backend->processInPlace(data);
</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;'>+-    inline bool processInPlace(QByteArray& data, quint64 rounds) Q_REQUIRED_RESULT {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Q_REQUIRED_RESULT inline bool processInPlace(QByteArray& data, quint64 rounds) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         Q_ASSERT(rounds > 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         return m_backend->processInPlace(data, rounds);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/crypto/SymmetricCipherBackend.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/crypto/SymmetricCipherBackend.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,8 +29,8 @@ class SymmetricCipherBackend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     virtual bool setIv(const QByteArray& iv) = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     virtual QByteArray process(const QByteArray& data, bool* ok) = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    virtual bool processInPlace(QByteArray& data) Q_REQUIRED_RESULT = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    virtual bool processInPlace(QByteArray& data, quint64 rounds) Q_REQUIRED_RESULT = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Q_REQUIRED_RESULT virtual bool processInPlace(QByteArray& data) = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Q_REQUIRED_RESULT virtual bool processInPlace(QByteArray& data, quint64 rounds) = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     virtual bool reset() = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     virtual int blockSize() const = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/crypto/SymmetricCipherGcrypt.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/crypto/SymmetricCipherGcrypt.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,8 +35,8 @@ class SymmetricCipherGcrypt : public SymmetricCipherBackend
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     bool setIv(const QByteArray& iv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     QByteArray process(const QByteArray& data, bool* ok);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    bool processInPlace(QByteArray& data) Q_REQUIRED_RESULT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    bool processInPlace(QByteArray& data, quint64 rounds) Q_REQUIRED_RESULT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Q_REQUIRED_RESULT bool processInPlace(QByteArray& data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Q_REQUIRED_RESULT bool processInPlace(QByteArray& data, quint64 rounds);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     bool reset();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     int blockSize() const;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/format/KeePass2RandomStream.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/format/KeePass2RandomStream.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,7 +29,7 @@ class KeePass2RandomStream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     bool init(const QByteArray& key);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     QByteArray randomBytes(int size, bool* ok);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     QByteArray process(const QByteArray& data, bool* ok);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-    bool processInPlace(QByteArray& data) Q_REQUIRED_RESULT;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    Q_REQUIRED_RESULT bool processInPlace(QByteArray& data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     QString errorString() const;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span></pre><pre style='margin:0'>

</pre>