[src/trunk]: src/crypto/external/bsd/openssh Handle OpenSSH-3.x

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

details:   https://anonhg.NetBSD.org/src/rev/ac7d75d78091
branches:  trunk
changeset: 374680:ac7d75d78091
user:      christos <christos%NetBSD.org@localhost>
date:      Tue May 09 22:25:26 2023 +0000

description:
Handle OpenSSH-3.x

diffstat:

 crypto/external/bsd/openssh/bin/ssh-agent/Makefile         |  3 ++-
 crypto/external/bsd/openssh/bin/ssh-keygen/Makefile        |  6 ++++--
 crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile       |  4 +++-
 crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile |  4 +++-
 crypto/external/bsd/openssh/bin/sshd/Makefile              |  4 +++-
 crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile |  5 ++++-
 6 files changed, 19 insertions(+), 7 deletions(-)

diffs (102 lines):

diff -r d87e3fe14e94 -r ac7d75d78091 crypto/external/bsd/openssh/bin/ssh-agent/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-agent/Makefile        Tue May 09 22:12:33 2023 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-agent/Makefile        Tue May 09 22:25:26 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2020/03/01 20:59:53 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2023/05/09 22:25:26 christos Exp $
 
 BINDIR=/usr/bin
 
@@ -6,5 +6,6 @@ PROG=   ssh-agent
 SRCS=  ssh-agent.c ssh-pkcs11-client.c
 
 COPTS.ssh-agent.c+=    ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ssh-pkcs11-client.c+= -Wno-error=deprecated-declarations
 
 .include <bsd.prog.mk>
diff -r d87e3fe14e94 -r ac7d75d78091 crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile       Tue May 09 22:12:33 2023 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile       Tue May 09 22:25:26 2023 +0000
@@ -1,12 +1,14 @@
-#      $NetBSD: Makefile,v 1.8 2020/03/01 20:59:53 christos Exp $
+#      $NetBSD: Makefile,v 1.9 2023/05/09 22:25:26 christos Exp $
 
 BINDIR=        /usr/bin
 
 PROG=  ssh-keygen
 SRCS=  ssh-keygen.c moduli.c sshsig.c
 
-COPTS.ssh-keygen.c=    -Wno-pointer-sign
+COPTS.ssh-keygen.c+=   -Wno-pointer-sign
 
 COPTS.ssh-keygen.c+=   ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.ssh-keygen.c+= -Wno-error=deprecated-declarations
+COPTS.moduli.c+= -Wno-error=deprecated-declarations
 
 .include <bsd.prog.mk>
diff -r d87e3fe14e94 -r ac7d75d78091 crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile      Tue May 09 22:12:33 2023 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile      Tue May 09 22:25:26 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2020/03/01 20:59:53 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2023/05/09 22:25:26 christos Exp $
 
 BINDIR=        /usr/bin
 
@@ -6,4 +6,6 @@ PROG=   ssh-keyscan
 SRCS=  ssh-keyscan.c ssh_api.c kexgexs.c
 MAN=   ssh-keyscan.1
 
+COPTS.kexgexs.c+= -Wno-error=deprecated-declarations
+
 .include <bsd.prog.mk>
diff -r d87e3fe14e94 -r ac7d75d78091 crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile        Tue May 09 22:12:33 2023 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile        Tue May 09 22:25:26 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2020/03/01 20:59:53 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2023/05/09 22:25:26 christos Exp $
 
 BINOWN= root
 BINMODE=555
@@ -7,4 +7,6 @@ BINDIR= /usr/libexec
 PROG=  ssh-pkcs11-helper
 MAN=   ssh-pkcs11-helper.8
 
+COPTS.ssh-pkcs11-helper.c+= -Wno-error=deprecated-declarations
+
 .include <bsd.prog.mk>
diff -r d87e3fe14e94 -r ac7d75d78091 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile     Tue May 09 22:12:33 2023 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile     Tue May 09 22:25:26 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.25 2022/10/05 22:39:36 christos Exp $
+#      $NetBSD: Makefile,v 1.26 2023/05/09 22:25:26 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -73,5 +73,7 @@ DPADD+=       ${LIBBLOCKLIST}
 
 COPTS.sshlogin.c+=     ${GCC_NO_STRINGOP_TRUNCATION}
 COPTS.ldapauth.c+=     ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
+COPTS.monitor.c+= -Wno-error=deprecated-declarations
+COPTS.kexgexs.c+= -Wno-error=deprecated-declarations
 
 .include <bsd.prog.mk>
diff -r d87e3fe14e94 -r ac7d75d78091 crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile
--- a/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile        Tue May 09 22:12:33 2023 +0000
+++ b/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile        Tue May 09 22:25:26 2023 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2020/03/04 17:30:40 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2023/05/09 22:25:26 christos Exp $
 
 BINDIR=        /usr/libexec
 
@@ -9,4 +9,7 @@ MAN=    ssh-sk-helper.8
 LDADD+=-lfido2 -lcbor -lusbhid -lm
 DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBM}
 
+COPTS.ssh-sk.c+= -Wno-error=deprecated-declarations
+COPTS.sk-usbhid.c+= -Wno-error=deprecated-declarations
+
 .include <bsd.prog.mk>