Module Name: src
Committed By: martin
Date: Fri Aug 11 18:13:07 UTC 2023
Modified Files:
src/crypto/external/bsd/openssh/bin/sftp [netbsd-10]: Makefile
src/crypto/external/bsd/openssh/bin/ssh [netbsd-10]: Makefile
src/crypto/external/bsd/openssh/bin/ssh-agent [netbsd-10]: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen [netbsd-10]: Makefile
src/crypto/external/bsd/openssh/bin/sshd [netbsd-10]: Makefile
src/crypto/external/bsd/openssh/lib [netbsd-10]: Makefile
Log Message:
Adjust make variable names to the variant used on this branch.
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 \
src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 \
src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.5.8.2 -r1.5.8.3 \
src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
cvs rdiff -u -r1.8.8.2 -r1.8.8.3 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r1.25.2.2 -r1.25.2.3 \
src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.34.6.2 -r1.34.6.3 \
src/crypto/external/bsd/openssh/lib/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/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.10.2.1 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.10.2.2
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.10.2.1 Fri Aug 11 15:36:40 2023
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Fri Aug 11 18:13:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.2.1 2023/08/11 15:36:40 martin Exp $
+# $NetBSD: Makefile,v 1.10.2.2 2023/08/11 18:13:06 martin Exp $
BINDIR= /usr/bin
@@ -14,6 +14,6 @@ COPTS.sftp-client.c+= -Wno-pointer-sign
.include <bsd.own.mk>
-COPTS.sftp.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH}
+COPTS.sftp.c+= ${GCC_NO_IMPLICIT_FALLTHRU}
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.18.2.1 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.18.2.2
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.18.2.1 Fri Aug 11 15:36:41 2023
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Fri Aug 11 18:13:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18.2.1 2023/08/11 15:36:41 martin Exp $
+# $NetBSD: Makefile,v 1.18.2.2 2023/08/11 18:13:07 martin Exp $
.include <bsd.own.mk>
@@ -23,6 +23,6 @@ LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LD
DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD}
.endif
-COPTS.sshconnect.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.sshconnect.c+= ${GCC_NO_FORMAT_TRUNCATION}
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.5.8.2 src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.5.8.3
--- src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.5.8.2 Fri Aug 11 15:36:41 2023
+++ src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile Fri Aug 11 18:13:07 2023
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5.8.2 2023/08/11 15:36:41 martin Exp $
+# $NetBSD: Makefile,v 1.5.8.3 2023/08/11 18:13:07 martin Exp $
BINDIR=/usr/bin
PROG= ssh-agent
SRCS= ssh-agent.c ssh-pkcs11-client.c
-COPTS.ssh-agent.c+= ${CC_WNO_FORMAT_TRUNCATION}
+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.8.2 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.8.8.3
--- src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.8.8.2 Fri Aug 11 15:36:41 2023
+++ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile Fri Aug 11 18:13:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8.8.2 2023/08/11 15:36:41 martin Exp $
+# $NetBSD: Makefile,v 1.8.8.3 2023/08/11 18:13:07 martin Exp $
BINDIR= /usr/bin
@@ -7,7 +7,7 @@ SRCS= ssh-keygen.c moduli.c sshsig.c
COPTS.ssh-keygen.c+= -Wno-pointer-sign
-COPTS.ssh-keygen.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.ssh-keygen.c+= ${GCC_NO_FORMAT_TRUNCATION}
COPTS.ssh-keygen.c+= -Wno-error=deprecated-declarations
COPTS.moduli.c+= -Wno-error=deprecated-declarations
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.25.2.2 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.25.2.3
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.25.2.2 Fri Aug 11 15:36:41 2023
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Fri Aug 11 18:13:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25.2.2 2023/08/11 15:36:41 martin Exp $
+# $NetBSD: Makefile,v 1.25.2.3 2023/08/11 18:13:07 martin Exp $
.include <bsd.own.mk>
@@ -71,8 +71,8 @@ LDADD+= -lblocklist
DPADD+= ${LIBBLOCKLIST}
.endif
-COPTS.sshlogin.c+= ${CC_WNO_STRINGOP_TRUNCATION}
-COPTS.ldapauth.c+= ${CC_WNO_STRINGOP_TRUNCATION} ${CC_WNO_STRINGOP_OVERFLOW}
+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
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.34.6.2 src/crypto/external/bsd/openssh/lib/Makefile:1.34.6.3
--- src/crypto/external/bsd/openssh/lib/Makefile:1.34.6.2 Fri Aug 11 15:36:41 2023
+++ src/crypto/external/bsd/openssh/lib/Makefile Fri Aug 11 18:13:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34.6.2 2023/08/11 15:36:41 martin Exp $
+# $NetBSD: Makefile,v 1.34.6.3 2023/08/11 18:13:07 martin Exp $
.include <bsd.own.mk>
@@ -123,8 +123,8 @@ COPTS.poly1305.c+= -O0
COPTS.umac.c+= -O0
.endif
-COPTS.hostfile.c+= ${CC_WNO_FORMAT_TRUNCATION}
-COPTS.sshkey.c+= ${CC_WNO_FORMAT_TRUNCATION}
+COPTS.hostfile.c+= ${GCC_NO_FORMAT_TRUNCATION}
+COPTS.sshkey.c+= ${GCC_NO_FORMAT_TRUNCATION}
COPTS.cipher.c+= -Wno-error=deprecated-declarations
COPTS.dh.c+= -Wno-error=deprecated-declarations
COPTS.kex.c+= -Wno-error=deprecated-declarations
