diff options
Diffstat (limited to 'debian/patches/openbsd-docs.patch')
-rw-r--r-- | debian/patches/openbsd-docs.patch | 135 |
1 files changed, 135 insertions, 0 deletions
diff --git a/debian/patches/openbsd-docs.patch b/debian/patches/openbsd-docs.patch new file mode 100644 index 000000000..fe8ebe757 --- /dev/null +++ b/debian/patches/openbsd-docs.patch | |||
@@ -0,0 +1,135 @@ | |||
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 | @@ -110,7 +110,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 | .Sh SEE ALSO | ||
32 | .Xr ssh-keygen 1 , | ||
33 | Index: b/ssh-keygen.1 | ||
34 | =================================================================== | ||
35 | --- a/ssh-keygen.1 | ||
36 | +++ b/ssh-keygen.1 | ||
37 | @@ -152,9 +152,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 | @@ -200,9 +198,7 @@ | ||
49 | For each of the key types (rsa1, rsa, dsa and ecdsa) for which host keys | ||
50 | do not exist, generate the host keys with the default key file path, | ||
51 | an empty passphrase, default bits for the key type, and default comment. | ||
52 | -This is used by | ||
53 | -.Pa /etc/rc | ||
54 | -to generate new host keys. | ||
55 | +This is used by system administration scripts to generate new host keys. | ||
56 | .It Fl a Ar trials | ||
57 | Specifies the number of primality tests to perform when screening DH-GEX | ||
58 | candidates using the | ||
59 | @@ -556,7 +552,7 @@ | ||
60 | Valid generator values are 2, 3, and 5. | ||
61 | .Pp | ||
62 | Screened DH groups may be installed in | ||
63 | -.Pa /etc/moduli . | ||
64 | +.Pa /etc/ssh/moduli . | ||
65 | It is important that this file contains moduli of a range of bit lengths and | ||
66 | that both ends of a connection share common moduli. | ||
67 | .Sh CERTIFICATES | ||
68 | @@ -682,7 +678,7 @@ | ||
69 | where the user wishes to log in using public key authentication. | ||
70 | There is no need to keep the contents of this file secret. | ||
71 | .Pp | ||
72 | -.It Pa /etc/moduli | ||
73 | +.It Pa /etc/ssh/moduli | ||
74 | Contains Diffie-Hellman groups used for DH-GEX. | ||
75 | The file format is described in | ||
76 | .Xr moduli 5 . | ||
77 | Index: b/ssh.1 | ||
78 | =================================================================== | ||
79 | --- a/ssh.1 | ||
80 | +++ b/ssh.1 | ||
81 | @@ -736,6 +736,10 @@ | ||
82 | .Sx HISTORY | ||
83 | section of | ||
84 | .Xr ssl 8 | ||
85 | +(on non-OpenBSD systems, see | ||
86 | +.nh | ||
87 | +http://www.openbsd.org/cgi\-bin/man.cgi?query=ssl&sektion=8#HISTORY) | ||
88 | +.hy | ||
89 | contains a brief discussion of the DSA and RSA algorithms. | ||
90 | .Pp | ||
91 | The file | ||
92 | Index: b/sshd.8 | ||
93 | =================================================================== | ||
94 | --- a/sshd.8 | ||
95 | +++ b/sshd.8 | ||
96 | @@ -69,7 +69,7 @@ | ||
97 | .Nm | ||
98 | listens for connections from clients. | ||
99 | It is normally started at boot from | ||
100 | -.Pa /etc/rc . | ||
101 | +.Pa /etc/init.d/ssh . | ||
102 | It forks a new | ||
103 | daemon for each incoming connection. | ||
104 | The forked daemons handle | ||
105 | @@ -858,7 +858,7 @@ | ||
106 | .Xr ssh 1 ) . | ||
107 | It should only be writable by root. | ||
108 | .Pp | ||
109 | -.It Pa /etc/moduli | ||
110 | +.It Pa /etc/ssh/moduli | ||
111 | Contains Diffie-Hellman groups used for the "Diffie-Hellman Group Exchange". | ||
112 | The file format is described in | ||
113 | .Xr moduli 5 . | ||
114 | @@ -956,7 +956,6 @@ | ||
115 | .Xr ssh-vulnkey 1 , | ||
116 | .Xr chroot 2 , | ||
117 | .Xr hosts_access 5 , | ||
118 | -.Xr login.conf 5 , | ||
119 | .Xr moduli 5 , | ||
120 | .Xr sshd_config 5 , | ||
121 | .Xr inetd 8 , | ||
122 | Index: b/sshd_config.5 | ||
123 | =================================================================== | ||
124 | --- a/sshd_config.5 | ||
125 | +++ b/sshd_config.5 | ||
126 | @@ -224,8 +224,7 @@ | ||
127 | By default, no banner is displayed. | ||
128 | .It Cm ChallengeResponseAuthentication | ||
129 | Specifies whether challenge-response authentication is allowed (e.g. via | ||
130 | -PAM or though authentication styles supported in | ||
131 | -.Xr login.conf 5 ) | ||
132 | +PAM). | ||
133 | The default is | ||
134 | .Dq yes . | ||
135 | .It Cm ChrootDirectory | ||