Merge 3.8p1 to the trunk. This builds and runs, but I haven't tested it

extensively yet.

ProtocolKeepAlives is now just a compatibility alias for
ServerAliveInterval.

1 files changed, 4 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index fce34d72b..b05e92200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openssh (1:3.7.1p2-1) UNRELEASED; urgency=low
+openssh (1:3.8p1-1) UNRELEASED; urgency=low
 
   * New upstream release (closes: #232281):
     - New PAM implementation based on that in FreeBSD. This runs PAM session
@@ -12,13 +12,11 @@ openssh (1:3.7.1p2-1) UNRELEASED; urgency=low
     than this, to maintain the standard Debian sshd configuration.
   * Comment out PAMAuthenticationViaKbdInt and RhostsAuthentication in
     sshd_config on upgrade. Neither option is supported any more.
+  * ServerAliveInterval implemented upstream, so ProtocolKeepAlives is now a
+    compatibility alias. The semantics differ slightly, though; see
+    ssh_config(5) for details.
   * Remove -fno-builtin-log, -DHAVE_MMAP_ANON_SHARED, and
     -D__FILE_OFFSET_BITS=64 compiler options, which are no longer necessary.
-  * Darren Tucker:
-    - Supply newlines in chauthtok PAM conversation function and in
-      accumulated PAM_TEXT_INFO and PAM_ERROR_MSG messages.
-    - Store output from pam_session and pam_setcred for display after login,
-      to fix problems with missing output from PAM session modules.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 23 Sep 2003 19:22:38 +0100