[Pkg-voip-commits] [asterisk] 01/01: use pbx_lua patch for asterisk 11 branch

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit 7607d3c2f7bac8ea122ddc566df2add21de5f3ef
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Thu Aug 7 10:11:24 2014 +0200

    use pbx_lua patch for asterisk 11 branch
---
 debian/patches/pbx_lua_regression.patch | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/debian/patches/pbx_lua_regression.patch b/debian/patches/pbx_lua_regression.patch
index ca7c637..23219ed 100644
--- a/debian/patches/pbx_lua_regression.patch
+++ b/debian/patches/pbx_lua_regression.patch
@@ -1,6 +1,6 @@
-commit 48c0e63c92142e3608e18c3f08b7926964cd1502
+commit 918e60b89e227d528b8a8fbbd03a98fc475b5177
 Author: George Joseph <george.joseph at fairview5.com>
-Date:   Wed Aug 6 16:12:26 2014 +0000
+Date:   Wed Aug 6 16:08:07 2014 +0000
 
     pbx_lua: fix regression with global sym export and context clash by pbx_config.
     
@@ -34,21 +34,15 @@ Date:   Wed Aug 6 16:12:26 2014 +0000
     ........
     
     Merged revisions 420146 from http://svn.asterisk.org/svn/asterisk/branches/1.8
-    ........
-    
-    Merged revisions 420147 from http://svn.asterisk.org/svn/asterisk/branches/11
-    ........
-    
-    Merged revisions 420148 from http://svn.asterisk.org/svn/asterisk/branches/12
     
     
-    git-svn-id: http://svn.asterisk.org/svn/asterisk/trunk@420149 f38db490-d61c-443f-a65b-d21fe96a405b
+    git-svn-id: http://svn.asterisk.org/svn/asterisk/branches/11@420147 f38db490-d61c-443f-a65b-d21fe96a405b
 
 diff --git a/main/pbx.c b/main/pbx.c
-index 4004e14..2dda200 100644
+index 347078c..3903cd0 100644
 --- a/main/pbx.c
 +++ b/main/pbx.c
-@@ -8828,6 +8828,11 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab *
+@@ -8891,6 +8891,11 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab *
  			ast_hashtab_end_traversal(prio_iter);
  		}
  		ast_hashtab_end_traversal(exten_iter);
@@ -61,15 +55,15 @@ index 4004e14..2dda200 100644
  
  	if (!insert_count && !new && (strcmp(context->registrar, registrar) != 0 ||
 diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
-index ece8984..77762e2 100644
+index f3cfe95..70dfd81 100644
 --- a/pbx/pbx_lua.c
 +++ b/pbx/pbx_lua.c
-@@ -1672,7 +1672,7 @@ static int load_module(void)
+@@ -1673,7 +1673,7 @@ static int load_module(void)
  	return AST_MODULE_LOAD_SUCCESS;
  }
  
 -AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Lua PBX Switch",
 +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Lua PBX Switch",
- 		.support_level = AST_MODULE_SUPPORT_EXTENDED,
  		.load = load_module,
  		.unload = unload_module,
+ 		.reload = reload,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git