From 71ddb39bd9ea33dcee2c01b48aab7e6fe48238a8 Mon Sep 17 00:00:00 2001
From: Asterisk Development Team <asteriskteam@digium.com>
Date: Wed, 20 Dec 2023 16:27:02 +0000
Subject: [PATCH] Update for 21.0.2

---
 .version                       |  2 +-
 CHANGES.md                     |  2 +-
 ChangeLogs/ChangeLog-21.0.2.md | 68 ++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 ChangeLogs/ChangeLog-21.0.2.md

diff --git a/.version b/.version
index a8f5438c0a..80645cbd62 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-21.0.1
+21.0.2
diff --git a/CHANGES.md b/CHANGES.md
index 6246e0691b..0d1e807b63 120000
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1 +1 @@
-ChangeLogs/ChangeLog-21.0.1.md
\ No newline at end of file
+ChangeLogs/ChangeLog-21.0.2.md
\ No newline at end of file
diff --git a/ChangeLogs/ChangeLog-21.0.2.md b/ChangeLogs/ChangeLog-21.0.2.md
new file mode 100644
index 0000000000..a4421416a0
--- /dev/null
+++ b/ChangeLogs/ChangeLog-21.0.2.md
@@ -0,0 +1,68 @@
+
+Change Log for Release asterisk-21.0.2
+========================================
+
+Links:
+----------------------------------------
+
+ - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-21.0.2.md)  
+ - [GitHub Diff](https://github.com/asterisk/asterisk/compare/21.0.1...21.0.2)  
+ - [Tarball](https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-21.0.2.tar.gz)  
+ - [Downloads](https://downloads.asterisk.org/pub/telephony/asterisk)  
+
+Summary:
+----------------------------------------
+
+- res_rtp_asterisk: Fix regression issues with DTLS client check
+
+User Notes:
+----------------------------------------
+
+
+Upgrade Notes:
+----------------------------------------
+
+
+Closed Issues:
+----------------------------------------
+
+  - #500: [bug regression]: res_rtp_asterisk doesn't build if pjproject isn't used
+  - #503: [bug]: The res_rtp_asterisk DTLS check against ICE candidates fails when it shouldn't
+  - #505: [bug]: res_pjproject: ast_sockaddr_cmp() always fails on sockaddrs created by ast_sockaddr_from_pj_sockaddr()
+
+Commits By Author:
+----------------------------------------
+
+- ### George Joseph (1):
+  - res_rtp_asterisk: Fix regression issues with DTLS client check
+
+
+Detail:
+----------------------------------------
+
+- ### res_rtp_asterisk: Fix regression issues with DTLS client check
+  Author: George Joseph  
+  Date:   2023-12-15  
+
+  * Since ICE candidates are used for the check and pjproject is
+    required to use ICE, res_rtp_asterisk was failing to compile
+    when pjproject wasn't available.  The check is now wrapped
+    with an #ifdef HAVE_PJPROJECT.
+
+  * The rtp->ice_active_remote_candidates container was being
+    used to check the address on incoming packets but that
+    container doesn't contain peer reflexive candidates discovered
+    during negotiation. This was causing the check to fail
+    where it shouldn't.  We now check against pjproject's
+    real_ice->rcand array which will contain those candidates.
+
+  * Also fixed a bug in ast_sockaddr_from_pj_sockaddr() where
+    we weren't zeroing out sin->sin_zero before returning.  This
+    was causing ast_sockaddr_cmp() to always return false when
+    one of the inputs was converted from a pj_sockaddr, even
+    if both inputs had the same address and port.
+
+  Resolves: #500
+  Resolves: #503
+  Resolves: #505
+