erlang: Update to 23.3.1

upstream changes:
-----------------
Patch Package:           OTP 23.3.1
Git Tag:                 OTP-23.3.1
Date:                    2021-03-30
Trouble Report Id:       OTP-17279
Seq num:
System:                  OTP
Release:                 23
Application:             ssh-4.11.1
Predecessor:             OTP 23.3

 Check out the git tag OTP-23.3.1, and build a full OTP system
 including documentation. Apply one or more applications from this
 build as patches to your installation using the 'otp_patch_apply'
 tool. For information on install requirements, see descriptions for
 each application version below.

 ---------------------------------------------------------------------
 --- ssh-4.11.1 ------------------------------------------------------
 ---------------------------------------------------------------------

 The ssh-4.11.1 application can be applied independently of other
 applications on a full OTP 23 installation.

 --- Fixed Bugs and Malfunctions ---

  OTP-17279    Application(s): ssh

               The idle_time timer was not cancelled when a channel
               was opened within the timeout time on an empty
               connection that have had channels previously.


 Full runtime dependencies of ssh-4.11.1: crypto-4.6.4, erts-9.0,
 kernel-5.3, public_key-1.6.1, stdlib-3.4.1
 ---------------------------------------------------------------------

Changes for 23.3 are at https://erlang.org/download/OTP-23.3.README

4 files changed, 280 insertions, 13 deletions

diff --git a/lang/erlang/Makefile.versions b/lang/erlang/Makefile.versions
index 7ae6eaf3eea..62e92d3e3b0 100644
--- a/lang/erlang/Makefile.versions
+++ b/lang/erlang/Makefile.versions
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.versions,v 1.54 2021/03/04 14:17:23 triaxx Exp $
+# $NetBSD: Makefile.versions,v 1.55 2021/03/31 13:41:58 triaxx Exp $
 
 # When making any update to the versions below (even patch level),
 # please check to see if the erlang-doc or erlang-man packages also
 # need their PLISTs regenerated, as they almost always will.
 DIST_VERSION_MAJOR=		23
-DIST_VERSION_MINOR=		2
-DIST_VERSION_PATCH=		7
+DIST_VERSION_MINOR=		3
+DIST_VERSION_PATCH=		1
 
 .include "versions.mk"
 
diff --git a/lang/erlang/PLIST b/lang/erlang/PLIST
index eb20a9a926d..9153a68623a 100644
--- a/lang/erlang/PLIST
+++ b/lang/erlang/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2021/02/20 01:02:29 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.46 2021/03/31 13:41:58 triaxx Exp $
 bin/ct_run
 bin/dialyzer
 bin/epmd
@@ -1028,20 +1028,67 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_pmatch.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_prettypr.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_to_icode.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/cerl_typean.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/elf_format.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_bif_types.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/erl_types.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.app
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.appup
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_adj_list.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_assemble.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_defuse.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_encode.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_frame.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_liveness.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_main.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_pp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_finalise.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_ls.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_naive.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_postconditions.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_ra_sse2_postconditions.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_registers.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific_sse2.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_specific_x87.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_spill_restore.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_sse2.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_subst.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_amd64_x87.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_assemble.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_cfg.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_defuse.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_encode.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_finalise.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_frame.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_liveness_gpr.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_main.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_pp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_finalise.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_ls.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_naive.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_ra_postconditions.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_registers.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_specific.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_arm_subst.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_bb.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_bb_weights.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_beam_to_icode.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_coalescing_regalloc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_consttab.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_data_pp.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_digraph.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dominators.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dot.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_dsets.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gen_cfg.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_gensym.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_graph_coloring_regalloc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode2rtl.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_bincomp.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_call_elim.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_callgraph.beam
@@ -1050,6 +1097,7 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_coordinator.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ebb.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_exceptions.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_fp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_heap_test.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_inline_bifs.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_instruction_counter.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_liveness.beam
@@ -1063,8 +1111,127 @@ lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_const_prop.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_copy_prop.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_ssa_struct_reuse.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_icode_type.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ig_moves.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_jit.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_liveness.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_main.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_llvm_merge.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ls_regalloc.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_main.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_moves.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_node_sets.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_optimistic_regalloc.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_pack_constants.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_assemble.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_cfg.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_defuse.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_encode.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_finalise.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_frame.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_all.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_fpr.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_liveness_gpr.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_main.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_pp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_finalise.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_ls.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_naive.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_postconditions.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_ra_postconditions_fp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_registers.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_specific.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_specific_fp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_ppc_subst.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_profile.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_range_split.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_reg_worklists.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_regalloc_loop.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_regalloc_prepass.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_restore_reuse.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arch.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arith_32.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_arith_64.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary_construct.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_binary_match.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_cfg.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_cleanup_const.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_exceptions.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_lcm.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_liveness.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_mk_switch.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_primops.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa_avail_expr.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssa_const_prop.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_ssapre.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_symbolic.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_amd64.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_arm.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_llvm.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_ppc.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_sparc.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_to_x86.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_varmap.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_rtl_verify_gcsafe.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sdi.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_segment_trees.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_assemble.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_cfg.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_defuse.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_encode.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_finalise.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_frame.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_all.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_fpr.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_liveness_gpr.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_main.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_pp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_finalise.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_ls.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_naive.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_postconditions.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_ra_postconditions_fp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_registers.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_specific.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_specific_fp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_sparc_subst.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillcost.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_color.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_spillmin_scan.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_tagscheme.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_temp_map.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_timing.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_vectors.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_assemble.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_cfg.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_defuse.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_encode.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_frame.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_liveness.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_main.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_postpass.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_pp.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_finalise.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_ls.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_naive.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_ra_postconditions.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_registers.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_specific.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_specific_x87.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_spill_restore.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_subst.beam
+lib/erlang/lib/hipe-${VERSION.hipe}/ebin/hipe_x86_x87.beam
 lib/erlang/lib/hipe-${VERSION.hipe}/flow/cfg.inc
 lib/erlang/lib/hipe-${VERSION.hipe}/flow/ebb.inc
 lib/erlang/lib/hipe-${VERSION.hipe}/flow/hipe_bb.erl
