From 93870e7bb4d5ef2cf5f9f06c110d7d45221cf067 Mon Sep 17 00:00:00 2001 From: "Joshua C. Colp" Date: Wed, 11 Aug 2021 08:15:16 -0300 Subject: [PATCH] policy: Deprecate modules and add versions to others. app_meetme is deprecated in 19, to be removed in 21. app_osplookup is deprecated in 19, to be removed in 21. chan_alsa is deprecated in 19, to be removed in 21. chan_mgcp is deprecated in 19, to be removed in 21. chan_skinny is deprecated in 19, to be removed in 21. res_pktccops is deprecated in 19, to be removed in 21. app_macro was deprecated in 16, to be removed in 21. chan_sip was deprecated in 17, to be removed in 21. res_monitor was deprecated in 16, to be removed in 21. ASTERISK-29548 ASTERISK-29549 ASTERISK-29550 ASTERISK-29551 ASTERISK-29552 ASTERISK-29553 ASTERISK-29558 ASTERISK-29567 ASTERISK-29572 Change-Id: Ic3bee31a10d42c4b3bbc913d893f7b2a28a27131 --- addons/app_mysql.c | 2 ++ addons/cdr_mysql.c | 2 ++ apps/app_dahdiras.c | 2 ++ apps/app_fax.c | 2 ++ apps/app_ices.c | 2 ++ apps/app_image.c | 2 ++ apps/app_macro.c | 2 ++ apps/app_meetme.c | 6 ++++-- apps/app_nbscat.c | 2 ++ apps/app_osplookup.c | 7 +++++-- apps/app_url.c | 2 ++ cdr/cdr_syslog.c | 2 ++ channels/chan_alsa.c | 7 +++++-- channels/chan_mgcp.c | 7 +++++-- channels/chan_misdn.c | 2 ++ channels/chan_nbs.c | 2 ++ channels/chan_oss.c | 2 ++ channels/chan_phone.c | 2 ++ channels/chan_sip.c | 2 ++ channels/chan_skinny.c | 7 +++++-- channels/chan_vpb.cc | 2 ++ doc/UPGRADE-staging/app_meetme_deprecation.txt | 6 ++++++ doc/UPGRADE-staging/app_osplookup_deprecation.txt | 6 ++++++ doc/UPGRADE-staging/chan_alsa_deprecation.txt | 6 ++++++ doc/UPGRADE-staging/chan_mgcp_deprecation.txt | 6 ++++++ doc/UPGRADE-staging/chan_skinny_deprecation.txt | 6 ++++++ doc/UPGRADE-staging/res_pktccops_deprecation.txt | 6 ++++++ res/res_config_sqlite.c | 2 ++ res/res_monitor.c | 2 ++ res/res_pktccops.c | 6 ++++-- utils/conf2ael.c | 2 ++ utils/muted.c | 2 ++ 32 files changed, 104 insertions(+), 12 deletions(-) create mode 100644 doc/UPGRADE-staging/app_meetme_deprecation.txt create mode 100644 doc/UPGRADE-staging/app_osplookup_deprecation.txt create mode 100644 doc/UPGRADE-staging/chan_alsa_deprecation.txt create mode 100644 doc/UPGRADE-staging/chan_mgcp_deprecation.txt create mode 100644 doc/UPGRADE-staging/chan_skinny_deprecation.txt create mode 100644 doc/UPGRADE-staging/res_pktccops_deprecation.txt diff --git a/addons/app_mysql.c b/addons/app_mysql.c index 1a79afebdb..6e35a7c5fa 100644 --- a/addons/app_mysql.c +++ b/addons/app_mysql.c @@ -37,6 +37,8 @@ no deprecated func_odbc + 1.8 + 19 ***/ #include "asterisk.h" diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c index c05b86a25f..25f8762c61 100644 --- a/addons/cdr_mysql.c +++ b/addons/cdr_mysql.c @@ -38,6 +38,8 @@ no deprecated cdr_adaptive_odbc + 1.8 + 19 ***/ #include "asterisk.h" diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c index b5b1ae91c4..d2ec137b4f 100644 --- a/apps/app_dahdiras.c +++ b/apps/app_dahdiras.c @@ -28,6 +28,8 @@ /*** MODULEINFO dahdi deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/apps/app_fax.c b/apps/app_fax.c index 2404773d0d..442df6666b 100644 --- a/apps/app_fax.c +++ b/apps/app_fax.c @@ -18,6 +18,8 @@ no deprecated res_fax + 16 + 19 ***/ /* Needed for spandsp headers */ diff --git a/apps/app_ices.c b/apps/app_ices.c index 29127fc303..38c68c0cae 100644 --- a/apps/app_ices.c +++ b/apps/app_ices.c @@ -29,6 +29,8 @@ /*** MODULEINFO deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/apps/app_image.c b/apps/app_image.c index 5d70c8cd30..53754eda64 100644 --- a/apps/app_image.c +++ b/apps/app_image.c @@ -27,6 +27,8 @@ /*** MODULEINFO deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/apps/app_macro.c b/apps/app_macro.c index 36632dc4c7..3f7632a86d 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -29,6 +29,8 @@ no deprecated app_stack (GoSub) + 16 + 21 ***/ #include "asterisk.h" diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 0f0baabca5..27d985b04e 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -41,8 +41,10 @@ /*** MODULEINFO dahdi no - extended + deprecated app_confbridge + 19 + 21 ***/ #include "asterisk.h" @@ -8076,7 +8078,7 @@ static int reload(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "MeetMe conference bridge", - .support_level = AST_MODULE_SUPPORT_EXTENDED, + .support_level = AST_MODULE_SUPPORT_DEPRECATED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c index a7fccaf0d9..c714cbb64b 100644 --- a/apps/app_nbscat.c +++ b/apps/app_nbscat.c @@ -27,6 +27,8 @@ /*** MODULEINFO deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c index 4e6e5df2b4..f80324f80a 100644 --- a/apps/app_osplookup.c +++ b/apps/app_osplookup.c @@ -31,7 +31,10 @@ /*** MODULEINFO osptk openssl - extended + no + deprecated + 19 + 21 ***/ #include "asterisk.h" @@ -3163,7 +3166,7 @@ static int reload(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Open Settlement Protocol Applications", - .support_level = AST_MODULE_SUPPORT_EXTENDED, + .support_level = AST_MODULE_SUPPORT_DEPRECATED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/apps/app_url.c b/apps/app_url.c index aced49e839..08e1ec54c6 100644 --- a/apps/app_url.c +++ b/apps/app_url.c @@ -27,6 +27,8 @@ /*** MODULEINFO deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c index 932d98f5f4..84e19b9622 100644 --- a/cdr/cdr_syslog.c +++ b/cdr/cdr_syslog.c @@ -40,6 +40,8 @@ syslog no deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index a5dead1a2e..2e6e1f235b 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -34,7 +34,10 @@ /*** MODULEINFO alsa - extended + no + deprecated + 19 + 21 ***/ #include "asterisk.h" @@ -1036,7 +1039,7 @@ static int load_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ALSA Console Channel Driver", - .support_level = AST_MODULE_SUPPORT_EXTENDED, + .support_level = AST_MODULE_SUPPORT_DEPRECATED, .load = load_module, .unload = unload_module, .load_pri = AST_MODPRI_CHANNEL_DRIVER, diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index 2c8c5253bf..9a43a298ab 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -35,7 +35,10 @@ /*** MODULEINFO res_pktccops - extended + no + deprecated + 19 + 21 ***/ #include "asterisk.h" @@ -5016,7 +5019,7 @@ static int unload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control Protocol (MGCP)", - .support_level = AST_MODULE_SUPPORT_EXTENDED, + .support_level = AST_MODULE_SUPPORT_DEPRECATED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index d17c4ad32e..546bb2be94 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -78,6 +78,8 @@ suppserv deprecated chan_dahdi + 16 + 19 ***/ #include "asterisk.h" diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c index 9a9e2669f8..c7c842ae34 100644 --- a/channels/chan_nbs.c +++ b/channels/chan_nbs.c @@ -28,6 +28,8 @@ /*** MODULEINFO nbs deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 7dde84fe66..69dd71f1ee 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -41,6 +41,8 @@ /*** MODULEINFO oss deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/channels/chan_phone.c b/channels/chan_phone.c index 9c7703751a..66c911b301 100644 --- a/channels/chan_phone.c +++ b/channels/chan_phone.c @@ -36,6 +36,8 @@ /*** MODULEINFO ixjuser deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/channels/chan_sip.c b/channels/chan_sip.c index d00d615ba0..2436808651 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -178,6 +178,8 @@ res_http_websocket no deprecated + 17 + 21 ***/ /*! \page sip_session_timers SIP Session Timers in Asterisk Chan_sip diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 17bc0390dc..05ec46fd60 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -34,7 +34,10 @@ */ /*** MODULEINFO - extended + no + deprecated + 19 + 21 ***/ #include "asterisk.h" @@ -8824,7 +8827,7 @@ static int reload(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Skinny Client Control Protocol (Skinny)", - .support_level = AST_MODULE_SUPPORT_EXTENDED, + .support_level = AST_MODULE_SUPPORT_DEPRECATED, .load = load_module, .unload = unload_module, .reload = reload, diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index cde5d483b9..9bcf3059ec 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -51,6 +51,8 @@ vpb no deprecated + 16 + 19 ***/ #include diff --git a/doc/UPGRADE-staging/app_meetme_deprecation.txt b/doc/UPGRADE-staging/app_meetme_deprecation.txt new file mode 100644 index 0000000000..23f7d4d581 --- /dev/null +++ b/doc/UPGRADE-staging/app_meetme_deprecation.txt @@ -0,0 +1,6 @@ +Subject: app_meetme +Master-Only: True + +This module is now deprecated and will no +longer be built by default. It is scheduled +to be removed as of Asterisk 21. diff --git a/doc/UPGRADE-staging/app_osplookup_deprecation.txt b/doc/UPGRADE-staging/app_osplookup_deprecation.txt new file mode 100644 index 0000000000..27e3bb6d26 --- /dev/null +++ b/doc/UPGRADE-staging/app_osplookup_deprecation.txt @@ -0,0 +1,6 @@ +Subject: app_osplookup +Master-Only: True + +This module is now deprecated and will no +longer be built by default. It is scheduled +to be removed as of Asterisk 21. diff --git a/doc/UPGRADE-staging/chan_alsa_deprecation.txt b/doc/UPGRADE-staging/chan_alsa_deprecation.txt new file mode 100644 index 0000000000..04edcf0073 --- /dev/null +++ b/doc/UPGRADE-staging/chan_alsa_deprecation.txt @@ -0,0 +1,6 @@ +Subject: chan_alsa +Master-Only: True + +This module is now deprecated and will no +longer be built by default. It is scheduled +to be removed as of Asterisk 21. diff --git a/doc/UPGRADE-staging/chan_mgcp_deprecation.txt b/doc/UPGRADE-staging/chan_mgcp_deprecation.txt new file mode 100644 index 0000000000..1d0d592978 --- /dev/null +++ b/doc/UPGRADE-staging/chan_mgcp_deprecation.txt @@ -0,0 +1,6 @@ +Subject: chan_mgcp +Master-Only: True + +This module is now deprecated and will no +longer be built by default. It is scheduled +to be removed as of Asterisk 21. diff --git a/doc/UPGRADE-staging/chan_skinny_deprecation.txt b/doc/UPGRADE-staging/chan_skinny_deprecation.txt new file mode 100644 index 0000000000..0f840fb958 --- /dev/null +++ b/doc/UPGRADE-staging/chan_skinny_deprecation.txt @@ -0,0 +1,6 @@ +Subject: chan_skinny +Master-Only: True + +This module is now deprecated and will no +longer be built by default. It is scheduled +to be removed as of Asterisk 21. diff --git a/doc/UPGRADE-staging/res_pktccops_deprecation.txt b/doc/UPGRADE-staging/res_pktccops_deprecation.txt new file mode 100644 index 0000000000..38acea1a03 --- /dev/null +++ b/doc/UPGRADE-staging/res_pktccops_deprecation.txt @@ -0,0 +1,6 @@ +Subject: res_pktccops +Master-Only: True + +This module is now deprecated and will no +longer be built by default. It is scheduled +to be removed as of Asterisk 21. diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c index 323d2249b2..232600018c 100644 --- a/res/res_config_sqlite.c +++ b/res/res_config_sqlite.c @@ -83,6 +83,8 @@ /*** MODULEINFO sqlite deprecated + 16 + 19 ***/ #include "asterisk.h" diff --git a/res/res_monitor.c b/res/res_monitor.c index efedab7c37..235dc2d587 100644 --- a/res/res_monitor.c +++ b/res/res_monitor.c @@ -27,6 +27,8 @@ func_periodic_hook deprecated app_mixmonitor + 16 + 21 ***/ #include "asterisk.h" diff --git a/res/res_pktccops.c b/res/res_pktccops.c index 9beabfb3d5..eb1f79f3cd 100644 --- a/res/res_pktccops.c +++ b/res/res_pktccops.c @@ -32,7 +32,9 @@ /*** MODULEINFO no - extended + deprecated + 19 + 21 ***/ #include "asterisk.h" @@ -1509,7 +1511,7 @@ static int reload_module(void) } AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "PktcCOPS manager for MGCP", - .support_level = AST_MODULE_SUPPORT_EXTENDED, + .support_level = AST_MODULE_SUPPORT_DEPRECATED, .load = load_module, .unload = unload_module, .reload = reload_module, diff --git a/utils/conf2ael.c b/utils/conf2ael.c index 0a327ececd..f668c3f3c8 100644 --- a/utils/conf2ael.c +++ b/utils/conf2ael.c @@ -25,6 +25,8 @@ /*** MODULEINFO res_ael_share deprecated + 16 + 19 ***/ #define ASTMM_LIBC ASTMM_IGNORE diff --git a/utils/muted.c b/utils/muted.c index 87a678f311..5376ba7d44 100644 --- a/utils/muted.c +++ b/utils/muted.c @@ -46,6 +46,8 @@ /*** MODULEINFO deprecated + 16 + 19 ***/ #include "asterisk/autoconfig.h"