From d1460a177431d034248b62b36240f634482e48de Mon Sep 17 00:00:00 2001 Message-ID: In-Reply-To: <20950a7c047ca08f9317d27866c06587ed51a338.1758727870.git.sam@gentoo.org> References: <20950a7c047ca08f9317d27866c06587ed51a338.1758727870.git.sam@gentoo.org> From: Damien Miller Date: Wed, 13 Aug 2025 09:19:53 +1000 Subject: [PATCH 6/7] back out unrelated manpages changes spotted by Colin Wilson --- configure | 3 --- moduli.0 | 2 +- scp.0 | 2 +- sftp-server.0 | 2 +- sftp.0 | 2 +- ssh-add.0 | 2 +- ssh-agent.0 | 2 +- ssh-keygen.0 | 2 +- ssh-keyscan.0 | 2 +- ssh-keysign.0 | 2 +- ssh-pkcs11-helper.0 | 2 +- ssh-sk-helper.0 | 2 +- ssh.0 | 2 +- ssh_config.0 | 2 +- sshd.0 | 2 +- sshd_config.0 | 6 +++--- 16 files changed, 17 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 32e38c4cb..07d19fd30 100755 --- a/configure +++ b/configure @@ -13317,9 +13317,6 @@ EOD printf "%s\n" "#define BROKEN_SETVBUF 1" >>confdefs.h ;; -*-*-gnu*) - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_GNU_SOURCE" - ;; esac { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking compiler and flags for sanity" >&5 diff --git a/moduli.0 b/moduli.0 index 90700a16f..057a018ef 100644 --- a/moduli.0 +++ b/moduli.0 @@ -71,4 +71,4 @@ STANDARDS M. Friedl, N. Provos, and W. Simpson, Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer Protocol, RFC 4419, March 2006. -OpenBSD 7.7 April 16, 2022 OpenBSD 7.7 +OpenBSD 7.5 April 16, 2022 OpenBSD 7.5 diff --git a/scp.0 b/scp.0 index 85d5f83d5..e098ddf55 100644 --- a/scp.0 +++ b/scp.0 @@ -229,4 +229,4 @@ CAVEATS requires careful quoting of any characters that have special meaning to the remote shell, such as quote characters. -OpenBSD 7.7 December 16, 2022 OpenBSD 7.7 +OpenBSD 7.5 December 16, 2022 OpenBSD 7.5 diff --git a/sftp-server.0 b/sftp-server.0 index 273b69908..23fdda399 100644 --- a/sftp-server.0 +++ b/sftp-server.0 @@ -95,4 +95,4 @@ HISTORY AUTHORS Markus Friedl -OpenBSD 7.7 July 27, 2021 OpenBSD 7.7 +OpenBSD 7.5 July 27, 2021 OpenBSD 7.5 diff --git a/sftp.0 b/sftp.0 index 0476733c1..c6a9e60c4 100644 --- a/sftp.0 +++ b/sftp.0 @@ -435,4 +435,4 @@ SEE ALSO T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh- filexfer-00.txt, January 2001, work in progress material. -OpenBSD 7.7 December 16, 2022 OpenBSD 7.7 +OpenBSD 7.5 December 16, 2022 OpenBSD 7.5 diff --git a/ssh-add.0 b/ssh-add.0 index 20f1a88e2..30eed6672 100644 --- a/ssh-add.0 +++ b/ssh-add.0 @@ -206,4 +206,4 @@ AUTHORS created OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. -OpenBSD 7.7 June 17, 2024 OpenBSD 7.7 +OpenBSD 7.5 June 17, 2024 OpenBSD 7.5 diff --git a/ssh-agent.0 b/ssh-agent.0 index 238fa54e2..2e4ef7b6e 100644 --- a/ssh-agent.0 +++ b/ssh-agent.0 @@ -137,4 +137,4 @@ AUTHORS created OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. -OpenBSD 7.7 August 10, 2023 OpenBSD 7.7 +OpenBSD 7.5 August 10, 2023 OpenBSD 7.5 diff --git a/ssh-keygen.0 b/ssh-keygen.0 index 13b032f46..a731a7fa8 100644 --- a/ssh-keygen.0 +++ b/ssh-keygen.0 @@ -904,4 +904,4 @@ AUTHORS created OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. -OpenBSD 7.7 June 17, 2024 OpenBSD 7.7 +OpenBSD 7.5 June 17, 2024 OpenBSD 7.5 diff --git a/ssh-keyscan.0 b/ssh-keyscan.0 index cf0962c82..110399094 100644 --- a/ssh-keyscan.0 +++ b/ssh-keyscan.0 @@ -120,4 +120,4 @@ AUTHORS Davison added support for protocol version 2. -OpenBSD 7.7 June 17, 2024 OpenBSD 7.7 +OpenBSD 7.5 June 17, 2024 OpenBSD 7.5 diff --git a/ssh-keysign.0 b/ssh-keysign.0 index ff3305809..577955d1b 100644 --- a/ssh-keysign.0 +++ b/ssh-keysign.0 @@ -47,4 +47,4 @@ HISTORY AUTHORS Markus Friedl -OpenBSD 7.7 June 17, 2024 OpenBSD 7.7 +OpenBSD 7.5 June 17, 2024 OpenBSD 7.5 diff --git a/ssh-pkcs11-helper.0 b/ssh-pkcs11-helper.0 index 4b1cb8d7d..564587259 100644 --- a/ssh-pkcs11-helper.0 +++ b/ssh-pkcs11-helper.0 @@ -32,4 +32,4 @@ HISTORY AUTHORS Markus Friedl -OpenBSD 7.7 April 29, 2022 OpenBSD 7.7 +OpenBSD 7.5 April 29, 2022 OpenBSD 7.5 diff --git a/ssh-sk-helper.0 b/ssh-sk-helper.0 index 4abc5e8a0..ea2117abd 100644 --- a/ssh-sk-helper.0 +++ b/ssh-sk-helper.0 @@ -31,4 +31,4 @@ HISTORY AUTHORS Damien Miller -OpenBSD 7.7 April 29, 2022 OpenBSD 7.7 +OpenBSD 7.5 April 29, 2022 OpenBSD 7.5 diff --git a/ssh.0 b/ssh.0 index 9c34e3e6e..78863b1b0 100644 --- a/ssh.0 +++ b/ssh.0 @@ -1016,4 +1016,4 @@ AUTHORS created OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. -OpenBSD 7.7 June 27, 2024 OpenBSD 7.7 +OpenBSD 7.5 June 27, 2024 OpenBSD 7.5 diff --git a/ssh_config.0 b/ssh_config.0 index f9a82781b..ef6c0936a 100644 --- a/ssh_config.0 +++ b/ssh_config.0 @@ -1428,4 +1428,4 @@ AUTHORS created OpenSSH. Markus Friedl contributed the support for SSH protocol versions 1.5 and 2.0. -OpenBSD 7.7 June 17, 2024 OpenBSD 7.7 +OpenBSD 7.5 June 17, 2024 OpenBSD 7.5 diff --git a/sshd.0 b/sshd.0 index eac127dcf..c7de2d311 100644 --- a/sshd.0 +++ b/sshd.0 @@ -682,4 +682,4 @@ AUTHORS versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support for privilege separation. -OpenBSD 7.7 June 17, 2024 OpenBSD 7.7 +OpenBSD 7.5 June 17, 2024 OpenBSD 7.5 diff --git a/sshd_config.0 b/sshd_config.0 index ca030fcca..6883dda4b 100644 --- a/sshd_config.0 +++ b/sshd_config.0 @@ -950,8 +950,8 @@ DESCRIPTION accumulated. Penalties are enabled by default with the default settings listed - below but may disabled using the no keyword. The defaults may be - overridden by specifying one or more of the keywords below, + below but may disabled using the off keyword. The defaults may + be overridden by specifying one or more of the keywords below, separated by whitespace. All keywords accept arguments, e.g. "crash:2m". @@ -1390,4 +1390,4 @@ AUTHORS versions 1.5 and 2.0. Niels Provos and Markus Friedl contributed support for privilege separation. -OpenBSD 7.7 June 24, 2024 OpenBSD 7.7 +OpenBSD 7.5 June 24, 2024 OpenBSD 7.5 -- 2.51.0