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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/doc/3RDPARTY,v
rcsdiff: /ftp/cvs/cvsroot/src/doc/3RDPARTY,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.1640
retrieving revision 1.1640.2.19
diff -u -p -r1.1640 -r1.1640.2.19
--- src/doc/3RDPARTY	2019/07/30 14:57:06	1.1640
+++ src/doc/3RDPARTY	2020/10/18 18:18:44	1.1640.2.19
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1640 2019/07/30 14:57:06 joerg Exp $
+#	$NetBSD: 3RDPARTY,v 1.1640.2.19 2020/10/18 18:18:44 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -120,8 +120,8 @@ Notes:
 bc includes dc, both of which are in the NetBSD tree.
 
 Package:	bind [named and utils]
-Version:	9.14.1/MPL
-Current Vers:	9.14.1/MPL
+Version:	9.14.7/MPL
+Current Vers:	9.14.7/MPL
 Maintainer:	ISC
 Archive Site:	ftp://ftp.isc.org/isc/bind9/
 Home Page:	http://www.isc.org/software/bind/
@@ -130,21 +130,21 @@ Mailing List:	https://lists.isc.org/mail
 Mailing List:	https://lists.isc.org/mailman/listinfo/bind-users
 Responsible:	christos
 License:	BSD-like (2-clause) / MPL
-Location:	external/bsd/bind/dist
+Location:	external/mpl/bind/dist
 Notes:
 First bind2netbsd script to import into src/external/bsd/bind/dist.
-The Makefiles in src/external/bsd/bind are not handled by the script.
+The Makefiles in src/external/mpl/bind are not handled by the script.
 Build bind to generate the include files.
 Then binclude4netbsd script to import into src/external/bsd/bind/include.
 The libc and include parts of the resolver are now part of libbind.
 
 Package:	unbound
-Version:	1.9.1
-Current Vers:	1.9.1
+Version:	1.9.6
+Current Vers:	1.9.6
 Maintainer:	Nlnetlabs
 Archive Site:	https://www.unbound.net/downloads/unbound-latest.tar.gz
 Home Page:	https://www.unbound.net/
-Date:		2019-05-23
+Date:		2019-12-15
 Mailing List:	https://unbound.nlnetlabs.nl/mailman/listinfo/unbound-users
 Responsible:	christos
 License:	BSD-like
@@ -341,12 +341,12 @@ Notes:
 Use the dhcp2netbsd script.
 
 Package:	dhcpcd
-Version:	8.0.2
-Current Vers:	8.0.2
+Version:	8.1.9
+Current Vers:	8.1.9
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/
-Date:		2019-07-30
+Date:		2020-04-21
 Mailing List: 	dhcpcd-discuss@marples.name
 License:	BSD (2-clause)
 Location:	external/bsd/dhcpcd/dist
@@ -396,12 +396,12 @@ Location:	external/bsd/ekermit
 Notes:
 
 Package:	expat
-Version:	2.2.1
-Current Vers:	2.2.7
+Version:	2.2.8
+Current Vers:	2.2.8
 Maintainer:	Expat Project
-Archive Site:	http://sourceforge.net/projects/expat/files/expat/
+Archive Site:	https://github.com/libexpat/libexpat/releases
 Home Page:	http://www.libexpat.org/
-Date:		2019-01-09
+Date:		2019-09-16
 Mailing List:	expat-discuss@libexpat.org
 Responsible:	mrg
 License:	MIT
@@ -1005,12 +1005,12 @@ Notes:
 We have lots of local fixes.
 
 Package:	OpenLDAP
-Version:	2.4.45
-Current Vers:	2.4.47
+Version:	2.4.48
+Current Vers:	2.4.48
 Maintainer:	OpenLDAP Foundation
 Archive Site:	http://www.openldap.org/
 Home Page:	http://www.openldap.org/
-Date:		2019-01-09
+Date:		2019-08-08
 Mailing List:
 Responsible:
 License:	BSD (3-clause)
@@ -1101,12 +1101,12 @@ markus is very cooperative about it):
 - adjust the DEFAULT_PKCS11_WHITELIST for ssh-agent
 
 Package:	OpenSSL
-Version:	1.0.2o/1.1.1c
-Current Vers:	1.0.2r/1.1.1c
+Version:	1.0.2o/1.1.1g
+Current Vers:	1.0.2t/1.1.1g
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/
-Date:		2019-06-09
+Date:		2020-04-27
 Mailing List:	openssl-announce@openssl.org
 Responsible:	christos, mjf, tls, riastradh, spz
 License:	OpenSSL and SSLeay license (both BSD-like)
@@ -1398,8 +1398,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2019b / tzdata2019a
-Current Vers:	tzcode2019b / tzdata2019b
+Version:	tzcode2019b / tzdata2020c
+Current Vers:	tzcode2020c / tzdata2020c
 Maintainer:	Paul Eggert <eggert@cs.ucla.edu>
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
@@ -2109,6 +2109,7 @@ Notes:
 Use groff2netbsd from external/gpl2/groff/groff2netbsd to prepare the
 distribution for import.
 Update MDATE in src/external/gpl2/groff/Makefile.inc.
+
 Package:	gmake
 Version:	3.81 (Last GPlv2+ version)
 Current Vers:	4.2
@@ -2174,3 +2175,15 @@ License:	BSD-like (4-clause)
 Location:	usr.bin/indent
 Notes:
 Tests are stored in tests/usr.bin/indent.
+
+Package:	ena
+Version:	0.8.1
+Current Vers:	2.0.0
+Maintainer:	Amazon.com
+Archive Site:	https://github.com/amzn/amzn-drivers/tree/master/kernel/fbsd/ena
+Home Page:	https://github.com/amzn/amzn-drivers/
+Mailing List:	none
+Responsible:
+License:	BSD-like (2 and 3-clause)
+Location:	sys/external/bsd/ena-com
+Notes: