<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/68f711ee1c862553fa57287cab8fa01c8c97799e">https://github.com/macports/macports-ports/commit/68f711ee1c862553fa57287cab8fa01c8c97799e</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 68f711ee1c8 mbedtls, mbedtls3: fix python branch issue, add mbedtls3
</span>68f711ee1c8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 68f711ee1c862553fa57287cab8fa01c8c97799e
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Jun 20 16:25:53 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> mbedtls, mbedtls3: fix python branch issue, add mbedtls3
</span>---
devel/mbedtls/Portfile | 14 +++++++-------
devel/{mbedtls => mbedtls3}/Portfile | 22 +++++++++++++---------
2 files changed, 20 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mbedtls/Portfile b/devel/mbedtls/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bdec45f3c12..08ddad4e9c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mbedtls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mbedtls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,9 @@ PortGroup github 1.0
</span> PortGroup compiler_blacklist_versions 1.0
github.setup ARMmbed mbedtls 2.28.0 mbedtls-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts mbedtls3
</span>
categories devel
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,15 +29,13 @@ variant python38 conflicts python39 python310 description {Use Python 3.8} {}
</span> variant python39 conflicts python38 python310 description {Use Python 3.9} {}
variant python310 conflicts python38 python39 description {Use Python 3.10} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python.branch 3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python38] && ![variant_isset python39]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python310
</span> }
foreach pv {310 39 38} {
if {[variant_isset python${pv}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_branch "[string index ${pv} 0].[string range ${pv} 1 end]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.branch "[string index ${pv} 0].[string range ${pv} 1 end]"
</span> depends_build-append \
port:python${pv}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ depends_build-append \
</span> compiler.blacklist-append {clang < 900}
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_TESTING=On \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_TESTING=ON \
</span> -DPERL_EXECUTABLE=${prefix}/bin/perl \
-DMBEDTLS_PYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python${python.branch} \
-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mbedtls/Portfile b/devel/mbedtls3/Portfile
</span>similarity index 77%
copy from devel/mbedtls/Portfile
copy to devel/mbedtls3/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index bdec45f3c12..9e1a9b535bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mbedtls/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mbedtls3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,9 +5,12 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ARMmbed mbedtls 2.28.0 mbedtls-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ARMmbed mbedtls 3.1.0 mbedtls-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name mbedtls3
</span> revision 0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts mbedtls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories devel
license Apache-2
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +22,9 @@ platforms darwin
</span> homepage https://tls.mbed.org
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b599364900a8829ffed0f573e5a004e615741567 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f644248f23cf04315cf9bb58d88c4c9471c16ca0533ecf33f86fb7749a3e5fa6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3712239
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ce6c970a6b8d43751c686dee01b9549770a733e2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 64d01a3b22b91cf3a25630257f268f11bc7bfa37981ae6d397802dd4ccec4690 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3766628
</span>
variant python38 conflicts python39 python310 description {Use Python 3.8} {}
variant python39 conflicts python38 python310 description {Use Python 3.9} {}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,13 +32,13 @@ variant python310 conflicts python38 python39 description {Use Python 3.10} {}
</span>
set python.branch 3.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python38] && ![variant_isset python39]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python310
</span> }
foreach pv {310 39 38} {
if {[variant_isset python${pv}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_branch "[string index ${pv} 0].[string range ${pv} 1 end]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python.branch "[string index ${pv} 0].[string range ${pv} 1 end]"
</span> depends_build-append \
port:python${pv}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +54,7 @@ depends_build-append \
</span> compiler.blacklist-append {clang < 900}
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_TESTING=On \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_TESTING=OFF \
</span> -DPERL_EXECUTABLE=${prefix}/bin/perl \
-DMBEDTLS_PYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python${python.branch} \
-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,6 +69,7 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span> -DCMAKE_RANLIB=${prefix}/bin/ranlib
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test currently broken (can't find exisiting file path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#test.run yes
</span>
github.livecheck.regex {(2\.\d+(\.\d+)?(?!a))}
</pre><pre style='margin:0'>
</pre>