<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/d6e05adab97e8e64939011a7885de3ecf4a55b69">https://github.com/macports/macports-ports/commit/d6e05adab97e8e64939011a7885de3ecf4a55b69</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 d6e05ad net/openssh: (hopefully) fix build failures on 10.6-. Round four.
</span>d6e05ad is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d6e05adab97e8e64939011a7885de3ecf4a55b69
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Fri Oct 25 05:11:32 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> net/openssh: (hopefully) fix build failures on 10.6-. Round four.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Security/Security.h pulls Security/SecItem.h in on 10.7+, but not so on
</span><span style='display:block; white-space:pre;color:#404040;'> older platforms, so import that header manually.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> kSecAttrAccessGroup is private data up until 10.8, hence we'll need to
</span><span style='display:block; white-space:pre;color:#404040;'> include it in our SecItemPriv.h shim.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> kSecClassGenericPassword likewise is a private data up until 10.7, so
</span><span style='display:block; white-space:pre;color:#404040;'> also add it to the shim.
</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><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/59424
</span>---
...-Apple-keychain-integration-other-changes.patch | 65 +++++++++++++++-------
1 file changed, 46 insertions(+), 19 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 45c0eea..028f201 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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,266 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.m 2019-10-25 03:54:31.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,274 @@
</span> +/*
+ * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
+ *
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,14 @@
</span> +
+#import <Foundation/Foundation.h>
+#import <Security/Security.h>
<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;'>++ * On 10.7+, Security.h pulls in SecItem.h.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Not so on 10.6-, for some reason.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# import <Security/SecItem.h>
</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> +#import "SecItemPriv-shim.h"
+#include <sys/stat.h>
+#include <stdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -268,7 +276,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.h 2019-10-25 02:33:21.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;'>@@ -307,7 +315,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in 2019-10-25 02:33:21.000000000 +0200
</span> @@ -41,6 +41,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
CC=@CC@
LD=@LD@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -378,7 +386,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/audit-bsm.c 2019-10-25 02:33:21.000000000 +0200
</span> @@ -62,6 +62,18 @@
#include <bsm/audit_record.h>
#include <locale.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -419,7 +427,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac 2019-10-25 02:33:21.000000000 +0200
</span> @@ -20,6 +20,7 @@ AC_LANG([C])
AC_CONFIG_HEADER([config.h])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -481,7 +489,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/groupaccess.c 2019-10-25 02:33:21.000000000 +0200
</span> @@ -39,6 +39,10 @@
#include "match.h"
#include "log.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -521,7 +529,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.c 2019-10-25 02:33:21.000000000 +0200
</span> @@ -167,6 +167,9 @@ typedef enum {
oHashKnownHosts,
oTunnel, oTunnelDevice,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -578,7 +586,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.h 2019-10-25 02:33:21.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;'>@@ -590,7 +598,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/session.c 2019-10-25 02:33:21.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;'>@@ -614,7 +622,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.0 2019-10-25 02:33:21.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;'>@@ -646,7 +654,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.1 2019-10-25 02:33:21.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;'>@@ -678,7 +686,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.c 2019-10-25 02:33:21.000000000 +0200
</span> @@ -67,6 +67,11 @@
#include "ssherr.h"
#include "digest.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -755,7 +763,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.c 2019-10-25 02:33:21.000000000 +0200
</span> @@ -70,6 +70,10 @@
#include <time.h>
#include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -907,7 +915,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c 2019-10-25 02:33:21.000000000 +0200
</span> @@ -73,6 +73,11 @@
#include "ssherr.h"
#include "utf8.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -949,7 +957,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-24 18:24:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.0 2019-10-25 02:33:21.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;'>@@ -969,7 +977,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-24 18:24:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.1 2019-10-25 02:33:21.000000000 +0200
</span> @@ -52,6 +52,8 @@
.Nm ssh-agent
.Op Fl c | s
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -991,8 +999,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-24 18:25:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,86 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/SecItemPriv-shim.h 2019-10-25 04:58:27.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,105 @@
</span> +/*
+ * Copyright (c) 2006-2013 Apple Inc. All Rights Reserved.
+ *
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1069,6 +1077,10 @@
</span> + @constant kSecAttrNoLegacy Specifies a dictionary key whose
+ value is a CFBooleanRef indicating that the query must be run on the
+ syncable backend even for non syncable items.
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ @constant kSecAttrAccessGroup Specifies a dictionary key whole value is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ a CFStringRef indicating which access group a item is in. The access
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ groups that a particular application has access to are determined by
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ an entitlement in that application.
</span> +*/
+
+#if ((defined (MAC_OS_X_VERSION_10_11)) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1076,6 +1088,21 @@
</span> + __OSX_AVAILABLE(10.11) __IOS_AVAILABLE(9.3) __TVOS_AVAILABLE(9.3) __WATCHOS_AVAILABLE(2.3);
+#endif /* ((defined (MAC_OS_X_VERSION_10_11)) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_11)) */
+
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#if ((!(defined (MAC_OS_X_VERSION_10_8))) || (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_8))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern CFTypeRef kSecAttrAccessGroup;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif /* ((!(defined (MAC_OS_X_VERSION_10_8))) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8)) */
</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;'>++ @enum Class Value Constants (Private)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @discussion Predefined item class constants used to get or set values in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ a dictionary. The kSecClass constant is the key and its value is one
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ of the constants defined here.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @constant kSecClassGenericPassword Specifies generic password items.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern const CFTypeRef kSecClassGenericPassword;
</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> +__END_DECLS
+
+#endif /* !_SECURITY_SECITEMPRIV_H_ */
</pre><pre style='margin:0'>
</pre>