git: 44a4b47e7b49 - main - lang/erlang-runtime25: 25.3.2.15 => 25.3.2.21

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sat, 17 May 2025 00:00:08 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=44a4b47e7b4923b4c6094e096212ee876ef18386

commit 44a4b47e7b4923b4c6094e096212ee876ef18386
Author:     Vladimir Druzenko <vvd@FreeBSD.org>
AuthorDate: 2025-05-16 23:46:33 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-05-16 23:46:33 +0000

    lang/erlang-runtime25: 25.3.2.15 => 25.3.2.21
    
    Changelogs:
    https://github.com/erlang/otp/releases/tag/OTP-25.3.2.16
    https://github.com/erlang/otp/releases/tag/OTP-25.3.2.17
    https://github.com/erlang/otp/releases/tag/OTP-25.3.2.18
    https://github.com/erlang/otp/releases/tag/OTP-25.3.2.19
    https://github.com/erlang/otp/releases/tag/OTP-25.3.2.20
    https://github.com/erlang/otp/releases/tag/OTP-25.3.2.21
    
    Refresh patches.
    Pet portclippy.
    
    PR:             286332
    Approved by:    erlang (maintainer, timeout > 3 weeks)
    Security:       CVE-2024-53846
    Security:       CVE-2025-26618
    Security:       CVE-2025-30211
    Security:       CVE-2025-32433
    Security:       CVE-2025-46712
    MFH:            2025Q2
---
 lang/erlang-runtime25/Makefile                                  | 5 ++---
 lang/erlang-runtime25/distinfo                                  | 6 +++---
 lang/erlang-runtime25/files/patch-Makefile.in                   | 6 +++---
 lang/erlang-runtime25/files/patch-erts_etc_unix_run__erl.c      | 8 ++++----
 lang/erlang-runtime25/files/patch-lib_crypto_c__src_Makefile.in | 4 ++--
 lang/erlang-runtime25/files/patch-lib_stdlib_src_calendar.erl   | 4 ++--
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lang/erlang-runtime25/Makefile b/lang/erlang-runtime25/Makefile
index 79bd9da78b92..b2b7fe3d686b 100644
--- a/lang/erlang-runtime25/Makefile
+++ b/lang/erlang-runtime25/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	erlang
 DISTVERSIONPREFIX=	OTP-
-DISTVERSION=	25.3.2.15
-PORTREVISION=	1
+DISTVERSION=	25.3.2.21
 CATEGORIES=	lang parallel java
 PKGNAMESUFFIX=	-runtime25
 DIST_SUBDIR=	erlang
@@ -68,9 +67,9 @@ CHUNKS_MAKE_ARGS+=		docs DOC_TARGETS=chunks
 DTRACE_CONFIGURE_WITH=		dynamic-trace=dtrace
 DTRACE_CFLAGS=			-fno-omit-frame-pointer
 DTRACE_VARS=			STRIP=""
+JAVA_USES=			java
 JAVA_CONFIGURE_WITH=		javac
 JAVA_CONFIGURE_ENV=		ac_cv_prog_JAVAC="${JAVAC}"
-JAVA_USES=			java
 KQUEUE_CONFIGURE_ENABLE=	kernel-poll
 ODBC_LIB_DEPENDS=		libodbc.so:databases/unixODBC
 ODBC_USES=			localbase:ldflags
diff --git a/lang/erlang-runtime25/distinfo b/lang/erlang-runtime25/distinfo
index f6d6db937962..6e3e1f403320 100644
--- a/lang/erlang-runtime25/distinfo
+++ b/lang/erlang-runtime25/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1729069053
-SHA256 (erlang/erlang-otp-OTP-25.3.2.15_GH0.tar.gz) = 8c7f8d390be1aa6ab89f712feed5fef927ca151bf66f8bb52e97a8cf34225cfb
-SIZE (erlang/erlang-otp-OTP-25.3.2.15_GH0.tar.gz) = 60953027
+TIMESTAMP = 1747434403
+SHA256 (erlang/erlang-otp-OTP-25.3.2.21_GH0.tar.gz) = 6761432927a9be4f5c13c4019acd6fa3d2f4363198f790947328023aece1986f
+SIZE (erlang/erlang-otp-OTP-25.3.2.21_GH0.tar.gz) = 60978586
 SHA256 (erlang/erlang-corba-5.2.1_GH0.tar.gz) = e96e9dc710c0ab3282ca5045434f5bc5ff493c22ba63fcfd764ce4d6a13a7c8f
 SIZE (erlang/erlang-corba-5.2.1_GH0.tar.gz) = 1400553
