Module Name:    src
Committed By:   riz
Date:           Mon Aug 13 20:19:24 UTC 2012

Modified Files:
        src/distrib/sets/lists/base [netbsd-6]: ad.mips64eb ad.mips64el
            md.amd64 md.sparc64 shl.mi
        src/distrib/sets/lists/comp [netbsd-6]: ad.mips64eb ad.mips64el
            md.amd64 md.sparc64 mi shl.mi
        src/doc [netbsd-6]: 3RDPARTY CHANGES

Log Message:
Pull up following revision(s) (requested by christos in ticket #491):
        doc/CHANGES: revision 1.1723
        distrib/sets/lists/comp/mi: revision 1.1770
        doc/3RDPARTY: revision 1.952
        distrib/sets/lists/base/md.amd64: revision 1.173
        distrib/sets/lists/comp/ad.mips64el: revision 1.86
        distrib/sets/lists/base/shl.mi: revision 1.634
        distrib/sets/lists/base/ad.mips64el: revision 1.97
        distrib/sets/lists/comp/shl.mi: revision 1.230
        distrib/sets/lists/base/md.sparc64: revision 1.163
        distrib/sets/lists/comp/md.sparc64: revision 1.154
        distrib/sets/lists/comp/ad.mips64eb: revision 1.85
        distrib/sets/lists/base/ad.mips64eb: revision 1.98
        distrib/sets/lists/comp/md.amd64: revision 1.172
new openssl
mention new openssl


To generate a diff of this commit:
cvs rdiff -u -r1.82.2.3 -r1.82.2.4 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.81.2.3 -r1.81.2.4 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.156.2.3 -r1.156.2.4 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.147.2.3 -r1.147.2.4 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.616.2.3 -r1.616.2.4 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.69.2.3 -r1.69.2.4 src/distrib/sets/lists/comp/ad.mips64eb
cvs rdiff -u -r1.69.2.4 -r1.69.2.5 src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.155.2.3 -r1.155.2.4 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.138.2.3 -r1.138.2.4 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1738.2.5 -r1.1738.2.6 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.209.2.3 -r1.209.2.4 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.909.2.12 -r1.909.2.13 src/doc/3RDPARTY
cvs rdiff -u -r1.1670.2.6 -r1.1670.2.7 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/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.82.2.3 src/distrib/sets/lists/base/ad.mips64eb:1.82.2.4
--- src/distrib/sets/lists/base/ad.mips64eb:1.82.2.3	Tue Jun  5 21:15:33 2012
+++ src/distrib/sets/lists/base/ad.mips64eb	Mon Aug 13 20:19:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.82.2.3 2012/06/05 21:15:33 bouyer Exp $
+# $NetBSD: ad.mips64eb,v 1.82.2.4 2012/08/13 20:19:24 riz Exp $
 ./libexec/ld.elf_so-64				base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32				base-sysutil-bin	compat,pic
 ./usr/lib/64					base-compat-lib
@@ -71,8 +71,8 @@
 ./usr/lib/64/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libcrypt.so.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libcrypt.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/64/libcrypto.so.7			base-compat-shlib	compat,pic,crypto
-./usr/lib/64/libcrypto.so.7.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libcrypto.so.8			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libcrypto.so.8.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libcurses.so.7			base-compat-shlib	compat,pic
 ./usr/lib/64/libcurses.so.7.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libdes.so.8			base-compat-shlib	compat,pic,crypto
@@ -245,8 +245,8 @@
 ./usr/lib/64/libss.so.6.0			base-compat-shlib	obsolete
 ./usr/lib/64/libssh.so.18			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libssh.so.18.0			base-compat-shlib	compat,pic,crypto
-./usr/lib/64/libssl.so.9			base-compat-shlib	compat,pic,crypto
-./usr/lib/64/libssl.so.9.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libssl.so.10			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libssl.so.10.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libstdc++.so.7			base-compat-shlib	compat,pic,cxx
 ./usr/lib/64/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx
 ./usr/lib/64/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx
@@ -369,8 +369,8 @@
 ./usr/lib/o32/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libcrypt.so.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/libcrypt.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/o32/libcrypto.so.7			base-compat-shlib	compat,pic,crypto
-./usr/lib/o32/libcrypto.so.7.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libcrypto.so.8			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libcrypto.so.8.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libcurses.so.7			base-compat-shlib	compat,pic
 ./usr/lib/o32/libcurses.so.7.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libdes.so.8			base-compat-shlib	compat,pic,crypto
@@ -543,8 +543,8 @@
 ./usr/lib/o32/libss.so.6.0			base-compat-shlib	obsolete
 ./usr/lib/o32/libssh.so.18			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libssh.so.18.0			base-compat-shlib	compat,pic,crypto
-./usr/lib/o32/libssl.so.9			base-compat-shlib	compat,pic,crypto
-./usr/lib/o32/libssl.so.9.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libssl.so.10			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libssl.so.10.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libstdc++.so.7			base-compat-shlib	compat,pic,cxx
 ./usr/lib/o32/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx
 ./usr/lib/o32/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx

Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.81.2.3 src/distrib/sets/lists/base/ad.mips64el:1.81.2.4
--- src/distrib/sets/lists/base/ad.mips64el:1.81.2.3	Tue Jun  5 21:15:33 2012
+++ src/distrib/sets/lists/base/ad.mips64el	Mon Aug 13 20:19:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.81.2.3 2012/06/05 21:15:33 bouyer Exp $
+# $NetBSD: ad.mips64el,v 1.81.2.4 2012/08/13 20:19:24 riz Exp $
 ./libexec/ld.elf_so-64				base-compat-shlib	compat,pic
 ./libexec/ld.elf_so-o32				base-sysutil-bin	compat,pic
 ./usr/lib/64					base-compat-lib
@@ -71,8 +71,8 @@
 ./usr/lib/64/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/64/libcrypt.so.1			base-compat-shlib	compat,pic
 ./usr/lib/64/libcrypt.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/64/libcrypto.so.7			base-compat-shlib	compat,pic,crypto
-./usr/lib/64/libcrypto.so.7.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libcrypto.so.8			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libcrypto.so.8.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libcurses.so.7			base-compat-shlib	compat,pic
 ./usr/lib/64/libcurses.so.7.0			base-compat-shlib	compat,pic
 ./usr/lib/64/libdes.so.8			base-compat-shlib	compat,pic,crypto
@@ -245,8 +245,8 @@
 ./usr/lib/64/libss.so.6.0			base-compat-shlib	obsolete
 ./usr/lib/64/libssh.so.18			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libssh.so.18.0			base-compat-shlib	compat,pic,crypto
-./usr/lib/64/libssl.so.9			base-compat-shlib	compat,pic,crypto
-./usr/lib/64/libssl.so.9.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libssl.so.10			base-compat-shlib	compat,pic,crypto
+./usr/lib/64/libssl.so.10.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/64/libstdc++.so.7			base-compat-shlib	compat,pic,cxx
 ./usr/lib/64/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx
 ./usr/lib/64/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx
@@ -369,8 +369,8 @@
 ./usr/lib/o32/libcom_err.so.7.0			base-compat-shlib	compat,pic,kerberos
 ./usr/lib/o32/libcrypt.so.1			base-compat-shlib	compat,pic
 ./usr/lib/o32/libcrypt.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/o32/libcrypto.so.7			base-compat-shlib	compat,pic,crypto
-./usr/lib/o32/libcrypto.so.7.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libcrypto.so.8			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libcrypto.so.8.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libcurses.so.7			base-compat-shlib	compat,pic
 ./usr/lib/o32/libcurses.so.7.0			base-compat-shlib	compat,pic
 ./usr/lib/o32/libdes.so.8			base-compat-shlib	compat,pic,crypto
@@ -543,8 +543,8 @@
 ./usr/lib/o32/libss.so.6.0			base-compat-shlib	obsolete
 ./usr/lib/o32/libssh.so.18			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libssh.so.18.0			base-compat-shlib	compat,pic,crypto
-./usr/lib/o32/libssl.so.9			base-compat-shlib	compat,pic,crypto
-./usr/lib/o32/libssl.so.9.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libssl.so.10			base-compat-shlib	compat,pic,crypto
+./usr/lib/o32/libssl.so.10.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/o32/libstdc++.so.7			base-compat-shlib	compat,pic,cxx
 ./usr/lib/o32/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic,cxx
 ./usr/lib/o32/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic,cxx

Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.156.2.3 src/distrib/sets/lists/base/md.amd64:1.156.2.4
--- src/distrib/sets/lists/base/md.amd64:1.156.2.3	Tue Jun  5 21:15:32 2012
+++ src/distrib/sets/lists/base/md.amd64	Mon Aug 13 20:19:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.156.2.3 2012/06/05 21:15:32 bouyer Exp $
+# $NetBSD: md.amd64,v 1.156.2.4 2012/08/13 20:19:23 riz Exp $
 ./dev/lms0					base-obsolete		obsolete
 ./dev/mms0					base-obsolete		obsolete
 ./libexec/ld.elf_so-i386			base-sys-shlib		compat,pic
@@ -74,8 +74,8 @@
 ./usr/lib/i386/libcom_err.so.7.0		base-compat-shlib	compat,pic,kerberos
 ./usr/lib/i386/libcrypt.so.1			base-compat-shlib	compat,pic
 ./usr/lib/i386/libcrypt.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/i386/libcrypto.so.7			base-compat-shlib	compat,pic
-./usr/lib/i386/libcrypto.so.7.0			base-compat-shlib	compat,pic
+./usr/lib/i386/libcrypto.so.8			base-compat-shlib	compat,pic
+./usr/lib/i386/libcrypto.so.8.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libcurses.so.7			base-compat-shlib	compat,pic
 ./usr/lib/i386/libcurses.so.7.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libgmp.so.10			base-compat-shlib	obsolete
@@ -248,8 +248,8 @@
 ./usr/lib/i386/libsqlite3.so.1.1		base-compat-shlib	compat,pic
 ./usr/lib/i386/libssh.so.18			base-compat-shlib	compat,pic
 ./usr/lib/i386/libssh.so.18.0			base-compat-shlib	compat,pic
-./usr/lib/i386/libssl.so.9			base-compat-shlib	compat,pic
-./usr/lib/i386/libssl.so.9.0			base-compat-shlib	compat,pic
+./usr/lib/i386/libssl.so.10			base-compat-shlib	compat,pic
+./usr/lib/i386/libssl.so.10.0			base-compat-shlib	compat,pic
 ./usr/lib/i386/libstdc++.so.7			base-compat-shlib	compat,pic
 ./usr/lib/i386/libstdc++.so.7.0			base-compat-shlib	gcc=4,compat,pic
 ./usr/lib/i386/libstdc++.so.7.1			base-compat-shlib	gcc=45,compat,pic

Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.147.2.3 src/distrib/sets/lists/base/md.sparc64:1.147.2.4
--- src/distrib/sets/lists/base/md.sparc64:1.147.2.3	Tue Jun  5 21:15:33 2012
+++ src/distrib/sets/lists/base/md.sparc64	Mon Aug 13 20:19:24 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.147.2.3 2012/06/05 21:15:33 bouyer Exp $
+# $NetBSD: md.sparc64,v 1.147.2.4 2012/08/13 20:19:24 riz Exp $
 ./libexec/ld.elf_so-sparc			base-sysutil-bin	compat,pic
 ./sbin/edlabel					base-sysutil-root	obsolete
 ./usr/bin/fdformat				base-util-bin
@@ -72,8 +72,8 @@
 ./usr/lib/sparc/libcom_err.so.7.0		base-compat-shlib	compat,pic,kerberos
 ./usr/lib/sparc/libcrypt.so.1			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libcrypt.so.1.0			base-compat-shlib	compat,pic
-./usr/lib/sparc/libcrypto.so.7			base-compat-shlib	compat,pic,crypto
-./usr/lib/sparc/libcrypto.so.7.0		base-compat-shlib	compat,pic,crypto
+./usr/lib/sparc/libcrypto.so.8			base-compat-shlib	compat,pic,crypto
+./usr/lib/sparc/libcrypto.so.8.0		base-compat-shlib	compat,pic,crypto
 ./usr/lib/sparc/libcurses.so.7			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libcurses.so.7.0		base-compat-shlib	compat,pic
 ./usr/lib/sparc/libdes.so.8			base-compat-shlib	compat,pic,crypto
@@ -246,8 +246,8 @@
 ./usr/lib/sparc/libss.so.6.0			base-compat-shlib	obsolete
 ./usr/lib/sparc/libssh.so.18			base-compat-shlib	compat,pic,crypto
 ./usr/lib/sparc/libssh.so.18.0			base-compat-shlib	compat,pic,crypto
-./usr/lib/sparc/libssl.so.9			base-compat-shlib	compat,pic,crypto
-./usr/lib/sparc/libssl.so.9.0			base-compat-shlib	compat,pic,crypto
+./usr/lib/sparc/libssl.so.10			base-compat-shlib	compat,pic,crypto
+./usr/lib/sparc/libssl.so.10.0			base-compat-shlib	compat,pic,crypto
 ./usr/lib/sparc/libstdc++.so.7			base-compat-shlib	compat,pic
 ./usr/lib/sparc/libstdc++.so.7.0		base-compat-shlib	gcc=4,compat,pic
 ./usr/lib/sparc/libstdc++.so.7.1		base-compat-shlib	gcc=45,compat,pic

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.616.2.3 src/distrib/sets/lists/base/shl.mi:1.616.2.4
--- src/distrib/sets/lists/base/shl.mi:1.616.2.3	Tue Jun  5 21:15:33 2012
+++ src/distrib/sets/lists/base/shl.mi	Mon Aug 13 20:19:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.616.2.3 2012/06/05 21:15:33 bouyer Exp $
+# $NetBSD: shl.mi,v 1.616.2.4 2012/08/13 20:19:23 riz Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -20,8 +20,8 @@
 ./lib/libcrypt.so.1				base-sys-shlib		dynamicroot
 ./lib/libcrypt.so.1.0				base-sys-shlib		dynamicroot
 ./lib/libcrypto.so				base-crypto-shlib	crypto,dynamicroot
-./lib/libcrypto.so.7				base-crypto-shlib	crypto,dynamicroot
-./lib/libcrypto.so.7.0				base-crypto-shlib	crypto,dynamicroot
+./lib/libcrypto.so.8				base-crypto-shlib	crypto,dynamicroot
+./lib/libcrypto.so.8.0				base-crypto-shlib	crypto,dynamicroot
 ./lib/libdevmapper.so				base-lvm-shlib		lvm,dynamicroot
 ./lib/libdevmapper.so.1				base-lvm-shlib		lvm,dynamicroot
 ./lib/libdevmapper.so.1.0			base-lvm-shlib		lvm,dynamicroot
@@ -182,8 +182,8 @@
 ./usr/lib/libcrypt.so.1				base-sys-shlib
 ./usr/lib/libcrypt.so.1.0			base-sys-shlib
 ./usr/lib/libcrypto.so				base-crypto-shlib	crypto
-./usr/lib/libcrypto.so.7			base-crypto-shlib	crypto
-./usr/lib/libcrypto.so.7.0			base-crypto-shlib	crypto
+./usr/lib/libcrypto.so.8			base-crypto-shlib	crypto
+./usr/lib/libcrypto.so.8.0			base-crypto-shlib	crypto
 ./usr/lib/libctf.so				base-sys-shlib		dtrace
 ./usr/lib/libctf.so.2				base-sys-shlib		dtrace
 ./usr/lib/libctf.so.2.0				base-sys-shlib		dtrace
@@ -655,8 +655,8 @@
 ./usr/lib/libssh.so.18				base-secsh-shlib	crypto
 ./usr/lib/libssh.so.18.0			base-secsh-shlib	crypto
 ./usr/lib/libssl.so				base-crypto-shlib	crypto
-./usr/lib/libssl.so.9				base-crypto-shlib	crypto
-./usr/lib/libssl.so.9.0				base-crypto-shlib	crypto
+./usr/lib/libssl.so.10				base-crypto-shlib	crypto
+./usr/lib/libssl.so.10.0				base-crypto-shlib	crypto
 ./usr/lib/libstdc++.so				base-sys-shlib		gcc,cxx
 ./usr/lib/libstdc++.so.5			base-sys-shlib		gcc=3
 ./usr/lib/libstdc++.so.5.0			base-sys-shlib		gcc=3,cxx

Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.3 src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.4
--- src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.3	Tue Jun  5 21:15:18 2012
+++ src/distrib/sets/lists/comp/ad.mips64eb	Mon Aug 13 20:19:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.69.2.3 2012/06/05 21:15:18 bouyer Exp $
+# $NetBSD: ad.mips64eb,v 1.69.2.4 2012/08/13 20:19:22 riz Exp $
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/gcc-4.5/loongson.h		comp-c-include		gcccmds,gcc=45
@@ -1278,7 +1278,7 @@
 ./usr/libdata/debug/usr/lib/64/libcom_err.so.6.0.debug	 comp-compat-shlib	 compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/64/libcom_err.so.7.0.debug	 comp-compat-shlib	 compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/64/libcrypt.so.1.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/64/libcrypto.so.7.0.debug	comp-crypto-debug	crypto,debug,compat
+./usr/libdata/debug/usr/lib/64/libcrypto.so.8.0.debug	comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/64/libctf.so.2.0.debug		comp-sys-debug	dtrace,debug,compat
 ./usr/libdata/debug/usr/lib/64/libcurses.so.7.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libdes.so.8.1.debug		comp-crypto-debug	crypto,debug,compat
@@ -1378,7 +1378,7 @@
 ./usr/libdata/debug/usr/lib/64/libsqlite3.so.1.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libss.so.6.0.debug		comp-krb5-debug	obsolete
 ./usr/libdata/debug/usr/lib/64/libssh.so.18.0.debug	comp-secsh-debug	crypto,debug,compat
-./usr/libdata/debug/usr/lib/64/libssl.so.9.0.debug		comp-crypto-debug	crypto,debug,compat
+./usr/libdata/debug/usr/lib/64/libssl.so.10.0.debug		comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug,compat
@@ -1431,7 +1431,7 @@
 ./usr/libdata/debug/usr/lib/o32/libcom_err.so.6.0.debug	 comp-compat-shlib	 compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/o32/libcom_err.so.7.0.debug	 comp-compat-shlib	 compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/o32/libcrypt.so.1.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libcrypto.so.7.0.debug	comp-crypto-debug	crypto,debug,compat
+./usr/libdata/debug/usr/lib/o32/libcrypto.so.8.0.debug	comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libctf.so.2.0.debug		comp-sys-debug	dtrace,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libcurses.so.7.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libdes.so.8.1.debug		comp-crypto-debug	crypto,debug,compat
@@ -1531,7 +1531,7 @@
 ./usr/libdata/debug/usr/lib/o32/libsqlite3.so.1.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libss.so.6.0.debug		comp-krb5-debug	obsolete
 ./usr/libdata/debug/usr/lib/o32/libssh.so.18.0.debug	comp-secsh-debug	crypto,debug,compat
-./usr/libdata/debug/usr/lib/o32/libssl.so.9.0.debug		comp-crypto-debug	crypto,debug,compat
+./usr/libdata/debug/usr/lib/o32/libssl.so.10.0.debug		comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug,compat

Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.69.2.4 src/distrib/sets/lists/comp/ad.mips64el:1.69.2.5
--- src/distrib/sets/lists/comp/ad.mips64el:1.69.2.4	Tue Jun  5 21:15:18 2012
+++ src/distrib/sets/lists/comp/ad.mips64el	Mon Aug 13 20:19:21 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.69.2.4 2012/06/05 21:15:18 bouyer Exp $
+# $NetBSD: ad.mips64el,v 1.69.2.5 2012/08/13 20:19:21 riz Exp $
 ./usr/bin/elf2aout				comp-obsolete		obsolete
 ./usr/bin/elf2ecoff				comp-sysutil-bin
 ./usr/include/gcc-4.5/loongson.h		comp-c-include		gcccmds,gcc=45
@@ -1278,7 +1278,7 @@
 ./usr/libdata/debug/usr/lib/64/libcom_err.so.6.0.debug	 comp-compat-shlib	 compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/64/libcom_err.so.7.0.debug	 comp-compat-shlib	 compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/64/libcrypt.so.1.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/64/libcrypto.so.7.0.debug	comp-crypto-debug	crypto,debug,compat
+./usr/libdata/debug/usr/lib/64/libcrypto.so.8.0.debug	comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/64/libctf.so.2.0.debug		comp-sys-debug	dtrace,debug,compat
 ./usr/libdata/debug/usr/lib/64/libcurses.so.7.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libdes.so.8.1.debug		comp-crypto-debug	crypto,debug,compat
@@ -1378,7 +1378,7 @@
 ./usr/libdata/debug/usr/lib/64/libsqlite3.so.1.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/64/libss.so.6.0.debug		comp-krb5-debug	obsolete
 ./usr/libdata/debug/usr/lib/64/libssh.so.18.0.debug	comp-secsh-debug	crypto,debug,compat
-./usr/libdata/debug/usr/lib/64/libssl.so.9.0.debug		comp-crypto-debug	crypto,debug,compat
+./usr/libdata/debug/usr/lib/64/libssl.so.10.0.debug		comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/64/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug,compat
@@ -1431,7 +1431,7 @@
 ./usr/libdata/debug/usr/lib/o32/libcom_err.so.6.0.debug	 comp-compat-shlib	 compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/o32/libcom_err.so.7.0.debug	 comp-compat-shlib	 compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/o32/libcrypt.so.1.0.debug	comp-sys-debug	debug,compat
-./usr/libdata/debug/usr/lib/o32/libcrypto.so.7.0.debug	comp-crypto-debug	crypto,debug,compat
+./usr/libdata/debug/usr/lib/o32/libcrypto.so.8.0.debug	comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libctf.so.2.0.debug		comp-sys-debug	dtrace,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libcurses.so.7.0.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libdes.so.8.1.debug		comp-crypto-debug	crypto,debug,compat
@@ -1531,7 +1531,7 @@
 ./usr/libdata/debug/usr/lib/o32/libsqlite3.so.1.1.debug	comp-sys-debug	debug,compat
 ./usr/libdata/debug/usr/lib/o32/libss.so.6.0.debug		comp-krb5-debug	obsolete
 ./usr/libdata/debug/usr/lib/o32/libssh.so.18.0.debug	comp-secsh-debug	crypto,debug,compat
-./usr/libdata/debug/usr/lib/o32/libssl.so.9.0.debug		comp-crypto-debug	crypto,debug,compat
+./usr/libdata/debug/usr/lib/o32/libssl.so.10.0.debug		comp-crypto-debug	crypto,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug,compat
 ./usr/libdata/debug/usr/lib/o32/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug,compat

Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.155.2.3 src/distrib/sets/lists/comp/md.amd64:1.155.2.4
--- src/distrib/sets/lists/comp/md.amd64:1.155.2.3	Tue Jun  5 21:15:18 2012
+++ src/distrib/sets/lists/comp/md.amd64	Mon Aug 13 20:19:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.155.2.3 2012/06/05 21:15:18 bouyer Exp $
+# $NetBSD: md.amd64,v 1.155.2.4 2012/08/13 20:19:23 riz Exp $
 ./usr/include/amd64				comp-c-include
 ./usr/include/amd64/ansi.h			comp-c-include
 ./usr/include/amd64/aout_machdep.h		comp-c-include
@@ -1057,7 +1057,7 @@
 ./usr/libdata/debug/usr/lib/i386/libcom_err.so.6.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/i386/libcom_err.so.7.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libcrypto.so.7.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libcrypto.so.8.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libcurses.so.7.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libdes.so.8.1.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libdevmapper.so.1.0.debug	comp-compat-shlib	compat,pic,lvm,debug
@@ -1153,7 +1153,7 @@
 ./usr/libdata/debug/usr/lib/i386/libsqlite3.so.1.1.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libss.so.6.0.debug	comp-compat-shlib	obsolete
 ./usr/libdata/debug/usr/lib/i386/libssh.so.18.0.debug	comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libssl.so.9.0.debug	comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libssl.so.10.0.debug	comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.0.debug	comp-compat-shlib	gcc=4,compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libstdc++.so.7.1.debug	comp-compat-shlib	gcc=45,compat,pic,debug
 ./usr/libdata/debug/usr/lib/i386/libterminfo.so.1.0.debug	comp-compat-shlib	compat,pic,debug

Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.138.2.3 src/distrib/sets/lists/comp/md.sparc64:1.138.2.4
--- src/distrib/sets/lists/comp/md.sparc64:1.138.2.3	Tue Jun  5 21:15:18 2012
+++ src/distrib/sets/lists/comp/md.sparc64	Mon Aug 13 20:19:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.138.2.3 2012/06/05 21:15:18 bouyer Exp $
+# $NetBSD: md.sparc64,v 1.138.2.4 2012/08/13 20:19:22 riz Exp $
 ./usr/include/gcc-4.5/tgmath.h			comp-c-include		gcccmds,gcc=45
 ./usr/include/ieeefp.h				comp-c-include
 ./usr/include/sparc				comp-c-include
@@ -900,7 +900,7 @@
 ./usr/libdata/debug/usr/lib/sparc/libcom_err.so.6.0.debug	comp-compat-shlib	compat,pic,kerberos,debug,obsolete
 ./usr/libdata/debug/usr/lib/sparc/libcom_err.so.7.0.debug	comp-compat-shlib	compat,pic,kerberos,debug
 ./usr/libdata/debug/usr/lib/sparc/libcrypt.so.1.0.debug			comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libcrypto.so.7.0.debug		comp-compat-shlib	compat,pic,debug,crypto
+./usr/libdata/debug/usr/lib/sparc/libcrypto.so.8.0.debug		comp-compat-shlib	compat,pic,debug,crypto
 ./usr/libdata/debug/usr/lib/sparc/libcurses.so.7.0.debug		comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libdes.so.8.1.debug			comp-compat-shlib	compat,pic,debug,crypto
 ./usr/libdata/debug/usr/lib/sparc/libdevmapper.so.1.0.debug			comp-compat-shlib	compat,pic,debug,lvm
@@ -991,7 +991,7 @@
 ./usr/libdata/debug/usr/lib/sparc/libsqlite3.so.1.1.debug		comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libss.so.6.0.debug			comp-compat-shlib	obsolete
 ./usr/libdata/debug/usr/lib/sparc/libssh.so.18.0.debug			comp-compat-shlib	compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libssl.so.9.0.debug			comp-compat-shlib	compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libssl.so.10.0.debug			comp-compat-shlib	compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libstdc++.so.7.0.debug		comp-compat-shlib	gcc=4,compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libstdc++.so.7.1.debug		comp-compat-shlib	gcc=45,compat,pic,debug
 ./usr/libdata/debug/usr/lib/sparc/libterminfo.so.1.0.debug		comp-compat-shlib	compat,pic,debug

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1738.2.5 src/distrib/sets/lists/comp/mi:1.1738.2.6
--- src/distrib/sets/lists/comp/mi:1.1738.2.5	Wed Aug  8 15:51:03 2012
+++ src/distrib/sets/lists/comp/mi	Mon Aug 13 20:19:20 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1738.2.5 2012/08/08 15:51:03 martin Exp $
+#	$NetBSD: mi,v 1.1738.2.6 2012/08/13 20:19:20 riz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2164,8 +2164,10 @@
 ./usr/include/openssl/rsa.h			comp-c-include		crypto
 ./usr/include/openssl/rsaref.h			comp-obsolete		obsolete
 ./usr/include/openssl/safestack.h		comp-c-include		crypto
+./usr/include/openssl/seed.h			comp-c-include		crypto
 ./usr/include/openssl/sha.h			comp-c-include		crypto
 ./usr/include/openssl/srp.h			comp-c-include		crypto
+./usr/include/openssl/srtp.h			comp-c-include		crypto
 ./usr/include/openssl/ssl.h			comp-c-include		crypto
 ./usr/include/openssl/ssl2.h			comp-c-include		crypto
 ./usr/include/openssl/ssl23.h			comp-c-include		crypto
@@ -2179,6 +2181,7 @@
 ./usr/include/openssl/txt_db.h			comp-c-include		crypto
 ./usr/include/openssl/ui.h			comp-c-include		crypto
 ./usr/include/openssl/ui_compat.h		comp-c-include		crypto
+./usr/include/openssl/whrlpool.h		comp-c-include		crypto
 ./usr/include/openssl/x509.h			comp-c-include		crypto
 ./usr/include/openssl/x509_vfy.h		comp-c-include		crypto
 ./usr/include/openssl/x509v3.h			comp-c-include		crypto

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.209.2.3 src/distrib/sets/lists/comp/shl.mi:1.209.2.4
--- src/distrib/sets/lists/comp/shl.mi:1.209.2.3	Tue Jun  5 21:15:18 2012
+++ src/distrib/sets/lists/comp/shl.mi	Mon Aug 13 20:19:22 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.209.2.3 2012/06/05 21:15:18 bouyer Exp $
+# $NetBSD: shl.mi,v 1.209.2.4 2012/08/13 20:19:22 riz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -252,7 +252,7 @@
 ./usr/libdata/debug/usr/lib/libc.so.12.181.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libcom_err.so.7.0.debug	comp-krb5-debug	kerberos,debug
 ./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug	comp-sys-debug	debug
-./usr/libdata/debug/usr/lib/libcrypto.so.7.0.debug	comp-crypto-debug	crypto,debug
+./usr/libdata/debug/usr/lib/libcrypto.so.8.0.debug	comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/lib/libctf.so.2.0.debug		comp-sys-debug	dtrace,debug
 ./usr/libdata/debug/usr/lib/libcurses.so.7.0.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libdes.so.8.1.debug		comp-crypto-debug	crypto,debug
@@ -408,7 +408,7 @@
 ./usr/libdata/debug/usr/lib/libsl.so.5.0.debug		comp-krb5-debug	kerberos,debug
 ./usr/libdata/debug/usr/lib/libsqlite3.so.1.1.debug	comp-sys-debug	debug
 ./usr/libdata/debug/usr/lib/libssh.so.18.0.debug	comp-secsh-debug	crypto,debug
-./usr/libdata/debug/usr/lib/libssl.so.9.0.debug		comp-crypto-debug	crypto,debug
+./usr/libdata/debug/usr/lib/libssl.so.10.0.debug		comp-crypto-debug	crypto,debug
 ./usr/libdata/debug/usr/lib/libstdc++.so.5.0.debug	comp-sys-debug	gcc=3,cxx,debug
 ./usr/libdata/debug/usr/lib/libstdc++.so.7.0.debug	comp-sys-debug	gcc=4,cxx,debug
 ./usr/libdata/debug/usr/lib/libstdc++.so.7.1.debug	comp-sys-debug	gcc=45,cxx,debug

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.909.2.12 src/doc/3RDPARTY:1.909.2.13
--- src/doc/3RDPARTY:1.909.2.12	Sun Aug 12 19:25:22 2012
+++ src/doc/3RDPARTY	Mon Aug 13 20:19:20 2012
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.909.2.12 2012/08/12 19:25:22 martin Exp $
+#	$NetBSD: 3RDPARTY,v 1.909.2.13 2012/08/13 20:19:20 riz Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -859,8 +859,8 @@ markus is very cooperative about it):
 - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes.
 
 Package:	OpenSSL
-Version:	1.0.1-stable-SNAP-20110605
-Current Vers:	1.0.1 [snapshot-20110605] with AES-NI patch
+Version:	1.0.1c
+Current Vers:	1.0.1c with AES-NI patch
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1670.2.6 src/doc/CHANGES:1.1670.2.7
--- src/doc/CHANGES:1.1670.2.6	Sun Aug 12 19:25:22 2012
+++ src/doc/CHANGES	Mon Aug 13 20:19:20 2012
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1670.2.6 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1670.2.7 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -1267,4 +1267,5 @@ Changes from NetBSD 5.0 to NetBSD 6.0:
 	amdtemp(4): Add support for Family 12h. [nonaka 20120302]
 	postfix(1): Add support for SQLite tables. [tron 20120304]
 	postfix(1): Import version 2.8.11 [tron 20120609]
+	OpenSSH: Imported 1.0.1c [christos 20120726]
 	postfix(1): Import version 2.8.12 [tron 20120810]

Reply via email to