Module Name:    src
Committed By:   christos
Date:           Wed May  2 02:44:21 UTC 2012

Modified Files:
        src/doc: 3RDPARTY CHANGES

Log Message:
mention openssh 6.0


To generate a diff of this commit:
cvs rdiff -u -r1.934 -r1.935 src/doc/3RDPARTY
cvs rdiff -u -r1.1698 -r1.1699 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.934 src/doc/3RDPARTY:1.935
--- src/doc/3RDPARTY:1.934	Wed Apr 25 08:22:48 2012
+++ src/doc/3RDPARTY	Tue May  1 22:44:20 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.934 2012/04/25 12:22:48 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.935 2012/05/02 02:44:20 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -818,10 +818,10 @@ Notes:
 Please submit all changes to the author.
 
 Package:	HPN-SSH
-Version:	5.6p1 13 v10
-Current Vers:	5.6p1 13 v10
+Version:	5.6p1 13 v11
+Current Vers:	5.6p1 13 v11
 Maintainer:	www.psc.edu
-Archive Site:	http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.6p1-hpn13v10.diff.gz
+Archive Site:	http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.6p1-hpn13v11.diff.gz
 Home Page:	http://www.psc.edu/networking/projects/hpn-ssh/
 Mailing List:
 Responsible:	christos
@@ -831,7 +831,7 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	5.9
+Version:	6.0
 Current Vers:	6.0 / portable 6.0p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1698 src/doc/CHANGES:1.1699
--- src/doc/CHANGES:1.1698	Fri Apr 20 18:43:19 2012
+++ src/doc/CHANGES	Tue May  1 22:44:21 2012
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1698 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1699 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -54,3 +54,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	kernel: add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing
 		Interface II SAS controllers.  [bouyer 20120419]
 	kernel: Add support for 256 CPUs on amd64. [rmind 20120420]
+	OpenSSH): Import 6.0 [christos 20120501]

Reply via email to