diff options
Diffstat (limited to 'debian/patches/openbsd-docs.patch')
-rw-r--r-- | debian/patches/openbsd-docs.patch | 117 |
1 files changed, 117 insertions, 0 deletions
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch new file mode 100644 index 000000000..dea370a1b --- /dev/null +++ b/debian/patches/openbsd-docs.patch | |||
@@ -0,0 +1,117 @@ | |||
1 | Description: Adjust various OpenBSD-specific references in manual pages | ||
2 | No single bug reference for this patch, but history includes: | ||
3 | http://bugs.debian.org/154434 (login.conf(5)) | ||
4 | http://bugs.debian.org/513417 (/etc/rc) | ||
5 | http://bugs.debian.org/530692 (ssl(8)) | ||
6 | https://bugs.launchpad.net/bugs/456660 (ssl(8)) | ||
7 | Author: Colin Watson <cjwatson@debian.org> | ||
8 | Forwarded: not-needed | ||
9 | Last-Update: 2010-02-28 | ||
10 | |||
11 | Index: b/moduli.5 | ||
12 | =================================================================== | ||
13 | --- a/moduli.5 | ||
14 | +++ b/moduli.5 | ||
15 | @@ -21,7 +21,7 @@ | ||
16 | .Nd Diffie Hellman moduli | ||
17 | .Sh DESCRIPTION | ||
18 | The | ||
19 | -.Pa /etc/moduli | ||
20 | +.Pa /etc/ssh/moduli | ||
21 | file contains prime numbers and generators for use by | ||
22 | .Xr sshd 8 | ||
23 | in the Diffie-Hellman Group Exchange key exchange method. | ||
24 | @@ -111,7 +111,7 @@ | ||
25 | Diffie Hellman output to sufficiently key the selected symmetric cipher. | ||
26 | .Xr sshd 8 | ||
27 | then randomly selects a modulus from | ||
28 | -.Fa /etc/moduli | ||
29 | +.Fa /etc/ssh/moduli | ||
30 | that best meets the size requirement. | ||
31 | .Pp | ||
32 | .Sh SEE ALSO | ||
33 | Index: b/ssh-keygen.1 | ||
34 | =================================================================== | ||
35 | --- a/ssh-keygen.1 | ||
36 | +++ b/ssh-keygen.1 | ||
37 | @@ -145,9 +145,7 @@ | ||
38 | .Pa ~/.ssh/id_dsa | ||
39 | or | ||
40 | .Pa ~/.ssh/id_rsa . | ||
41 | -Additionally, the system administrator may use this to generate host keys, | ||
42 | -as seen in | ||
43 | -.Pa /etc/rc . | ||
44 | +Additionally, the system administrator may use this to generate host keys. | ||
45 | .Pp | ||
46 | Normally this program generates the key and asks for a file in which | ||
47 | to store the private key. | ||
48 | @@ -367,9 +365,7 @@ | ||
49 | .It Fl q | ||
50 | Silence | ||
51 | .Nm ssh-keygen . | ||
52 | -Used by | ||
53 | -.Pa /etc/rc | ||
54 | -when creating a new key. | ||
55 | +Used by system administration scripts when creating a new key. | ||
56 | .It Fl R Ar hostname | ||
57 | Removes all keys belonging to | ||
58 | .Ar hostname | ||
59 | Index: b/ssh.1 | ||
60 | =================================================================== | ||
61 | --- a/ssh.1 | ||
62 | +++ b/ssh.1 | ||
63 | @@ -762,6 +762,10 @@ | ||
64 | .Sx HISTORY | ||
65 | section of | ||
66 | .Xr ssl 8 | ||
67 | +(on non-OpenBSD systems, see | ||
68 | +.nh | ||
69 | +http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY) | ||
70 | +.hy | ||
71 | contains a brief discussion of the two algorithms. | ||
72 | .Pp | ||
73 | The file | ||
74 | Index: b/sshd.8 | ||
75 | =================================================================== | ||
76 | --- a/sshd.8 | ||
77 | +++ b/sshd.8 | ||
78 | @@ -70,7 +70,7 @@ | ||
79 | .Nm | ||
80 | listens for connections from clients. | ||
81 | It is normally started at boot from | ||
82 | -.Pa /etc/rc . | ||
83 | +.Pa /etc/init.d/ssh . | ||
84 | It forks a new | ||
85 | daemon for each incoming connection. | ||
86 | The forked daemons handle | ||
87 | @@ -835,7 +835,7 @@ | ||
88 | .Xr ssh 1 ) . | ||
89 | It should only be writable by root. | ||
90 | .Pp | ||
91 | -.It /etc/moduli | ||
92 | +.It /etc/ssh/moduli | ||
93 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange". | ||
94 | The file format is described in | ||
95 | .Xr moduli 5 . | ||
96 | @@ -931,7 +931,6 @@ | ||
97 | .Xr ssh-vulnkey 1 , | ||
98 | .Xr chroot 2 , | ||
99 | .Xr hosts_access 5 , | ||
100 | -.Xr login.conf 5 , | ||
101 | .Xr moduli 5 , | ||
102 | .Xr sshd_config 5 , | ||
103 | .Xr inetd 8 , | ||
104 | Index: b/sshd_config.5 | ||
105 | =================================================================== | ||
106 | --- a/sshd_config.5 | ||
107 | +++ b/sshd_config.5 | ||
108 | @@ -177,8 +177,7 @@ | ||
109 | By default, no banner is displayed. | ||
110 | .It Cm ChallengeResponseAuthentication | ||
111 | Specifies whether challenge-response authentication is allowed (e.g. via | ||
112 | -PAM or though authentication styles supported in | ||
113 | -.Xr login.conf 5 ) | ||
114 | +PAM). | ||
115 | The default is | ||
116 | .Dq yes . | ||
117 | .It Cm ChrootDirectory | ||