[Pkg-voip-commits] r4153 - in asterisk/trunk/debian: . patches
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Sun Aug 19 22:26:21 UTC 2007
Author: paravoid
Date: 2007-08-19 22:26:20 +0000 (Sun, 19 Aug 2007)
New Revision: 4153
Added:
asterisk/trunk/debian/patches/h323-add-missing-ptrace-guard
asterisk/trunk/debian/patches/h323-no-deps-on-asterisk
Removed:
asterisk/trunk/debian/patches/dbug433884
Modified:
asterisk/trunk/debian/changelog
asterisk/trunk/debian/patches/astvarrundir
asterisk/trunk/debian/patches/bashism-safeasterisk
asterisk/trunk/debian/patches/series
Log:
* Patch channels/h323/ast_h323.cxx to add some missing PTRACING guards
(h323-add-missing-ptrace-guard).
Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog 2007-08-19 20:59:36 UTC (rev 4152)
+++ asterisk/trunk/debian/changelog 2007-08-19 22:26:20 UTC (rev 4153)
@@ -17,6 +17,8 @@
* 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)
@@ -26,7 +28,7 @@
(use-libpri-bristuffed).
* Ship xagi-test.c (from bristuff) to examples.
- -- Faidon Liambotis <paravoid at debian.org> Sun, 19 Aug 2007 22:33:26 +0300
+ -- Faidon Liambotis <paravoid at debian.org> Mon, 20 Aug 2007 01:17:16 +0300
asterisk (1:1.4.10~dfsg-1) unstable; urgency=low
Modified: asterisk/trunk/debian/patches/astvarrundir
===================================================================
--- asterisk/trunk/debian/patches/astvarrundir 2007-08-19 20:59:36 UTC (rev 4152)
+++ asterisk/trunk/debian/patches/astvarrundir 2007-08-19 22:26:20 UTC (rev 4153)
@@ -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/trunk/debian/patches/bashism-safeasterisk
===================================================================
--- asterisk/trunk/debian/patches/bashism-safeasterisk 2007-08-19 20:59:36 UTC (rev 4152)
+++ asterisk/trunk/debian/patches/bashism-safeasterisk 2007-08-19 22:26:20 UTC (rev 4153)
@@ -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/trunk/debian/patches/dbug433884
===================================================================
--- asterisk/trunk/debian/patches/dbug433884 2007-08-19 20:59:36 UTC (rev 4152)
+++ asterisk/trunk/debian/patches/dbug433884 2007-08-19 22:26:20 UTC (rev 4153)
@@ -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::
Added: asterisk/trunk/debian/patches/h323-add-missing-ptrace-guard
===================================================================
--- asterisk/trunk/debian/patches/h323-add-missing-ptrace-guard (rev 0)
+++ asterisk/trunk/debian/patches/h323-add-missing-ptrace-guard 2007-08-19 22:26:20 UTC (rev 4153)
@@ -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/trunk/debian/patches/h323-no-deps-on-asterisk (from rev 4138, asterisk/trunk/debian/patches/dbug433884)
===================================================================
--- asterisk/trunk/debian/patches/h323-no-deps-on-asterisk (rev 0)
+++ asterisk/trunk/debian/patches/h323-no-deps-on-asterisk 2007-08-19 22:26:20 UTC (rev 4153)
@@ -0,0 +1,33 @@
+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::
Modified: asterisk/trunk/debian/patches/series
===================================================================
--- asterisk/trunk/debian/patches/series 2007-08-19 20:59:36 UTC (rev 4152)
+++ asterisk/trunk/debian/patches/series 2007-08-19 22:26:20 UTC (rev 4153)
@@ -1,11 +1,14 @@
#
+bashism-safeasterisk
astvarrundir
ast_key_dir
-pubkey_jnctn
-#dbug433884
make-clean-fixes
-bashism-safeasterisk
+h323-add-missing-ptrace-guard
+#h323-no-deps-on-asterisk
+
+pubkey_jnctn
+
### bristuff
bristuff/bristuff-notice
More information about the Pkg-voip-commits
mailing list