[Pkg-voip-commits] r7463 - in /asterisk/trunk/debian: changelog patches/h323-fix-makefile patches/series

[paravoid at alioth.debian.org]

Author: paravoid
Date: Tue Jul 28 00:43:51 2009
New Revision: 7463

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7463
Log:
* Re-enable and port to 1.6 the h323 segfault patch, apparently it's still
  needed.
* Fix asterisk's Makefiles so that the openh323/libpt dependencies are added
  to chan_h323.so instead of the main asterisk binary.

Added:
    asterisk/trunk/debian/patches/h323-fix-makefile
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7463&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Tue Jul 28 00:43:51 2009
@@ -21,8 +21,10 @@
     by the init script (thanks lintian).
   * Remove asterisk-progdocs: it is of very limited use but a) is enormous in
     size and b) takes too long to build.
-  * Re-enable and port to 1.6 the h323 segfault patches, apparently they're
-    still needed.
+  * Re-enable and port to 1.6 the h323 segfault patch, apparently it's still
+    needed.
+  * Fix asterisk's Makefiles so that the openh323/libpt dependencies are added
+    to chan_h323.so instead of the main asterisk binary.
   * Fix astgenkey to respect system's umask. Thanks Jonas Smedegaard.
     (Closes: #531730) 
   * Create /var/log/asterisk/* directories if non-existent, for /var/log on
@@ -40,7 +42,7 @@
   * Patch makefile_appdocs_dtd: fix location of DTD installation.
   * Register the HTML docs with doc-base as well.
 
- -- Faidon Liambotis <paravoid at debian.org>  Mon, 27 Jul 2009 23:34:23 +0300
+ -- Faidon Liambotis <paravoid at debian.org>  Tue, 28 Jul 2009 03:42:54 +0300
 
 asterisk (1:1.6.1.0~dfsg-1) unstable; urgency=low
 

Added: asterisk/trunk/debian/patches/h323-fix-makefile
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/h323-fix-makefile?rev=7463&op=file
==============================================================================
--- asterisk/trunk/debian/patches/h323-fix-makefile (added)
+++ asterisk/trunk/debian/patches/h323-fix-makefile Tue Jul 28 00:43:51 2009
@@ -1,0 +1,33 @@
+Fix LD flags on chan_h323.so
+
+chan_h323.so's LD flags are wrong in the first invocation of make: openh323 and
+pt are not included.
+
+This was workarounded in 1.4 by requiring the user to run make twice when
+chan_h323 was enabled.
+
+Fix this properly by fixing channels/Makefile
+
+  -- Faidon Liambotis <paravoid at debian.org>
+
+--- a/channels/Makefile
++++ b/channels/Makefile
+@@ -57,9 +57,7 @@ ifneq ($(findstring $(OSARCH), mingw32 c
+   LIBS+= -lres_monitor.so -lres_features.so
+ endif
+ 
+-ifneq ($(wildcard h323/Makefile.ast),)
+ include h323/Makefile.ast
+-endif
+ 
+ clean::
+ 	$(MAKE) -C misdn clean
+@@ -74,7 +72,7 @@ ifneq ($(filter chan_h323,$(EMBEDDED_MOD
+ modules.link: h323/libchanh323.a
+ else
+ ifeq ($(OSARCH),linux-gnu)
+-chan_h323.so: chan_h323.o h323/libchanh323.a
++chan_h323.so: chan_h323.o h323/libchanh323.a h323/Makefile.ast
+ 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+ 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(H323LDLIBS)
+ else

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=7463&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Tue Jul 28 00:43:51 2009
@@ -10,6 +10,7 @@
 app-osplookup-osptk-3.4
 
 h323-no-deps-on-asterisk
+h323-fix-makefile
 h323-workaround-openh323-segfault
 
 astgenkey-security