<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/31b5e09ff6d6ac53e6e4ea85bd8ff8b366ade980">https://github.com/macports/macports-ports/commit/31b5e09ff6d6ac53e6e4ea85bd8ff8b366ade980</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 31b5e09 net/openssh: (hopefully) fix build failures on 10.6-. Round two.
</span>31b5e09 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 31b5e09ff6d6ac53e6e4ea85bd8ff8b366ade980
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Thu Oct 24 07:03:50 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> net/openssh: (hopefully) fix build failures on 10.6-. Round two.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> sys/acl.h (implicitly pulled in by other headers) breaks with
</span><span style='display:block; white-space:pre;color:#404040;'> __APPLE_API_STRICT_CONFORMANCE set. Since we don't need it in the
</span><span style='display:block; white-space:pre;color:#404040;'> keychain integration code, just drop it in that file.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> xpc/xpc.h is only available on 10.7+. Since we don't need any
</span><span style='display:block; white-space:pre;color:#404040;'> declarations or macros from there, don't include it on older platforms.
</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 | 94 ++++++++++++++--------
1 file changed, 61 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 e4d64de..19fc5b6 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,6 +1,6 @@
</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-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,241 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.m 2019-10-24 07:06:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,266 @@
</span> +/*
+ * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
+ *
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,6 +33,31 @@
</span> + * @APPLE_BSD_LICENSE_HEADER_END@
+ */
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ((!(defined (MAC_OS_X_VERSION_10_6))) || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_6))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Older versions of sys/acl.h are (arguably) buggy in that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * __APPLE_API_STRICT_CONFORMANCE macro - that we need for proper sandbox code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * compilation on older systems (10.7-) - affects (or rather restricts) the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * inclusion of macros in sys/kauth.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * These macros are then used unconditionally and everything blows up if the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * former is set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * This is not a problem with newer sys/acl.h versions, since these define
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * internal macros and hence don't rely on the KAUTH_* macros any longer (even
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * though they still include sys/kauth.h, which strictly speaking is redundant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * in such a case).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Since we don't need to work around any sandbox header bugs in the keychain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * integration, let's just drop the former macro.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifdef __APPLE_API_STRICT_CONFORMANCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# undef __APPLE_API_STRICT_CONFORMANCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif /* defined (__APPLE_API_STRICT_CONFORMANCE) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ((!(defined (MAC_OS_X_VERSION_10_6))) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)) */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span> +#import <Foundation/Foundation.h>
+#import <Security/Security.h>
+#import "SecItemPriv-shim.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -243,7 +268,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-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.h 2019-10-24 07:04:11.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;'>@@ -281,8 +306,8 @@
</span> +void remove_from_keychain(const char *filename);
+char *keychain_read_passphrase(const char *filename);
+int load_identities_from_keychain(int (^add_identity)(const char *identity));
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Makefile.in 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.in 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.in 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in 2019-10-24 07:04:11.000000000 +0200
</span> @@ -41,6 +41,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
CC=@CC@
LD=@LD@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -352,8 +377,8 @@
</span>
ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o sshsig.o
$(LD) -o $@ ssh-keygen.o sshsig.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/audit-bsm.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/audit-bsm.c 2019-10-22 16:49:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/audit-bsm.c 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/audit-bsm.c 2019-10-24 07:04:11.000000000 +0200
</span> @@ -62,6 +62,18 @@
#include <bsm/audit_record.h>
#include <locale.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -393,8 +418,8 @@
</span> if (the_authctxt->valid)
info.ai_auid = the_authctxt->pw->pw_uid;
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/configure.ac 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/configure.ac 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac 2019-10-24 07:04:11.000000000 +0200
</span> @@ -20,6 +20,7 @@ AC_LANG([C])
AC_CONFIG_HEADER([config.h])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -455,8 +480,8 @@
</span> dnl Adding -Werror to CFLAGS early prevents configure tests from running.
dnl Add now.
CFLAGS="$CFLAGS $werror_flags"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/groupaccess.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/groupaccess.c 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/groupaccess.c 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/groupaccess.c 2019-10-24 07:04:11.000000000 +0200
</span> @@ -39,6 +39,10 @@
#include "match.h"
#include "log.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -495,8 +520,8 @@
</span>
for (i = 0, j = 0; i < ngroups; i++)
if ((gr = getgrgid(groups_bygid[i])) != NULL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/readconf.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.c 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/readconf.c 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.c 2019-10-24 07:04:11.000000000 +0200
</span> @@ -167,6 +167,9 @@ typedef enum {
oHashKnownHosts,
oTunnel, oTunnelDevice,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -552,8 +577,8 @@
</span> }
struct fwdarg {
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/readconf.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/readconf.h 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/readconf.h 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.h 2019-10-24 07:04:11.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;'>@@ -564,8 +589,8 @@
</span> int visual_host_key;
int request_tty;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/session.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/session.c 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/session.c 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/session.c 2019-10-24 07:04:11.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;'>@@ -588,8 +613,8 @@
</span> if (debug_flag) {
/* dump the environment */
fprintf(stderr, "Environment:\n");
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh-add.0 2019-10-09 02:39:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.0 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh-add.0 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.0 2019-10-24 07:04:11.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;'>@@ -620,8 +645,8 @@
</span> -k When loading keys into or deleting keys from the agent, process
plain private keys only and skip certificates.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh-add.1 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.1 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh-add.1 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.1 2019-10-24 07:04:11.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;'>@@ -652,8 +677,8 @@
</span> .It Fl k
When loading keys into or deleting keys from the agent, process plain private
keys only and skip certificates.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh-add.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-add.c 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh-add.c 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.c 2019-10-24 07:04:11.000000000 +0200
</span> @@ -67,6 +67,11 @@
#include "ssherr.h"
#include "digest.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -729,8 +754,8 @@
</span> }
int
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh-agent.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.c 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh-agent.c 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.c 2019-10-24 07:04:12.000000000 +0200
</span> @@ -70,6 +70,10 @@
#include <time.h>
#include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -881,8 +906,8 @@
</span> if (ac > 0)
parent_alive_interval = 10;
idtab_init();
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshconnect2.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshconnect2.c 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshconnect2.c 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c 2019-10-24 07:04:12.000000000 +0200
</span> @@ -73,6 +73,11 @@
#include "ssherr.h"
#include "utf8.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -923,8 +948,8 @@
</span> if (!quit && private != NULL && id->agent_fd == -1 &&
!(id->key && id->isprivate))
maybe_add_key_to_agent(id->filename, private, comment,
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh-agent.0 2019-10-09 02:39:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.0 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh-agent.0 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.0 2019-10-24 07:04:12.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;'>@@ -943,8 +968,8 @@
</span> If a command line is given, this is executed as a subprocess of the
agent. When the command dies, so does the agent.
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh-agent.1 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh-agent.1 2019-10-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh-agent.1 2019-10-24 06:27:51.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.1 2019-10-24 07:04:12.000000000 +0200
</span> @@ -52,6 +52,8 @@
.Nm ssh-agent
.Op Fl c | s
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -966,8 +991,8 @@
</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-22 16:47:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,83 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/SecItemPriv-shim.h 2019-10-24 07:04:12.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,86 @@
</span> +/*
+ * Copyright (c) 2006-2013 Apple Inc. All Rights Reserved.
+ *
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1024,7 +1049,10 @@
</span> +#include <CoreFoundation/CFError.h>
+#include <TargetConditionals.h>
+#include <Security/SecBase.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ((defined (MAC_OS_X_VERSION_10_7)) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7))
</span> +#include <xpc/xpc.h>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ((defined (MAC_OS_X_VERSION_10_7)) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7)) */
</span> +
+#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE))
+#include <Security/SecTask.h>
</pre><pre style='margin:0'>
</pre>