[Pkg-voip-commits] [asterisk] 01/01: prepare packaging for asterisk 11.12.0

[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 fb48503e442e891e9a2ef2498c739597ac54671d
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Aug 20 15:12:31 2014 +0200

    prepare packaging for asterisk 11.12.0
---
 debian/changelog                        |  6 ++-
 debian/patches/pbx_lua_regression.patch | 69 ---------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36c3476..159a7ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-asterisk (1:11.11.0~dfsg-3) UNRELEASED; urgency=medium
+asterisk (1:11.12.0~dfsg-1) unstable; urgency=medium
 
+  * New upstream release.
+    - Drop pbx_lua_regression patch, fixed upstream.
   * Make asterisk Provide asterisk-$$AST_BUILDOPT_SUM (Closes: #689109).
 
- -- Jeremy Lainé <jeremy.laine at m4x.org>  Thu, 07 Aug 2014 17:45:28 +0200
+ -- Jeremy Lainé <jeremy.laine at m4x.org>  Wed, 20 Aug 2014 15:23:03 +0200
 
 asterisk (1:11.11.0~dfsg-2) unstable; urgency=medium
 
diff --git a/debian/patches/pbx_lua_regression.patch b/debian/patches/pbx_lua_regression.patch
deleted file mode 100644
index 23219ed..0000000
--- a/debian/patches/pbx_lua_regression.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 918e60b89e227d528b8a8fbbd03a98fc475b5177
-Author: George Joseph <george.joseph at fairview5.com>
-Date:   Wed Aug 6 16:08:07 2014 +0000
-
-    pbx_lua: fix regression with global sym export and context clash by pbx_config.
-    
-    ASTERISK-23818 (lua contexts being overwritten by contexts of the same name in
-    pbx_config) surfaced because pbx_lua, having the AST_MODFLAG_GLOBAL_SYMBOLS
-    set, was always force loaded before pbx_config.  Since I couldn't find any
-    reason for pbx_lua to export it's symbols to the rest of Asterisk, I simply
-    changed the flag to AST_MODFLAG_DEFAULT.  Problem solved.  What I didn't
-    realize was that the symbols need to be exported not because Asterisk needs
-    them but because any external Lua modules like luasql.mysql need the base
-    Lua language APIs exported (ASTERISK-17279).
-    
-    Back to ASTERISK-23818...  It looks like there's an issue in pbx.c where
-    context_merge was only merging includes, switches and ignore patterns if
-    the context was already existing AND has extensions, or if the context was
-    brand new.  If pbx_lua is loaded before pbx_config, the context will exist
-    BUT pbx_lua, being implemented as a switch, will never place extensions in
-    it, just the switch statement.  The result is that when pbx_config loads,
-    it never merges the switch statement created by pbx_lua into the final
-    context.
-    
-    This patch sets pbx_lua's modflag back to AST_MODFLAG_GLOBAL_SYMBOLS and adds
-    an "else if" in context_merge that catches the case where an existing context
-    has includes, switchs or ingore patterns but no actual extensions.
-    
-    ASTERISK-23818 #close
-    Reported by: Dennis Guse
-    Reported by: Timo Teräs
-    Tested by: George Joseph
-    Review: https://reviewboard.asterisk.org/r/3891/
-    ........
-    
-    Merged revisions 420146 from http://svn.asterisk.org/svn/asterisk/branches/1.8
-    
-    
-    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 347078c..3903cd0 100644
---- a/main/pbx.c
-+++ b/main/pbx.c
-@@ -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);
-+	} else if (new) {
-+		/* If the context existed but had no extensions, we still want to merge
-+		 * the includes, switches and ignore patterns.
-+		 */
-+		context_merge_incls_swits_igps_other_registrars(new, context, registrar);
- 	}
- 
- 	if (!insert_count && !new && (strcmp(context->registrar, registrar) != 0 ||
-diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
-index f3cfe95..70dfd81 100644
---- a/pbx/pbx_lua.c
-+++ b/pbx/pbx_lua.c
-@@ -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",
- 		.load = load_module,
- 		.unload = unload_module,
- 		.reload = reload,
diff --git a/debian/patches/series b/debian/patches/series
index ccf7d2e..fe958d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -31,6 +31,5 @@ ignore_failed_channels.patch
 smsq_enable.patch
 smsq_manpage.patch
 escape_manpage_hyphen.patch
-pbx_lua_regression.patch
 aelparse_enable.patch
 aelparse_manpage.patch

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