Import of OpenSSH 5.0p1

diff --git a/openssh/ChangeLog b/openssh/ChangeLog
index fc8809a191fc93281a8a34a8afe0ce4b05d31eaa..0d266c1d2b9101e941c2ce528192fcbf7c499ee2 100644 (file)
--- a/openssh/ChangeLog
+++ b/openssh/ChangeLog
@@ -1,3 +1,29 @@
+20080403
+ - (djm) OpenBSD CVS sync:
+   - markus@cvs.openbsd.org 2008/04/02 15:36:51
+     [channels.c]
+     avoid possible hijacking of x11-forwarded connections (back out 1.183)
+     CVE-2008-1483; ok djm@
+   - jmc@cvs.openbsd.org 2008/03/27 22:37:57
+     [sshd.8]
+     remove trailing whitespace;
+   - djm@cvs.openbsd.org 2008/04/03 09:50:14
+     [version.h]
+     openssh-5.0
+ - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] Crank version numbers in RPM spec files
+ - (djm) [README] Update link to release notes
+ - (djm) Release 5.0p1
+
+20080315
+ - (djm) [regress/test-exec.sh] Quote putty-related variables in case they are
+   empty; report and patch from Peter Stuge
+ - (djm) [regress/test-exec.sh] Silence noise from detection of putty
+   commands; report from Peter Stuge
+ - (djm) [session.c] Relocate incorrectly-placed closefrom() that was causing
+   crashes when used with ChrootDirectory
+
+
 20080327
  - (dtucker) Cache selinux status earlier so we know if it's enabled after a
    chroot.  Allows ChrootDirectory to work with selinux support compiled in

diff --git a/openssh/README b/openssh/README
index b29c3363d63d4d800a2403bbdf01371e5c288b58..312fef0883d41995af2335410eea60062438de6d 100644 (file)
--- a/openssh/README
+++ b/openssh/README
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-4.9 for the release notes.
+See http://www.openssh.com/txt/release-5.0 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html

diff --git a/openssh/channels.c b/openssh/channels.c
index c766cc27520c570a34bc8f87fb34d00654ccc539..b6bd901f053d24a5d3bd45527c449494e065d3a2 100644 (file)
--- a/openssh/channels.c
+++ b/openssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.272 2008/01/19 23:02:40 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.273 2008/04/02 21:36:51 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2906,9 +2906,6 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
                                debug2("bind port %d: %.100s", port, strerror(errno));
                                close(sock);
 
-                               if (ai->ai_next)
-                                       continue;
-
                                for (n = 0; n < num_socks; n++) {
                                        close(socks[n]);
                                }

diff --git a/openssh/contrib/caldera/openssh.spec b/openssh/contrib/caldera/openssh.spec
index 24ac953fded98cd2c6adf4bae5df7a6e9cdf6d8b..5b2fcdf1a35323b07a008bfdf3cd3bf49687ee27 100644 (file)
--- a/openssh/contrib/caldera/openssh.spec
+++ b/openssh/contrib/caldera/openssh.spec
@@ -17,11 +17,11 @@
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable     1
 %if %{use_stable}
-  %define version      4.9p1
+  %define version      5.0p1
   %define cvs          %{nil}
   %define release      1
 %else
-  %define version      4.9p1
+  %define version      5.0p1
   %define cvs          cvs20050315
   %define release      0r1
 %endif

diff --git a/openssh/contrib/redhat/openssh.spec b/openssh/contrib/redhat/openssh.spec
index d6bd31b95f7f8642bc486b2d7685b8910a763790..28f3fdadaae18c103e40461c226957c576a8f8c5 100644 (file)
--- a/openssh/contrib/redhat/openssh.spec
+++ b/openssh/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 4.9p1
+%define ver 5.0p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID

diff --git a/openssh/contrib/suse/openssh.spec b/openssh/contrib/suse/openssh.spec
index 7819af4e8678e4d64f3613b2663bb943e8f70754..4e8c1e3326e37eea1d3bf0593f26ec604f6780a9 100644 (file)
--- a/openssh/contrib/suse/openssh.spec
+++ b/openssh/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
 
 Summary:       OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name:          openssh
-Version:       4.9p1
+Version:       5.0p1
 URL:           http://www.openssh.com/
 Release:       1
 Source0:       openssh-%{version}.tar.gz

diff --git a/openssh/sshd.8 b/openssh/sshd.8
index 3bdc05aa20b8dc14a8d0aad638eedc1faba3ca84..c9476ade37d950a07baa95ce4ccfa01825ba0d31 100644 (file)
--- a/openssh/sshd.8
+++ b/openssh/sshd.8
@@ -34,8 +34,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd.8,v 1.240 2008/03/26 21:28:14 djm Exp $
-.Dd $Mdocdate: March 27 2008 $
+.\" $OpenBSD: sshd.8,v 1.241 2008/03/27 22:37:57 jmc Exp $
+.Dd $Mdocdate: April 3 2008 $
 .Dt SSHD 8
 .Os
 .Sh NAME
@@ -532,7 +532,7 @@ option.
 .It Cm no-pty
 Prevents tty allocation (a request to allocate a pty will fail).
 .It Cm no-user-rc
-Disables execution of 
+Disables execution of
 .Pa ~/.ssh/rc .
 .It Cm no-X11-forwarding
 Forbids X11 forwarding when this key is used for authentication.

diff --git a/openssh/version.h b/openssh/version.h
index a72d421d574f6ba95d25760189dfa4805ac0554e..a310df51c140ec8ff66d12b8083678446fceabd9 100644 (file)
--- a/openssh/version.h
+++ b/openssh/version.h
@@ -1,6 +1,6 @@
-/* $OpenBSD: version.h,v 1.52 2008/03/27 00:16:49 djm Exp $ */
+/* $OpenBSD: version.h,v 1.53 2008/04/03 09:50:14 djm Exp $ */
 
-#define SSH_VERSION    "OpenSSH_4.9"
+#define SSH_VERSION    "OpenSSH_5.0"
 
 #define SSH_PORTABLE   "p1"
 #define SSH_RELEASE    SSH_VERSION SSH_PORTABLE