[asterisk-commits] irroot: branch irroot/distrotech-customers-1.8 r340881 - in /team/irroot/dist...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Oct 14 11:47:11 CDT 2011
Author: irroot
Date: Fri Oct 14 11:47:05 2011
New Revision: 340881
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=340881
Log:
Multiple revisions 340863,340878
........
r340863 | jrose | 2011-10-14 17:58:44 +0200 (Fri, 14 Oct 2011) | 5 lines
Fixes some support level info so that it can be read by menuselect.
(issue ASTERISK-18268)
Review: https://reviewboard.asterisk.org/r/1525/
........
r340878 | twilson | 2011-10-14 18:33:28 +0200 (Fri, 14 Oct 2011) | 8 lines
Avoid unnecessary WARNING message
Add AST_CONTROL_UPDATE_RTP_PEER frame to be ignored here to avoid
displaying a WARNING message.
(closes issue ASTERISK-18610)
Patch by: Kristijan_Vrban
........
Merged revisions 340863,340878 from http://svn.asterisk.org/svn/asterisk/branches/1.8
Modified:
team/irroot/distrotech-customers-1.8/ (props changed)
team/irroot/distrotech-customers-1.8/apps/app_celgenuserevent.c
team/irroot/distrotech-customers-1.8/apps/app_system.c
team/irroot/distrotech-customers-1.8/build_tools/cflags.xml
team/irroot/distrotech-customers-1.8/codecs/codec_dahdi.c
team/irroot/distrotech-customers-1.8/funcs/func_realtime.c
team/irroot/distrotech-customers-1.8/main/channel.c
team/irroot/distrotech-customers-1.8/res/res_curl.c
team/irroot/distrotech-customers-1.8/res/res_fax.c
team/irroot/distrotech-customers-1.8/utils/utils.xml
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
automerge = *
Propchange: team/irroot/distrotech-customers-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Oct 14 11:47:05 2011
@@ -1,1 +1,1 @@
-/branches/1.8:1-340822
+/branches/1.8:1-340879
Modified: team/irroot/distrotech-customers-1.8/apps/app_celgenuserevent.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/apps/app_celgenuserevent.c?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/apps/app_celgenuserevent.c (original)
+++ team/irroot/distrotech-customers-1.8/apps/app_celgenuserevent.c Fri Oct 14 11:47:05 2011
@@ -22,6 +22,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-1.8/apps/app_system.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/apps/app_system.c?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/apps/app_system.c (original)
+++ team/irroot/distrotech-customers-1.8/apps/app_system.c Fri Oct 14 11:47:05 2011
@@ -24,6 +24,10 @@
*
* \ingroup applications
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-1.8/build_tools/cflags.xml
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/build_tools/cflags.xml?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/build_tools/cflags.xml (original)
+++ team/irroot/distrotech-customers-1.8/build_tools/cflags.xml Fri Oct 14 11:47:05 2011
@@ -1,15 +1,19 @@
<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
<member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
+ <support_level>core</support_level>
</member>
<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
+ <support_level>core</support_level>
</member>
<member name="STATIC_BUILD" displayname="Build static binaries">
<support_level>extended</support_level>
</member>
<member name="LOADABLE_MODULES" displayname="Runtime module loading">
+ <support_level>core</support_level>
<defaultenabled>yes</defaultenabled>
</member>
<member name="DEBUG_FD_LEAKS" displayname="Enable File Descriptor Leak Detection">
+ <support_level>core</support_level>
</member>
<member name="REBUILD_PARSERS" displayname="Rebuild AEL and expression parsers from bison/flex source files">
<depend>bison</depend>
@@ -32,6 +36,7 @@
<support_level>extended</support_level>
</member>
<member name="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans">
+ <support_level>core</support_level>
</member>
<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
<support_level>extended</support_level>
@@ -53,6 +58,7 @@
<support_level>extended</support_level>
</member>
<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
+ <support_level>core</support_level>
</member>
<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
<conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>
Modified: team/irroot/distrotech-customers-1.8/codecs/codec_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/codecs/codec_dahdi.c?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/codecs/codec_dahdi.c (original)
+++ team/irroot/distrotech-customers-1.8/codecs/codec_dahdi.c Fri Oct 14 11:47:05 2011
@@ -27,6 +27,7 @@
*/
/*** MODULEINFO
+ <support_level>core</support_level>
<depend>dahdi</depend>
***/
Modified: team/irroot/distrotech-customers-1.8/funcs/func_realtime.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/funcs/func_realtime.c?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/funcs/func_realtime.c (original)
+++ team/irroot/distrotech-customers-1.8/funcs/func_realtime.c Fri Oct 14 11:47:05 2011
@@ -14,6 +14,10 @@
* channels for your use.
*
*/
+
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
/*! \file
*
Modified: team/irroot/distrotech-customers-1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/main/channel.c?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/main/channel.c (original)
+++ team/irroot/distrotech-customers-1.8/main/channel.c Fri Oct 14 11:47:05 2011
@@ -3562,6 +3562,7 @@
case AST_CONTROL_SRCCHANGE:
case AST_CONTROL_CONNECTED_LINE:
case AST_CONTROL_REDIRECTING:
+ case AST_CONTROL_UPDATE_RTP_PEER:
case -1:
/* Unimportant */
break;
Modified: team/irroot/distrotech-customers-1.8/res/res_curl.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/res/res_curl.c?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/res/res_curl.c (original)
+++ team/irroot/distrotech-customers-1.8/res/res_curl.c Fri Oct 14 11:47:05 2011
@@ -27,6 +27,7 @@
*/
/*** MODULEINFO
+ <support_level>core</support_level>
<depend>curl</depend>
***/
Modified: team/irroot/distrotech-customers-1.8/res/res_fax.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/res/res_fax.c?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/res/res_fax.c (original)
+++ team/irroot/distrotech-customers-1.8/res/res_fax.c Fri Oct 14 11:47:05 2011
@@ -35,6 +35,7 @@
*/
/*** MODULEINFO
+ <support_level>core</support_level>
<conflict>app_fax</conflict>
***/
@@ -46,16 +47,12 @@
* \author Kevin P. Fleming <kpfleming at digium.com>
* \author Matthew Nicholson <mnicholson at digium.com>
* \author Gregory H. Nietsky <gregory at distrotech.co.za>
- *
+ *
* A generic FAX resource module that provides SendFAX and ReceiveFAX applications.
* This module requires FAX technology modules, like res_fax_spandsp, to register with it
* so it can use the technology modules to perform the actual FAX transmissions.
* \ingroup applications
*/
-
-/*** MODULEINFO
- <support_level>core</support_level>
- ***/
#include "asterisk.h"
Modified: team/irroot/distrotech-customers-1.8/utils/utils.xml
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-1.8/utils/utils.xml?view=diff&rev=340881&r1=340880&r2=340881
==============================================================================
--- team/irroot/distrotech-customers-1.8/utils/utils.xml (original)
+++ team/irroot/distrotech-customers-1.8/utils/utils.xml Fri Oct 14 11:47:05 2011
@@ -5,6 +5,7 @@
</member>
<member name="astcanary">
<defaultenabled>yes</defaultenabled>
+ <support_level>core</support_level>
</member>
<member name="astman">
<defaultenabled>no</defaultenabled>
More information about the asterisk-commits
mailing list