Tue May 9 22:25:26 2023 UTC ()
Handle OpenSSH-3.x


(christos)
diff -r1.5 -r1.6 src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
diff -r1.8 -r1.9 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
diff -r1.5 -r1.6 src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
diff -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
diff -r1.25 -r1.26 src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -r1.3 -r1.4 src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile
cvs diff -r1.5 -r1.6 src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile 2020/03/01 20:59:53 1.5
+++ src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile 2023/05/09 22:25:26 1.6
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1# $NetBSD: Makefile,v 1.5 2020/03/01 20:59:53 christos Exp $ 1# $NetBSD: Makefile,v 1.6 2023/05/09 22:25:26 christos Exp $
2 2
3BINDIR=/usr/bin 3BINDIR=/usr/bin
4 4
5PROG= ssh-agent 5PROG= ssh-agent
6SRCS= ssh-agent.c ssh-pkcs11-client.c 6SRCS= ssh-agent.c ssh-pkcs11-client.c
7 7
8COPTS.ssh-agent.c+= ${GCC_NO_FORMAT_TRUNCATION} 8COPTS.ssh-agent.c+= ${GCC_NO_FORMAT_TRUNCATION}
 9COPTS.ssh-pkcs11-client.c+= -Wno-error=deprecated-declarations
9 10
10.include <bsd.prog.mk> 11.include <bsd.prog.mk>
cvs diff -r1.8 -r1.9 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile 2020/03/01 20:59:53 1.8
+++ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile 2023/05/09 22:25:26 1.9
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2020/03/01 20:59:53 christos Exp $ 1# $NetBSD: Makefile,v 1.9 2023/05/09 22:25:26 christos Exp $
2 2
3BINDIR= /usr/bin 3BINDIR= /usr/bin
4 4
5PROG= ssh-keygen 5PROG= ssh-keygen
6SRCS= ssh-keygen.c moduli.c sshsig.c 6SRCS= ssh-keygen.c moduli.c sshsig.c
7 7
8COPTS.ssh-keygen.c= -Wno-pointer-sign 8COPTS.ssh-keygen.c+= -Wno-pointer-sign
9 9
10COPTS.ssh-keygen.c+= ${GCC_NO_FORMAT_TRUNCATION} 10COPTS.ssh-keygen.c+= ${GCC_NO_FORMAT_TRUNCATION}
 11COPTS.ssh-keygen.c+= -Wno-error=deprecated-declarations
 12COPTS.moduli.c+= -Wno-error=deprecated-declarations
11 13
12.include <bsd.prog.mk> 14.include <bsd.prog.mk>
cvs diff -r1.5 -r1.6 src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile 2020/03/01 20:59:53 1.5
+++ src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile 2023/05/09 22:25:26 1.6
@@ -1,9 +1,11 @@ @@ -1,9 +1,11 @@
1# $NetBSD: Makefile,v 1.5 2020/03/01 20:59:53 christos Exp $ 1# $NetBSD: Makefile,v 1.6 2023/05/09 22:25:26 christos Exp $
2 2
3BINDIR= /usr/bin 3BINDIR= /usr/bin
4 4
5PROG= ssh-keyscan 5PROG= ssh-keyscan
6SRCS= ssh-keyscan.c ssh_api.c kexgexs.c 6SRCS= ssh-keyscan.c ssh_api.c kexgexs.c
7MAN= ssh-keyscan.1 7MAN= ssh-keyscan.1
8 8
 9COPTS.kexgexs.c+= -Wno-error=deprecated-declarations
 10
9.include <bsd.prog.mk> 11.include <bsd.prog.mk>
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile 2020/03/01 20:59:53 1.3
+++ src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile 2023/05/09 22:25:26 1.4
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
1# $NetBSD: Makefile,v 1.3 2020/03/01 20:59:53 christos Exp $ 1# $NetBSD: Makefile,v 1.4 2023/05/09 22:25:26 christos Exp $
2 2
3BINOWN= root 3BINOWN= root
4BINMODE=555 4BINMODE=555
5BINDIR= /usr/libexec 5BINDIR= /usr/libexec
6 6
7PROG= ssh-pkcs11-helper 7PROG= ssh-pkcs11-helper
8MAN= ssh-pkcs11-helper.8 8MAN= ssh-pkcs11-helper.8
9 9
 10COPTS.ssh-pkcs11-helper.c+= -Wno-error=deprecated-declarations
 11
