erlang*: Update to 22.2.7.

Highlights
==========

erts:
 o The Kernel application's User's Guide now contains a Logger Cookbook
   with common usage patterns.
 o Numerous improvements in the new socket and net modules

Standard libraries:
 o common_test: ct_property_test logging is improved
 o ssl: Correct handling of unordered chains so that it works as expected

Tools:
 o Emacs erlang-mode function that lets the user open the documentation for
   an Erlang/OTP function in an Emacs buffer has been improved.  Users will
   be asked if they want the man pages downloaded if they are not present in
   the system.

10 files changed, 39 insertions, 39 deletions

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 1b42fd2b33e..1ea87c54073 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2020/01/18 21:49:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.99 2020/02/27 13:46:39 jperkin Exp $
 
 DISTNAME=	erlang-${DIST_VERSION_MAJOR}.${DIST_VERSION_MINOR}${!empty(DIST_VERSION_PATCH):?.:}${DIST_VERSION_PATCH}
 PKGNAME=	${DISTNAME:S/OTP-/erlang-/}
-PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=erlang/}
 GITHUB_PROJECT=	otp
@@ -40,14 +39,12 @@ do-configure-post-hook: replace-interpreter
 REPLACE_INTERPRETER+=	escript
 REPLACE.escript.old=	.*escript
 REPLACE.escript.new=	${PREFIX}/bin/escript
-REPLACE_FILES.escript=	\
-	lib/diameter/bin/diameterc \
-	lib/erl_docgen/priv/bin/codeline_preprocessing.escript \
-	lib/erl_docgen/priv/bin/xml_from_edoc.escript \
-	lib/reltool/examples/display_args \
-	lib/reltool/examples/mnesia_core_dump_viewer \
-	lib/snmp/bin/snmpc \
-	lib/snmp/src/compile/snmpc.src
+REPLACE_FILES.escript+=	lib/diameter/bin/diameterc
+REPLACE_FILES.escript+=	lib/erl_docgen/priv/bin/codeline_preprocessing.escript
+REPLACE_FILES.escript+=	lib/erl_docgen/priv/bin/xml_from_edoc.escript
+REPLACE_FILES.escript+=	lib/reltool/examples/display_args
+REPLACE_FILES.escript+=	lib/reltool/examples/mnesia_core_dump_viewer
+REPLACE_FILES.escript+=	lib/snmp/src/compile/snmpc.src
 
 SUBST_CLASSES+=		target
 SUBST_STAGE.target=	pre-configure
@@ -57,7 +54,6 @@ SUBST_MESSAGE.target=	Fixing target name.
 
 TEST_TARGET=		tests
 TEST_MAKE_FLAGS=	ERL_TOP=${WRKSRC}
-REPLACE_PERL+=		make/make_emakefile
 
 SMF_NAME=		epmd
 
@@ -91,8 +87,11 @@ pre-build:
 versions: do-extract
 	@${ECHO} "# \$$NetBSD\$$" > ${.CURDIR}/versions.mk
 	@${ECHO} "# Do not edit, regenerate using 'make versions'" >> ${.CURDIR}/versions.mk
-	${AWK} -F: '/OTP-${PKGVERSION_NOREV} :/{print $$2}' ${WRKSRC}/otp_versions.table |\
-		${SED} -e 's/# //g' -e 's/-/ /g' -e 's,^ ,_VERSIONS=	,' >> ${.CURDIR}/versions.mk
+	${AWK} -F: '/OTP-${PKGVERSION_NOREV} :/{print $$2}' ${WRKSRC}/otp_versions.table | \
+		${SED} -e 's/# //g' -e 's/-/ /g' \
+		       -e 's,^ ,_VERSIONS=	,' \
+		       -e 's, *$$,,' \
+			>> ${.CURDIR}/versions.mk
 
 post-install:
 	chmod -R go-w ${DESTDIR}${PREFIX}/lib/erlang/lib
diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index 2465b4c645c..7c91276c58a 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.versions,v 1.47 2019/12/04 11:44:40 nia Exp $
+# $NetBSD: Makefile.versions,v 1.48 2020/02/27 13:46:39 jperkin Exp $
 
 DIST_VERSION_MAJOR=		22
-DIST_VERSION_MINOR=		1
+DIST_VERSION_MINOR=		2
 # Only set when sources for patch level releases are published on erlang.org
