<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/d81ba886874ab5c0dc11a2cf0e0bbb03108b6966">https://github.com/macports/macports-ports/commit/d81ba886874ab5c0dc11a2cf0e0bbb03108b6966</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 d81ba88 qca : cleanup/overhaul and upgrade to 2.2.1
</span>d81ba88 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d81ba886874ab5c0dc11a2cf0e0bbb03108b6966
</span>Author: René Bertin <rjvbertin@gmail.com>
AuthorDate: Sun Jun 9 16:09:19 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> qca : cleanup/overhaul and upgrade to 2.2.1
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also introduces a subport for the (new?) PKCS11 plugin.
</span>---
devel/qca/Portfile | 130 ++++++++-------------
devel/qca/files/patch-cmakeminver.diff | 24 ++++
devel/qca/files/patch-configure.diff | 81 +++++++++++++
devel/qca/files/patch-installname.diff | 14 +++
devel/qca/files/patch-macports-clang.diff | 15 ---
devel/qca/files/patch-qca-ossl.diff | 30 ++---
devel/qca/files/patch-qca210-qt550.diff | 8 +-
devel/qca/files/patch-qca210-qt56x.diff | 17 ---
.../patch-src_botantools_botan_botan_secmem.h.diff | 11 ++
.../files/patch-src_qac_systemstore_mac.cpp.diff | 10 --
10 files changed, 199 insertions(+), 141 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/Portfile b/devel/qca/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba98cb7..c467274 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qca/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,61 +1,49 @@
</span> # -*- 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 style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name qca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name qca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.2.1
</span>
# Qt version handling logic
global Qt_Major
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport ${name}-qt5 {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-qt5 {}
</span>
if {[string match "${name}-qt5*" ${subport}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.1.0.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/55154
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set Qt_Major 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://download.kde.org/stable/qca-qt5/${version}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 cc4040d013170ca5f21fbcefd0607daa8191d333 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ab0170696a8ff87588d38a72d36d0b4b42db9080c991d1a40ceb3f8311d289f9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname "qca-qt5-${version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "qca-qt5-(\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set Qt_Major 5
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set branch [join [lrange [split ${version} .] 0 0] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set Qt_Major 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://delta.affinix.com/download/qca/${branch}.0/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 c2b00c732036244701bae4853a2101cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 2b582b3ccc7e6098cd14d6f52a829ae1539e9cc8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 30358bbd182cfeb9eaa696b5b39fa9e6d1f99b4c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set Qt_Major 4
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel crypto security
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL-2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Qt Cryptographic Architecture
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Qt Cryptographic Architecture provides an easy API for the following \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- features: SSL/TLS, X509, SASL, RSA, Hashing (SHA1, MD5), Ciphers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (BlowFish, 3DES, AES). Functionality is supplied via plugins.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://delta.affinix.com/qca/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:botan \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgcrypt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:nss
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# remove unnecessary Carbon #include, which fails on 10.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-src_qac_systemstore_mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qca-ossl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# best included after the required Qt PG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories devel crypto security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {gmail.com:rjvbertin @RJVB} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Qt Cryptographic Architecture
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description Qt Cryptographic Architecture provides an easy API for the following \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ features: SSL/TLS, X509, SASL, RSA, Hashing (SHA1, MD5), Ciphers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (BlowFish, 3DES, AES). Functionality is supplied via plugins.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://userbase.kde.org/QCA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://download.kde.org/stable/qca/${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xz yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 dddc3cf240dc5424b9df13fc1bf41c8e04f3b814 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d716d2d8e3ed8d95bbdb061f03081d7d032206f746a30a4d29d72196f50e7b02 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 691676
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:botan \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgcrypt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nss
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -Np1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-qca-ossl.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-installname.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmakeminver.diff
</span>
# the QCA plugins have been rolled into the main source tarball and are built by default
# when their dependencies are available. Allow this for all plugins that were not already
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,21 +66,9 @@ if {${Qt_Major} eq "4"} {
</span> configure.args-append \
-DQT4_BUILD:BOOL=ON
} elseif {${Qt_Major} eq "5"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-qca210-qt550.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-qca210-qt56x.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-qca210-qt550.diff
</span> configure.args-append \
-DQCA_SUFFIX:STRING="qt5"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://phabricator.kde.org/D8510
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/53201
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-macports-clang.diff
</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;'>-# allow ccache, if specified by the user
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool configure.ccache]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.post_args "CCACHE=ccache"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,31 +91,15 @@ post-destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# It doesn't seem possible to do debug+release builds with the new cmake-based approach.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Override the debug variant and avoid the checks imposed by the Qt portgroups and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# instruct the user to use a compiler option.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant debug description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{Build both release and debug library} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_msg "this variant is obsolete; use configure.optflags=\"-g\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # avoid installing the examples into Qt's binary tree
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant examples description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{Include examples in install} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant examples description {Include examples in install} {
</span> post-destroot {
xinstall -d -m 755 ${destroot}${prefix}/share/${subport}/examples/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy {*}[glob ${worksrcpath}/examples/*] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ eval file copy [glob ${worksrcpath}/examples/*] \
</span> ${destroot}${prefix}/share/${subport}/examples/
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport qca-tls {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- replaced_by qca-ossl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long_description "This port is obsolete."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> ### Plugin subports:
### The ossl, cyrus-sasl and gnupg plugins used to be standalone ports
### are now implemented as subports. The other plugins are built together with
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,7 +112,7 @@ set qt.versions {"" "-qt5"}
</span> foreach qv ${qt.versions} {
subport ${name}${qv}-ossl {
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name}${qv} path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}${qv} port:openssl
</span> configure.args-delete -DBUILD_PLUGINS:STRING="botan\;gcrypt\;logger\;nss\;softstore"
configure.args-append -DBUILD_PLUGINS:STRING="ossl"
build.dir ${workpath}/build/plugins/qca-ossl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,6 +131,13 @@ foreach qv ${qt.versions} {
</span> configure.args-append -DBUILD_PLUGINS:STRING="gnupg"
build.dir ${workpath}/build/plugins/qca-gnupg
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ subport ${name}${qv}-pkcs11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ license LGPL-2.1+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}${qv} port:openssl port:pkcs11-helper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete -DBUILD_PLUGINS:STRING="botan\;gcrypt\;logger\;nss\;softstore"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_PLUGINS:STRING="pkcs11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${workpath}/build/plugins/qca-pkcs11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
### Provide stub subports for those plugins that have been available through
### a subport for a while.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -192,4 +159,5 @@ foreach virtual {"botan" "gcrypt" "logger" "nss" "softstore"} {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${master_sites}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url https://download.kde.org/stable/qca
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "(2\\.\\d+(?:\\.\\d+)+(?:\\.\\d+)*)\\/"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/patch-cmakeminver.diff b/devel/qca/files/patch-cmakeminver.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b0ff5ff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/files/patch-cmakeminver.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</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 2f2b5d0b538db93c03c3724904357d1cf12fb892..ef4b825e842bc42905996283c9081239c29d67ea 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Checking for user explicity defined CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Checking for user explicitly defined CMAKE_INSTALL_PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # It must be done before project(...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT CMAKE_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(QCA_INSTALL_IN_QT_PREFIX ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,10 +6,11 @@ if(NOT CMAKE_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unset(CMAKE_INSTALL_PREFIX CACHE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif(NOT CMAKE_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-project(qca)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# The cmake min. version should be set before calling project(...) too
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake_minimum_required(VERSION 3.4)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++project(qca)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(QCA_LIB_MAJOR_VERSION "2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(QCA_LIB_MINOR_VERSION "2")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(QCA_LIB_PATCH_VERSION "1")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/patch-configure.diff b/devel/qca/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5b97c2b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,81 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2010-11-02 16:22:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2010-11-02 16:34:52.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -618,12 +618,6 @@
</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(opt_framework && qc_buildmode_debug)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- printf("\nError: Cannot use both --framework and --debug.\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(1);
</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;'>+ // sanity check exclusive options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int x;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -695,24 +689,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool exec()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef Q_OS_MAC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString str = "CONFIG += @ARCHES@\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(qc_getenv("QC_UNIVERSAL") == "Y")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qc_universal_enabled = true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString str =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " CONFIG += x86 ppc\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "}\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString sdk = qc_getenv("QC_MAC_SDK");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!sdk.isEmpty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qc_universal_sdk = sdk;
</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;'>+- conf->addExtra(str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ conf->addExtra(str);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -814,13 +803,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str += "QMAKE_CFLAGS += -g\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str += "QMAKE_CXXFLAGS += -g\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ str += " CONFIG += @ARCHES@\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(universal)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- str +=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- " CONFIG += x86 ppc\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "}\n";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(!sdk.isEmpty())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str += QString("QMAKE_MAC_SDK = %1\n").arg(sdk);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -884,10 +869,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QString pkg_template3 = QString(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Requires: %1\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- QString pkg_template4 = QString(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Libs: -L\${libdir} -l%1\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "Cflags: -I\${includedir}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QString pkg_template4;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (qc_buildmode_framework_enabled) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_template4 = QString(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Libs: -F\${libdir} -framework %1\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Libs.private: -L\${libdir}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Cflags: -I\${includedir}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_template4 = QString(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Libs: -L\${libdir} -l%1\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Cflags: -I\${includedir}\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "\n");
</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;'>+ QStringList pcfiles;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/patch-installname.diff b/devel/qca/files/patch-installname.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..53b7034
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/files/patch-installname.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2e819743d615314a30c0ccf66d122e49fbd7f333..6c721e56cee6305c3362f2652c3b44e7ffcd086d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -152,7 +152,7 @@ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(COREFOUNDATION_LIBRARY_SECURITY "-framework Security")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_LINK_LIBRARIES(${QCA_LIB_NAME} ${COREFOUNDATION_LIBRARY} ${COREFOUNDATION_LIBRARY_SECURITY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(OSX_FRAMEWORK AND NOT USE_RELATIVE_PATHS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT USE_RELATIVE_PATHS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(${QCA_LIB_NAME} PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_NAME_DIR "${QCA_LIBRARY_INSTALL_DIR}"
</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;color:#808080;'>diff --git a/devel/qca/files/patch-macports-clang.diff b/devel/qca/files/patch-macports-clang.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5afdbb0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qca/files/patch-macports-clang.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2015-01-13 09:22:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2017-10-26 19:38:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,9 +6,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unset(CMAKE_INSTALL_PREFIX CACHE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif(NOT CMAKE_INSTALL_PREFIX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--project(qca)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cmake_minimum_required(VERSION 2.8.12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+cmake_policy(SET CMP0025 NEW)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+project(qca)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(QCA_LIB_MAJOR_VERSION "2")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(QCA_LIB_MINOR_VERSION "1")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/patch-qca-ossl.diff b/devel/qca/files/patch-qca-ossl.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 54bafe4..28f561a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qca/files/patch-qca-ossl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/files/patch-qca-ossl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git plugins/qca-ossl/qca-ossl.cpp plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 783a20d..b218992 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1930,7 +1930,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 11ecdc9d2c34f639a8515ac3fe7a12400590ac29..59e2135209b481ba60ebb32b6cb7f2af33d42188 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/plugins/qca-ossl/qca-ossl.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2102,7 +2102,7 @@ public:
</span> md = EVP_sha1();
else if(alg == EMSA3_MD5)
md = EVP_md5();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ index 783a20d..b218992 100644
</span> else if(alg == EMSA3_MD2)
md = EVP_md2();
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1958,7 +1958,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2130,7 +2130,7 @@ public:
</span> md = EVP_sha1();
else if(alg == EMSA3_MD5)
md = EVP_md5();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ index 783a20d..b218992 100644
</span> else if(alg == EMSA3_MD2)
md = EVP_md2();
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3606,7 +3606,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3848,7 +3848,7 @@ public:
</span> case NID_md5WithRSAEncryption:
p.sigalgo = QCA::EMSA3_MD5;
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ index 783a20d..b218992 100644
</span> case NID_md2WithRSAEncryption:
p.sigalgo = QCA::EMSA3_MD2;
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4106,7 +4106,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4351,7 +4351,7 @@ public:
</span> case NID_md5WithRSAEncryption:
p.sigalgo = QCA::EMSA3_MD5;
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ index 783a20d..b218992 100644
</span> case NID_md2WithRSAEncryption:
p.sigalgo = QCA::EMSA3_MD2;
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4298,7 +4298,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4548,7 +4548,7 @@ public:
</span> case NID_md5WithRSAEncryption:
p.sigalgo = QCA::EMSA3_MD5;
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,16 +47,16 @@ index 783a20d..b218992 100644
</span> case NID_md2WithRSAEncryption:
p.sigalgo = QCA::EMSA3_MD2;
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6878,7 +6878,7 @@ static QStringList all_hash_types()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- list += "sha1";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7176,7 +7176,7 @@ static QStringList all_hash_types()
</span> list += "sha0";
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> list += "ripemd160";
-#ifdef HAVE_OPENSSL_MD2
+#if defined(HAVE_OPENSSL_MD2) && !defined(OPENSSL_NO_MD2)
list += "md2";
#endif
list += "md4";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7098,7 +7098,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7411,7 +7411,7 @@ public:
</span> list += all_hash_types();
list += all_mac_types();
list += all_cipher_types();
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,8 +65,8 @@ index 783a20d..b218992 100644
</span> list += "pbkdf1(md2)";
#endif
list += "pbkdf1(sha1)";
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7133,7 +7133,7 @@ public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return new opensslHashContext( EVP_sha(), this, type);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7451,7 +7451,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span> else if ( type == "ripemd160" )
return new opensslHashContext( EVP_ripemd160(), this, type);
-#ifdef HAVE_OPENSSL_MD2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ index 783a20d..b218992 100644
</span> else if ( type == "md2" )
return new opensslHashContext( EVP_md2(), this, type);
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7165,7 +7165,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7483,7 +7483,7 @@ public:
</span> */
else if ( type == "pbkdf1(sha1)" )
return new opensslPbkdf1Context( EVP_sha1(), this, type );
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/patch-qca210-qt550.diff b/devel/qca/files/patch-qca210-qt550.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a8570e..ba3a707 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qca/files/patch-qca210-qt550.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/files/patch-qca210-qt550.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/QtCrypto/orig.qca_core.h 2014-11-06 09:15:45.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtCrypto/qca_core.h 2015-10-05 15:33:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +38,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/include/QtCrypto/qca_core.h b/include/QtCrypto/qca_core.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8c25a701dd49961c87bd4a5ebf5024d8459c604b..9592cb3739da1847a7dfc3e14b74bf90c89d53e1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/QtCrypto/qca_core.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/QtCrypto/qca_core.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,7 @@
</span> #include <QList>
#include <QSharedData>
#include <QSharedDataPointer>
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/patch-qca210-qt56x.diff b/devel/qca/files/patch-qca210-qt56x.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1e0609c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qca/files/patch-qca210-qt56x.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/QtCrypto/orig.qca_safetimer.h 2015-01-13 17:22:06.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/QtCrypto/qca_safetimer.h 2016-06-15 18:57:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,12 +44,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void setSingleShot(bool singleShot);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int timerId() const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--public slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+public Q_SLOTS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void start(int msec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void start();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void stop();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--signals:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Q_SIGNALS:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void timeout();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protected:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/patch-src_botantools_botan_botan_secmem.h.diff b/devel/qca/files/patch-src_botantools_botan_botan_secmem.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ff13044
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/qca/files/patch-src_botantools_botan_botan_secmem.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/botantools/botan/botan/secmem.h.orig 2012-09-26 21:16:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/botantools/botan/botan/secmem.h 2012-09-26 21:16:38.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -214,7 +214,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SecureVector(u32bit n = 0) { MemoryRegion<T>::init(true, n); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SecureVector(const T in[], u32bit n)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { MemoryRegion<T>::init(true); set(in, n); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { MemoryRegion<T>::init(true); MemoryRegion<T>::set(in, n); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SecureVector(const MemoryRegion<T>& in)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { MemoryRegion<T>::init(true); set(in); }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SecureVector(const MemoryRegion<T>& in1, const MemoryRegion<T>& in2)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/qca/files/patch-src_qac_systemstore_mac.cpp.diff b/devel/qca/files/patch-src_qac_systemstore_mac.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2bb7f0c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/qca/files/patch-src_qac_systemstore_mac.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/qca_systemstore_mac.cpp.orig 2013-04-20 15:40:07.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/qca_systemstore_mac.cpp 2013-04-20 15:40:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "qca_systemstore.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Security/SecTrust.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Security/SecCertificate.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>