[src/trunk]: src/rescue Unfortunately libssh has an undefined symbol sshsk_si...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/171e065451eb
branches:  trunk
changeset: 1007721:171e065451eb
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Feb 27 17:17:34 2020 +0000

description:
Unfortunately libssh has an undefined symbol sshsk_sign(), which is provided
by different implementations depending if we are a server or a client. While
the clients we compile in, provide that symbol, it is getting hidden by
crunchhide, so we provide it again. It would have been a lot simpler to
use a function pointer instead in the library...

diffstat:

 rescue/Makefile |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r b8032a874b19 -r 171e065451eb rescue/Makefile
--- a/rescue/Makefile   Thu Feb 27 16:59:23 2020 +0000
+++ b/rescue/Makefile   Thu Feb 27 17:17:34 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.39 2019/12/29 18:26:16 christos Exp $
+#      $NetBSD: Makefile,v 1.40 2020/02/27 17:17:34 christos Exp $
 
 NOLIBCSANITIZER=       # defined
 NOSANITIZER=           # defined
@@ -57,8 +57,9 @@
 #      various library functions
 #
 
-OVERRIDEOBJS=  rcmd.o
-.PATH: ${NETBSDSRCDIR}/lib/libc/net
+OVERRIDEOBJS=  rcmd.o ssh-sk-client.o
+.PATH: ${NETBSDSRCDIR}/lib/libc/net \
+       ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
 CPPFLAGS.rcmd.c+=-I${NETBSDSRCDIR}/lib/libc/include -DRESCUEDIR=\"${RESCUEDIR}\"
 
 LIBOVERRIDE=   liboverride.o