<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/10282bf4b5b49925d40eaa687604eed1235d58de">https://github.com/macports/macports-ports/commit/10282bf4b5b49925d40eaa687604eed1235d58de</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 10282bf net/openssh: fix build failures on 10.7-. Round six.
</span>10282bf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 10282bf4b5b49925d40eaa687604eed1235d58de
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Sat Oct 26 02:39:24 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> net/openssh: fix build failures on 10.7-. Round six.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> YES and NO are macros defined in /usr/include/objc/objc.h - but their
</span><span style='display:block; white-space:pre;color:#404040;'> definitions differs based on OS version.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> 10.8+ define them as "((BOOL)X)", while earlier versions define them as
</span><span style='display:block; white-space:pre;color:#404040;'> "(BOOL)X".
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> When later used in an expression such as "@X", the latter (older)
</span><span style='display:block; white-space:pre;color:#404040;'> definition is causing compile errors and needs to be wrapped in an extra
</span><span style='display:block; white-space:pre;color:#404040;'> pair of parentheses.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Newer versions are not negatively affected by the extra pair of
</span><span style='display:block; white-space:pre;color:#404040;'> parentheses, so we can keep them around in shared code paths (but not
</span><span style='display:block; white-space:pre;color:#404040;'> unnecessarily for code paths only enabled for newer OS versions).
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This change should finally allow successful building on 10.7 and 10.6,
</span><span style='display:block; white-space:pre;color:#404040;'> and potentially on even older platforms.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> I cannot, however, guarantee that it actually works correctly.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Additionally, fix up copyright header of the Object Subscripting compat
</span><span style='display:block; white-space:pre;color:#404040;'> implementation.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since this only fixes build failures.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59397
</span>---
...-Apple-keychain-integration-other-changes.patch | 67 +++++++++++-----------
1 file changed, 34 insertions(+), 33 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch b/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 32561ad..8cde823 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/0002-Apple-keychain-integration-other-changes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> --- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/keychain.m 2019-10-25 20:01:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.m 2019-10-26 02:33:33.000000000 +0200
</span> @@ -0,0 +1,290 @@
+/*
+ * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,7 +116,7 @@
</span> + (id)kSecUseAuthenticationUI: (id)kSecUseAuthenticationUIFail,
+#endif /* ((defined (MAC_OS_X_VERSION_10_11)) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11)) */
+ (id)kSecAttrAccessGroup: @"com.apple.ssh.passphrases",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (id)kSecReturnData: @YES};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (id)kSecReturnData: @(YES)};
</span> + debug3("Search for item with query: %s", [[searchQuery description] UTF8String]);
+ ret = SecItemCopyMatching((CFDictionaryRef)searchQuery, (CFTypeRef *)&passphraseData);
+ if (ret == errSecItemNotFound) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,7 +176,7 @@
</span> + (id)kSecAttrAccessGroup: @"com.apple.ssh.passphrases"};
+
+ CFTypeRef searchResults = NULL;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMutableDictionary *searchQuery = [@{(id)kSecReturnRef: @YES} mutableCopy];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSMutableDictionary *searchQuery = [@{(id)kSecReturnRef: @(YES)} mutableCopy];
</span> + [searchQuery addEntriesFromDictionary: defaultAttributes];
+
+ debug3("Search for existing item with query: %s", [[searchQuery description] UTF8String]);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,7 +266,7 @@
</span> + (id)kSecUseAuthenticationUI: (id)kSecUseAuthenticationUIFail,
+#endif /* ((defined (MAC_OS_X_VERSION_10_11)) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11)) */
+ (id)kSecAttrAccessGroup: @"com.apple.ssh.passphrases",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (id)kSecReturnAttributes: @YES,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (id)kSecReturnAttributes: @(YES),
</span> + (id)kSecMatchLimit: (id)kSecMatchLimitAll};
+
+ err = SecItemCopyMatching((CFDictionaryRef)searchQuery, (CFTypeRef *)&searchResults);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -292,7 +292,7 @@
</span> + return ret;
+}
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/keychain.h 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.h 2019-10-26 02:28:24.000000000 +0200
</span> @@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,7 +331,7 @@
</span> +char *keychain_read_passphrase(const char *filename);
+int load_identities_from_keychain(int (^add_identity)(const char *identity));
--- a/Makefile.in 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.in 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in 2019-10-26 02:28:24.000000000 +0200
</span> @@ -41,6 +41,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
CC=@CC@
LD=@LD@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -402,7 +402,7 @@
</span> ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o sshsig.o
$(LD) -o $@ ssh-keygen.o sshsig.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
--- a/audit-bsm.c 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/audit-bsm.c 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/audit-bsm.c 2019-10-26 02:28:24.000000000 +0200
</span> @@ -62,6 +62,18 @@
#include <bsm/audit_record.h>
#include <locale.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -443,7 +443,7 @@
</span> info.ai_auid = the_authctxt->pw->pw_uid;
else
--- a/configure.ac 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac 2019-10-26 02:28:24.000000000 +0200
</span> @@ -20,6 +20,7 @@ AC_LANG([C])
AC_CONFIG_HEADER([config.h])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -505,7 +505,7 @@
</span> dnl Add now.
CFLAGS="$CFLAGS $werror_flags"
--- a/groupaccess.c 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/groupaccess.c 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/groupaccess.c 2019-10-26 02:28:24.000000000 +0200
</span> @@ -39,6 +39,10 @@
#include "match.h"
#include "log.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -545,7 +545,7 @@
</span> for (i = 0, j = 0; i < ngroups; i++)
if ((gr = getgrgid(groups_bygid[i])) != NULL)
--- a/readconf.c 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.c 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.c 2019-10-26 02:28:24.000000000 +0200
</span> @@ -167,6 +167,9 @@ typedef enum {
oHashKnownHosts,
oTunnel, oTunnelDevice,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -602,7 +602,7 @@
</span>
struct fwdarg {
--- a/readconf.h 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.h 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.h 2019-10-26 02:28:24.000000000 +0200
</span> @@ -137,6 +137,9 @@ typedef struct {
char *local_command;
int permit_local_command;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -614,7 +614,7 @@
</span>
int request_tty;
--- a/session.c 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/session.c 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/session.c 2019-10-26 02:28:24.000000000 +0200
</span> @@ -1185,6 +1185,21 @@ do_setup_env(struct ssh *ssh, Session *s
child_set_env(&env, &envsize, "SSH_ORIGINAL_COMMAND",
original_command);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -638,7 +638,7 @@
</span> /* dump the environment */
fprintf(stderr, "Environment:\n");
--- a/ssh-add.0 2019-10-09 02:39:14.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.0 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.0 2019-10-26 02:28:24.000000000 +0200
</span> @@ -4,7 +4,7 @@ NAME
ssh-add M-bM-^@M-^S adds private key identities to the authentication agent
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -670,7 +670,7 @@
</span> plain private keys only and skip certificates.
--- a/ssh-add.1 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.1 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.1 2019-10-26 02:28:24.000000000 +0200
</span> @@ -43,7 +43,7 @@
.Nd adds private key identities to the authentication agent
.Sh SYNOPSIS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -702,7 +702,7 @@
</span> When loading keys into or deleting keys from the agent, process plain private
keys only and skip certificates.
--- a/ssh-add.c 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.c 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.c 2019-10-26 02:28:24.000000000 +0200
</span> @@ -67,6 +67,11 @@
#include "ssherr.h"
#include "digest.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -779,7 +779,7 @@
</span>
int
--- a/ssh-agent.c 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.c 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.c 2019-10-26 02:28:24.000000000 +0200
</span> @@ -70,6 +70,10 @@
#include <time.h>
#include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -931,7 +931,7 @@
</span> parent_alive_interval = 10;
idtab_init();
--- a/sshconnect2.c 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshconnect2.c 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c 2019-10-26 02:28:24.000000000 +0200
</span> @@ -73,6 +73,11 @@
#include "ssherr.h"
#include "utf8.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -973,7 +973,7 @@
</span> !(id->key && id->isprivate))
maybe_add_key_to_agent(id->filename, private, comment,
--- a/ssh-agent.0 2019-10-09 02:39:14.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.0 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.0 2019-10-26 02:28:24.000000000 +0200
</span> @@ -7,6 +7,7 @@ SYNOPSIS
ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]
[-P pkcs11_whitelist] [-t life] [command [arg ...]]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -993,7 +993,7 @@
</span> agent. When the command dies, so does the agent.
--- a/ssh-agent.1 2019-10-09 02:31:03.000000000 +0200
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.1 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.1 2019-10-26 02:28:24.000000000 +0200
</span> @@ -52,6 +52,8 @@
.Nm ssh-agent
.Op Fl c | s
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1015,7 +1015,7 @@
</span> .Pp
If a command line is given, this is executed as a subprocess of the agent.
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/SecItemPriv-shim.h 2019-10-25 19:44:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/SecItemPriv-shim.h 2019-10-26 02:28:24.000000000 +0200
</span> @@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2006-2013 Apple Inc. All Rights Reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1123,8 +1123,8 @@
</span> +
+#endif /* !_SECURITY_SECITEMPRIV_H_ */
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/macos-object-subscripting.m 2019-10-25 19:57:45.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/macos-object-subscripting.m 2019-10-26 02:32:19.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,65 @@
</span> +/*
+ * Copyright (c) 2017-2019 Mihai Moldovan <ionic@ionic.de>
+ *
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1137,20 +1137,21 @@
</span> + * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * 3. Neither the name of the authors nor the names of its
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * 3. Neither the name of the copyright holder nor the names of its
</span> + * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ITS CONTRIBUTORS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * POSSIBILITY OF SUCH DAMAGE.
</span> + */
+
+#include <AvailabilityMacros.h>
</pre><pre style='margin:0'>
</pre>