diff options
author | Colin Watson <cjwatson@debian.org> | 2019-06-05 06:41:44 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2019-06-09 22:09:07 +0100 |
commit | 865a97e05b6aab1619e1c8eeb33ccb8f9a9e48d3 (patch) | |
tree | 7bb2128eb663180bacfabca88f26d26bf0733824 /debian/patches/debian-config.patch | |
parent | ba627ba172d6649919baedff5ba2789610da382a (diff) | |
parent | 7d50f9e5be88179325983a1f58c9d51bb58f025a (diff) |
New upstream release (8.0p1)
Diffstat (limited to 'debian/patches/debian-config.patch')
-rw-r--r-- | debian/patches/debian-config.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch index 4866d52ad..0d47f6706 100644 --- a/debian/patches/debian-config.patch +++ b/debian/patches/debian-config.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a433d9baa031d7136a8cf3e3807ebff83a3a8634 Mon Sep 17 00:00:00 2001 | 1 | From ebd590550bb09fe129b103994d53143788683d05 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:18 +0000 | 3 | Date: Sun, 9 Feb 2014 16:10:18 +0000 |
4 | Subject: Various Debian-specific configuration changes | 4 | Subject: Various Debian-specific configuration changes |
@@ -39,10 +39,10 @@ Patch-Name: debian-config.patch | |||
39 | 6 files changed, 77 insertions(+), 9 deletions(-) | 39 | 6 files changed, 77 insertions(+), 9 deletions(-) |
40 | 40 | ||
41 | diff --git a/readconf.c b/readconf.c | 41 | diff --git a/readconf.c b/readconf.c |
42 | index 6b01f20d2..661b8bf40 100644 | 42 | index cd60007f8..f35bde6e6 100644 |
43 | --- a/readconf.c | 43 | --- a/readconf.c |
44 | +++ b/readconf.c | 44 | +++ b/readconf.c |
45 | @@ -2000,7 +2000,7 @@ fill_default_options(Options * options) | 45 | @@ -2028,7 +2028,7 @@ fill_default_options(Options * options) |
46 | if (options->forward_x11 == -1) | 46 | if (options->forward_x11 == -1) |
47 | options->forward_x11 = 0; | 47 | options->forward_x11 = 0; |
48 | if (options->forward_x11_trusted == -1) | 48 | if (options->forward_x11_trusted == -1) |
@@ -52,10 +52,10 @@ index 6b01f20d2..661b8bf40 100644 | |||
52 | options->forward_x11_timeout = 1200; | 52 | options->forward_x11_timeout = 1200; |
53 | /* | 53 | /* |
54 | diff --git a/ssh.1 b/ssh.1 | 54 | diff --git a/ssh.1 b/ssh.1 |
55 | index ad1ed0f86..1bcc8edab 100644 | 55 | index 8d2b08a29..4e298cb56 100644 |
56 | --- a/ssh.1 | 56 | --- a/ssh.1 |
57 | +++ b/ssh.1 | 57 | +++ b/ssh.1 |
58 | @@ -782,6 +782,16 @@ directive in | 58 | @@ -795,6 +795,16 @@ directive in |
59 | .Xr ssh_config 5 | 59 | .Xr ssh_config 5 |
60 | for more information. | 60 | for more information. |
61 | .Pp | 61 | .Pp |
@@ -72,7 +72,7 @@ index ad1ed0f86..1bcc8edab 100644 | |||
72 | .It Fl x | 72 | .It Fl x |
73 | Disables X11 forwarding. | 73 | Disables X11 forwarding. |
74 | .Pp | 74 | .Pp |
75 | @@ -790,6 +800,17 @@ Enables trusted X11 forwarding. | 75 | @@ -803,6 +813,17 @@ Enables trusted X11 forwarding. |
76 | Trusted X11 forwardings are not subjected to the X11 SECURITY extension | 76 | Trusted X11 forwardings are not subjected to the X11 SECURITY extension |
77 | controls. | 77 | controls. |
78 | .Pp | 78 | .Pp |
@@ -91,7 +91,7 @@ index ad1ed0f86..1bcc8edab 100644 | |||
91 | Send log information using the | 91 | Send log information using the |
92 | .Xr syslog 3 | 92 | .Xr syslog 3 |
93 | diff --git a/ssh_config b/ssh_config | 93 | diff --git a/ssh_config b/ssh_config |
94 | index bcb9f153d..1b676fb2c 100644 | 94 | index 1ff999b68..6dd6ecf87 100644 |
95 | --- a/ssh_config | 95 | --- a/ssh_config |
96 | +++ b/ssh_config | 96 | +++ b/ssh_config |
97 | @@ -17,9 +17,10 @@ | 97 | @@ -17,9 +17,10 @@ |
@@ -106,7 +106,7 @@ index bcb9f153d..1b676fb2c 100644 | |||
106 | # PasswordAuthentication yes | 106 | # PasswordAuthentication yes |
107 | # HostbasedAuthentication no | 107 | # HostbasedAuthentication no |
108 | # GSSAPIAuthentication no | 108 | # GSSAPIAuthentication no |
109 | @@ -46,3 +47,6 @@ | 109 | @@ -45,3 +46,6 @@ |
110 | # VisualHostKey no | 110 | # VisualHostKey no |
111 | # ProxyCommand ssh -q -W %h:%p gateway.example.com | 111 | # ProxyCommand ssh -q -W %h:%p gateway.example.com |
112 | # RekeyLimit 1G 1h | 112 | # RekeyLimit 1G 1h |
@@ -114,7 +114,7 @@ index bcb9f153d..1b676fb2c 100644 | |||
114 | + HashKnownHosts yes | 114 | + HashKnownHosts yes |
115 | + GSSAPIAuthentication yes | 115 | + GSSAPIAuthentication yes |
116 | diff --git a/ssh_config.5 b/ssh_config.5 | 116 | diff --git a/ssh_config.5 b/ssh_config.5 |
117 | index a91355726..1a8e24bd1 100644 | 117 | index 39535c4f8..a27631ae9 100644 |
118 | --- a/ssh_config.5 | 118 | --- a/ssh_config.5 |
119 | +++ b/ssh_config.5 | 119 | +++ b/ssh_config.5 |
120 | @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more | 120 | @@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more |
@@ -140,7 +140,7 @@ index a91355726..1a8e24bd1 100644 | |||
140 | The file contains keyword-argument pairs, one per line. | 140 | The file contains keyword-argument pairs, one per line. |
141 | Lines starting with | 141 | Lines starting with |
142 | .Ql # | 142 | .Ql # |
143 | @@ -699,11 +715,12 @@ elapsed. | 143 | @@ -717,11 +733,12 @@ elapsed. |
144 | .It Cm ForwardX11Trusted | 144 | .It Cm ForwardX11Trusted |
145 | If this option is set to | 145 | If this option is set to |
146 | .Cm yes , | 146 | .Cm yes , |
@@ -204,7 +204,7 @@ index 2c48105f8..ed8272f6d 100644 | |||
204 | # Example of overriding settings on a per-user basis | 204 | # Example of overriding settings on a per-user basis |
205 | #Match User anoncvs | 205 | #Match User anoncvs |
206 | diff --git a/sshd_config.5 b/sshd_config.5 | 206 | diff --git a/sshd_config.5 b/sshd_config.5 |
207 | index 23f71fd1d..ba50a30f1 100644 | 207 | index f995e4ab0..c0c4ebd66 100644 |
208 | --- a/sshd_config.5 | 208 | --- a/sshd_config.5 |
209 | +++ b/sshd_config.5 | 209 | +++ b/sshd_config.5 |
210 | @@ -56,6 +56,28 @@ Arguments may optionally be enclosed in double quotes | 210 | @@ -56,6 +56,28 @@ Arguments may optionally be enclosed in double quotes |