summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/.git-dpm4
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/debian-config.patch14
-rw-r--r--debian/patches/fix-case-sensitive-matching.patch2
-rw-r--r--sshd_config.52
5 files changed, 11 insertions, 13 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index 3455d7da0..5a2f70e06 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
2c662cd7269217e67b4c47ed4afdbe0ca8d355fd4 2bdb60d16baf6d163844fc6f5f8520bc853b6611b
3c662cd7269217e67b4c47ed4afdbe0ca8d355fd4 3bdb60d16baf6d163844fc6f5f8520bc853b6611b
49a975a9faed7c4f334e8c8490db3e77e102f2b21 49a975a9faed7c4f334e8c8490db3e77e102f2b21
59a975a9faed7c4f334e8c8490db3e77e102f2b21 59a975a9faed7c4f334e8c8490db3e77e102f2b21
6openssh_6.5p1.orig.tar.gz 6openssh_6.5p1.orig.tar.gz
diff --git a/debian/changelog b/debian/changelog
index a58eb9ff3..ca43c3762 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ openssh (1:6.5p1-3) UNRELEASED; urgency=medium
2 2
3 * Clarify socket activation mode in README.Debian, as suggested by Uoti 3 * Clarify socket activation mode in README.Debian, as suggested by Uoti
4 Urpala. 4 Urpala.
5 * Stop claiming that "Protocol 2" is a Debian-specific default; this has
6 been upstream's default since 5.4p1.
5 7
6 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000 8 -- Colin Watson <cjwatson@debian.org> Tue, 11 Feb 2014 21:36:14 +0000
7 9
diff --git a/debian/patches/debian-config.patch b/debian/patches/debian-config.patch
index 5d24b22b8..70e057ed5 100644
--- a/debian/patches/debian-config.patch
+++ b/debian/patches/debian-config.patch
@@ -1,4 +1,4 @@
1From ee8d8b97cc2c6081df3af453a228992b87309ec4 Mon Sep 17 00:00:00 2001 1From f08f2d9c3fedf37f97f1b2d06f1fe36af4e5f1c3 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,7 +22,7 @@ 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: 2013-09-14 25Last-Update: 2014-02-12
26 26
27Patch-Name: debian-config.patch 27Patch-Name: debian-config.patch
28--- 28---
@@ -30,8 +30,8 @@ Patch-Name: debian-config.patch
30 ssh_config | 7 ++++++- 30 ssh_config | 7 ++++++-
31 ssh_config.5 | 19 ++++++++++++++++++- 31 ssh_config.5 | 19 ++++++++++++++++++-
32 sshd_config | 1 + 32 sshd_config | 1 +
33 sshd_config.5 | 27 +++++++++++++++++++++++++++ 33 sshd_config.5 | 25 +++++++++++++++++++++++++
34 5 files changed, 53 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 273552d..6ac8bea 100644 37index 273552d..6ac8bea 100644
@@ -120,10 +120,10 @@ index d9b8594..4db32f5 100644
120 #StrictModes yes 120 #StrictModes yes
121 #MaxAuthTries 6 121 #MaxAuthTries 6
122diff --git a/sshd_config.5 b/sshd_config.5 122diff --git a/sshd_config.5 b/sshd_config.5
123index 9fa6086..e7ac846 100644 123index 9fa6086..496530b 100644
124--- a/sshd_config.5 124--- a/sshd_config.5
125+++ b/sshd_config.5 125+++ b/sshd_config.5
126@@ -57,6 +57,33 @@ Arguments may optionally be enclosed in double quotes 126@@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes
127 .Pq \&" 127 .Pq \&"
128 in order to represent arguments containing spaces. 128 in order to represent arguments containing spaces.
129 .Pp 129 .Pp
@@ -139,8 +139,6 @@ index 9fa6086..e7ac846 100644
139+.Pp 139+.Pp
140+.Bl -bullet -offset indent -compact 140+.Bl -bullet -offset indent -compact
141+.It 141+.It
142+.Cm Protocol No 2
143+.It
144+.Cm ChallengeResponseAuthentication No no 142+.Cm ChallengeResponseAuthentication No no
145+.It 143+.It
146+.Cm X11Forwarding No yes 144+.Cm X11Forwarding No yes
diff --git a/debian/patches/fix-case-sensitive-matching.patch b/debian/patches/fix-case-sensitive-matching.patch
index b6213962d..820745cc1 100644
--- a/debian/patches/fix-case-sensitive-matching.patch
+++ b/debian/patches/fix-case-sensitive-matching.patch
@@ -1,4 +1,4 @@
1From c662cd7269217e67b4c47ed4afdbe0ca8d355fd4 Mon Sep 17 00:00:00 2001 1From bdb60d16baf6d163844fc6f5f8520bc853b6611b Mon Sep 17 00:00:00 2001
2From: Damien Miller <djm@mindrot.org> 2From: Damien Miller <djm@mindrot.org>
3Date: Tue, 4 Feb 2014 11:26:04 +1100 3Date: Tue, 4 Feb 2014 11:26:04 +1100
4Subject: Unbreak case-sensitive matching of ssh_config 4Subject: Unbreak case-sensitive matching of ssh_config
diff --git a/sshd_config.5 b/sshd_config.5
index e7ac84644..496530bf5 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -69,8 +69,6 @@ following:
69.Pp 69.Pp
70.Bl -bullet -offset indent -compact 70.Bl -bullet -offset indent -compact
71.It 71.It
72.Cm Protocol No 2
73.It
74.Cm ChallengeResponseAuthentication No no 72.Cm ChallengeResponseAuthentication No no
75.It 73.It
76.Cm X11Forwarding No yes 74.Cm X11Forwarding No yes