DEP-3 tagging for message adjustments, and start on miscellaneous bug fixes

7 files changed, 53 insertions, 0 deletions

diff --git a/debian/patches/banner-noslash.patch b/debian/patches/banner-noslash.patch
index 8002791bd..af5f4213c 100644
--- a/debian/patches/banner-noslash.patch
+++ b/debian/patches/banner-noslash.patch
@@ -1,3 +1,12 @@
+Description: Don't duplicate backslashes when displaying server banner
+Origin: vendor, http://bugs.gentoo.org/show_bug.cgi?id=244222
+Author: Michał Górny <gentoo@mgorny.alt.pl>
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1533
+Bug-Debian: http://bugs.debian.org/505378
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/425346
+Bug-Gentoo: http://bugs.gentoo.org/show_bug.cgi?id=244222
+Last-Update: 2010-02-27
+
 Index: b/sshconnect2.c
 ===================================================================
 --- a/sshconnect2.c
diff --git a/debian/patches/gnome-ssh-askpass2-link.patch b/debian/patches/gnome-ssh-askpass2-link.patch
index 6e1a341b0..040bf6467 100644
--- a/debian/patches/gnome-ssh-askpass2-link.patch
+++ b/debian/patches/gnome-ssh-askpass2-link.patch
@@ -1,3 +1,9 @@
+Description: Use x11.pc when compiling/linking gnome-ssh-askpass2
+ This fixes linking with binutils-gold.
+Author: Colin Watson <cjwatson@debian.org>
+Bug-Debian: http://bugs.debian.org/555951
+Last-Update: 2010-02-27
+
 Index: b/contrib/Makefile
 ===================================================================
 --- a/contrib/Makefile
diff --git a/debian/patches/helpful-wait-terminate.patch b/debian/patches/helpful-wait-terminate.patch
index f4baa88ba..857f86456 100644
--- a/debian/patches/helpful-wait-terminate.patch
+++ b/debian/patches/helpful-wait-terminate.patch
@@ -1,3 +1,8 @@
+Description: Mention ~& when waiting for forwarded connections to terminate
+Author: Matthew Vernon <matthew@debian.org>
+Bug-Debian: http://bugs.debian.org/50308
+Last-Update: 2010-02-27
+
 Index: b/serverloop.c
 ===================================================================
 --- a/serverloop.c
diff --git a/debian/patches/keyfile-debug.patch b/debian/patches/keyfile-debug.patch
index 7a46a78d7..2e5f209f3 100644
--- a/debian/patches/keyfile-debug.patch
+++ b/debian/patches/keyfile-debug.patch
@@ -1,3 +1,10 @@
+Description: Output a debug if we can't open an existing keyfile
+Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/openssh/main/revision/5873
+Author: Darren Tucker <dtucker@zip.com.au>
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1694
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/505301
+Last-Update: 2010-02-27
+
 Index: b/auth.c
 ===================================================================
 --- a/auth.c
diff --git a/debian/patches/oom-adjust.patch b/debian/patches/oom-adjust.patch
index d01f1f3ad..ce79053f7 100644
--- a/debian/patches/oom-adjust.patch
+++ b/debian/patches/oom-adjust.patch
@@ -1,3 +1,10 @@
+Description: Disable the Linux kernel's OOM-killer for the sshd parent
+Author: Vaclav Ovsik <vaclav.ovsik@i.cz>
+Author: Colin Watson <cjwatson@debian.org>
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=1470
+Bug-Debian: http://bugs.debian.org/480020
+Last-Update: 2010-02-27
+
 Index: b/config.h.in
 ===================================================================
 --- a/config.h.in
diff --git a/debian/patches/quieter-signals.patch b/debian/patches/quieter-signals.patch
index bf36b5498..40606adc2 100644
--- a/debian/patches/quieter-signals.patch
+++ b/debian/patches/quieter-signals.patch
@@ -1,3 +1,12 @@
+Description: Reduce severity of "Killed by signal %d"
+ This produces irritating messages when using ProxyCommand or other programs
+ that use ssh under the covers (e.g. Subversion).  These messages are more
+ normally printed by the calling program, such as the shell.
+Author: Peter Samuelson <peter@p12n.org>
+Author: Colin Watson <cjwatson@debian.org>
+Bug-Debian: http://bugs.debian.org/313371
+Last-Update: 2010-02-27
+
 Index: b/clientloop.c
 ===================================================================
 --- a/clientloop.c
diff --git a/debian/patches/syslog-level-silent.patch b/debian/patches/syslog-level-silent.patch
index 492d61983..1c3dacb83 100644
--- a/debian/patches/syslog-level-silent.patch
+++ b/debian/patches/syslog-level-silent.patch
@@ -1,3 +1,13 @@
+Description: Add "LogLevel SILENT" (-qq), suppressing even fatal errors
+ It's not clear that this is as useful as originally intended, or
+ implemented correctly, and there's no bug trail to be found for the
+ original feature (although it has been tweaked by bug reports since it was
+ added in Debian openssh 1:3.0.1p1-1).  Needs review.
+Author: Jonathan David Amery <jdamery@ysolde.ucam.org>
+Author: Matthew Vernon <matthew@debian.org>
+Author: Colin Watson <cjwatson@debian.org>
+Last-Update: 2010-02-27
+
 Index: b/clientloop.c
 ===================================================================
 --- a/clientloop.c