<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7c17445b3e5387680f1ea917dd0622557eaf57b8">https://github.com/macports/macports-ports/commit/7c17445b3e5387680f1ea917dd0622557eaf57b8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7c17445b3e5387680f1ea917dd0622557eaf57b8
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Fri Nov 29 22:48:26 2019 -0800
<span style='display:block; white-space:pre;color:#404040;'> ntpsec: Fix broken Python code.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> There are a number of issues related to Python version selection,
</span><span style='display:block; white-space:pre;color:#404040;'> which were exacerbated by the switch to 3.7 as the default in the
</span><span style='display:block; white-space:pre;color:#404040;'> Python PortGroup. In addition, users may have code using the provided
</span><span style='display:block; white-space:pre;color:#404040;'> Python package, which would be broken by switching the Python version.
</span><span style='display:block; white-space:pre;color:#404040;'> For now, switch ntpsec back to Python 2.7. Later, add variants for
</span><span style='display:block; white-space:pre;color:#404040;'> Python versions, but unless the waf PortGroup is fixed to properly
</span><span style='display:block; white-space:pre;color:#404040;'> allow specifying the waf Python version, such a change would require
</span><span style='display:block; white-space:pre;color:#404040;'> either abandoning the waf PortGroup or fixing the upstream code to
</span><span style='display:block; white-space:pre;color:#404040;'> make the --python option work properly.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also fixes a problem with dependencies.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Built and ran on MacPro 10.9, MacPro 10.14, MacPro 10.15, MacBookPro
</span><span style='display:block; white-space:pre;color:#404040;'> 10.9, PowerBook 10.5, and VMs for 10.5-10.13. Built with default
</span><span style='display:block; white-space:pre;color:#404040;'> variants, all single non-default variants, and all non-default
</span><span style='display:block; white-space:pre;color:#404040;'> variants.
</span>---
sysutils/ntpsec/Portfile | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ntpsec/Portfile b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce1f45f..6769d07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ntpsec/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,6 +6,7 @@ PortGroup python 1.0
</span>
name ntpsec
version 1.1.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories sysutils net
maintainers {fwright.net:fw @fhgwright} openmaintainer
description A secure, hardened, and improved implementation of NTP
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,8 +23,19 @@ checksums rmd160 4f88807fc4652d2bb0608ca82df5b7e6be18eb63 \
</span> sha256 48eb3e0ed932fccc21373bc34a344b0c7164fda637f9b822b85b146f1aea398b \
size 2534524
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:bison
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl port:python${python.version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# To avoid breaking any code that uses our Python package, keep the Python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# version at 2.7 until we add variants for Python versions. The upstream
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# code itself works with 2.6, 2.7, and 3.3+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note that the upstream --python option doesn't work correctly, so waf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# must be run with the target Python version. The waf PortGroup doesn't
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# currently allow selecting its Python version, but since it's hard-coded
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# for 2.7, we can ignore this for now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:bison
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python.version}
</span>
patchfiles patch-PreHighSierra.diff
</pre><pre style='margin:0'>
</pre>