lang/erlang/26: update to 26.1

Drops two patches accepted upstream

ok kn@
master
volker 2023-09-24 14:37:18 +00:00
parent 3ed0be6e28
commit 7bc9c7982b
5 changed files with 27 additions and 57 deletions

View File

@ -6,7 +6,7 @@ USE_WXNEEDED= Yes
COMMENT-main= ${COMMENT}
COMMENT-wx= WxWidgets bindings for Erlang
V= 26.0.2
V= 26.1
DISTNAME= otp_src_${V}
PORTROACH= limit:^OTP-26\.
PKGNAME= erlang-${V}
@ -67,44 +67,44 @@ UPDATE_PLIST_ARGS = -i V
# Use the target 'gen-versions' to update this list
ERL_VERSIONS= \
ASN1_VSN 5.1 \
COMMON_TEST_VSN 1.25 \
COMPILER_VSN 8.3.2 \
CRYPTO_VSN 5.2 \
DEBUGGER_VSN 5.3.1 \
DIALYZER_VSN 5.1 \
ASN1_VSN 5.2 \
COMMON_TEST_VSN 1.25.1 \
COMPILER_VSN 8.4 \
CRYPTO_VSN 5.3 \
DEBUGGER_VSN 5.3.2 \
DIALYZER_VSN 5.1.1 \
DIAMETER_VSN 2.3 \
EDOC_VSN 1.2 \
EI_VSN 5.4 \
ELDAP_VSN 1.2.11 \
EMACS_VSN 2.7.0 \
ERL_DOCGEN_VSN 1.5 \
ERL_DOCGEN_VSN 1.5.1 \
ERL_INTERFACE_VSN 5.4 \
ET_VSN 1.7 \
EUNIT_VSN 2.8.2 \
FTP_VSN 1.2 \
INETS_VSN 9.0.1 \
INETS_VSN 9.0.2 \
JINTERFACE_VSN 1.14 \
KERNEL_VSN 9.0.2 \
MEGACO_VSN 4.4.4 \
MNESIA_VSN 4.22 \
OBSERVER_VSN 2.15 \
KERNEL_VSN 9.1 \
MEGACO_VSN 4.5 \
MNESIA_VSN 4.22.1 \
OBSERVER_VSN 2.15.1 \
ODBC_VSN 2.14 \
OS_MON_VSN 2.9 \
PARSETOOLS_VSN 2.5 \
PUBLIC_KEY_VSN 1.14 \
PUBLIC_KEY_VSN 1.14.1 \
RELTOOL_VSN 1.0 \
RUNTIME_TOOLS_VSN 2.0 \
SASL_VSN 4.2.1 \
SNMP_VSN 5.14 \
SNMP_VSN 5.15 \
SSH_VSN 5.0.1 \
SSL_VSN 11.0.2 \
STDLIB_VSN 5.0.2 \
SSL_VSN 11.0.3 \
STDLIB_VSN 5.1 \
SYNTAX_TOOLS_VSN 3.1 \
TFTP_VSN 1.1 \
TOOLS_VSN 3.6 \
WX_VSN 2.3 \
XMERL_VSN 1.3.32 \
ERTS_VSN 14.0.2
XMERL_VSN 1.3.31.1 \
ERTS_VSN 14.1
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
SHA256 (otp_doc_man_26.0.2.tar.gz) = M8y1N/sZvYr733OgsTC5oZotXW1B2AmuknBq5zMGs/4=
SHA256 (otp_src_26.0.2.tar.gz) = R4U+qSMGQ6CjEARDPwenHBuS1uAJRTT2KeO3Xbxi8ZM=
SIZE (otp_doc_man_26.0.2.tar.gz) = 1742245
SIZE (otp_src_26.0.2.tar.gz) = 107096862
SHA256 (otp_doc_man_26.1.tar.gz) = phIAJTVt9l41nYHTJobQflJ+D2lCD7m7nzu9aKdBiXo=
SHA256 (otp_src_26.1.tar.gz) = +RTd6nkBmrJTORHN1PkWU3JqybBWGz7FeqbsvMPfP1U=
SIZE (otp_doc_man_26.1.tar.gz) = 1745691
SIZE (otp_src_26.1.tar.gz) = 107409296

View File

@ -1,17 +0,0 @@
Index: lib/crypto/c_src/openssl_config.h
--- lib/crypto/c_src/openssl_config.h.orig
+++ lib/crypto/c_src/openssl_config.h
@@ -322,6 +322,13 @@
# endif
#endif
+#ifdef HAS_LIBRESSL
+# if LIBRESSL_VERSION_NUMBER >= 0x3070000fL
+# define HAVE_CHACHA20_POLY1305
+# define HAVE_CHACHA20
+# endif
+#endif
+
#if OPENSSL_VERSION_NUMBER <= PACKED_OPENSSL_VERSION(0,9,8,'l')
# define HAVE_ECB_IVEC_BUG
# define HAVE_UPDATE_EMPTY_DATA_BUG

View File

@ -1,16 +0,0 @@
With opaque EVP_MD_METHOD, erlang needs to use EVP_MD_meth_*()
instead of initializing the method statically.
Index: lib/crypto/c_src/otp_test_engine.c
--- lib/crypto/c_src/otp_test_engine.c.orig
+++ lib/crypto/c_src/otp_test_engine.c
@@ -36,8 +36,7 @@
#define PACKED_OPENSSL_VERSION_PLAIN(MAJ, MIN, FIX) \
PACKED_OPENSSL_VERSION(MAJ,MIN,FIX,('a'-1))
-#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0) \
- || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
# define OLD
#endif

View File

@ -333,7 +333,6 @@ lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/ct_default.css
lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/jquery-latest.js
lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/jquery.tablesorter.min.js
lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/tile1.jpg
lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/vts.tool
lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/src/
lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/src/ct.erl
lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/src/ct_config.erl
@ -3536,6 +3535,7 @@ lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/digraph_utils.chunk
lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin.chunk
lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin_context.chunk
lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin_expand.chunk
lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin_key.chunk
lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin_type_suggestion.chunk
lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/epp.chunk
lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/erl_abstract_code.chunk
@ -3627,6 +3627,7 @@ lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/digraph_utils.beam
lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin.beam
lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin_context.beam
lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin_expand.beam
lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin_key.beam
lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin_type_suggestion.beam
lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/epp.beam
lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/erl_abstract_code.beam
@ -3731,6 +3732,7 @@ lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/digraph_utils.erl
lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin.erl
lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin_context.erl
lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin_expand.erl
lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin_key.erl
lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin_type_suggestion.erl
lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/epp.erl
lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/erl_abstract_code.erl
@ -4137,6 +4139,7 @@ lib/${ERLANG_V}/man/man3/
@man lib/${ERLANG_V}/man/man3/disksup.3
@man lib/${ERLANG_V}/man/man3/driver_entry.3
@man lib/${ERLANG_V}/man/man3/dyntrace.3
@man lib/${ERLANG_V}/man/man3/edlin.3
@man lib/${ERLANG_V}/man/man3/edlin_expand.3
@man lib/${ERLANG_V}/man/man3/edoc.3
@man lib/${ERLANG_V}/man/man3/edoc_doclet.3