[asterisk-commits] murf: branch murf/AEL2-1.2 r51459 -
/team/murf/AEL2-1.2/patches/diffs.AEL2.patch
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Mon Jan 22 14:28:41 MST 2007
Author: murf
Date: Mon Jan 22 15:28:40 2007
New Revision: 51459
URL: http://svn.digium.com/view/asterisk?view=rev&rev=51459
Log:
Updated the patch to reflect fixes via 8836
Modified:
team/murf/AEL2-1.2/patches/diffs.AEL2.patch
Modified: team/murf/AEL2-1.2/patches/diffs.AEL2.patch
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2-1.2/patches/diffs.AEL2.patch?view=diff&rev=51459&r1=51458&r2=51459
==============================================================================
--- team/murf/AEL2-1.2/patches/diffs.AEL2.patch (original)
+++ team/murf/AEL2-1.2/patches/diffs.AEL2.patch Mon Jan 22 15:28:40 2007
@@ -1,7 +1,7 @@
Index: pbx/argdesc.y
===================================================================
--- pbx/argdesc.y (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/argdesc.y (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,268 @@
+%{
+#include <stdio.h>
@@ -284,7 +284,7 @@
Index: pbx/ael.tab.c
===================================================================
--- pbx/ael.tab.c (.../branches/1.2) (revision 0)
-+++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael.tab.c (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,3334 @@
+/* A Bison parser, made by GNU Bison 2.1a. */
+
@@ -3633,7 +3633,7 @@
Index: pbx/ael_lex.c
===================================================================
--- pbx/ael_lex.c (.../branches/1.2) (revision 0)
-+++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael_lex.c (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,3015 @@
+#line 2 "ael_lex.c"
+
@@ -6660,10 +6660,30 @@
Name: svn:keywords
+ Author Date Id Revision
+Index: pbx/pbx_ael.c
+===================================================================
+--- pbx/pbx_ael.c (.../branches/1.2) (revision 51457)
++++ pbx/pbx_ael.c (.../team/murf/AEL2-1.2) (revision 51457)
+@@ -1258,7 +1258,6 @@
+
+ static int ael_reload(int fd, int argc, char *argv[])
+ {
+- ast_context_destroy(NULL, registrar);
+ return (pbx_load_module());
+ }
+
+@@ -1290,7 +1289,6 @@
+
+ int reload(void)
+ {
+- ast_context_destroy(NULL, registrar);
+ return pbx_load_module();
+ }
+
Index: pbx/ael.tab.h
===================================================================
--- pbx/ael.tab.h (.../branches/1.2) (revision 0)
-+++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael.tab.h (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,150 @@
+/* A Bison parser, made by GNU Bison 2.1a. */
+
@@ -6828,7 +6848,7 @@
Index: pbx/argdesc.tab.c
===================================================================
--- pbx/argdesc.tab.c (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/argdesc.tab.c (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,1730 @@
+/* A Bison parser, made by GNU Bison 2.0. */
+
@@ -8573,7 +8593,7 @@
Index: pbx/ael.flex
===================================================================
--- pbx/ael.flex (.../branches/1.2) (revision 0)
-+++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael.flex (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,594 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
@@ -9182,7 +9202,7 @@
Index: pbx/argdesc_lex.c
===================================================================
--- pbx/argdesc_lex.c (.../branches/1.2) (revision 0)
-+++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/argdesc_lex.c (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,2141 @@
+#line 2 "argdesc_lex.c"
+
@@ -11338,7 +11358,7 @@
Index: pbx/argdesc.l
===================================================================
--- pbx/argdesc.l (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/argdesc.l (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,88 @@
+%{
+#include <sys/types.h>
@@ -11441,7 +11461,7 @@
Index: pbx/argdesc.tab.h
===================================================================
--- pbx/argdesc.tab.h (.../branches/1.2) (revision 0)
-+++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/argdesc.tab.h (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,115 @@
+/* A Bison parser, made by GNU Bison 2.0. */
+
@@ -11571,7 +11591,7 @@
Index: pbx/ael.y
===================================================================
--- pbx/ael.y (.../branches/1.2) (revision 0)
-+++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael.y (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,820 @@
+%{
+/*
@@ -12406,7 +12426,7 @@
Index: pbx/applist
===================================================================
--- pbx/applist (.../branches/1.2) (revision 0)
-+++ pbx/applist (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/applist (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,142 @@
+ AddQueueMember: "Dynamically adds queue members"; args=queuename|[interface]|[:penalty#i]|[:options]; options=j; Chanvars=AQMSTATUS:ADDED | MEMBERALREADY | NOSUCHQUEUE;
+ ADSIProg: "Load Asterisk ADSI Scripts into phone"; args=scriptfile;
@@ -12562,8 +12582,8 @@
Index: pbx/Makefile
===================================================================
---- pbx/Makefile (.../branches/1.2) (revision 48453)
-+++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 48453)
+--- pbx/Makefile (.../branches/1.2) (revision 51457)
++++ pbx/Makefile (.../team/murf/AEL2-1.2) (revision 51457)
@@ -12,7 +12,7 @@
#
@@ -12621,7 +12641,7 @@
Index: pbx/pbx_ael2.c
===================================================================
--- pbx/pbx_ael2.c (.../branches/1.2) (revision 0)
-+++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/pbx_ael2.c (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,4326 @@
+/*
+ * Asterisk -- An open source telephony toolkit.
@@ -16962,7 +16982,7 @@
Index: pbx/ael-test/ref.ael-test6
===================================================================
--- pbx/ael-test/ref.ael-test6 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test6 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,45 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17022,7 +17042,7 @@
Index: pbx/ael-test/ref.ael-test7
===================================================================
--- pbx/ael-test/ref.ael-test7 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test7 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,15 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17052,7 +17072,7 @@
Index: pbx/ael-test/ref.ael-test8
===================================================================
--- pbx/ael-test/ref.ael-test8 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test8 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -17080,7 +17100,7 @@
Index: pbx/ael-test/ref.ael-vtest13
===================================================================
--- pbx/ael-test/ref.ael-vtest13 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-vtest13 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-vtest13 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,2875 @@
+[globals]
+static=yes
@@ -19970,7 +19990,7 @@
Index: pbx/ael-test/ael-ntest9/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest9/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest9/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-ntest9/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,12 @@
+
+context workext {
@@ -19999,7 +20019,7 @@
Index: pbx/ael-test/ref.ael-vtest17
===================================================================
--- pbx/ael-test/ref.ael-vtest17 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-vtest17 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-vtest17 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,68 @@
+
+
@@ -20082,7 +20102,7 @@
Index: pbx/ael-test/setref
===================================================================
--- pbx/ael-test/setref (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/setref (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/setref (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
@@ -20106,7 +20126,7 @@
Index: pbx/ael-test/ref.ael-test11
===================================================================
--- pbx/ael-test/ref.ael-test11 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test11 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test11 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,12 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20133,7 +20153,7 @@
Index: pbx/ael-test/ref.ael-test14
===================================================================
--- pbx/ael-test/ref.ael-test14 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test14 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test14 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,11 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20159,7 +20179,7 @@
Index: pbx/ael-test/ref.ael-test15
===================================================================
--- pbx/ael-test/ref.ael-test15 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test15 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test15 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,13 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20187,7 +20207,7 @@
Index: pbx/ael-test/ael-test11/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test11/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test11/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test11/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,56 @@
+context test1
+{
@@ -20258,7 +20278,7 @@
Index: pbx/ael-test/ael-test14/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test14/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test14/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test14/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,20 @@
+context test1
+{
@@ -20293,7 +20313,7 @@
Index: pbx/ael-test/ael-test15/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test15/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test15/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test15/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,17 @@
+/* and some comments
+ would make a nice touch */
@@ -20325,7 +20345,7 @@
Index: pbx/ael-test/runtests
===================================================================
--- pbx/ael-test/runtests (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/runtests (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/runtests (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,56 @@
+#!/bin/bash
+ORIG=`mktemp /tmp/mytest.XXXXXX`
@@ -20398,7 +20418,7 @@
Index: pbx/ael-test/ael-ntest10/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest10/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest10/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-ntest10/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,131 @@
+macro endsess()
+{
@@ -20544,7 +20564,7 @@
Index: pbx/ael-test/ael-ntest12/extensions.ael2
===================================================================
--- pbx/ael-test/ael-ntest12/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-ntest12/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-ntest12/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,13 @@
+context test1
+{
@@ -20572,7 +20592,7 @@
Index: pbx/ael-test/ael-test1/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test1/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test1/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test1/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,163 @@
+
+macro testdial(number, timeout) {
@@ -20750,7 +20770,7 @@
Index: pbx/ael-test/ref.ael-ntest9
===================================================================
--- pbx/ael-test/ref.ael-ntest9 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest9 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-ntest9 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,25 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -20790,7 +20810,7 @@
Index: pbx/ael-test/ael-test2/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test2/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test2/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test2/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -20813,7 +20833,7 @@
Index: pbx/ael-test/ael-test2/apptest.ael2
===================================================================
--- pbx/ael-test/ael-test2/apptest.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test2/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test2/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,146 @@
+// this is a quick test to see how many of the apps we can spot j options in
+// include this in a macro or extension
@@ -20974,7 +20994,7 @@
Index: pbx/ael-test/ael-test3/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test3/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test3/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -24174,7 +24194,7 @@
Index: pbx/ael-test/ael-test3/telemarket_torture.ael2
===================================================================
--- pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test3/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -25003,7 +25023,7 @@
Index: pbx/ael-test/ael-test3/include1.ael2
===================================================================
--- pbx/ael-test/ael-test3/include1.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include1.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test3/include1.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -25021,7 +25041,7 @@
Index: pbx/ael-test/ael-test3/include2.ael2
===================================================================
--- pbx/ael-test/ael-test3/include2.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include2.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test3/include2.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -25040,7 +25060,7 @@
Index: pbx/ael-test/ael-test3/include3.ael2
===================================================================
--- pbx/ael-test/ael-test3/include3.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include3.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test3/include3.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -25057,7 +25077,7 @@
Index: pbx/ael-test/ael-test3/include4.ael2
===================================================================
--- pbx/ael-test/ael-test3/include4.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include4.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test3/include4.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -25074,7 +25094,7 @@
Index: pbx/ael-test/ael-test3/include5.ael2
===================================================================
--- pbx/ael-test/ael-test3/include5.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test3/include5.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test3/include5.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -25090,7 +25110,7 @@
Index: pbx/ael-test/ael-test4/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test4/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test4/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test4/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,8 @@
+context test1
+{
@@ -25113,7 +25133,7 @@
Index: pbx/ael-test/ael-test4/apptest.ael2
===================================================================
--- pbx/ael-test/ael-test4/apptest.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test4/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test4/apptest.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,146 @@
+// this is a quick test to see how many of the apps we can spot j options in
+// include this in a macro or extension
@@ -25274,7 +25294,7 @@
Index: pbx/ael-test/ael-test5/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test5/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test5/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test5/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -26122,7 +26142,7 @@
Index: pbx/ael-test/ael-test5/extensions.ael.orig
===================================================================
--- pbx/ael-test/ael-test5/extensions.ael.orig (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test5/extensions.ael.orig (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test5/extensions.ael.orig (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -26970,7 +26990,7 @@
Index: pbx/ael-test/ael-test6/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test6/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test6/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test6/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,833 @@
+///////////////////////////////////////////////////////////////////////////////
+// Helpdesk Queue
@@ -27818,7 +27838,7 @@
Index: pbx/ael-test/ael-test7/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test7/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test7/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test7/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,460 @@
+//
+// Example AEL config file
@@ -28293,7 +28313,7 @@
Index: pbx/ael-test/ael-test8/extensions.ael2
===================================================================
--- pbx/ael-test/ael-test8/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-test8/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-test8/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,27 @@
+context default
+{
@@ -28335,7 +28355,7 @@
Index: pbx/ael-test/ref.ael-ntest10
===================================================================
--- pbx/ael-test/ref.ael-ntest10 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest10 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-ntest10 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,129 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -28479,7 +28499,7 @@
Index: pbx/ael-test/ael-vtest13/extensions.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-vtest13/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,3183 @@
+globals
+{
@@ -31679,7 +31699,7 @@
Index: pbx/ael-test/ael-vtest13/telemarket_torture.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-vtest13/telemarket_torture.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,812 @@
+//
+// AN EXCERSIZE IN BAD DIALPLAN DESIGN
@@ -32508,7 +32528,7 @@
Index: pbx/ael-test/ael-vtest13/include1.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include1.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include1.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-vtest13/include1.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,3 @@
+ NoOp(Hello, this is included from include1.ael2);
+ #include "include2.ael2"
@@ -32526,7 +32546,7 @@
Index: pbx/ael-test/ael-vtest13/include2.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include2.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include2.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-vtest13/include2.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,4 @@
+ NoOp(This was included from include2.ael2);
+ #include "include3.ael2"
@@ -32545,7 +32565,7 @@
Index: pbx/ael-test/ael-vtest13/include3.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include3.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include3.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-vtest13/include3.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,2 @@
+ NoOp(This is include3.ael2!);
+ #include "include5.ael2"
@@ -32562,7 +32582,7 @@
Index: pbx/ael-test/ael-vtest13/include4.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include4.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include4.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-vtest13/include4.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,2 @@
+ NoOp(This is include4.ael2! Isn't it cool!?!?!?!);
+ NoOp(4 doesn't include anything);
@@ -32579,7 +32599,7 @@
Index: pbx/ael-test/ael-vtest13/include5.ael2
===================================================================
--- pbx/ael-test/ael-vtest13/include5.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest13/include5.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-vtest13/include5.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1 @@
+ NoOp(Include5.ael2 doesn't include anything, either!);
@@ -32595,7 +32615,7 @@
Index: pbx/ael-test/ref.ael-test1
===================================================================
--- pbx/ael-test/ref.ael-test1 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test1 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test1 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,21 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32631,7 +32651,7 @@
Index: pbx/ael-test/ref.ael-ntest12
===================================================================
--- pbx/ael-test/ref.ael-ntest12 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-ntest12 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-ntest12 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,32 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32678,7 +32698,7 @@
Index: pbx/ael-test/ref.ael-test2
===================================================================
--- pbx/ael-test/ref.ael-test2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,38 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32731,7 +32751,7 @@
Index: pbx/ael-test/ref.ael-test3
===================================================================
--- pbx/ael-test/ref.ael-test3 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test3 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test3 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,21 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32767,7 +32787,7 @@
Index: pbx/ael-test/ael-vtest17/extensions.ael2
===================================================================
--- pbx/ael-test/ael-vtest17/extensions.ael2 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ael-vtest17/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ael-vtest17/extensions.ael2 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,116 @@
+context dialextens
+{
@@ -32898,7 +32918,7 @@
Index: pbx/ael-test/ref.ael-test4
===================================================================
--- pbx/ael-test/ref.ael-test4 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test4 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test4 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,38 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32951,7 +32971,7 @@
Index: pbx/ael-test/ref.ael-test5
===================================================================
--- pbx/ael-test/ref.ael-test5 (.../branches/1.2) (revision 0)
-+++ pbx/ael-test/ref.ael-test5 (.../team/murf/AEL2-1.2) (revision 48453)
++++ pbx/ael-test/ref.ael-test5 (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,23 @@
+
+(If you find progress and other non-error messages irritating, you can use -q to suppress them)
@@ -32988,8 +33008,8 @@
Index: ast_expr2f.c
===================================================================
---- ast_expr2f.c (.../branches/1.2) (revision 48453)
-+++ ast_expr2f.c (.../team/murf/AEL2-1.2) (revision 48453)
+--- ast_expr2f.c (.../branches/1.2) (revision 51457)
++++ ast_expr2f.c (.../team/murf/AEL2-1.2) (revision 51457)
@@ -523,34 +523,34 @@
7, -11, -11, -11, -11, -11, -11, -11, -11, -11,
-11, -11, -11, -11, -11, -11, -11, -11, -11, -11,
@@ -34164,7 +34184,7 @@
Index: doc/ael2.txt
===================================================================
--- doc/ael2.txt (.../branches/1.2) (revision 0)
-+++ doc/ael2.txt (.../team/murf/AEL2-1.2) (revision 48453)
++++ doc/ael2.txt (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,1255 @@
+The Asterisk Extension Language - v 2
+=====================================
@@ -35433,8 +35453,8 @@
Index: ast_expr2.fl
===================================================================
---- ast_expr2.fl (.../branches/1.2) (revision 48453)
-+++ ast_expr2.fl (.../team/murf/AEL2-1.2) (revision 48453)
+--- ast_expr2.fl (.../branches/1.2) (revision 51457)
++++ ast_expr2.fl (.../team/murf/AEL2-1.2) (revision 51457)
@@ -1,7 +1,25 @@
%{
+/*
@@ -35661,8 +35681,8 @@
}
Index: Makefile
===================================================================
---- Makefile (.../branches/1.2) (revision 48453)
-+++ Makefile (.../team/murf/AEL2-1.2) (revision 48453)
+--- Makefile (.../branches/1.2) (revision 51457)
++++ Makefile (.../team/murf/AEL2-1.2) (revision 51457)
@@ -563,14 +563,14 @@
exit 1; \
fi; \
@@ -35689,7 +35709,7 @@
Index: include/asterisk/argdesc.h
===================================================================
--- include/asterisk/argdesc.h (.../branches/1.2) (revision 0)
-+++ include/asterisk/argdesc.h (.../team/murf/AEL2-1.2) (revision 48453)
++++ include/asterisk/argdesc.h (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,55 @@
+#ifndef INC_ARGDESC_H
+
@@ -35759,7 +35779,7 @@
Index: include/asterisk/ael_structs.h
===================================================================
--- include/asterisk/ael_structs.h (.../branches/1.2) (revision 0)
-+++ include/asterisk/ael_structs.h (.../team/murf/AEL2-1.2) (revision 48453)
++++ include/asterisk/ael_structs.h (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,192 @@
+#ifndef _ASTERISK_AEL_STRUCTS_H
+#define _ASTERISK_AEL_STRUCTS_H
@@ -35965,8 +35985,8 @@
Index: ast_expr2.c
===================================================================
---- ast_expr2.c (.../branches/1.2) (revision 48453)
-+++ ast_expr2.c (.../team/murf/AEL2-1.2) (revision 48453)
+--- ast_expr2.c (.../branches/1.2) (revision 51457)
++++ ast_expr2.c (.../team/murf/AEL2-1.2) (revision 51457)
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.0. */
+/* A Bison parser, made by GNU Bison 2.1. */
@@ -37087,8 +37107,8 @@
return make_integer(0);
Index: ast_expr2.h
===================================================================
---- ast_expr2.h (.../branches/1.2) (revision 48453)
-+++ ast_expr2.h (.../team/murf/AEL2-1.2) (revision 48453)
+--- ast_expr2.h (.../branches/1.2) (revision 51457)
++++ ast_expr2.h (.../team/murf/AEL2-1.2) (revision 51457)
@@ -1,7 +1,7 @@
-/* A Bison parser, made by GNU Bison 2.0. */
+/* A Bison parser, made by GNU Bison 2.1. */
@@ -37136,8 +37156,8 @@
# define YYSTYPE_IS_TRIVIAL 1
Index: ast_expr2.y
===================================================================
---- ast_expr2.y (.../branches/1.2) (revision 48453)
-+++ ast_expr2.y (.../team/murf/AEL2-1.2) (revision 48453)
+--- ast_expr2.y (.../branches/1.2) (revision 51457)
++++ ast_expr2.y (.../team/murf/AEL2-1.2) (revision 51457)
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <string.h>
@@ -37302,10 +37322,33 @@
free_value(a);
free_value(b);
return make_integer(0);
+Index: update-patch
+===================================================================
+--- update-patch (.../branches/1.2) (revision 0)
++++ update-patch (.../team/murf/AEL2-1.2) (revision 51457)
+@@ -0,0 +1,6 @@
++#!/bin/bash
++
++ASTSVN=https://origsvn.digium.com/svn
++
++svn diff $ASTSVN/asterisk/branches/1.2 $ASTSVN/asterisk/team/murf/AEL2-1.2 > diffs.AEL2.patch
++
+
+Property changes on: update-patch
+___________________________________________________________________
+Name: svn:eol-style
+ + native
+Name: svn:executable
+ + *
+Name: svn:mime-type
+ + text/plain
+Name: svn:keywords
+ + Author Id Date Revision
+
Index: CREDITS
===================================================================
---- CREDITS (.../branches/1.2) (revision 48453)
-+++ CREDITS (.../team/murf/AEL2-1.2) (revision 48453)
+--- CREDITS (.../branches/1.2) (revision 51457)
++++ CREDITS (.../team/murf/AEL2-1.2) (revision 51457)
@@ -84,7 +84,7 @@
Steve Kann - new jitter buffer for IAX2
stevek at stevek.com
@@ -37317,8 +37360,8 @@
Index: configs/extensions.ael.sample
===================================================================
---- configs/extensions.ael.sample (.../branches/1.2) (revision 48453)
-+++ configs/extensions.ael.sample (.../team/murf/AEL2-1.2) (revision 48453)
+--- configs/extensions.ael.sample (.../branches/1.2) (revision 51457)
++++ configs/extensions.ael.sample (.../team/murf/AEL2-1.2) (revision 51457)
@@ -1,7 +1,308 @@
//
// Example AEL config file
@@ -37745,7 +37788,7 @@
Index: utils/ael_main.c
===================================================================
--- utils/ael_main.c (.../branches/1.2) (revision 0)
-+++ utils/ael_main.c (.../team/murf/AEL2-1.2) (revision 48453)
++++ utils/ael_main.c (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,498 @@
+#include <sys/types.h>
+#include <stdio.h>
@@ -38257,8 +38300,8 @@
Index: utils/Makefile
===================================================================
---- utils/Makefile (.../branches/1.2) (revision 48453)
-+++ utils/Makefile (.../team/murf/AEL2-1.2) (revision 48453)
+--- utils/Makefile (.../branches/1.2) (revision 51457)
++++ utils/Makefile (.../team/murf/AEL2-1.2) (revision 51457)
@@ -20,7 +20,7 @@
CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
endif
@@ -38297,7 +38340,7 @@
Index: utils/expr2.testinput
===================================================================
--- utils/expr2.testinput (.../branches/1.2) (revision 0)
-+++ utils/expr2.testinput (.../team/murf/AEL2-1.2) (revision 48453)
++++ utils/expr2.testinput (.../team/murf/AEL2-1.2) (revision 51457)
@@ -0,0 +1,92 @@
+2 + 2
+ 2 + 2
@@ -38407,7 +38450,7 @@
Name: automerge
+ yessir
Name: svnmerge-integrated
- + /branches/1.2:1-48451
+ + /branches/1.2:1-51426
Name: automerge-email
+ murf at parsetree.com
More information about the asterisk-commits
mailing list