Update for 21.6.0

diff --git a/.version b/.version
index be5e329e24e06c3502bff8170657a14cd2b089c5..986c3cc7613204d839cb4eb5548c53cf6d8e4b32 100644 (file)
--- a/.version
+++ b/.version
@@ -1 +1 @@
-21.6.0-rc1
+21.6.0

diff --git a/CHANGES.md b/CHANGES.md
index eeda0ea82523320a5f5db5d345620c57c091f568..191542bdfac17a45bb25f17fdb270eeb95c34deb 120000 (symlink)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1 +1 @@
-ChangeLogs/ChangeLog-21.6.0-rc1.md
\ No newline at end of file
+ChangeLogs/ChangeLog-21.6.0.md
\ No newline at end of file

diff --git a/ChangeLogs/ChangeLog-21.6.0-rc1.md b/ChangeLogs/ChangeLog-21.6.0.md
similarity index 97%
rename from ChangeLogs/ChangeLog-21.6.0-rc1.md
rename to ChangeLogs/ChangeLog-21.6.0.md
index 40a0f51cd896f5f185312915076fd5835f0a3f3f..bf06f893c791be3889cc0cd9d92be8fbfa6fa3db 100644 (file)
--- a/ChangeLogs/ChangeLog-21.6.0-rc1.md
+++ b/ChangeLogs/ChangeLog-21.6.0.md
@@ -1,18 +1,18 @@
 
-## Change Log for Release asterisk-21.6.0-rc1
+## Change Log for Release asterisk-21.6.0
 
 ### Links:
 
- - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-21.6.0-rc1.md)  
- - [GitHub Diff](https://github.com/asterisk/asterisk/compare/21.5.0...21.6.0-rc1)  
- - [Tarball](https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-21.6.0-rc1.tar.gz)  
+ - [Full ChangeLog](https://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-21.6.0.md)  
+ - [GitHub Diff](https://github.com/asterisk/asterisk/compare/21.5.0...21.6.0)  
+ - [Tarball](https://downloads.asterisk.org/pub/telephony/asterisk/asterisk-21.6.0.tar.gz)  
  - [Downloads](https://downloads.asterisk.org/pub/telephony/asterisk)  
 
 ### Summary:
 
-- Commits: 38
+- Commits: 39
 - Commit Authors: 9
-- Issues Resolved: 21
+- Issues Resolved: 22
 - Security Advisories Resolved: 0
 
 ### User Notes:
@@ -59,7 +59,7 @@
 - Allan Nathanson: (1)
 - Ben Ford: (3)
 - Chrsmj: (1)
-- George Joseph: (14)
+- George Joseph: (15)
 - Jiangxc: (1)
 - Naveen Albert: (7)
 - Peter Jannesen: (2)
@@ -90,6 +90,7 @@
   - 979: [improvement]: Add ability to suppress MOH when a remote endpoint sends "sendonly" or "inactive"
   - 982: [bug]: The addition of tenantid to the ast_sip_endpoint structure broke ABI compatibility
   - 990: [improvement]: The help for PJSIP_AOR should indicate that you need to call PJSIP_CONTACT to get contact details
+  - 995: [bug]: suppress_moh_on_sendonly should use AST_BOOL_VALUES instead of YESNO_VALUES in alembic script
 
 ### Commits By Author:
 
@@ -101,7 +102,7 @@
   - app_mixmonitor: Add 'D' option for dual-channel audio.
   - Add res_pjsip_config_sangoma external module.
 
-- #### George Joseph (14):
+- #### George Joseph (15):
   - db.c: Remove limit on family/key length
   - manager.c: Split XML documentation to manager_doc.xml
   - manager: Enhance event filtering for performance
@@ -116,6 +117,7 @@
   - res_pjsip: Move tenantid to end of ast_sip_endpoint
   - func_pjsip_aor/contact: Fix documentation for contact ID
   - res_pjsip: Add new endpoint option "suppress_moh_on_sendonly"
+  - res_pjsip: Change suppress_moh_on_sendonly to OPT_BOOL_T
 
 - #### Naveen Albert (7):
   - app_voicemail: Fix ill-formatted pager emails with custom subject.
@@ -152,6 +154,7 @@
 
 ### Commit List:
 
+-  res_pjsip: Change suppress_moh_on_sendonly to OPT_BOOL_T
 -  res_pjsip: Add new endpoint option "suppress_moh_on_sendonly"
 -  res_pjsip.c: Fix Contact header rendering for IPv6 addresses.
 -  samples: remove and/or change some wiki mentions
@@ -192,6 +195,19 @@
 
 ### Commit Details:
 
+#### res_pjsip: Change suppress_moh_on_sendonly to OPT_BOOL_T
+  Author: George Joseph
+  Date:   2024-11-15
+
+  The suppress_moh_on_sendonly endpoint option should have been
+  defined as OPT_BOOL_T in pjsip_configuration.c and AST_BOOL_VALUES
+  in the alembic script instead of OPT_YESNO_T and YESNO_VALUES.
+
+  Also updated contrib/ast-db-manage/README.md to indicate that
+  AST_BOOL_VALUES should always be used and provided an example.
+
+  Resolves: #995
+
 #### res_pjsip: Add new endpoint option "suppress_moh_on_sendonly"
   Author: George Joseph
   Date:   2024-11-05

diff --git a/contrib/realtime/mysql/mysql_config.sql b/contrib/realtime/mysql/mysql_config.sql
index 2f75770deb4bbaa35d4ec73007fb7ab0b45f73f1..7e28215bbe16cd4f0830cda0b10f34324dbcbb1b 100644 (file)
--- a/contrib/realtime/mysql/mysql_config.sql
+++ b/contrib/realtime/mysql/mysql_config.sql
@@ -1709,7 +1709,7 @@ UPDATE alembic_version SET version_num='801b9fced8b7' WHERE alembic_version.vers
 
 -- Running upgrade 801b9fced8b7 -> 4f91fc18c979
 
-ALTER TABLE ps_endpoints ADD COLUMN suppress_moh_on_sendonly ENUM('yes','no');
+ALTER TABLE ps_endpoints ADD COLUMN suppress_moh_on_sendonly ENUM('0','1','off','on','false','true','no','yes');
 
 UPDATE alembic_version SET version_num='4f91fc18c979' WHERE alembic_version.version_num = '801b9fced8b7';
 

diff --git a/contrib/realtime/postgresql/postgresql_config.sql b/contrib/realtime/postgresql/postgresql_config.sql
index ea01b5332e0ed132850efcafef78246ef7dd3961..f40240bf76347b86587353d9ac414df7f30bc610 100644 (file)
--- a/contrib/realtime/postgresql/postgresql_config.sql
+++ b/contrib/realtime/postgresql/postgresql_config.sql
@@ -1833,7 +1833,7 @@ UPDATE alembic_version SET version_num='801b9fced8b7' WHERE alembic_version.vers
 
 -- Running upgrade 801b9fced8b7 -> 4f91fc18c979
 
-ALTER TABLE ps_endpoints ADD COLUMN suppress_moh_on_sendonly yesno_values;
+ALTER TABLE ps_endpoints ADD COLUMN suppress_moh_on_sendonly ast_bool_values;
 
 UPDATE alembic_version SET version_num='4f91fc18c979' WHERE alembic_version.version_num = '801b9fced8b7';