commit c49a793346ef8fdae7455d353f7be698a87cc553 Author: Kimmo Suominen Date: Sun Dec 24 22:27:13 2023 +0200 OpenSSH 9.6 patch for netbsd-10 Patch doc/3RDPARTY, update set lists for the new libssh version, and revert compiler option macro name changes from HEAD. diff --git a/crypto/external/bsd/openssh/bin/sftp/Makefile b/crypto/external/bsd/openssh/bin/sftp/Makefile index 76a02496ebe5..3d355f60ffab 100644 --- a/crypto/external/bsd/openssh/bin/sftp/Makefile +++ b/crypto/external/bsd/openssh/bin/sftp/Makefile @@ -14,6 +14,6 @@ COPTS.sftp-client.c+= -Wno-pointer-sign .include -COPTS.sftp.c+= ${CC_WNO_IMPLICIT_FALLTHROUGH} +COPTS.sftp.c+= ${GCC_NO_IMPLICIT_FALLTHROUGH} .include diff --git a/crypto/external/bsd/openssh/bin/ssh-agent/Makefile b/crypto/external/bsd/openssh/bin/ssh-agent/Makefile index c2eb0da7371e..ed669f05ee1c 100644 --- a/crypto/external/bsd/openssh/bin/ssh-agent/Makefile +++ b/crypto/external/bsd/openssh/bin/ssh-agent/Makefile @@ -5,7 +5,7 @@ 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 diff --git a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile index a6b3a210b9f1..5c48aa27a0d2 100644 --- a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile +++ b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile @@ -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 diff --git a/crypto/external/bsd/openssh/bin/ssh/Makefile b/crypto/external/bsd/openssh/bin/ssh/Makefile index b17b1365217d..a349785087c3 100644 --- a/crypto/external/bsd/openssh/bin/ssh/Makefile +++ b/crypto/external/bsd/openssh/bin/ssh/Makefile @@ -23,6 +23,6 @@ LDADD+= -lgssapi -lheimntlm ${LIBKRB5_LDADD} DPADD+= ${LIBGSSAPI} ${LIBHEIMNTLM} ${LIBKRB5_DPADD} .endif -COPTS.sshconnect.c+= ${CC_WNO_FORMAT_TRUNCATION} +COPTS.sshconnect.c+= ${GCC_NO_FORMAT_TRUNCATION} .include diff --git a/crypto/external/bsd/openssh/bin/sshd/Makefile b/crypto/external/bsd/openssh/bin/sshd/Makefile index 2ff8a0c08e43..8bb8bedb88f4 100644 --- a/crypto/external/bsd/openssh/bin/sshd/Makefile +++ b/crypto/external/bsd/openssh/bin/sshd/Makefile @@ -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 diff --git a/crypto/external/bsd/openssh/lib/Makefile b/crypto/external/bsd/openssh/lib/Makefile index e0c3f3999bcc..1ae46928afb2 100644 --- a/crypto/external/bsd/openssh/lib/Makefile +++ b/crypto/external/bsd/openssh/lib/Makefile @@ -117,8 +117,8 @@ COPTS.${f}.c+= -Wno-pointer-sign # XXX COPTS.channels.c+= -fno-strict-aliasing -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 diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index 928af598275d..53be22ef19ee 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -872,9 +872,8 @@ ./usr/lib/libsqlite3.so.1.4 base-sys-shlib compatfile ./usr/lib/libss.so base-obsolete obsolete ./usr/lib/libssh.so base-secsh-shlib compatfile -./usr/lib/libssh.so.45 base-secsh-shlib compatfile -./usr/lib/libssh.so.45.0 base-obsolete obsolete -./usr/lib/libssh.so.45.1 base-secsh-shlib compatfile +./usr/lib/libssh.so.46 base-secsh-shlib compatfile +./usr/lib/libssh.so.46.1 base-secsh-shlib compatfile ./usr/lib/libssl.so base-crypto-shlib compatfile ./usr/lib/libssl.so.12 base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 diff --git a/distrib/sets/lists/debug/shl.mi b/distrib/sets/lists/debug/shl.mi index 13e555301349..595be1f9fa6d 100644 --- a/distrib/sets/lists/debug/shl.mi +++ b/distrib/sets/lists/debug/shl.mi @@ -283,8 +283,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.7.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.45.0.debug comp-obsolete obsolete -./usr/libdata/debug/usr/lib/libssh.so.45.1.debug comp-secsh-debug debug,compatfile +./usr/libdata/debug/usr/lib/libssh.so.46.1.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 ./usr/libdata/debug/usr/lib/libssl.so.15.0.debug comp-crypto-debug debug,compatfile,openssl=30 diff --git a/doc/3RDPARTY b/doc/3RDPARTY index 9454c9a32779..de75ab23c021 100644 --- a/doc/3RDPARTY +++ b/doc/3RDPARTY @@ -1071,8 +1071,8 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 9.5 -Current Vers: 9.5 / portable 9.5p1 +Version: 9.6 +Current Vers: 9.6 / portable 9.6p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html