<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/c324770cbf372776c5aa882d989747af73bec080">https://github.com/macports/macports-ports/commit/c324770cbf372776c5aa882d989747af73bec080</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 c324770 net/openssh: (hopefully) fix build failures on 10.6-.
</span>c324770 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c324770cbf372776c5aa882d989747af73bec080
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Tue Oct 22 17:02:51 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> net/openssh: (hopefully) fix build failures on 10.6-.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Only 10.7 introduced the audit-session.h header, so we can't rely on it
</span><span style='display:block; white-space:pre;color:#404040;'> on older platforms. Shouldn't terribly matter, since older Apple patches
</span><span style='display:block; white-space:pre;color:#404040;'> didn't set the newly introduced flags either.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also, while at it, fix a compiler warning due to memmem() not being
</span><span style='display:block; white-space:pre;color:#404040;'> declared - just a typo in the code.
</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 or warnings.
</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>---
net/openssh/Portfile | 3 +-
...-Apple-keychain-integration-other-changes.patch | 43 ++++++++++++----------
.../files/patch-openbsd_compat-memmem-bug.diff | 11 ++++++
net/openssh/files/series | 1 +
net/openssh/files/series-gsskex | 1 +
net/openssh/files/series-hpn | 1 +
6 files changed, 40 insertions(+), 20 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 cfcd8de..e5f1217 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;'>@@ -49,7 +49,8 @@ if {${name} eq ${subport}} {
</span> patch-sandbox-darwin.c-apple-sandbox-named-external.diff \
patch-sshd.c-apple-sandbox-named-external.diff \
0002-Apple-keychain-integration-other-changes.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-config.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-config.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-openbsd_compat-memmem-bug.diff
</span>
# We need a couple of patches
# - pam.patch
<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 eac0a2a..e4d64de 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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.m 2019-10-22 16:47:36.000000000 +0200
</span> @@ -0,0 +1,241 @@
+/*
+ * Copyright (c) 2007-2016 Apple Inc. All rights reserved.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -243,7 +243,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/keychain.h 2019-10-22 16:47:36.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;'>@@ -282,7 +282,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in 2019-10-22 16:47:36.000000000 +0200
</span> @@ -41,6 +41,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
CC=@CC@
LD=@LD@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -353,13 +353,16 @@
</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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,6 +62,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/audit-bsm.c 2019-10-22 16:49:35.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,6 +62,18 @@
</span> #include <bsm/audit_record.h>
#include <locale.h>
+#ifdef __APPLE__
<span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</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 <bsm/audit_session.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> +#include "auth-options.h"
+#include "misc.h"
+#include "servconf.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -370,12 +373,13 @@
</span> #if defined(HAVE_GETAUDIT_ADDR)
#define AuditInfoStruct auditinfo_addr
#define AuditInfoTermID au_tid_addr_t
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -305,6 +314,17 @@ bsm_audit_session_setup(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -305,6 +317,19 @@ bsm_audit_session_setup(void)
</span> return;
}
+#ifdef __APPLE__
+ bzero(&info, sizeof (info));
<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> + info.ai_flags = AU_SESSION_FLAG_IS_REMOTE;
+ if (the_authctxt->valid) {
+ info.ai_flags |= AU_SESSION_FLAG_HAS_AUTHENTICATED;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -383,13 +387,14 @@
</span> + if (auth_opts->permit_pty_flag && options.permit_tty) {
+ info.ai_flags |= AU_SESSION_FLAG_HAS_TTY;
+ }
<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> +#endif
+
if (the_authctxt->valid)
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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac 2019-10-22 16:47:36.000000000 +0200
</span> @@ -20,6 +20,7 @@ AC_LANG([C])
AC_CONFIG_HEADER([config.h])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -451,7 +456,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/groupaccess.c 2019-10-22 16:47:36.000000000 +0200
</span> @@ -39,6 +39,10 @@
#include "match.h"
#include "log.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,7 +496,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.c 2019-10-22 16:47:36.000000000 +0200
</span> @@ -167,6 +167,9 @@ typedef enum {
oHashKnownHosts,
oTunnel, oTunnelDevice,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -548,7 +553,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/readconf.h 2019-10-22 16:47:36.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;'>@@ -560,7 +565,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/session.c 2019-10-22 16:47:36.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;'>@@ -584,7 +589,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.0 2019-10-22 16:47:36.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;'>@@ -616,7 +621,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.1 2019-10-22 16:47:36.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;'>@@ -648,7 +653,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-17 00:34:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-add.c 2019-10-22 16:47:36.000000000 +0200
</span> @@ -67,6 +67,11 @@
#include "ssherr.h"
#include "digest.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -725,7 +730,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-17 00:34:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.c 2019-10-22 16:47:36.000000000 +0200
</span> @@ -70,6 +70,10 @@
#include <time.h>
#include <string.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -877,7 +882,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-17 00:34:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c 2019-10-22 16:47:36.000000000 +0200
</span> @@ -73,6 +73,11 @@
#include "ssherr.h"
#include "utf8.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -919,7 +924,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-17 00:34:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.0 2019-10-22 16:47:36.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;'>@@ -939,7 +944,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-17 00:34:44.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh-agent.1 2019-10-22 16:47:36.000000000 +0200
</span> @@ -52,6 +52,8 @@
.Nm ssh-agent
.Op Fl c | s
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -961,7 +966,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-17 00:41:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/SecItemPriv-shim.h 2019-10-22 16:47:36.000000000 +0200
</span> @@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2006-2013 Apple Inc. All Rights Reserved.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/patch-openbsd_compat-memmem-bug.diff b/net/openssh/files/patch-openbsd_compat-memmem-bug.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c1cd189
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/patch-openbsd_compat-memmem-bug.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/openbsd-compat/openbsd-compat.h 2019-10-22 16:54:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/openbsd-compat/openbsd-compat.h 2019-10-22 16:56:25.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73,7 +73,7 @@ int getpagesize(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *getcwd(char *pt, size_t size);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_MEMMEM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef HAVE_MEMMEM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *memmem(const void *, size_t, const void *, size_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/series b/net/openssh/files/series
</span><span style='display:block; white-space:pre;color:#808080;'>index 69de532..54ef868 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/series
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/series
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,4 +4,5 @@ patch-sandbox-darwin.c-apple-sandbox-named-external.diff
</span> patch-sshd.c-apple-sandbox-named-external.diff
0002-Apple-keychain-integration-other-changes.patch
macports-config.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch-openbsd_compat-memmem-bug.diff
</span> openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/series-gsskex b/net/openssh/files/series-gsskex
</span><span style='display:block; white-space:pre;color:#808080;'>index 69de532..54ef868 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/series-gsskex
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/series-gsskex
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,4 +4,5 @@ patch-sandbox-darwin.c-apple-sandbox-named-external.diff
</span> patch-sshd.c-apple-sandbox-named-external.diff
0002-Apple-keychain-integration-other-changes.patch
macports-config.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch-openbsd_compat-memmem-bug.diff
</span> openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/series-hpn b/net/openssh/files/series-hpn
</span><span style='display:block; white-space:pre;color:#808080;'>index 1df3fce..e128c7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/series-hpn
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/series-hpn
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,5 +4,6 @@ patch-sandbox-darwin.c-apple-sandbox-named-external.diff
</span> patch-sshd.c-apple-sandbox-named-external.diff
0002-Apple-keychain-integration-other-changes.patch
macports-config.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patch-openbsd_compat-memmem-bug.diff
</span> openssh-8.1p1-hpnssh14v18.diff
openssh-8.1p1-hpnssh14v18-openssl-1.1.diff
</pre><pre style='margin:0'>
</pre>