Module Name: src
Committed By: christos
Date: Tue May 9 22:25:26 UTC 2023
Modified Files:
src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keyscan: Makefile
src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/libexec/ssh-sk-helper: Makefile
Log Message:
Handle OpenSSH-3.x
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.5 src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.6
--- src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.5 Sun Mar 1 15:59:53 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile Tue May 9 18:25:26 2023
@@ -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>
Index: src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.8 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.9
--- src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.8 Sun Mar 1 15:59:53 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile Tue May 9 18:25:26 2023
@@ -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>
Index: src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile:1.5 src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile:1.6
--- src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile:1.5 Sun Mar 1 15:59:53 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile Tue May 9 18:25:26 2023
@@ -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>
Index: src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile:1.3 src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile:1.4
--- src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile:1.3 Sun Mar 1 15:59:53 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile Tue May 9 18:25:26 2023
@@ -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>
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.25 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.26
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.25 Wed Oct 5 18:39:36 2022
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Tue May 9 18:25:26 2023
@@ -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>
Index: src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile
diff -u src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile:1.3 src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile:1.4
--- src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile:1.3 Wed Mar 4 12:30:40 2020
+++ src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile Tue May 9 18:25:26 2023
@@ -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>
