From a0891a62d4aff34fb6ec72a2091c62110bb31afe Mon Sep 17 00:00:00 2001
From: Asterisk Development Team
Date: Thu, 10 Jul 2025 15:58:55 +0000
Subject: [PATCH] Update for 21.10.0-rc3
---
.version | 2 +-
CHANGES.html | 2 +-
CHANGES.md | 2 +-
ChangeLogs/ChangeLog-21.10.0-rc3.html | 59 ++++++++++++++++++++++
ChangeLogs/ChangeLog-21.10.0-rc3.md | 70 +++++++++++++++++++++++++++
README.html | 4 +-
README.md | 2 +-
7 files changed, 135 insertions(+), 6 deletions(-)
create mode 100644 ChangeLogs/ChangeLog-21.10.0-rc3.html
create mode 100644 ChangeLogs/ChangeLog-21.10.0-rc3.md
diff --git a/.version b/.version
index 6c3a0d581c..2b605f0eed 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-21.10.0-rc2
+21.10.0-rc3
diff --git a/CHANGES.html b/CHANGES.html
index f80f240f01..8c0f33588b 120000
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -1 +1 @@
-ChangeLogs/ChangeLog-21.10.0-rc2.html
\ No newline at end of file
+ChangeLogs/ChangeLog-21.10.0-rc3.html
\ No newline at end of file
diff --git a/CHANGES.md b/CHANGES.md
index c84be13533..fac6649dea 120000
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1 +1 @@
-ChangeLogs/ChangeLog-21.10.0-rc2.md
\ No newline at end of file
+ChangeLogs/ChangeLog-21.10.0-rc3.md
\ No newline at end of file
diff --git a/ChangeLogs/ChangeLog-21.10.0-rc3.html b/ChangeLogs/ChangeLog-21.10.0-rc3.html
new file mode 100644
index 0000000000..46e5c5091e
--- /dev/null
+++ b/ChangeLogs/ChangeLog-21.10.0-rc3.html
@@ -0,0 +1,59 @@
+ChangeLog for asterisk-21.10.0-rc3
+Change Log for Release asterisk-21.10.0-rc3
+Links:
+
+Summary:
+
+- Commits: 2
+- Commit Authors: 1
+- Issues Resolved: 2
+- Security Advisories Resolved: 0
+
+User Notes:
+Upgrade Notes:
+Commit Authors:
+
+Issue and Commit Detail:
+Closed Issues:
+
+- 1287: [bug]: channelstorage.c: Compilation failure with DEBUG_FD_LEAKS
+- 1288: [bug]: Crash when destroying channel with C++ alternative storage backend enabled
+
+Commits By Author:
+
+-
+
George Joseph (2):
+
+- channelstorage_cpp_map_name_id: Fix callback returning non-matching channels.
+- channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.
+
+Commit List:
+
+- channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.
+- channelstorage_cpp_map_name_id: Fix callback returning non-matching channels.
+
+Commit Details:
+channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.
+Author: George Joseph
+ Date: 2025-07-08
+DEBUG_FD_LEAKS replaces calls to "open" and "close" with functions that keep
+ track of file descriptors, even when those calls are actually callbacks
+ defined in structures like ast_channelstorage_instance->open and don't touch
+ file descriptors. This causes compilation failures. Those callbacks
+ have been renamed to "open_instance" and "close_instance" respectively.
+Resolves: #1287
+channelstorage_cpp_map_name_id: Fix callback returning non-matching channels.
+Author: George Joseph
+ Date: 2025-07-09
+When the callback() API was invoked but no channel passed the test, callback
+ would return the last channel tested instead of NULL. It now correctly
+ returns NULL when no channel matches.
+Resolves: #1288
+
diff --git a/ChangeLogs/ChangeLog-21.10.0-rc3.md b/ChangeLogs/ChangeLog-21.10.0-rc3.md
new file mode 100644
index 0000000000..c477c22c9c
--- /dev/null
+++ b/ChangeLogs/ChangeLog-21.10.0-rc3.md
@@ -0,0 +1,70 @@
+
+## Change Log for Release asterisk-21.10.0-rc3
+
+### Links:
+
+ - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-21.10.0-rc3.html)
+ - [GitHub Diff](https://github.com/asterisk/asterisk/compare/21.10.0-rc2...21.10.0-rc3)
+ - [Tarball](https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-21.10.0-rc3.tar.gz)
+ - [Downloads](https://downloads.asterisk.org/pub/telephony/asterisk)
+
+### Summary:
+
+- Commits: 2
+- Commit Authors: 1
+- Issues Resolved: 2
+- Security Advisories Resolved: 0
+
+### User Notes:
+
+
+### Upgrade Notes:
+
+
+### Commit Authors:
+
+- George Joseph: (2)
+
+## Issue and Commit Detail:
+
+### Closed Issues:
+
+ - 1287: [bug]: channelstorage.c: Compilation failure with DEBUG_FD_LEAKS
+ - 1288: [bug]: Crash when destroying channel with C++ alternative storage backend enabled
+
+### Commits By Author:
+
+- #### George Joseph (2):
+ - channelstorage_cpp_map_name_id: Fix callback returning non-matching channels.
+ - channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.
+
+
+### Commit List:
+
+- channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.
+- channelstorage_cpp_map_name_id: Fix callback returning non-matching channels.
+
+### Commit Details:
+
+#### channelstorage: Rename callbacks that conflict with DEBUG_FD_LEAKS.
+ Author: George Joseph
+ Date: 2025-07-08
+
+ DEBUG_FD_LEAKS replaces calls to "open" and "close" with functions that keep
+ track of file descriptors, even when those calls are actually callbacks
+ defined in structures like ast_channelstorage_instance->open and don't touch
+ file descriptors. This causes compilation failures. Those callbacks
+ have been renamed to "open_instance" and "close_instance" respectively.
+
+ Resolves: #1287
+
+#### channelstorage_cpp_map_name_id: Fix callback returning non-matching channels.
+ Author: George Joseph
+ Date: 2025-07-09
+
+ When the callback() API was invoked but no channel passed the test, callback
+ would return the last channel tested instead of NULL. It now correctly
+ returns NULL when no channel matches.
+
+ Resolves: #1288
+
diff --git a/README.html b/README.html
index 29366a9823..e1d09a61b7 100644
--- a/README.html
+++ b/README.html
@@ -1,4 +1,4 @@
-Readme for asterisk-21.10.0-rc2
+Readme for asterisk-21.10.0-rc3
The Asterisk(R) Open Source PBX
By Mark Spencer <markster@digium.com> and the Asterisk.org developer community.
Copyright (C) 2001-2025 Sangoma Technologies Corporation and other copyright holders.
@@ -37,7 +37,7 @@ hardware.
If you are updating from a previous version of Asterisk, make sure you
read the Change Logs.
-Change Logs
+Change Logs
NEW INSTALLATIONS
diff --git a/README.md b/README.md
index d22c333c7c..fff78fec28 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ If you are updating from a previous version of Asterisk, make sure you
read the Change Logs.
-[Change Logs](ChangeLogs/ChangeLog-21.10.0-rc2.html)
+[Change Logs](ChangeLogs/ChangeLog-21.10.0-rc3.html)
### NEW INSTALLATIONS
--
2.47.2