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 @@
 # see git-dpm(1) from git-dpm package
-c662cd7269217e67b4c47ed4afdbe0ca8d355fd4
-c662cd7269217e67b4c47ed4afdbe0ca8d355fd4
+bdb60d16baf6d163844fc6f5f8520bc853b6611b
+bdb60d16baf6d163844fc6f5f8520bc853b6611b
 9a975a9faed7c4f334e8c8490db3e77e102f2b21
 9a975a9faed7c4f334e8c8490db3e77e102f2b21
 openssh_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
 
   * Clarify socket activation mode in README.Debian, as suggested by Uoti
     Urpala.
+  * Stop claiming that "Protocol 2" is a Debian-specific default; this has
+    been upstream's default since 5.4p1.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 11 Feb 2014 21:36:14 +0000
 
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 @@
-From ee8d8b97cc2c6081df3af453a228992b87309ec4 Mon Sep 17 00:00:00 2001
+From f08f2d9c3fedf37f97f1b2d06f1fe36af4e5f1c3 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 9 Feb 2014 16:10:18 +0000
 Subject: Various Debian-specific configuration changes
@@ -22,7 +22,7 @@ debian/openssh-server.postinst.
 
 Author: Russ Allbery <rra@debian.org>
 Forwarded: not-needed
-Last-Update: 2013-09-14
+Last-Update: 2014-02-12
 
 Patch-Name: debian-config.patch
 ---
@@ -30,8 +30,8 @@ Patch-Name: debian-config.patch
  ssh_config    |  7 ++++++-
  ssh_config.5  | 19 ++++++++++++++++++-
  sshd_config   |  1 +
- sshd_config.5 | 27 +++++++++++++++++++++++++++
- 5 files changed, 53 insertions(+), 3 deletions(-)
+ sshd_config.5 | 25 +++++++++++++++++++++++++
+ 5 files changed, 51 insertions(+), 3 deletions(-)
 
 diff --git a/readconf.c b/readconf.c
 index 273552d..6ac8bea 100644
@@ -120,10 +120,10 @@ index d9b8594..4db32f5 100644
  #StrictModes yes
  #MaxAuthTries 6
 diff --git a/sshd_config.5 b/sshd_config.5
-index 9fa6086..e7ac846 100644
+index 9fa6086..496530b 100644
 --- a/sshd_config.5
 +++ b/sshd_config.5
-@@ -57,6 +57,33 @@ Arguments may optionally be enclosed in double quotes
+@@ -57,6 +57,31 @@ Arguments may optionally be enclosed in double quotes
  .Pq \&"
  in order to represent arguments containing spaces.
  .Pp
@@ -139,8 +139,6 @@ index 9fa6086..e7ac846 100644
 +.Pp
 +.Bl -bullet -offset indent -compact
 +.It
-+.Cm Protocol No 2
-+.It
 +.Cm ChallengeResponseAuthentication No no
 +.It
 +.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 @@
-From c662cd7269217e67b4c47ed4afdbe0ca8d355fd4 Mon Sep 17 00:00:00 2001
+From bdb60d16baf6d163844fc6f5f8520bc853b6611b Mon Sep 17 00:00:00 2001
 From: Damien Miller <djm@mindrot.org>
 Date: Tue, 4 Feb 2014 11:26:04 +1100
 Subject: 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:
 .Pp
 .Bl -bullet -offset indent -compact
 .It
-.Cm Protocol No 2
-.It
 .Cm ChallengeResponseAuthentication No no
 .It
 .Cm X11Forwarding No yes