Module Name:    src
Committed By:   snj
Date:           Tue Mar  8 21:41:06 UTC 2016

Modified Files:
        src/doc [netbsd-7-0]: 3RDPARTY CHANGES-7.0.1

Log Message:
Note OpenSSL update to 1.0.1s in ticket 1127.


To generate a diff of this commit:
cvs rdiff -u -r1.1145.2.18.2.1 -r1.1145.2.18.2.2 src/doc/3RDPARTY
cvs rdiff -u -r1.1.2.41 -r1.1.2.42 src/doc/CHANGES-7.0.1

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.18.2.1 src/doc/3RDPARTY:1.1145.2.18.2.2
--- src/doc/3RDPARTY:1.1145.2.18.2.1	Sun Nov  8 01:55:21 2015
+++ src/doc/3RDPARTY	Tue Mar  8 21:41:06 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1145.2.18.2.1 2015/11/08 01:55:21 riz Exp $
+#	$NetBSD: 3RDPARTY,v 1.1145.2.18.2.2 2016/03/08 21:41:06 snj Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1000,8 +1000,8 @@ markus is very cooperative about it):
 - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes.
 
 Package:	OpenSSL
-Version:	1.0.1p
-Current Vers:	1.0.1p
+Version:	1.0.1s
+Current Vers:	1.0.1s
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/

Index: src/doc/CHANGES-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.41 src/doc/CHANGES-7.0.1:1.1.2.42
--- src/doc/CHANGES-7.0.1:1.1.2.41	Tue Mar  8 13:50:12 2016
+++ src/doc/CHANGES-7.0.1	Tue Mar  8 21:41:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.41 2016/03/08 13:50:12 martin Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.42 2016/03/08 21:41:06 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -1632,6 +1632,7 @@ crypto/external/bsd/openssl/lib/libcrypt
 crypto/external/bsd/openssl/lib/libcrypto/man/openssl_x509v3_config.1	 up to 1.11.2.3
 crypto/external/bsd/openssl/lib/libcrypto/man/ssl.3	 up to 1.11.2.3
 crypto/external/bsd/openssl/dist/ssl/ssl2_stub_syms.c	 new file
+doc/3RDPARTY						 patch
 
 	Import openssl-1.0.1s, fixing various CVEs:
 	CVE-2015-0293 CVE-2015-1794 CVE-2015-3193 CVE-2015-3194

Reply via email to