-DIST_VERSION_PATCH=		8
+DIST_VERSION_PATCH=		7
 
 .include "versions.mk"
 
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index c42400e226f..b3c6d88efcc 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2019/11/18 20:46:01 nia Exp $
+@comment $NetBSD: PLIST,v 1.40 2020/02/27 13:46:39 jperkin Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -2601,6 +2601,7 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_listener_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_packet_demux.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_record.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_socket.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/dtls_v1.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/inet6_tls_dist.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/inet_tls_dist.beam
@@ -2637,6 +2638,8 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session_cache_api.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_srp_primes.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_v3.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_bloom_filter.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_client_ticket_store.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection_1_3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_connection_sup.beam
@@ -2645,7 +2648,11 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_handshake_1_3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_record.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_record_1_3.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_sender.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_server_session_ticket.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_server_session_ticket_sup.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_server_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_socket.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/tls_v1.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cacerts.pem
 lib/erlang/lib/ssl-${VERSION.ssl}/examples/certs/etc/client/cert.pem
@@ -2668,6 +2675,7 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_packet_demux.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_record.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_record.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_socket.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/dtls_v1.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/inet6_tls_dist.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/inet_tls_dist.erl
@@ -2710,6 +2718,8 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_srp.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_srp_primes.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_v3.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_bloom_filter.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_client_ticket_store.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_connection_1_3.erl
@@ -2723,7 +2733,11 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_record.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_record_1_3.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_record_1_3.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_sender.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_server_session_ticket.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_server_session_ticket_sup.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_server_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_socket.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/tls_v1.erl
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/array.beam
 lib/erlang/lib/stdlib-${VERSION.stdlib}/ebin/base64.beam
@@ -3700,6 +3714,7 @@ lib/erlang/usr/lib/liberl_interface_st.a
 lib/erlang/usr/lib/liberts.a
 lib/erlang/usr/lib/liberts_r.a
 @pkgdir lib/erlang/lib/ssh-${VERSION.ssh}/include
+${PLIST.odbc}@pkgdir lib/erlang/lib/odbc-${VERSION.odbc}/priv/obj
 @pkgdir lib/erlang/lib/mnesia-${VERSION.mnesia}/include
 @pkgdir lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/priv
 @pkgdir lib/erlang/lib/kernel-${VERSION.kernel}/examples/uds_dist/ebin
diff --git a/lang/erlang/PLIST.Darwin b/lang/erlang/PLIST.Darwin
deleted file mode 100644
index ef3d67f7702..00000000000
--- a/lang/erlang/PLIST.Darwin
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2015/09/13 08:11:09 fhajny Exp $
-lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/cpu_sup
-lib/erlang/lib/os_mon-${VERSION.os_mon}/src/cpu_sup.c
diff --git a/lang/erlang/PLIST.FreeBSD b/lang/erlang/PLIST.FreeBSD
deleted file mode 100644
index dc779288e81..00000000000
--- a/lang/erlang/PLIST.FreeBSD
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.FreeBSD,v 1.1 2015/12/20 12:39:30 sevan Exp $
-lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/cpu_sup
-lib/erlang/lib/os_mon-${VERSION.os_mon}/src/cpu_sup.c
diff --git a/lang/erlang/PLIST.Linux b/lang/erlang/PLIST.Linux
deleted file mode 100644
index 0b009d0c71e..00000000000
--- a/lang/erlang/PLIST.Linux
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1 2012/01/24 03:39:22 sbd Exp $
-lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/cpu_sup
-lib/erlang/lib/os_mon-${VERSION.os_mon}/src/cpu_sup.c
diff --git a/lang/erlang/PLIST.NetBSD b/lang/erlang/PLIST.NetBSD
deleted file mode 100644
index 4e6b174903f..00000000000
--- a/lang/erlang/PLIST.NetBSD
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2015/07/25 12:13:53 abs Exp $
-lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/cpu_sup
-lib/erlang/lib/os_mon-${VERSION.os_mon}/src/cpu_sup.c
diff --git a/lang/erlang/PLIST.SunOS b/lang/erlang/PLIST.SunOS
index cc7bf350c95..c31b3e1586a 100644
--- a/lang/erlang/PLIST.SunOS
+++ b/lang/erlang/PLIST.SunOS
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2009/12/15 12:09:20 asau Exp $
-lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/cpu_sup
+@comment $NetBSD: PLIST.SunOS,v 1.2 2020/02/27 13:46:39 jperkin Exp $
 lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/ferrule
 lib/erlang/lib/os_mon-${VERSION.os_mon}/priv/bin/mod_syslog
