summaryrefslogtreecommitdiffstats
path: root/debian/patches/openbsd-docs.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-27 08:42:40 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-27 08:42:40 +0000
commit61ddb5002596ce4bfc6a400fd9952b514350c95a (patch)
treeb3c2223bb28ef51f8c683867e440500ef781e20d /debian/patches/openbsd-docs.patch
parentMerging upstream version 1:9.9p1. (diff)
downloadopenssh-debian.tar.xz
openssh-debian.zip
Adding debian version 1:9.9p1-1.debian/1%9.9p1-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--debian/patches/openbsd-docs.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch
index 8774599..f1fa958 100644
--- a/debian/patches/openbsd-docs.patch
+++ b/debian/patches/openbsd-docs.patch
@@ -1,4 +1,4 @@
-From 169d164b95c9f068cbf5fc9860029690f9bf19d3 Mon Sep 17 00:00:00 2001
+From 672018a74977e165fc82c47d64b8cbd420b95fb8 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Sun, 9 Feb 2014 16:10:09 +0000
Subject: Adjust various OpenBSD-specific references in manual pages
@@ -42,7 +42,7 @@ index 5086a6d42..6dffdc7e6 100644
.Sh SEE ALSO
.Xr ssh-keygen 1 ,
diff --git a/ssh-keygen.1 b/ssh-keygen.1
-index df6803fd9..0617d0dc2 100644
+index 06f0555a4..76239bcdf 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -211,9 +211,7 @@ key in
@@ -86,7 +86,7 @@ index df6803fd9..0617d0dc2 100644
The file format is described in
.Xr moduli 5 .
diff --git a/sshd.8 b/sshd.8
-index e2a621950..2469bfff8 100644
+index 464d402f6..bd1117bfe 100644
--- a/sshd.8
+++ b/sshd.8
@@ -64,7 +64,7 @@ over an insecure network.
@@ -98,7 +98,7 @@ index e2a621950..2469bfff8 100644
It forks a new
daemon for each incoming connection.
The forked daemons handle
-@@ -932,7 +932,7 @@ This file is for host-based authentication (see
+@@ -936,7 +936,7 @@ This file is for host-based authentication (see
.Xr ssh 1 ) .
It should only be writable by root.
.Pp
@@ -107,7 +107,7 @@ index e2a621950..2469bfff8 100644
Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange"
key exchange method.
The file format is described in
-@@ -1030,7 +1030,6 @@ The content of this file is not sensitive; it can be world-readable.
+@@ -1034,7 +1034,6 @@ The content of this file is not sensitive; it can be world-readable.
.Xr ssh-keyscan 1 ,
.Xr chroot 2 ,
.Xr hosts_access 5 ,
@@ -116,7 +116,7 @@ index e2a621950..2469bfff8 100644
.Xr sshd_config 5 ,
.Xr inetd 8 ,
diff --git a/sshd_config.5 b/sshd_config.5
-index 81671fb99..9d33cb472 100644
+index ed2f74060..e177e4af8 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -1001,9 +1001,6 @@ for interactive sessions and
@@ -129,7 +129,7 @@ index 81671fb99..9d33cb472 100644
The default is
.Cm yes .
The argument to this keyword must be
-@@ -1112,45 +1109,33 @@ The following forms may be used:
+@@ -1117,45 +1114,33 @@ The following forms may be used:
.Sm off
.Ar hostname | address
.Sm on
@@ -176,7 +176,7 @@ index 81671fb99..9d33cb472 100644
.It Cm LoginGraceTime
The server disconnects after this time if the user has not
successfully logged in.
-@@ -1276,14 +1261,8 @@ The available criteria are
+@@ -1283,14 +1268,8 @@ The available criteria are
.Cm Host ,
.Cm LocalAddress ,
.Cm LocalPort ,
@@ -192,15 +192,15 @@ index 81671fb99..9d33cb472 100644
.Pp
The match patterns may consist of single entries or comma-separated
lists and may use the wildcard and negation operators described in the
-@@ -1356,7 +1335,6 @@ Available keywords are
- .Cm PubkeyAuthOptions ,
+@@ -1364,7 +1343,6 @@ Available keywords are
+ .Cm RefuseConnection ,
.Cm RekeyLimit ,
.Cm RevokedKeys ,
-.Cm RDomain ,
.Cm SetEnv ,
.Cm StreamLocalBindMask ,
.Cm StreamLocalBindUnlink ,
-@@ -1838,15 +1816,6 @@ an OpenSSH Key Revocation List (KRL) as generated by
+@@ -1863,15 +1841,6 @@ an OpenSSH Key Revocation List (KRL) as generated by
.Xr ssh-keygen 1 .
For more information on KRLs, see the KEY REVOCATION LISTS section in
.Xr ssh-keygen 1 .
@@ -216,7 +216,7 @@ index 81671fb99..9d33cb472 100644
.It Cm SecurityKeyProvider
Specifies a path to a library that will be used when loading
FIDO authenticator-hosted keys, overriding the default of using
-@@ -2180,8 +2149,6 @@ A literal
+@@ -2205,8 +2174,6 @@ A literal
Identifies the connection endpoints, containing
four space-separated values: client address, client port number,
server address, and server port number.
@@ -225,7 +225,7 @@ index 81671fb99..9d33cb472 100644
.It %F
The fingerprint of the CA key.
.It %f
-@@ -2220,9 +2187,6 @@ accepts the tokens %%, %h, %U, and %u.
+@@ -2245,9 +2212,6 @@ accepts the tokens %%, %h, %U, and %u.
.Pp
.Cm ChrootDirectory
accepts the tokens %%, %h, %U, and %u.