Module Name:    src
Committed By:   christos
Date:           Tue Jun 11 15:14:00 UTC 2024

Modified Files:
        src/doc: 3RDPARTY CHANGES

Log Message:
update for OpenSSL
(also remove mention of upstreaming of bug for libarchive)


To generate a diff of this commit:
cvs rdiff -u -r1.2009 -r1.2010 src/doc/3RDPARTY
cvs rdiff -u -r1.3064 -r1.3065 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.2009 src/doc/3RDPARTY:1.2010
--- src/doc/3RDPARTY:1.2009	Tue Jun 11 06:47:11 2024
+++ src/doc/3RDPARTY	Tue Jun 11 11:14:00 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.2009 2024/06/11 10:47:11 wiz Exp $
+#	$NetBSD: 3RDPARTY,v 1.2010 2024/06/11 15:14:00 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -728,7 +728,6 @@ License:	BSD (2-clause)
 Location:	external/bsd/libarchive/dist
 Notes:
 Distribution is stripped down to the relevant part.
-Local fix for PR bin/56080 sent back to upstream.
 
 Package:	libdevmapper
 Version:	1.02.40
@@ -1123,19 +1122,19 @@ markus is very cooperative about it):
 - blocklistd additions
 
 Package:	OpenSSL
-Version:	1.0.2o/1.1.1t/3.0.12
-Current Vers:	1.0.2zd/1.1.1u/3.0.12/3.3.0
+Version:	1.0.2o/1.1.1t/3.0.14
+Current Vers:	1.0.2zd/1.1.1u/3.0.14/3.3.1
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/
-Date:		2023-10-24
+Date:		2024-06-11
 Mailing List:	openssl-annou...@openssl.org
 Responsible:	christos, mjf, tls, riastradh, spz
 License:	OpenSSL and SSLeay license (both BSD-like)
 Location:	crypto/external/bsd/openssl/dist
 Vendor tag:	OPENSSL
 Release tag:	openssl-x-y-z (openssl-x-y-zw in past with lettered releases)
-Current tag:	openssl-3-0-12
+Current tag:	openssl-3-0-14
 Notes:
 - Run openssl2netbsd to get rid of the RCSID identifiers
 - run make in /usr/src/crypto/external/bsd/openssl/lib/libcrypto/man

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.3064 src/doc/CHANGES:1.3065
--- src/doc/CHANGES:1.3064	Tue Jun 11 06:47:11 2024
+++ src/doc/CHANGES	Tue Jun 11 11:14:00 2024
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3064 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.3065 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -418,3 +418,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
 	pthread(3): Fix memory leak in pthread_create(). [hannken 20240608]
 	libarchive: Import libarchive-3.7.4. [christos 20240609]
 	pkg_install: Import pkg_install-20240307. [wiz 20240611]
+	OpenSSL: Imported 3.0.14. [christos 2020611]

Reply via email to