10.include <bsd.prog.mk> 12.include <bsd.prog.mk>
cvs diff -r1.25 -r1.26 src/crypto/external/bsd/openssh/bin/sshd/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/bin/sshd/Makefile 2022/10/05 22:39:36 1.25
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile 2023/05/09 22:25:26 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2022/10/05 22:39:36 christos Exp $ 1# $NetBSD: Makefile,v 1.26 2023/05/09 22:25:26 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= sshd 5PROG= sshd
6MAN= sshd.8 sshd_config.5 moduli.5 6MAN= sshd.8 sshd_config.5 moduli.5
7 7
8BINDIR= /usr/sbin 8BINDIR= /usr/sbin
9 9
10SRCS= sshd.c auth-rhosts.c auth-passwd.c auth2-pubkeyfile.c \ 10SRCS= sshd.c auth-rhosts.c auth-passwd.c auth2-pubkeyfile.c \
11 sshpty.c sshlogin.c servconf.c serverloop.c \ 11 sshpty.c sshlogin.c servconf.c serverloop.c \
12 auth.c auth2.c auth-options.c session.c \ 12 auth.c auth2.c auth-options.c session.c \
13 auth-krb5.c auth2-chall.c groupaccess.c \ 13 auth-krb5.c auth2-chall.c groupaccess.c \
14 auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \ 14 auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
@@ -63,15 +63,17 @@ DPADD+= ${LIBCRYPT} ${LIBUTIL} @@ -63,15 +63,17 @@ DPADD+= ${LIBCRYPT} ${LIBUTIL}
63 63
64LDADD+= -lwrap 64LDADD+= -lwrap
65DPADD+= ${LIBWRAP} 65DPADD+= ${LIBWRAP}
66 66
67.ifdef CRUNCHEDPROG 67.ifdef CRUNCHEDPROG
68CPPFLAGS+=-DSMALL 68CPPFLAGS+=-DSMALL
69.else 69.else
70LDADD+= -lblocklist 70LDADD+= -lblocklist
71DPADD+= ${LIBBLOCKLIST} 71DPADD+= ${LIBBLOCKLIST}
72.endif 72.endif
73 73
74COPTS.sshlogin.c+= ${GCC_NO_STRINGOP_TRUNCATION} 74COPTS.sshlogin.c+= ${GCC_NO_STRINGOP_TRUNCATION}
75COPTS.ldapauth.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW} 75COPTS.ldapauth.c+= ${GCC_NO_STRINGOP_TRUNCATION} ${GCC_NO_STRINGOP_OVERFLOW}
 76COPTS.monitor.c+= -Wno-error=deprecated-declarations
 77COPTS.kexgexs.c+= -Wno-error=deprecated-declarations
76 78
77.include <bsd.prog.mk> 79.include <bsd.prog.mk>
cvs diff -r1.3 -r1.4 src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile (expand / switch to unified diff)

--- src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile 2020/03/04 17:30:40 1.3
+++ src/crypto/external/bsd/openssh/libexec/ssh-sk-helper/Makefile 2023/05/09 22:25:26 1.4
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1# $NetBSD: Makefile,v 1.3 2020/03/04 17:30:40 christos Exp $ 1# $NetBSD: Makefile,v 1.4 2023/05/09 22:25:26 christos Exp $
2 2
3BINDIR= /usr/libexec 3BINDIR= /usr/libexec
4 4
5PROG= ssh-sk-helper 5PROG= ssh-sk-helper
6SRCS= ssh-sk-helper.c ssh-sk.c sk-usbhid.c 6SRCS= ssh-sk-helper.c ssh-sk.c sk-usbhid.c
7MAN= ssh-sk-helper.8 7MAN= ssh-sk-helper.8
8 8
9LDADD+=-lfido2 -lcbor -lusbhid -lm 9LDADD+=-lfido2 -lcbor -lusbhid -lm
10DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBM} 10DPADD+=${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBM}
11 11
 12COPTS.ssh-sk.c+= -Wno-error=deprecated-declarations
 13COPTS.sk-usbhid.c+= -Wno-error=deprecated-declarations
 14
12.include <bsd.prog.mk> 15.include <bsd.prog.mk>