-lib/erlang/lib/os_mon-${VERSION.os_mon}/src/cpu_sup.c
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/ferrule.c
 lib/erlang/lib/os_mon-${VERSION.os_mon}/src/mod_syslog.c
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index 3a969718850..5bc12081b89 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.77 2019/12/04 11:44:40 nia Exp $
+$NetBSD: distinfo,v 1.78 2020/02/27 13:46:39 jperkin Exp $
 
-SHA1 (erlang-22.1.8.tar.gz) = d4639c51f9ec067b43990096ba461077fdd731c2
-RMD160 (erlang-22.1.8.tar.gz) = 13ded65cea8e1cd46418f02ac193cf935460aab9
-SHA512 (erlang-22.1.8.tar.gz) = 4260fab3f6cd9338ca167371cd982bcf9557729e93d58c3911e485529ed8ee97089e1de3466745d21206c94276f9865ac4fddcb2803afe915494b43feda46dda
-Size (erlang-22.1.8.tar.gz) = 54967877 bytes
+SHA1 (erlang-22.2.7.tar.gz) = b4823b9e83c41e9225c636e62e92951c57670ba6
+RMD160 (erlang-22.2.7.tar.gz) = 0ea31b15c4616fc4b877f500d323be05689d4b51
+SHA512 (erlang-22.2.7.tar.gz) = 1746acd526eda37c769b70bba1ad0f73ee1e658d05d0cbbe4063f34c11f8061932b2cde04df725537f5c5b81b537897ada2f0f9b6b18b7554b0f7596c492906b
+Size (erlang-22.2.7.tar.gz) = 55748754 bytes
 SHA1 (patch-ab) = 5f1602f3a49c05fd4c45884a7cd6be8d3f287ac3
 SHA1 (patch-ay) = f5f1accdb11e404ba4779b056228431e3080e4cd
 SHA1 (patch-erts_aclocal.m4) = 3812a0feda06eb7c6ff02b5ac7125284ad5df2cb
diff --git a/lang/erlang/versions.mk b/lang/erlang/versions.mk
index 15732bdfcc1..8279a69d702 100644
--- a/lang/erlang/versions.mk
+++ b/lang/erlang/versions.mk
@@ -1,3 +1,3 @@
-# $NetBSD: versions.mk,v 1.16 2019/12/04 11:44:41 nia Exp $
+# $NetBSD: versions.mk,v 1.17 2020/02/27 13:46:39 jperkin Exp $
 # Do not edit, regenerate using 'make versions'
-_VERSIONS=	erts 10.5.6 asn1 5.0.9 common_test 1.18 compiler 7.4.9 crypto 4.6.2 debugger 4.2.7 dialyzer 4.1 diameter 2.2.1 edoc 0.11 eldap 1.2.8 erl_docgen 0.10 erl_interface 3.13 et 1.6.4 eunit 2.3.8 ftp 1.0.3 hipe 3.19.1 inets 7.1.1 jinterface 1.10.1 kernel 6.5 megaco 3.18.6 mnesia 4.16.1 observer 2.9.2 odbc 2.12.4 os_mon 2.5.1 parsetools 2.1.8 public_key 1.7 reltool 0.8 runtime_tools 1.14 sasl 3.4.1 snmp 5.4.3 ssh 4.8 ssl 9.4 stdlib 3.10 syntax_tools 2.2.1 tftp 1.0.1 tools 3.2.1 wx 1.8.9 xmerl 1.3.22 
+_VERSIONS=	compiler 7.5.2 asn1 5.0.9 common_test 1.18.1 crypto 4.6.4 debugger 4.2.8 dialyzer 4.1.1 diameter 2.2.1 edoc 0.11 eldap 1.2.8 erl_docgen 0.11 erl_interface 3.13.1 erts 10.6.4 et 1.6.4 eunit 2.4 ftp 1.0.4 hipe 3.19.2 inets 7.1.2 jinterface 1.10.1 kernel 6.5.1 megaco 3.18.7 mnesia 4.16.2 observer 2.9.3 odbc 2.12.4 os_mon 2.5.1 parsetools 2.1.8 public_key 1.7.1 reltool 0.8 runtime_tools 1.14 sasl 3.4.1 snmp 5.4.5 ssh 4.8.2 ssl 9.5.3 stdlib 3.11.2 syntax_tools 2.2.1 tftp 1.0.2 tools 3.3 wx 1.9 xmerl 1.3.23