diff --git a/lang/erlang-runtime25/files/patch-Makefile.in b/lang/erlang-runtime25/files/patch-Makefile.in
index 4c30ccecd02f..7dcae6e3bf6b 100644
--- a/lang/erlang-runtime25/files/patch-Makefile.in
+++ b/lang/erlang-runtime25/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2015-06-23 18:56:21 UTC
+--- Makefile.in.orig	2025-05-08 11:08:25 UTC
 +++ Makefile.in
-@@ -60,7 +60,7 @@ bindir		= @bindir@
+@@ -60,7 +60,7 @@ libdir		= @libdir@
  libdir		= @libdir@
  
  # Where Erlang/OTP is located
@@ -9,7 +9,7 @@
  erlang_libdir	= $(libdir)$(libdir_suffix)
  erlang_bindir	= $(erlang_libdir)/bin
  
-@@ -1013,7 +1013,7 @@ $(TEST_DIRS):
+@@ -1136,7 +1136,7 @@ $(TEST_DIRS):
  #
  # Order is important here, don't change it!
  #
diff --git a/lang/erlang-runtime25/files/patch-erts_etc_unix_run__erl.c b/lang/erlang-runtime25/files/patch-erts_etc_unix_run__erl.c
index b76c5127d2a8..114fa638557f 100644
--- a/lang/erlang-runtime25/files/patch-erts_etc_unix_run__erl.c
+++ b/lang/erlang-runtime25/files/patch-erts_etc_unix_run__erl.c
@@ -1,8 +1,8 @@
---- erts/etc/unix/run_erl.c.orig	2015-03-31 12:32:52 UTC
+--- erts/etc/unix/run_erl.c.orig	2025-05-08 11:08:25 UTC
 +++ erts/etc/unix/run_erl.c
-@@ -73,9 +73,6 @@
- #ifdef HAVE_UTMP_H
- #  include <utmp.h>
+@@ -81,9 +81,6 @@
+ #ifdef HAVE_LIBUTIL_H
+ #  include <libutil.h>
  #endif
 -#ifdef HAVE_UTIL_H
 -#  include <util.h>
diff --git a/lang/erlang-runtime25/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang-runtime25/files/patch-lib_crypto_c__src_Makefile.in
index 8397bcac2200..6ffda4699a9b 100644
--- a/lang/erlang-runtime25/files/patch-lib_crypto_c__src_Makefile.in
+++ b/lang/erlang-runtime25/files/patch-lib_crypto_c__src_Makefile.in
@@ -1,6 +1,6 @@
---- lib/crypto/c_src/Makefile.in.orig	2021-05-27 09:40:45 UTC
+--- lib/crypto/c_src/Makefile.in.orig	2025-05-08 11:08:25 UTC
 +++ lib/crypto/c_src/Makefile.in
-@@ -136,7 +136,7 @@ endif
+@@ -147,7 +147,7 @@ ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
  endif
  
  ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
diff --git a/lang/erlang-runtime25/files/patch-lib_stdlib_src_calendar.erl b/lang/erlang-runtime25/files/patch-lib_stdlib_src_calendar.erl
index 34b753d85b27..52854bdbd959 100644
--- a/lang/erlang-runtime25/files/patch-lib_stdlib_src_calendar.erl
+++ b/lang/erlang-runtime25/files/patch-lib_stdlib_src_calendar.erl
@@ -1,6 +1,6 @@
---- lib/stdlib/src/calendar.erl.orig	2015-03-31 12:32:52 UTC
+--- lib/stdlib/src/calendar.erl.orig	2025-04-16 13:06:44 UTC
 +++ lib/stdlib/src/calendar.erl
-@@ -279,11 +279,19 @@ local_time_to_universal_time(DateTime, I
+@@ -297,11 +297,19 @@ local_time_to_universal_time(DateTime, IsDst) ->
        DateTime1 :: datetime1970(),
        DateTime :: datetime1970().
  local_time_to_universal_time_dst(DateTime) ->