* New upstream release (http://www.openssh.com/txt/release-5.6):

  - Added a ControlPersist option to ssh_config(5) that automatically
    starts a background ssh(1) multiplex master when connecting.  This
    connection can stay alive indefinitely, or can be set to automatically
    close after a user-specified duration of inactivity (closes: #335697,
    #350898, #454787, #500573, #550262).
  - Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
    HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
    Match blocks (closes: #549858).
  - sftp(1): fix ls in working directories that contain globbing
    characters in their pathnames (LP: #530714).

1 files changed, 2 insertions, 3 deletions

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 6bea9a40f..515fe334d 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -16,12 +16,11 @@
 
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
+%define version         5.6p1
 %if %{use_stable}
-  %define version       5.5p1
   %define cvs           %{nil}
   %define release       1
 %else
-  %define version       5.5p1
   %define cvs           cvs20050315
   %define release       0r1
 %endif
@@ -360,4 +359,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.70 2010/03/21 19:11:58 djm Exp $
+$Id: openssh.spec,v 1.71 2010/08/08 16:32:09 djm Exp $