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

diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 1a79afebdbffc98f61e64ef6cf59a0a53bb15dd0..6e35a7c5fafb0dea7e051f0f6e2b438100589a19 100644 (file)
--- 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 c05b86a25f59289931646da33b055438fc2a98a3..25f8762c6131a964b1298d678b495d09912ebc96 100644 (file)
--- 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 b5b1ae91c45c57305422b96afdf62568226270e4..d2ec137b4fb217f78bcb39dbbc6308481c731666 100644 (file)
--- 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 2404773d0d10bfb07e8f665d07150f22a4ccda96..442df6666b6e8f70f7325d6e7d089fb19ca1a18f 100644 (file)
--- 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 29127fc303fc9ae681ce01eea45afed1936f59ee..38c68c0cae753f8a97cf0d7d07bd33439b4f40e6 100644 (file)
--- 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 5d70c8cd308a75b2568a84ab3be200f6d57a4b53..53754eda64dbb1003782dd53300ee2a1c6160469 100644 (file)
--- 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 36632dc4c7719b7b1e41f670999096e751bf9d4d..3f7632a86dc0bcd31f1376669167cec4fe195f21 100644 (file)
--- 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 0f0baabca5f0d7bbea16a9f59074c2a7607d760b..27d985b04eae44eb035331b188cfeaac64e02a84 100644 (file)
--- 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 @@ 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 a7fccaf0d9b42b83b8b7e76f2bd491adccb51f6e..c714cbb64b8d35cbfc6df9c77ce97631db0def05 100644 (file)
--- 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 4e6e5df2b4822a04e80648e45d4a0655fb52c097..f80324f80a62e578c0dc8fe7b02c8f4706060553 100644 (file)
--- 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 @@ 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 aced49e839c65ca866614b585b1fa371b928e527..08e1ec54c6939aba79c408f187cae8ac79f1ec2c 100644 (file)
--- 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 932d98f5f474008d9ef28148fd4c19fc255f3026..84e19b9622e8c75869c4dc9b3b71de8e66092bbe 100644 (file)
--- 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 a5dead1a2ef41acdef335a59ffb2d825fc686fb1..2e6e1f235ba98ceac2c69fb5972a3cc0f8108d64 100644 (file)
--- 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 @@ 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 2c8c5253bf9c19c8844a37e2472a4c971e506dd4..9a43a298abe0c6e3cc4c378dd6062ed93df0944f 100644 (file)
--- 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 @@ 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 d17c4ad32ee4f90351ce99dccfb7d0008603a772..546bb2be94392bce69429b458981962c7d10706c 100644 (file)
--- 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 9a9e2669f88f89f9d6f62c9bc7b9fa8ed033b5c1..c7c842ae34c433b591771f112a89626a4568e1bd 100644 (file)
--- 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 7dde84fe660b3f0e56f81b7c7a6c110285a9968b..69dd71f1eea821ad2de3979eda00870a703eb0cc 100644 (file)
--- 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 9c7703751a426974ebfce7d9bc41a11a164bd935..66c911b30183a5224dfe0ae25187a11434f4951b 100644 (file)
--- 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 d00d615ba035838d814a5810e4be937339319e91..24368086519b40a46df0950a3b27df25aab27083 100644 (file)
--- 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 17bc0390dc1c07a737fa00ae3e74dca1ef467936..05ec46fd60718cd3ed9e6547e3870279e64a94e9 100644 (file)
--- 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 @@ 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 cde5d483b919ac065e5a86c07f1affe1c703b760..9bcf3059ec5be4d29b2843b0b7692cb1bf5ee17f 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 (file)
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 323d2249b2841ca90daf9bbf9e40b5e7453dc8a5..232600018c4e7f2ee355a97b7fbc49d382066038 100644 (file)
--- 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 efedab7c3734b00f2c33f3c125d4847e412f2831..235dc2d5874824de7e7317f5cb7fddf89195f625 100644 (file)
--- 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 9beabfb3d5b613acb157ef5b6bfcac6e14755e22..eb1f79f3cdad026b4b41cc8a66eb300b72a35a22 100644 (file)
--- 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 @@ 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 0a327ececd8b8c570af7d2e6a583335b8e8f94e8..f668c3f3c842d3e53e3277678af790392c28091c 100644 (file)
--- 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 87a678f3113adb8cfa177562e16981db40022f01..5376ba7d4421e7be6b257c07dc32370ade5cb121 100644 (file)
--- 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"