[117118] trunk/dports/net/openssh
cal at macports.org
cal at macports.org
Sun Feb 16 14:49:16 PST 2014
Revision: 117118
https://trac.macports.org/changeset/117118
Author: cal at macports.org
Date: 2014-02-16 14:49:16 -0800 (Sun, 16 Feb 2014)
Log Message:
-----------
openssh: Fix #36291 for +gsskex, fix #41923, bumping revision because the build succeeded, but the binary was broken
Modified Paths:
--------------
trunk/dports/net/openssh/Portfile
trunk/dports/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch
Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile 2014-02-16 22:45:27 UTC (rev 117117)
+++ trunk/dports/net/openssh/Portfile 2014-02-16 22:49:16 UTC (rev 117118)
@@ -5,7 +5,7 @@
name openssh
version 6.5p1
-revision 3
+revision 4
categories net
platforms darwin
@@ -139,23 +139,27 @@
}
variant gsskex conflicts hpn requires kerberos5 description "Add OpenSSH GSSAPI key exchange patch" {
- set extra_cppflags [concat \
- "-F/System/Library/Frameworks/DirectoryService.framework" \
- "-F/System/Library/Frameworks/CoreFoundation.framework" \
- "-D_UTMPX_COMPAT -D__APPLE_LAUNCHD__ -D__APPLE_MEMBERSHIP__" \
- "-D__APPLE_XSAN__"]
use_autoreconf yes
patchfiles-append 0002-Apple-keychain-integration-other-changes.patch \
openssh-6.3p1-gsskex-all-20130920.patch
+ configure.cppflags-append \
+ -F/System/Library/Frameworks/DirectoryService.framework \
+ -F/System/Library/Frameworks/CoreFoundation.framework \
+ -D_UTMPX_COMPAT \
+ -D__APPLE_LAUNCHD__ \
+ -D__APPLE_MEMBERSHIP__ \
+ -D__APPLE_XSAN__
+ configure.ldflags-append \
+ -Wl,-pie \
+ -framework CoreFoundation \
+ -framework DirectoryService
+ configure.cflags-append -fPIE
configure.args-append --with-4in6 \
--with-audit=bsm \
--with-keychain=apple \
--disable-utmp \
--disable-wtmp \
- --with-privsep-user=_sshd \
- CFLAGS="-fPIE -O2" \
- CPPFLAGS="$extra_cppflags" \
- LDFLAGS="-Wl,-pie -framework CoreFoundation -framework DirectoryService"
+ --with-privsep-user=_sshd
}
variant kerberos5 description "Add Kerberos5 support" {
Modified: trunk/dports/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch
===================================================================
--- trunk/dports/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch 2014-02-16 22:45:27 UTC (rev 117117)
+++ trunk/dports/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch 2014-02-16 22:49:16 UTC (rev 117118)
@@ -1671,7 +1671,7 @@
exit(2);
}
- while ((ch = getopt(argc, argv, "klLcdDxXe:s:t:")) != -1) {
-+ while ((ch = getopt(argc, argv, "kKlLcdDxXe:s:t:")) != -1) {
++ while ((ch = getopt(argc, argv, "kKlLcdDxXmMe:s:t:")) != -1) {
switch (ch) {
case 'k':
key_only = 1;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140216/664a9d48/attachment.html>
More information about the macports-changes
mailing list