summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/changelog9
-rw-r--r--debian/openssh-server.postinst13
-rw-r--r--debian/patches/debian-config.patch36
-rw-r--r--ssh_config2
-rw-r--r--ssh_config.56
-rw-r--r--sshd_config.56
7 files changed, 29 insertions, 47 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 10768e918..7713e7a1b 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
1# see git-dpm(1) from git-dpm package 1# see git-dpm(1) from git-dpm package
244f0937b56758f662ff388d474213107e3290863 2581424965d2d722a991c3247d4c0bb5950cb4fc5
344f0937b56758f662ff388d474213107e3290863 3581424965d2d722a991c3247d4c0bb5950cb4fc5
4487bdb3a5ef6075887b830ccb8a0b14f6da78e93 4487bdb3a5ef6075887b830ccb8a0b14f6da78e93
5487bdb3a5ef6075887b830ccb8a0b14f6da78e93 5487bdb3a5ef6075887b830ccb8a0b14f6da78e93
6openssh_6.7p1.orig.tar.gz 6openssh_6.7p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 19d32e429..ccb93072a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
1openssh (1:6.7p1-5) UNRELEASED; urgency=medium
2
3 * Revert change from previous upload, which causes far more trouble than
4 it is worth (closes: #780797):
5 - Send/accept only specific known LC_* variables, rather than using a
6 wildcard.
7
8 -- Colin Watson <cjwatson@debian.org> Sun, 22 Mar 2015 23:09:32 +0000
9
1openssh (1:6.7p1-4) unstable; urgency=medium 10openssh (1:6.7p1-4) unstable; urgency=medium
2 11
3 * Send/accept only specific known LC_* variables, rather than using a 12 * Send/accept only specific known LC_* variables, rather than using a
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst
index 12ccb4f76..5131b2647 100644
--- a/debian/openssh-server.postinst
+++ b/debian/openssh-server.postinst
@@ -147,13 +147,6 @@ update_server_key_bits() {
147} 147}
148 148
149 149
150update_accept_env() {
151 if [ "$(get_config_option AcceptEnv)" = 'LANG LC_*' ]; then
152 set_config_option AcceptEnv 'LANG LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL'
153 fi
154}
155
156
157create_sshdconfig() { 150create_sshdconfig() {
158 if [ -e /etc/ssh/sshd_config ] ; then 151 if [ -e /etc/ssh/sshd_config ] ; then
159 # Upgrade an existing sshd configuration. 152 # Upgrade an existing sshd configuration.
@@ -175,10 +168,6 @@ create_sshdconfig() {
175 update_server_key_bits 168 update_server_key_bits
176 fi 169 fi
177 170
178 if dpkg --compare-versions "$oldversion" lt 1:6.7p1-4; then
179 update_accept_env
180 fi
181
182 return 0 171 return 0
183 fi 172 fi
184 173
@@ -257,7 +246,7 @@ TCPKeepAlive yes
257#Banner /etc/issue.net 246#Banner /etc/issue.net
258 247
259# Allow client to pass locale environment variables 248# Allow client to pass locale environment variables
260AcceptEnv LANG LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL 249AcceptEnv LANG LC_*
261 250
262Subsystem sftp /usr/lib/openssh/sftp-server 251Subsystem sftp /usr/lib/openssh/sftp-server
263 252
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index f81d731f1..f995717fa 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
1From 44f0937b56758f662ff388d474213107e3290863 Mon Sep 17 00:00:00 2001 1From 581424965d2d722a991c3247d4c0bb5950cb4fc5 Mon Sep 17 00:00:00 2001
2From: Colin Watson <cjwatson@debian.org> 2From: Colin Watson <cjwatson@debian.org>
3Date: Sun, 9 Feb 2014 16:10:18 +0000 3Date: Sun, 9 Feb 2014 16:10:18 +0000
4Subject: Various Debian-specific configuration changes 4Subject: Various Debian-specific configuration changes
@@ -22,16 +22,16 @@ debian/openssh-server.postinst.
22 22
23Author: Russ Allbery <rra@debian.org> 23Author: Russ Allbery <rra@debian.org>
24Forwarded: not-needed 24Forwarded: not-needed
25Last-Update: 2014-11-06 25Last-Update: 2015-03-22
26 26
27Patch-Name: debian-config.patch 27Patch-Name: debian-config.patch
28--- 28---
29 readconf.c | 2 +- 29 readconf.c | 2 +-
30 ssh_config | 7 ++++++- 30 ssh_config | 7 ++++++-
31 ssh_config.5 | 23 ++++++++++++++++++++++- 31 ssh_config.5 | 19 ++++++++++++++++++-
32 sshd_config | 1 + 32 sshd_config | 1 +
33 sshd_config.5 | 29 +++++++++++++++++++++++++++++ 33 sshd_config.5 | 25 +++++++++++++++++++++++++
34 5 files changed, 59 insertions(+), 3 deletions(-) 34 5 files changed, 51 insertions(+), 3 deletions(-)
35 35
36diff --git a/readconf.c b/readconf.c 36diff --git a/readconf.c b/readconf.c
37index 0648867..29338b6 100644 37index 0648867..29338b6 100644
@@ -47,7 +47,7 @@ index 0648867..29338b6 100644
47 options->forward_x11_timeout = 1200; 47 options->forward_x11_timeout = 1200;
48 if (options->exit_on_forward_failure == -1) 48 if (options->exit_on_forward_failure == -1)
49diff --git a/ssh_config b/ssh_config 49diff --git a/ssh_config b/ssh_config
50index 228e5ab..91be1e7 100644 50index 228e5ab..c9386aa 100644
51--- a/ssh_config 51--- a/ssh_config
52+++ b/ssh_config 52+++ b/ssh_config
53@@ -17,9 +17,10 @@ 53@@ -17,9 +17,10 @@
@@ -66,15 +66,15 @@ index 228e5ab..91be1e7 100644
66 # VisualHostKey no 66 # VisualHostKey no
67 # ProxyCommand ssh -q -W %h:%p gateway.example.com 67 # ProxyCommand ssh -q -W %h:%p gateway.example.com
68 # RekeyLimit 1G 1h 68 # RekeyLimit 1G 1h
69+ SendEnv LANG LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL 69+ SendEnv LANG LC_*
70+ HashKnownHosts yes 70+ HashKnownHosts yes
71+ GSSAPIAuthentication yes 71+ GSSAPIAuthentication yes
72+ GSSAPIDelegateCredentials no 72+ GSSAPIDelegateCredentials no
73diff --git a/ssh_config.5 b/ssh_config.5 73diff --git a/ssh_config.5 b/ssh_config.5
74index a1005ba..5985769 100644 74index a1005ba..da3c177 100644
75--- a/ssh_config.5 75--- a/ssh_config.5
76+++ b/ssh_config.5 76+++ b/ssh_config.5
77@@ -71,6 +71,26 @@ Since the first obtained value for each parameter is used, more 77@@ -71,6 +71,22 @@ Since the first obtained value for each parameter is used, more
78 host-specific declarations should be given near the beginning of the 78 host-specific declarations should be given near the beginning of the
79 file, and general defaults at the end. 79 file, and general defaults at the end.
80 .Pp 80 .Pp
@@ -87,11 +87,7 @@ index a1005ba..5985769 100644
87+.Pp 87+.Pp
88+.Bl -bullet -offset indent -compact 88+.Bl -bullet -offset indent -compact
89+.It 89+.It
90+.Cm SendEnv No LANG Xo 90+.Cm SendEnv No LANG LC_*
91+.No LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT
92+.No LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME
93+.No LC_ALL
94+.Xc
95+.It 91+.It
96+.Cm HashKnownHosts No yes 92+.Cm HashKnownHosts No yes
97+.It 93+.It
@@ -101,7 +97,7 @@ index a1005ba..5985769 100644
101 The configuration file has the following format: 97 The configuration file has the following format:
102 .Pp 98 .Pp
103 Empty lines and lines starting with 99 Empty lines and lines starting with
104@@ -673,7 +693,8 @@ token used for the session will be set to expire after 20 minutes. 100@@ -673,7 +689,8 @@ token used for the session will be set to expire after 20 minutes.
105 Remote clients will be refused access after this time. 101 Remote clients will be refused access after this time.
106 .Pp 102 .Pp
107 The default is 103 The default is
@@ -124,10 +120,10 @@ index d9b8594..4db32f5 100644
124 #StrictModes yes 120 #StrictModes yes
125 #MaxAuthTries 6 121 #MaxAuthTries 6
126diff --git a/sshd_config.5 b/sshd_config.5 122diff --git a/sshd_config.5 b/sshd_config.5
127index 7396b23..09bb5fe 100644 123index 7396b23..7aa7b47 100644
128--- a/sshd_config.5 124--- a/sshd_config.5
129+++ b/sshd_config.5 125+++ b/sshd_config.5
130@@ -57,6 +57,35 @@ Arguments may optionally be enclosed in double quotes 126@@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes
131 .Pq \&" 127 .Pq \&"
132 in order to represent arguments containing spaces. 128 in order to represent arguments containing spaces.
133 .Pp 129 .Pp
@@ -149,11 +145,7 @@ index 7396b23..09bb5fe 100644
149+.It 145+.It
150+.Cm PrintMotd No no 146+.Cm PrintMotd No no
151+.It 147+.It
152+.Cm AcceptEnv No LANG Xo 148+.Cm AcceptEnv No LANG LC_*
153+.No LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT
154+.No LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME
155+.No LC_ALL
156+.Xc
157+.It 149+.It
158+.Cm Subsystem No sftp /usr/lib/openssh/sftp-server 150+.Cm Subsystem No sftp /usr/lib/openssh/sftp-server
159+.It 151+.It
diff --git a/ssh_config b/ssh_config
index 91be1e760..c9386aadd 100644
--- a/ssh_config
+++ b/ssh_config
@@ -49,7 +49,7 @@ Host *
49# VisualHostKey no 49# VisualHostKey no
50# ProxyCommand ssh -q -W %h:%p gateway.example.com 50# ProxyCommand ssh -q -W %h:%p gateway.example.com
51# RekeyLimit 1G 1h 51# RekeyLimit 1G 1h
52 SendEnv LANG LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME LC_ALL 52 SendEnv LANG LC_*
53 HashKnownHosts yes 53 HashKnownHosts yes
54 GSSAPIAuthentication yes 54 GSSAPIAuthentication yes
55 GSSAPIDelegateCredentials no 55 GSSAPIDelegateCredentials no
diff --git a/ssh_config.5 b/ssh_config.5
index 598576997..da3c1771a 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -80,11 +80,7 @@ which are not the default in
80.Pp 80.Pp
81.Bl -bullet -offset indent -compact 81.Bl -bullet -offset indent -compact
82.It 82.It
83.Cm SendEnv No LANG Xo 83.Cm SendEnv No LANG LC_*
84.No LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT
85.No LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME
86.No LC_ALL
87.Xc
88.It 84.It
89.Cm HashKnownHosts No yes 85.Cm HashKnownHosts No yes
90.It 86.It
diff --git a/sshd_config.5 b/sshd_config.5
index 09bb5fe33..7aa7b4733 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -75,11 +75,7 @@ following:
75.It 75.It
76.Cm PrintMotd No no 76.Cm PrintMotd No no
77.It 77.It
78.Cm AcceptEnv No LANG Xo 78.Cm AcceptEnv No LANG LC_*
79.No LC_ADDRESS LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT
80.No LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME
81.No LC_ALL
82.Xc
83.It 79.It
84.Cm Subsystem No sftp /usr/lib/openssh/sftp-server 80.Cm Subsystem No sftp /usr/lib/openssh/sftp-server
85.It 81.It