git: d27003d56449 - main - security/openssh-portable: Various build fixes

[Bryan Drewery]

The branch main has been updated by bdrewery:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d27003d5644902b91d86ff3f0c36d7b8c56710f0

commit d27003d5644902b91d86ff3f0c36d7b8c56710f0
Author:     Bryan Drewery <bdrewery at FreeBSD.org>
AuthorDate: 2021-09-10 17:46:02 +0000
Commit:     Bryan Drewery <bdrewery at FreeBSD.org>
CommitDate: 2021-09-10 17:48:05 +0000

    security/openssh-portable: Various build fixes
    
    - Fix build with WITH_BLACKLISTD [1]
    - Fix build with WITHOUT_LIBEDIT due to upstream bug [2]
    
    Reported by:    emaste [1]
    Reported by:    Ivan Rozhuk [2]
    PR:             258402 [2]
---
 security/openssh-portable/files/extra-patch-blacklistd | 10 +++++-----
 security/openssh-portable/files/patch-sftp.c           | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/security/openssh-portable/files/extra-patch-blacklistd b/security/openssh-portable/files/extra-patch-blacklistd
index 92e0fc35903e..a8e9505fef74 100644
--- a/security/openssh-portable/files/extra-patch-blacklistd
+++ b/security/openssh-portable/files/extra-patch-blacklistd
@@ -322,8 +322,8 @@
  			ssh_packet_clear_keys(ssh);
  			errno = oerrno;
  			logdie("Unable to negotiate with %s: %s. "
---- sshd.c.orig	2021-04-15 20:55:25.000000000 -0700
-+++ sshd.c	2021-04-28 13:37:18.741786000 -0700
+--- sshd.c.orig	2021-08-19 21:03:49.000000000 -0700
++++ sshd.c	2021-09-10 10:37:17.926747000 -0700
 @@ -123,6 +123,7 @@
  #include "version.h"
  #include "ssherr.h"
@@ -338,10 +338,10 @@
  
 +	BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, the_active_state, "ssh");
 +
- 	/* XXX pre-format ipaddr/port so we don't need to access active_state */
  	/* Log error and exit. */
- 	sigdie("Timeout before authentication for %s port %d",
-@@ -2209,6 +2212,9 @@ main(int ac, char **av)
+ 	if (use_privsep && pmonitor != NULL && pmonitor->m_pid <= 0)
+ 		cleanup_exit(255); /* don't log in privsep child */
+@@ -2225,6 +2228,9 @@ main(int ac, char **av)
  	if ((loginmsg = sshbuf_new()) == NULL)
  		fatal_f("sshbuf_new failed");
  	auth_debug_reset();
diff --git a/security/openssh-portable/files/patch-sftp.c b/security/openssh-portable/files/patch-sftp.c
new file mode 100644
index 000000000000..1e5e2c8de17b
--- /dev/null
+++ b/security/openssh-portable/files/patch-sftp.c
@@ -0,0 +1,17 @@
+--- sftp.c.orig	2021-09-10 10:43:58.802512000 -0700
++++ sftp.c	2021-09-10 10:44:19.707367000 -0700
+@@ -252,12 +252,14 @@ cmd_interrupt(int signo)
+ 	errno = olderrno;
+ }
+ 
++#ifdef USE_LIBEDIT
+ /* ARGSUSED */
+ static void
+ read_interrupt(int signo)
+ {
+ 	interrupted = 1;
+ }
++#endif
+ 
+ /*ARGSUSED*/
+ static void