[Pkg-voip-commits] r4155 - in asterisk/trunk/debian: . patches

[paravoid at alioth.debian.org]

Author: paravoid
Date: 2007-08-20 01:42:51 +0000 (Mon, 20 Aug 2007)
New Revision: 4155

Added:
   asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
   asterisk/trunk/debian/patches/series
Log:
* h323-workaround-openh323-segfault patch: workaround libopenh323 bug
  (#438815) which causes Asterisk to segfault on startup. (Closes: #435146)

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-08-19 23:30:53 UTC (rev 4154)
+++ asterisk/trunk/debian/changelog	2007-08-20 01:42:51 UTC (rev 4155)
@@ -20,15 +20,15 @@
   * Patch channels/h323/ast_h323.cxx to add some missing PTRACING guards
     (h323-add-missing-ptrace-guard).
   * Switch to quilt as a patch management system instead of dpatch.
-  * Disable fix for #433884, (dbug433884) because it makes Asterisk
-    segfault on startup (Closes: #435146)
+  * h323-workaround-openh323-segfault patch: workaround libopenh323 bug
+    (#438815) which causes Asterisk to segfault on startup. (Closes: #435146)
   * Split bristuff 0.4.0-test3 into individual patches and add it to the
     quilt patchset.
   * Use libpri-bristuffed.so.1 and its respective header
     (use-libpri-bristuffed).
   * Ship xagi-test.c (from bristuff) to examples.
 
- -- Faidon Liambotis <paravoid at debian.org>  Mon, 20 Aug 2007 01:17:16 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 20 Aug 2007 04:35:21 +0300
 
 asterisk (1:1.4.10~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
===================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk	2007-08-19 23:30:53 UTC (rev 4154)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk	2007-08-20 01:42:51 UTC (rev 4155)
@@ -1,8 +1,9 @@
 Don't link the Asterisk binary with the H.323 libraries since they are only
-used by separate shared object, chan_h323.so. (#433884)
+used by separate shared object, chan_h323.so. (Closes: #433884)
 
-Currently disabled, since it makes asterisk segfault when dlopen()ing
-chan_h323.so. See #435146 for more.
+WARNING: this will make Asterisk segfault (see #435146) when loading
+chan_h323.so because libopenh323 is buggy (#438815).
+We are working around this, see patch h323-workaround-openh323-segfault.
 
  -- Faidon Liambotis <paravoid at debian.org>
 

Added: asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
===================================================================
--- asterisk/trunk/debian/patches/h323-workaround-openh323-segfault	                        (rev 0)
+++ asterisk/trunk/debian/patches/h323-workaround-openh323-segfault	2007-08-20 01:42:51 UTC (rev 4155)
@@ -0,0 +1,24 @@
+Flag chan_h323 as a module providing global symbols.
+
+This isn't the case, but this causes the dynamic loader (main/loader.c) to not
+call dlclose() on the first pass of loading modules.
+It is needed since libopenh323 is buggy and crashes on dlclose().
+
+This is a very very hacky workaround needed because we are removing the
+libopenh323 from the asterisk binary. (h323-no-deps-on-asterisk)
+
+Should be removed when #438815 closes.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.10.1~dfsg.orig/channels/chan_h323.c
++++ asterisk-1.4.10.1~dfsg/channels/chan_h323.c
+@@ -3271,7 +3271,7 @@ static int unload_module(void)
+ 	return 0;
+ }
+ 
+-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "The NuFone Network's OpenH323 Channel Driver",
++AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "The NuFone Network's OpenH323 Channel Driver",
+ 		.load = load_module,
+ 		.unload = unload_module,
+ 		.reload = reload,

Modified: asterisk/trunk/debian/patches/series
===================================================================
--- asterisk/trunk/debian/patches/series	2007-08-19 23:30:53 UTC (rev 4154)
+++ asterisk/trunk/debian/patches/series	2007-08-20 01:42:51 UTC (rev 4155)
@@ -5,7 +5,8 @@
 make-clean-fixes
 
 h323-add-missing-ptrace-guard
-#h323-no-deps-on-asterisk
+h323-no-deps-on-asterisk
+h323-workaround-openh323-segfault
 
 pubkey_jnctn