[Pkg-voip-commits] r4156 - in asterisk/branches/experimental/debian: . patches
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Mon Aug 20 01:48:19 UTC 2007
Author: paravoid
Date: 2007-08-20 01:48:18 +0000 (Mon, 20 Aug 2007)
New Revision: 4156
Added:
asterisk/branches/experimental/debian/patches/h323-add-missing-ptrace-guard
asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk
asterisk/branches/experimental/debian/patches/h323-workaround-openh323-segfault
Removed:
asterisk/branches/experimental/debian/asterisk-gtk-console.install
asterisk/branches/experimental/debian/patches/dbug433884
Modified:
asterisk/branches/experimental/debian/changelog
asterisk/branches/experimental/debian/control
asterisk/branches/experimental/debian/patches/astvarrundir
asterisk/branches/experimental/debian/patches/bashism-safeasterisk
asterisk/branches/experimental/debian/patches/series
Log:
Merge from trunk
Deleted: asterisk/branches/experimental/debian/asterisk-gtk-console.install
===================================================================
--- asterisk/branches/experimental/debian/asterisk-gtk-console.install 2007-08-20 01:42:51 UTC (rev 4155)
+++ asterisk/branches/experimental/debian/asterisk-gtk-console.install 2007-08-20 01:48:18 UTC (rev 4156)
@@ -1 +0,0 @@
-usr/lib/asterisk/modules/pbx_gtkconsole.so
Modified: asterisk/branches/experimental/debian/changelog
===================================================================
--- asterisk/branches/experimental/debian/changelog 2007-08-20 01:42:51 UTC (rev 4155)
+++ asterisk/branches/experimental/debian/changelog 2007-08-20 01:48:18 UTC (rev 4156)
@@ -35,16 +35,19 @@
asterisk-rate-engine and add for twinkle.
* Remove Conflicts for an old version of asterisk-oh323 which was only
present until sarge.
+ * Remove versioned dependency on an ancient (pre-sarge) version of sed.
+ * 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> Sun, 19 Aug 2007 22:17:08 +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/branches/experimental/debian/control
===================================================================
--- asterisk/branches/experimental/debian/control 2007-08-20 01:42:51 UTC (rev 4155)
+++ asterisk/branches/experimental/debian/control 2007-08-20 01:48:18 UTC (rev 4156)
@@ -4,7 +4,7 @@
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4), quilt, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp10-dev | libsnmp-dev, libc-client-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 5), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libtonezone-dev (>= 1:1.4.1~0), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.4), quilt, zaptel-source (>= 1:1.4.1~0), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev, graphviz, libcurl4-dev | libcurl-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), libiksemel-dev, libradiusclient-ng-dev, freetds-dev, libvorbis-dev, libsnmp10-dev | libsnmp-dev, libc-client-dev, dpkg-dev (>= 1.13.19)
XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/asterisk/
Modified: asterisk/branches/experimental/debian/patches/astvarrundir
===================================================================
--- asterisk/branches/experimental/debian/patches/astvarrundir 2007-08-20 01:42:51 UTC (rev 4155)
+++ asterisk/branches/experimental/debian/patches/astvarrundir 2007-08-20 01:48:18 UTC (rev 4156)
@@ -1,5 +1,8 @@
Move ASTVARRUNDIR to /var/run/asterisk/
+This is needed because we need to have write access to a directory when
+dropping uid/gid.
+
-- Mark Purcell <msp at debian.org>
--- asterisk-1.4.9~dfsg.orig/Makefile
Modified: asterisk/branches/experimental/debian/patches/bashism-safeasterisk
===================================================================
--- asterisk/branches/experimental/debian/patches/bashism-safeasterisk 2007-08-20 01:42:51 UTC (rev 4155)
+++ asterisk/branches/experimental/debian/patches/bashism-safeasterisk 2007-08-20 01:48:18 UTC (rev 4156)
@@ -1,6 +1,8 @@
/bin/sh is not guranteed to handle bashisms. Switch interpreter of
safe_asterisk to /bin/bash.
+Should be forwarded upstream.
+
-- Mark Purcell <msp at debian.org>
--- asterisk-1.4.9~dfsg.orig/contrib/scripts/safe_asterisk
Deleted: asterisk/branches/experimental/debian/patches/dbug433884
===================================================================
--- asterisk/branches/experimental/debian/patches/dbug433884 2007-08-20 01:42:51 UTC (rev 4155)
+++ asterisk/branches/experimental/debian/patches/dbug433884 2007-08-20 01:48:18 UTC (rev 4156)
@@ -1,33 +0,0 @@
-Don't link the Asterisk binary with the H.323 libraries since they are only
-used by separate shared object, chan_h323.so. (#433884)
-
-Currently disabled, since it makes asterisk segfault when dlopen()ing
-chan_h323.so. See #435146 for more.
-
- -- Faidon Liambotis <paravoid at debian.org>
-
---- asterisk-1.4.9~dfsg.orig/main/Makefile
-+++ asterisk-1.4.9~dfsg/main/Makefile
-@@ -120,13 +120,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
- AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
- OBJS:=$(sort $(OBJS))
-
--ifneq ($(wildcard ../channels/h323/Makefile.ast),)
-- include ../channels/h323/Makefile.ast
--else
-- H323LDFLAGS=
-- 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 \
-@@ -135,7 +128,7 @@ asterisk: $(OBJS) editline/libedit.a db1
- @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
- @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
- $(ECHO_PREFIX) echo " [LD] $^ -> $@"
-- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
-+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
- @$(ASTTOPDIR)/build_tools/strip_nonapi $@
-
- clean::
Copied: asterisk/branches/experimental/debian/patches/h323-add-missing-ptrace-guard (from rev 4155, asterisk/trunk/debian/patches/h323-add-missing-ptrace-guard)
===================================================================
--- asterisk/branches/experimental/debian/patches/h323-add-missing-ptrace-guard (rev 0)
+++ asterisk/branches/experimental/debian/patches/h323-add-missing-ptrace-guard 2007-08-20 01:48:18 UTC (rev 4156)
@@ -0,0 +1,46 @@
+Add a missing PTRACING guard.
+
+Operator << against PayloadTypes is missing on non-PTRACING builds
+(src/rtp.cxx:561 on openh323-1.18.0)
+
+Should be forwarded upstream.
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.10.1~dfsg.orig/channels/h323/ast_h323.cxx
++++ asterisk-1.4.10.1~dfsg/channels/h323/ast_h323.cxx
+@@ -287,7 +287,9 @@ int MyH323EndPoint::MyMakeCall(const PSt
+ cout << "\t-- " << GetLocalUserName() << " is calling host " << fullAddress << endl;
+ cout << "\t-- Call token is " << (const char *)token << endl;
+ cout << "\t-- Call reference is " << *callReference << endl;
++#ifdef PTRACING
+ cout << "\t-- DTMF Payload is " << connection->dtmfCodec << endl;
++#endif
+ }
+ connection->Unlock();
+ return 0;
+@@ -1649,10 +1651,12 @@ void MyH323Connection::OnSendCapabilityS
+ H245_AudioTelephonyEventCapability & atec = cap;
+ atec.m_dynamicRTPPayloadType = dtmfCodec;
+ // on_set_rfc2833_payload(GetCallReference(), (const char *)GetCallToken(), (int)dtmfCodec);
++#ifdef PTRACING
+ if (h323debug) {
+ cout << "\t-- Transmitting RFC2833 on payload " <<
+ atec.m_dynamicRTPPayloadType << endl;
+ }
++#endif
+ }
+ }
+ }
+@@ -1712,9 +1716,11 @@ BOOL MyH323Connection::OnReceivedCapabil
+ on_set_rfc2833_payload(GetCallReference(), (const char *)GetCallToken(), (int)pt);
+ if ((dtmfMode == H323_DTMF_RFC2833) && (sendUserInputMode == SendUserInputAsTone))
+ sendUserInputMode = SendUserInputAsInlineRFC2833;
++#ifdef PTRACING
+ if (h323debug) {
+ cout << "\t-- Inbound RFC2833 on payload " << pt << endl;
+ }
++#endif
+ }
+ memset(&prefs, 0, sizeof(prefs));
+ int peer_capabilities = 0;
Copied: asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk (from rev 4155, asterisk/trunk/debian/patches/h323-no-deps-on-asterisk)
===================================================================
--- asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk (rev 0)
+++ asterisk/branches/experimental/debian/patches/h323-no-deps-on-asterisk 2007-08-20 01:48:18 UTC (rev 4156)
@@ -0,0 +1,34 @@
+Don't link the Asterisk binary with the H.323 libraries since they are only
+used by separate shared object, chan_h323.so. (Closes: #433884)
+
+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>
+
+--- asterisk-1.4.9~dfsg.orig/main/Makefile
++++ asterisk-1.4.9~dfsg/main/Makefile
+@@ -120,13 +120,6 @@ AST_EMBED_LDFLAGS:=$(foreach dep,$(EMBED
+ AST_EMBED_LIBS:=$(foreach dep,$(EMBED_LIBS),$(value $(dep)))
+ OBJS:=$(sort $(OBJS))
+
+-ifneq ($(wildcard ../channels/h323/Makefile.ast),)
+- include ../channels/h323/Makefile.ast
+-else
+- H323LDFLAGS=
+- 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 \
+@@ -135,7 +128,7 @@ asterisk: $(OBJS) editline/libedit.a db1
+ @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
+ @$(CC) -c -o buildinfo.o $(ASTCFLAGS) buildinfo.c
+ $(ECHO_PREFIX) echo " [LD] $^ -> $@"
+- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS)
++ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS)
+ @$(ASTTOPDIR)/build_tools/strip_nonapi $@
+
+ clean::
Copied: asterisk/branches/experimental/debian/patches/h323-workaround-openh323-segfault (from rev 4155, asterisk/trunk/debian/patches/h323-workaround-openh323-segfault)
===================================================================
--- asterisk/branches/experimental/debian/patches/h323-workaround-openh323-segfault (rev 0)
+++ asterisk/branches/experimental/debian/patches/h323-workaround-openh323-segfault 2007-08-20 01:48:18 UTC (rev 4156)
@@ -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/branches/experimental/debian/patches/series
===================================================================
--- asterisk/branches/experimental/debian/patches/series 2007-08-20 01:42:51 UTC (rev 4155)
+++ asterisk/branches/experimental/debian/patches/series 2007-08-20 01:48:18 UTC (rev 4156)
@@ -1,11 +1,15 @@
#
+bashism-safeasterisk
astvarrundir
ast_key_dir
-pubkey_jnctn
-#dbug433884
make-clean-fixes
-bashism-safeasterisk
+h323-add-missing-ptrace-guard
+h323-no-deps-on-asterisk
+h323-workaround-openh323-segfault
+
+pubkey_jnctn
+
### bristuff
bristuff/bristuff-notice
More information about the Pkg-voip-commits
mailing list