@@ -1082,6 +1249,7 @@ lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_coordinator.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ebb.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_exceptions.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_fp.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_heap_test.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_inline_bifs.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_instruction_counter.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_liveness.erl
@@ -1097,15 +1265,55 @@ lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_copy_prop.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_ssa_struct_reuse.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/icode/hipe_icode_type.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf32_format.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf64_format.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/elf_format.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_arch.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_liveness.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_main.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_llvm_merge.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/llvm/hipe_rtl_to_llvm.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe.hrl
 lib/erlang/lib/hipe-${VERSION.hipe}/main/hipe_main.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_consttab.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_data_pp.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_gensym.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_pack_constants.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_sdi.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_sdi.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/misc/hipe_segment_trees.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_icode2rtl.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_literals.hrl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arch.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arith_32.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_arith_64.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary_construct.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_binary_match.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_cfg.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_cleanup_const.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_exceptions.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_lcm.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_liveness.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_mk_switch.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_primops.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa_avail_expr.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssa_const_prop.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_ssapre.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_symbolic.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_varmap.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_rtl_verify_gcsafe.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/rtl/hipe_tagscheme.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_digraph.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_dot.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_dsets.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_timing.erl
+lib/erlang/lib/hipe-${VERSION.hipe}/util/hipe_vectors.erl
 lib/erlang/lib/hipe-${VERSION.hipe}/vsn.mk
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_chunk.beam
 lib/erlang/lib/inets-${VERSION.inets}/ebin/http_request.beam
@@ -1381,6 +1589,65 @@ lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_service.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_sup.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_tftp_wrapper.erl
 lib/erlang/lib/inets-${VERSION.inets}/src/inets_app/inets_trace.erl
+lib/erlang/lib/jinterface-${VERSION.jinterface}/ebin/jinterface.app
+lib/erlang/lib/jinterface-${VERSION.jinterface}/ebin/jinterface.appup
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/AbstractConnection.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/AbstractNode.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/GenericQueue.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/Link.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/Links.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpAuthException.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpConnection.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpCookedConnection.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpEpmd.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangAtom.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBinary.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBitstr.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangBoolean.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangByte.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangChar.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangDecodeException.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangDouble.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangException.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangExit.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangExternalFun.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangFloat.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangFun.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangInt.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangList.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangLong.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangMap.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangObject.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangPid.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangPort.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangRangeException.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangRef.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangShort.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangString.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangTuple.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangUInt.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpErlangUShort.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpException.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpExternal.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpInputStream.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpLocalNode.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpMD5.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpMbox.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpMsg.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpNode.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpNodeStatus.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpPeer.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpSelf.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpServer.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpServerSocketTransport.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpServerTransport.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpSocketTransport.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpSocketTransportFactory.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpSystem.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpTransport.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/java_src/com/ericsson/otp/erlang/OtpTransportFactory.java
+lib/erlang/lib/jinterface-${VERSION.jinterface}/priv/OtpErlang.jar
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application_controller.beam
 lib/erlang/lib/kernel-${VERSION.kernel}/ebin/application_master.beam
