Module Name: src
Committed By: riz
Date: Thu Apr 30 14:02:09 UTC 2015
Modified Files:
src/doc [netbsd-7]: 3RDPARTY CHANGES-7.0
Log Message:
Adjust documentation and 3RDPARTY for ticket 711.
To generate a diff of this commit:
cvs rdiff -u -r1.1145.2.12 -r1.1145.2.13 src/doc/3RDPARTY
cvs rdiff -u -r1.1.2.273 -r1.1.2.274 src/doc/CHANGES-7.0
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.1145.2.12 src/doc/3RDPARTY:1.1145.2.13
--- src/doc/3RDPARTY:1.1145.2.12 Wed Apr 29 20:28:34 2015
+++ src/doc/3RDPARTY Thu Apr 30 14:02:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1145.2.12 2015/04/29 20:28:34 snj Exp $
+# $NetBSD: 3RDPARTY,v 1.1145.2.13 2015/04/30 14:02:09 riz Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -959,8 +959,8 @@ Notes:
Patch applied after OpenSSH import.
Package: OpenSSH
-Version: 6.4
-Current Vers: 6.4 / portable 6.4p1
+Version: 6.8
+Current Vers: 6.8 / portable 6.8p1
Maintainer: OpenSSH
Archive Site: http://www.openssh.com/ftp.html
Home Page: http://www.openssh.com/portable.html
Index: src/doc/CHANGES-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.273 src/doc/CHANGES-7.0:1.1.2.274
--- src/doc/CHANGES-7.0:1.1.2.273 Thu Apr 30 06:22:52 2015
+++ src/doc/CHANGES-7.0 Thu Apr 30 14:02:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.273 2015/04/30 06:22:52 riz Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.274 2015/04/30 14:02:09 riz Exp $
A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
until the 7.0 release:
@@ -22653,6 +22653,7 @@ distrib/sets/lists/debug/md.sparc64 pat
distrib/sets/lists/debug/shl.mi patch
distrib/sets/lists/etc/mi patch
distrib/sets/lists/man/mi patch
+doc/3RDPARTY patch
etc/defaults/rc.conf 1.130
etc/mtree/NetBSD.dist.base 1.142
external/bsd/Makefile up to 1.48
@@ -22721,6 +22722,6 @@ libexec/ftpd/ftpd.c
Add blacklistd(8), a daemon to block and release network ports
on demand to mitigate abuse, and related changes to system daemons
- to support it.
+ to support it. Also updated OpenSSH to version 6.8.
[christos, ticket #711]
