From 11a0f4d42d5b07b61ebefa6505158570fa5656fd Mon Sep 17 00:00:00 2001 From: itojun Date: Tue, 1 Oct 2002 14:12:17 +0000 Subject: [PATCH] openssh upgrade --- doc/3RDPARTY | 8 +++++--- doc/CHANGES | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/3RDPARTY b/doc/3RDPARTY index ee349e963d93..3c41331d9b07 100644 --- a/doc/3RDPARTY +++ b/doc/3RDPARTY @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2 2002/09/22 10:12:48 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.3 2002/10/01 14:12:17 itojun Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -488,8 +488,8 @@ NOTE: As of 20010405 -current includes a fix for the "ntpdx" root exploit/DoS attack which has been pulled up to the 1.4 and 1.5 branches. Package: OpenSSH -Version: 3.4 around 20020626 -Current Vers: 3.4 / portable 3.4p1 +Version: 3.5 around 20021001 +Current Vers: 3.5 / portable 3.4p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Mailing List: openssh-unix-announce@mindrot.org @@ -506,6 +506,8 @@ markus is very cooperative about it): 1.5 branch uses /etc for configuration files, while current/1.6 uses /etc/ssh. http://www.openbsd.org/advisories/ssh_channelalloc.txt is integrated manually to 1.5 branch. version date "20020307" identifies the fix. +http://www.openssh.com/txt/preauth.adv is integrated manually to 1.5 branch. +veresion date "20020626" identifies the fix. Package: OpenSSL Version: 0.9.6g diff --git a/doc/CHANGES b/doc/CHANGES index 407415929089..4330f75dcee4 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.14 $> +LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.15 $> [Note: This file does not mention every change made to the NetBSD source tree. @@ -126,3 +126,5 @@ Changes from NetBSD 1.6 to NetBSD 1.7: mrouted(8): moved to gnusrc, as it is not under BSD license. [itojun 20021001] i386: merge the sommerfeld_i386mp_1 branch [fvdl 20020926] + ssh(1): upgrade OpenBSD-based Secure Shell, based on OpenSSH 3.5 + around 20021001. [itojun 20021001]