@@ -2638,6 +2905,7 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_app.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_certificate.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_cipher.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_cipher_format.beam
+lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_client_session_cache_db.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_config.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_connection_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_crl.beam
@@ -2660,7 +2928,6 @@ lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_server_session_cache.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_server_session_cache_db.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_server_session_cache_sup.beam
 lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session.beam
-lib/erlang/lib/ssl-${VERSION.ssl}/ebin/ssl_session_cache.beam
 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
@@ -2723,6 +2990,7 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_certificate.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_cipher_format.erl
+lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_client_session_cache_db.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_config.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_connection_sup.erl
@@ -2749,7 +3017,6 @@ lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_server_session_cache.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_server_session_cache_db.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_server_session_cache_sup.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_session.erl
-lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_session_cache.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_session_cache_api.erl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_srp.hrl
 lib/erlang/lib/ssl-${VERSION.ssl}/src/ssl_srp_primes.erl
diff --git a/lang/erlang/distinfo b/lang/erlang/distinfo
index af6df335b77..197a5767577 100644
--- a/lang/erlang/distinfo
+++ b/lang/erlang/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.87 2021/03/04 14:17:23 triaxx Exp $
+$NetBSD: distinfo,v 1.88 2021/03/31 13:41:58 triaxx Exp $
 
-SHA1 (erlang-23.2.7.tar.gz) = d109c86cd5605056a64d6bdf2f38050743c61900
-RMD160 (erlang-23.2.7.tar.gz) = 9bcc667031565d88ff373b04e0336167ea9a8246
-SHA512 (erlang-23.2.7.tar.gz) = 1e94b641644edb1edc3d15679222dd5d198abf1cae6daa4b91304317f8df21514029971f208767396625c0a0be7107c357c9ef80974c9865113a760aa2655220
-Size (erlang-23.2.7.tar.gz) = 56600356 bytes
+SHA1 (erlang-23.3.1.tar.gz) = f449f565bd7a706dc4f7d2c71ce706300ecdcfba
+RMD160 (erlang-23.3.1.tar.gz) = ee647dce86efab095297efce895e51456257311c
+SHA512 (erlang-23.3.1.tar.gz) = 03d4be9b25a14359e9f8db52d8e7d8edff1e8c53686a189caae15373c7e15d03f05e1138c549b8b41b8e6b7c55ab154cea47356f6fe79f7b72d5fb4ce759c4b0
+Size (erlang-23.3.1.tar.gz) = 56654422 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 2f5e6553dc8..62407f304a3 100644
--- a/lang/erlang/versions.mk
+++ b/lang/erlang/versions.mk
@@ -1,3 +1,3 @@
-# $NetBSD: versions.mk,v 1.22 2021/03/04 14:17:23 triaxx Exp $
+# $NetBSD: versions.mk,v 1.23 2021/03/31 13:41:58 triaxx Exp $
 # Do not edit, regenerate using 'make versions'
-_VERSIONS=	kernel 7.2.1 ssl 10.2.4 asn1 5.0.14 common_test 1.19.1 compiler 7.6.6 crypto 4.8.3 debugger 5.0 dialyzer 4.3 diameter 2.2.3 edoc 0.12 eldap 1.2.8 erl_docgen 1.0.2 erl_interface 4.0.2 erts 11.1.8 et 1.6.4 eunit 2.6 ftp 1.0.5 hipe 4.0.1 inets 7.3.2 jinterface 1.11 megaco 3.19.5 mnesia 4.18.1 observer 2.9.5 odbc 2.13.2 os_mon 2.6.1 parsetools 2.2 public_key 1.9.2 reltool 0.8 runtime_tools 1.15.1 sasl 4.0.1 snmp 5.7.3 ssh 4.10.8 stdlib 3.14 syntax_tools 2.4 tftp 1.0.2 tools 3.4.3 wx 1.9.2 xmerl 1.3.26
+_VERSIONS=	ssh 4.11.1 asn1 5.0.14 common_test 1.20 compiler 7.6.7 crypto 4.9 debugger 5.0 dialyzer 4.3.1 diameter 2.2.3 edoc 0.12 eldap 1.2.9 erl_docgen 1.0.2 erl_interface 4.0.2 erts 11.2 et 1.6.4 eunit 2.6 ftp 1.0.5 hipe 4.0.1 inets 7.3.2 jinterface 1.11.1 kernel 7.3 megaco 3.19.5 mnesia 4.19 observer 2.9.5 odbc 2.13.3 os_mon 2.6.1 parsetools 2.2 public_key 1.10 reltool 0.8 runtime_tools 1.16 sasl 4.0.2 snmp 5.8 ssl 10.3 stdlib 3.14.1 syntax_tools 2.5 tftp 1.0.2 tools 3.4.4 wx 1.9.3 xmerl 1.3.26