[Asterisk-code-review] policy: Deprecate modules and add versions to others. (asterisk[master])
Friendly Automation
asteriskteam at digium.com
Mon Aug 16 11:56:44 CDT 2021
Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/16277 )
Change subject: policy: Deprecate modules and add versions to others.
......................................................................
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
---
M addons/app_mysql.c
M addons/cdr_mysql.c
M apps/app_dahdiras.c
M apps/app_fax.c
M apps/app_ices.c
M apps/app_image.c
M apps/app_macro.c
M apps/app_meetme.c
M apps/app_nbscat.c
M apps/app_osplookup.c
M apps/app_url.c
M cdr/cdr_syslog.c
M channels/chan_alsa.c
M channels/chan_mgcp.c
M channels/chan_misdn.c
M channels/chan_nbs.c
M channels/chan_oss.c
M channels/chan_phone.c
M channels/chan_sip.c
M channels/chan_skinny.c
M channels/chan_vpb.cc
A doc/UPGRADE-staging/app_meetme_deprecation.txt
A doc/UPGRADE-staging/app_osplookup_deprecation.txt
A doc/UPGRADE-staging/chan_alsa_deprecation.txt
A doc/UPGRADE-staging/chan_mgcp_deprecation.txt
A doc/UPGRADE-staging/chan_skinny_deprecation.txt
A doc/UPGRADE-staging/res_pktccops_deprecation.txt
M res/res_config_sqlite.c
M res/res_monitor.c
M res/res_pktccops.c
M utils/conf2ael.c
M utils/muted.c
32 files changed, 104 insertions(+), 12 deletions(-)
Approvals:
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 1a79afe..6e35a7c 100644
--- a/addons/app_mysql.c
+++ b/addons/app_mysql.c
@@ -37,6 +37,8 @@
<defaultenabled>no</defaultenabled>
<support_level>deprecated</support_level>
<replacement>func_odbc</replacement>
+ <deprecated_in>1.8</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index c05b86a..25f8762 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -38,6 +38,8 @@
<defaultenabled>no</defaultenabled>
<support_level>deprecated</support_level>
<replacement>cdr_adaptive_odbc</replacement>
+ <deprecated_in>1.8</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index b5b1ae9..d2ec137 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -28,6 +28,8 @@
/*** MODULEINFO
<depend>dahdi</depend>
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/apps/app_fax.c b/apps/app_fax.c
index 2404773..442df66 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -18,6 +18,8 @@
<defaultenabled>no</defaultenabled>
<support_level>deprecated</support_level>
<replacement>res_fax</replacement>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
/* Needed for spandsp headers */
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 29127fc..38c68c0 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -29,6 +29,8 @@
/*** MODULEINFO
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/apps/app_image.c b/apps/app_image.c
index 5d70c8c..53754ed 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -27,6 +27,8 @@
/*** MODULEINFO
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/apps/app_macro.c b/apps/app_macro.c
index 36632dc..3f7632a 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -29,6 +29,8 @@
<defaultenabled>no</defaultenabled>
<support_level>deprecated</support_level>
<replacement>app_stack (GoSub)</replacement>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>21</removed_in>
***/
#include "asterisk.h"
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 0f0baab..27d985b 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -41,8 +41,10 @@
/*** MODULEINFO
<depend>dahdi</depend>
<defaultenabled>no</defaultenabled>
- <support_level>extended</support_level>
+ <support_level>deprecated</support_level>
<replacement>app_confbridge</replacement>
+ <deprecated_in>19</deprecated_in>
+ <removed_in>21</removed_in>
***/
#include "asterisk.h"
@@ -8076,7 +8078,7 @@
}
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 a7fccaf..c714cbb 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -27,6 +27,8 @@
/*** MODULEINFO
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 4e6e5df..f80324f 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -31,7 +31,10 @@
/*** MODULEINFO
<depend>osptk</depend>
<depend>openssl</depend>
- <support_level>extended</support_level>
+ <defaultenabled>no</defaultenabled>
+ <support_level>deprecated</support_level>
+ <deprecated_in>19</deprecated_in>
+ <removed_in>21</removed_in>
***/
#include "asterisk.h"
@@ -3163,7 +3166,7 @@
}
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 aced49e..08e1ec5 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -27,6 +27,8 @@
/*** MODULEINFO
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index 932d98f..84e19b9 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -40,6 +40,8 @@
<depend>syslog</depend>
<defaultenabled>no</defaultenabled>
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index a5dead1..2e6e1f2 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -34,7 +34,10 @@
/*** MODULEINFO
<depend>alsa</depend>
- <support_level>extended</support_level>
+ <defaultenabled>no</defaultenabled>
+ <support_level>deprecated</support_level>
+ <deprecated_in>19</deprecated_in>
+ <removed_in>21</removed_in>
***/
#include "asterisk.h"
@@ -1036,7 +1039,7 @@
}
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 2c8c525..9a43a29 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -35,7 +35,10 @@
/*** MODULEINFO
<use type="module">res_pktccops</use>
- <support_level>extended</support_level>
+ <defaultenabled>no</defaultenabled>
+ <support_level>deprecated</support_level>
+ <deprecated_in>19</deprecated_in>
+ <removed_in>21</removed_in>
***/
#include "asterisk.h"
@@ -5016,7 +5019,7 @@
}
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 d17c4ad..546bb2b 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -78,6 +78,8 @@
<depend>suppserv</depend>
<support_level>deprecated</support_level>
<replacement>chan_dahdi</replacement>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index 9a9e266..c7c842a 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -28,6 +28,8 @@
/*** MODULEINFO
<depend>nbs</depend>
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 7dde84f..69dd71f 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -41,6 +41,8 @@
/*** MODULEINFO
<depend>oss</depend>
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 9c77037..66c911b 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -36,6 +36,8 @@
/*** MODULEINFO
<depend>ixjuser</depend>
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d00d615..2436808 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -178,6 +178,8 @@
<use type="module">res_http_websocket</use>
<defaultenabled>no</defaultenabled>
<support_level>deprecated</support_level>
+ <deprecated_in>17</deprecated_in>
+ <removed_in>21</removed_in>
***/
/*! \page sip_session_timers SIP Session Timers in Asterisk Chan_sip
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 17bc039..05ec46f 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -34,7 +34,10 @@
*/
/*** MODULEINFO
- <support_level>extended</support_level>
+ <defaultenabled>no</defaultenabled>
+ <support_level>deprecated</support_level>
+ <deprecated_in>19</deprecated_in>
+ <removed_in>21</removed_in>
***/
#include "asterisk.h"
@@ -8824,7 +8827,7 @@
}
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 cde5d48..9bcf305 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -51,6 +51,8 @@
<depend>vpb</depend>
<defaultenabled>no</defaultenabled>
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include <vpbapi.h>
diff --git a/doc/UPGRADE-staging/app_meetme_deprecation.txt b/doc/UPGRADE-staging/app_meetme_deprecation.txt
new file mode 100644
index 0000000..23f7d4d
--- /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 0000000..27e3bb6
--- /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 0000000..04edcf0
--- /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 0000000..1d0d592
--- /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 0000000..0f840fb
--- /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 0000000..38acea1
--- /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 323d224..2326000 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -83,6 +83,8 @@
/*** MODULEINFO
<depend>sqlite</depend>
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk.h"
diff --git a/res/res_monitor.c b/res/res_monitor.c
index efedab7..235dc2d 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -27,6 +27,8 @@
<use type="module">func_periodic_hook</use>
<support_level>deprecated</support_level>
<replacement>app_mixmonitor</replacement>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>21</removed_in>
***/
#include "asterisk.h"
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index 9beabfb..eb1f79f 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -32,7 +32,9 @@
/*** MODULEINFO
<defaultenabled>no</defaultenabled>
- <support_level>extended</support_level>
+ <support_level>deprecated</support_level>
+ <deprecated_in>19</deprecated_in>
+ <removed_in>21</removed_in>
***/
#include "asterisk.h"
@@ -1509,7 +1511,7 @@
}
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 0a327ec..f668c3f 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -25,6 +25,8 @@
/*** MODULEINFO
<depend>res_ael_share</depend>
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#define ASTMM_LIBC ASTMM_IGNORE
diff --git a/utils/muted.c b/utils/muted.c
index 87a678f..5376ba7 100644
--- a/utils/muted.c
+++ b/utils/muted.c
@@ -46,6 +46,8 @@
/*** MODULEINFO
<support_level>deprecated</support_level>
+ <deprecated_in>16</deprecated_in>
+ <removed_in>19</removed_in>
***/
#include "asterisk/autoconfig.h"
--
To view, visit https://gerrit.asterisk.org/c/asterisk/+/16277
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Change-Id: Ic3bee31a10d42c4b3bbc913d893f7b2a28a27131
Gerrit-Change-Number: 16277
Gerrit-PatchSet: 5
Gerrit-Owner: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at sangoma.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20210816/227ca4ed/attachment-0001.html>
More information about the asterisk-code-review
mailing list