* New upstream release (http://www.openssh.org/txt/release-5.7):

  - Implement Elliptic Curve Cryptography modes for key exchange (ECDH)
    and host/user keys (ECDSA) as specified by RFC5656.  ECDH and ECDSA
    offer better performance than plain DH and DSA at the same equivalent
    symmetric key length, as well as much shorter keys.
  - sftp(1)/sftp-server(8): add a protocol extension to support a hard
    link operation.  It is available through the "ln" command in the
    client.  The old "ln" behaviour of creating a symlink is available
    using its "-s" option or through the preexisting "symlink" command.
  - scp(1): Add a new -3 option to scp: Copies between two remote hosts
    are transferred through the local host (closes: #508613).
  - ssh(1): "atomically" create the listening mux socket by binding it on
    a temporary name and then linking it into position after listen() has
    succeeded.  This allows the mux clients to determine that the server
    socket is either ready or stale without races (closes: #454784).
    Stale server sockets are now automatically removed (closes: #523250).
  - ssh(1): install a SIGCHLD handler to reap expired child process
    (closes: #594687).
  - ssh(1)/ssh-agent(1): honour $TMPDIR for client xauth and ssh-agent
    temporary directories (closes: #357469, although only if you arrange
    for ssh-agent to actually see $TMPDIR since the setgid bit will cause
    it to be stripped off).

4 files changed, 11 insertions, 7 deletions

diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index 515fe334d..23397b04d 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -16,7 +16,7 @@
 
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
-%define version         5.6p1
+%define version         5.7p1
 %if %{use_stable}
   %define cvs           %{nil}
   %define release       1
@@ -57,7 +57,7 @@ BuildRequires	: XFree86-imake
 # %{use_stable}==0:     :pserver:cvs@bass.directhit.com:/cvs/openssh_cvs
 Source0: see-above:/.../openssh-%{version}.tar.gz
 %if %{use_stable}
-Source1: see-above:/.../openssh-%{version}.tar.gz.sig
+Source1: see-above:/.../openssh-%{version}.tar.gz.asc
 %endif
 Source2: http://www.jmknoble.net/software/%{xsa}/%{askpass}.tar.gz
 Source3: http://www.openssh.com/faq.html
@@ -182,7 +182,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
             --with-privsep-path=%{_var}/empty/sshd \
             #leave this line for easy edits.
 
-%__make CFLAGS="$RPM_OPT_FLAGS"
+%__make
 
 cd %{askpass}
 %configure \
@@ -356,7 +356,11 @@ fi
  
 
 %ChangeLog
+* Tue Jan 18 2011 Tim Rice <tim@multitalents.net>
+- Use CFLAGS from Makefile instead of RPM so build completes.
+- Signatures were changed to .asc since 4.1p1.
+
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.71 2010/08/08 16:32:09 djm Exp $
+$Id: openssh.spec,v 1.73 2011/01/22 09:23:33 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index 77e66252e..8fc76b625 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 5.6p1
+%define ver 5.7p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init
index e5d837cbc..854aff665 100755
--- a/contrib/redhat/sshd.init
+++ b/contrib/redhat/sshd.init
@@ -104,7 +104,7 @@ start()
         do_dsa_keygen
 
         echo -n $"Starting $prog:"
-        initlog -c "$SSHD $OPTIONS" && success || failure
+        $SSHD $OPTIONS && success || failure
         RETVAL=$?
         [ "$RETVAL" = 0 ] && touch /var/lock/subsys/sshd
         echo
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index f099746f2..4573c52fd 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
 
 Summary:        OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name:           openssh
-Version:        5.6p1
+Version:        5.7p1
 URL:            http://www.openssh.com/
 Release:        1
 Source0:        openssh-%{version}.tar.gz