diff options
Diffstat (limited to 'debian/patches/openbsd-docs.patch')
-rw-r--r-- | debian/patches/openbsd-docs.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch index 771e77216..5a6428a16 100644 --- a/debian/patches/openbsd-docs.patch +++ b/debian/patches/openbsd-docs.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ab7ae820a882c8a51b06ec0b3522813b4e90eeff Mon Sep 17 00:00:00 2001 | 1 | From 57a5ec3553730b373c96e8457815c42733304427 Mon Sep 17 00:00:00 2001 |
2 | From: Colin Watson <cjwatson@debian.org> | 2 | From: Colin Watson <cjwatson@debian.org> |
3 | Date: Sun, 9 Feb 2014 16:10:09 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:09 +0000 |
4 | Subject: Adjust various OpenBSD-specific references in manual pages | 4 | Subject: Adjust various OpenBSD-specific references in manual pages |
@@ -22,7 +22,7 @@ Patch-Name: openbsd-docs.patch | |||
22 | 5 files changed, 13 insertions(+), 15 deletions(-) | 22 | 5 files changed, 13 insertions(+), 15 deletions(-) |
23 | 23 | ||
24 | diff --git a/moduli.5 b/moduli.5 | 24 | diff --git a/moduli.5 b/moduli.5 |
25 | index ef0de08..149846c 100644 | 25 | index ef0de085..149846c8 100644 |
26 | --- a/moduli.5 | 26 | --- a/moduli.5 |
27 | +++ b/moduli.5 | 27 | +++ b/moduli.5 |
28 | @@ -21,7 +21,7 @@ | 28 | @@ -21,7 +21,7 @@ |
@@ -44,7 +44,7 @@ index ef0de08..149846c 100644 | |||
44 | .Sh SEE ALSO | 44 | .Sh SEE ALSO |
45 | .Xr ssh-keygen 1 , | 45 | .Xr ssh-keygen 1 , |
46 | diff --git a/ssh-keygen.1 b/ssh-keygen.1 | 46 | diff --git a/ssh-keygen.1 b/ssh-keygen.1 |
47 | index ce2213c..01711df 100644 | 47 | index ce2213c7..01711dff 100644 |
48 | --- a/ssh-keygen.1 | 48 | --- a/ssh-keygen.1 |
49 | +++ b/ssh-keygen.1 | 49 | +++ b/ssh-keygen.1 |
50 | @@ -178,9 +178,7 @@ key in | 50 | @@ -178,9 +178,7 @@ key in |
@@ -88,7 +88,7 @@ index ce2213c..01711df 100644 | |||
88 | The file format is described in | 88 | The file format is described in |
89 | .Xr moduli 5 . | 89 | .Xr moduli 5 . |
90 | diff --git a/ssh.1 b/ssh.1 | 90 | diff --git a/ssh.1 b/ssh.1 |
91 | index feef81a..b1f128c 100644 | 91 | index feef81a5..b1f128c2 100644 |
92 | --- a/ssh.1 | 92 | --- a/ssh.1 |
93 | +++ b/ssh.1 | 93 | +++ b/ssh.1 |
94 | @@ -877,6 +877,10 @@ implements public key authentication protocol automatically, | 94 | @@ -877,6 +877,10 @@ implements public key authentication protocol automatically, |
@@ -103,10 +103,10 @@ index feef81a..b1f128c 100644 | |||
103 | .Pp | 103 | .Pp |
104 | The file | 104 | The file |
105 | diff --git a/sshd.8 b/sshd.8 | 105 | diff --git a/sshd.8 b/sshd.8 |
106 | index 589841f..58eefe9 100644 | 106 | index c6784602..e6915141 100644 |
107 | --- a/sshd.8 | 107 | --- a/sshd.8 |
108 | +++ b/sshd.8 | 108 | +++ b/sshd.8 |
109 | @@ -67,7 +67,7 @@ over an insecure network. | 109 | @@ -65,7 +65,7 @@ over an insecure network. |
110 | .Nm | 110 | .Nm |
111 | listens for connections from clients. | 111 | listens for connections from clients. |
112 | It is normally started at boot from | 112 | It is normally started at boot from |
@@ -115,7 +115,7 @@ index 589841f..58eefe9 100644 | |||
115 | It forks a new | 115 | It forks a new |
116 | daemon for each incoming connection. | 116 | daemon for each incoming connection. |
117 | The forked daemons handle | 117 | The forked daemons handle |
118 | @@ -891,7 +891,7 @@ This file is for host-based authentication (see | 118 | @@ -836,7 +836,7 @@ This file is for host-based authentication (see |
119 | .Xr ssh 1 ) . | 119 | .Xr ssh 1 ) . |
120 | It should only be writable by root. | 120 | It should only be writable by root. |
121 | .Pp | 121 | .Pp |
@@ -124,7 +124,7 @@ index 589841f..58eefe9 100644 | |||
124 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" | 124 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange" |
125 | key exchange method. | 125 | key exchange method. |
126 | The file format is described in | 126 | The file format is described in |
127 | @@ -993,7 +993,6 @@ The content of this file is not sensitive; it can be world-readable. | 127 | @@ -936,7 +936,6 @@ The content of this file is not sensitive; it can be world-readable. |
128 | .Xr ssh-keyscan 1 , | 128 | .Xr ssh-keyscan 1 , |
129 | .Xr chroot 2 , | 129 | .Xr chroot 2 , |
130 | .Xr hosts_access 5 , | 130 | .Xr hosts_access 5 , |
@@ -133,10 +133,10 @@ index 589841f..58eefe9 100644 | |||
133 | .Xr sshd_config 5 , | 133 | .Xr sshd_config 5 , |
134 | .Xr inetd 8 , | 134 | .Xr inetd 8 , |
135 | diff --git a/sshd_config.5 b/sshd_config.5 | 135 | diff --git a/sshd_config.5 b/sshd_config.5 |
136 | index ac9b1f0..b2b349e 100644 | 136 | index 4ea0a9c3..e45a8937 100644 |
137 | --- a/sshd_config.5 | 137 | --- a/sshd_config.5 |
138 | +++ b/sshd_config.5 | 138 | +++ b/sshd_config.5 |
139 | @@ -382,8 +382,7 @@ then no banner is displayed. | 139 | @@ -372,8 +372,7 @@ then no banner is displayed. |
140 | By default, no banner is displayed. | 140 | By default, no banner is displayed. |
141 | .It Cm ChallengeResponseAuthentication | 141 | .It Cm ChallengeResponseAuthentication |
142 | Specifies whether challenge-response authentication is allowed (e.g. via | 142 | Specifies whether challenge-response authentication is allowed (e.g. via |
@@ -144,5 +144,5 @@ index ac9b1f0..b2b349e 100644 | |||
144 | -.Xr login.conf 5 ) | 144 | -.Xr login.conf 5 ) |
145 | +PAM). | 145 | +PAM). |
146 | The default is | 146 | The default is |
147 | .Dq yes . | 147 | .Cm yes . |
148 | .It Cm ChrootDirectory | 148 | .It Cm ChrootDirectory |