[Pkg-voip-commits] r7456 - in /asterisk/trunk/debian: changelog patches/h323-no-deps-on-asterisk patches/h323-workaround-openh323-segfault patches/series

[paravoid at alioth.debian.org]

Author: paravoid
Date: Mon Jul 27 19:07:26 2009
New Revision: 7456

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7456
Log:
Re-enable and port to 1.6 the h323 segfault patches, apparently they're
still needed.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
    asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7456&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Jul 27 19:07:26 2009
@@ -25,6 +25,8 @@
     (Closes: #531730) 
   * Create /var/log/asterisk/* directories if non-existent, for /var/log on
     tmpfs scenarios. Thanks martin f krafft! (Closes: #524015)
+  * Re-enable and port to 1.6 the h323 segfault patches, apparently they're
+    still needed.
 
   [ Tzafrir Cohen ]
   * New upstream release.
@@ -36,7 +38,7 @@
   [ Lionel Elie Mamane ]
   * Install UPGRADE-1.6.txt, useful for people upgrading from lenny
 
- -- Faidon Liambotis <paravoid at debian.org>  Mon, 27 Jul 2009 21:53:03 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 27 Jul 2009 22:06:40 +0300
 
 asterisk (1:1.6.1.0~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-no-deps-on-asterisk?rev=7456&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (original)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk Mon Jul 27 19:07:26 2009
@@ -9,7 +9,7 @@
 
 --- a/main/Makefile
 +++ b/main/Makefile
-@@ -131,13 +131,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+@@ -142,13 +142,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
  AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
  OBJS:=$(sort $(OBJS))
  
@@ -20,17 +20,17 @@
 -  H323LDLIBS=
 -endif
 -
- asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
- 	@$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
- 	@if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
-@@ -146,11 +139,7 @@ asterisk: $(OBJS) editline/libedit.a db1
- 	@rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
+ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+ MAIN_TGT:=asterisk.dll
+ asterisk: cygload
+@@ -166,11 +159,7 @@ endif
+ $(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
  	@$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
  	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 -ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
- 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
+ 	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
 -else
--	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
+-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
 -endif
  	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
  

Modified: asterisk/trunk/debian/patches/h323-workaround-openh323-segfault
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-workaround-openh323-segfault?rev=7456&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/h323-workaround-openh323-segfault (original)
+++ asterisk/trunk/debian/patches/h323-workaround-openh323-segfault Mon Jul 27 19:07:26 2009
@@ -15,9 +15,9 @@
 
 --- a/main/loader.c
 +++ b/main/loader.c
-@@ -359,6 +359,12 @@ static struct ast_module *load_dynamic_m
- 
- 	strcpy(resource_being_loaded->resource, resource);
+@@ -382,6 +382,12 @@ static struct ast_module *load_dynamic_m
+ 	if (missing_so)
+ 		strcat(resource_being_loaded->resource, ".so");
  
 +	/* libopenh323 is buggy and segfaults on dlclose() when opened with
 +	 * RTLD_LAZY. Workaround this until it gets fixed */
@@ -27,4 +27,4 @@
 +
  	if (!(lib = dlopen(fn, RTLD_LAZY | RTLD_LOCAL))) {
  		ast_log(LOG_WARNING, "Error loading module '%s': %s\n", resource_in, dlerror());
- 		free(resource_being_loaded);
+ 		ast_free(resource_being_loaded);

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=7456&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon Jul 27 19:07:26 2009
@@ -9,9 +9,8 @@
 
 app-osplookup-osptk-3.4
 
-# Remed-out for now. Should be fixed later on:
-#h323-no-deps-on-asterisk
-#h323-workaround-openh323-segfault
+h323-no-deps-on-asterisk
+h323-workaround-openh323-segfault
 
 astgenkey-security