Updates lang/erlang/25 to the latest bugfix release.
This release implements the strict KEX option for SSH.
Unfortunately there seems to have been a hickup with the include path in the
related test, so I added a small patch to make sure that the tests build and
pass.
Builds, runs, consumer ports are happy on amd64. ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/erlang/25/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 7 Aug 2023 15:47:03 -0000 1.20
+++ Makefile 19 Dec 2023 18:22:48 -0000
@@ -4,7 +4,7 @@ USE_NOBTCFI= Yes
COMMENT-main= ${COMMENT}
COMMENT-wx= WxWidgets bindings for Erlang
-V= 25.3.2.5
+V= 25.3.2.8
PORTROACH= limit:^OTP-25\.
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
@@ -64,43 +64,43 @@ UPDATE_PLIST_ARGS = -i V
# Use the target 'gen-versions' to update this list
ERL_VERSIONS= \
-ASN1_VSN 5.0.21 \
+ASN1_VSN 5.0.21.1 \
COMMON_TEST_VSN 1.24.0.1 \
COMPILER_VSN 8.2.6.3 \
-CRYPTO_VSN 5.1.4 \
-DEBUGGER_VSN 5.3.1.1 \
+CRYPTO_VSN 5.1.4.1 \
+DEBUGGER_VSN 5.3.1.2 \
DIALYZER_VSN 5.0.5 \
DIAMETER_VSN 2.2.7 \
EDOC_VSN 1.2 \
-EI_VSN 5.3.2 \
+EI_VSN 5.3.2.1 \
ELDAP_VSN 1.2.11 \
EMACS_VSN 2.7.0 \
ERL_DOCGEN_VSN 1.4 \
ET_VSN 1.6.5 \
EUNIT_VSN 2.8.2 \
FTP_VSN 1.1.4 \
-INETS_VSN 8.3.1.1 \
+INETS_VSN 8.3.1.2 \
JINTERFACE_VSN 1.13.1 \
-KERNEL_VSN 8.5.4.1 \
+KERNEL_VSN 8.5.4.2 \
MEGACO_VSN 4.4.3 \
-MNESIA_VSN 4.21.4 \
+MNESIA_VSN 4.21.4.2 \
OBSERVER_VSN 2.14 \
ODBC_VSN 2.14 \
OS_MON_VSN 2.8.2 \
PARSETOOLS_VSN 2.4.1 \
-PUBLIC_KEY_VSN 1.13.3 \
+PUBLIC_KEY_VSN 1.13.3.2 \
RELTOOL_VSN 0.9.1 \
RUNTIME_TOOLS_VSN 1.19 \
SASL_VSN 4.2 \
SNMP_VSN 5.13.5 \
-SSH_VSN 4.15.3 \
-SSL_VSN 10.9.1.1 \
-STDLIB_VSN 4.3.1.2 \
+SSH_VSN 4.15.3.1 \
+SSL_VSN 10.9.1.3 \
+STDLIB_VSN 4.3.1.3 \
SYNTAX_TOOLS_VSN 3.0.1 \
TFTP_VSN 1.0.4 \
TOOLS_VSN 3.5.3 \
-WX_VSN 2.2.2 \
+WX_VSN 2.2.2.1 \
XMERL_VSN 1.3.31.1 \
-ERTS_VSN 13.2.2.2
+ERTS_VSN 13.2.2.5
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/erlang/25/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 7 Aug 2023 15:47:03 -0000 1.11
+++ distinfo 19 Dec 2023 18:22:48 -0000
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_25.3.2.5.tar.gz) =
g5S0EcRMnoxxUkB7k69g6S1/Hvn/1e/UAtzAQOrBiIQ=
-SHA256 (otp_src_25.3.2.5.tar.gz) = H4mbSx74VpwIcTt2vFRgeglQOh0Yjm1hUSA2GIzDVts=
-SIZE (otp_doc_man_25.3.2.5.tar.gz) = 1716246
-SIZE (otp_src_25.3.2.5.tar.gz) = 106241022
+SHA256 (otp_doc_man_25.3.2.8.tar.gz) =
nEpln2gjrfrhiDsPJ5qTpjJaRQ45Mwo7lYb/YVXpgEw=
+SHA256 (otp_src_25.3.2.8.tar.gz) = lCTXcTs2HIokaQUVrL1+D9N7Z9VMrR4eSvFG6uDjNdM=
+SIZE (otp_doc_man_25.3.2.8.tar.gz) = 1717484
+SIZE (otp_src_25.3.2.8.tar.gz) = 104657871
Index: patches/patch-lib_ssh_test_ssh_to_openssh_SUITE_erl
===================================================================
RCS file: patches/patch-lib_ssh_test_ssh_to_openssh_SUITE_erl
diff -N patches/patch-lib_ssh_test_ssh_to_openssh_SUITE_erl
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_ssh_test_ssh_to_openssh_SUITE_erl 19 Dec 2023 18:22:48
-0000
@@ -0,0 +1,12 @@
+Index: lib/ssh/test/ssh_to_openssh_SUITE.erl
+--- lib/ssh/test/ssh_to_openssh_SUITE.erl.orig
++++ lib/ssh/test/ssh_to_openssh_SUITE.erl
+@@ -23,7 +23,7 @@
+
+ -include_lib("common_test/include/ct.hrl").
+ -include("ssh_test_lib.hrl").
+--include_lib("ssh/src/ssh_transport.hrl").
++-include_lib("ssh_transport.hrl").
+
+ -export([
+ suite/0,
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/erlang/25/pkg/PLIST-main,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-main
--- pkg/PLIST-main 10 Jun 2023 15:03:10 -0000 1.11
+++ pkg/PLIST-main 19 Dec 2023 18:22:48 -0000
@@ -1143,8 +1143,6 @@ lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/e
lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/ei_x_encode.h
lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/eidef.h
lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/eiext.h
-lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/eimd5.c
-lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/eimd5.h
lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/get_type.c
lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/putget.h
lib/${ERLANG_V}/lib/${ERL_EI}/src/misc/show_msg.c
@@ -4358,7 +4356,6 @@ lib/${ERLANG_V}/man/man6/
lib/${ERLANG_V}/man/man7/
lib/${ERLANG_V}/misc/
lib/${ERLANG_V}/misc/format_man_pages
-lib/${ERLANG_V}/misc/makewhatis
lib/${ERLANG_V}/releases/
lib/${ERLANG_V}/releases/25/
lib/${ERLANG_V}/releases/25/OTP_VERSION
