<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/435a1966b46f4208a99e048fe29aea53dc23dd43">https://github.com/macports/macports-ports/commit/435a1966b46f4208a99e048fe29aea53dc23dd43</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 435a1966b46f4208a99e048fe29aea53dc23dd43
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Fri Nov 8 02:40:15 2019 +0100
<span style='display:block; white-space:pre;color:#404040;'> net/openssh: fix include/{security,pam} symlinking. Revbump.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previously, the symlink was always created, but only ever needed on OS X
</span><span style='display:block; white-space:pre;color:#404040;'> 10.5-. 10.6 renamed the directory back to the more-standard "security"
</span><span style='display:block; white-space:pre;color:#404040;'> name.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Worse, still, it was never actually used. A mass-commit to ports in 2007
</span><span style='display:block; white-space:pre;color:#404040;'> erroneously removed it from the CPPFLAGS, likely because the committer
</span><span style='display:block; white-space:pre;color:#404040;'> didn't saw the ${workpath} variable and assumed it was just a redundant
</span><span style='display:block; white-space:pre;color:#404040;'> ${prefix}/include definition.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> But it wasn't, so fix that up.
</span>---
net/openssh/Portfile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/Portfile b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8313909..69086f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name openssh
version 8.1p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories net
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,10 +219,14 @@ if {${name} eq ${subport}} {
</span> platform darwin {
# create link to /usr/include/pam because 'security' was renamed to 'pam'
# in OS X.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${workpath}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${workpath}/include/security
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s /usr/include/pam ${workpath}/include/security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # And then again back to security in 10.6.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${workpath}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${workpath}/include/security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s /usr/include/pam ${workpath}/include/security
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cppflags-append "-I${workpath}/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
</pre><pre style='margin:0'>
</pre>