commit 7d6df7af8804b91d2418d6b82dc3d0a43aa5b9dd Author: Brian Pepple bpepple@fedoraproject.org Date: Mon Jan 31 18:38:39 2011 -0500
- Update url and source url. - Add patch to prevent crash when receiving a call from user's own URI. (#668308)
...ming-calls-from-the-same-URI-as-the-local.patch | 32 ++++++++++++++++++++ telepathy-sofiasip.spec | 12 +++++-- 2 files changed, 41 insertions(+), 3 deletions(-) --- diff --git a/0001-Reject-incoming-calls-from-the-same-URI-as-the-local.patch b/0001-Reject-incoming-calls-from-the-same-URI-as-the-local.patch new file mode 100644 index 0000000..c0b93b8 --- /dev/null +++ b/0001-Reject-incoming-calls-from-the-same-URI-as-the-local.patch @@ -0,0 +1,32 @@ +From f69dc4be0e713eef64ecb65c84ded2fa357b39b9 Mon Sep 17 00:00:00 2001 +From: Mikhail Zabaluev mikhail.zabaluev@nokia.com +Date: Mon, 31 Jan 2011 19:46:47 +0200 +Subject: [PATCH] Reject incoming calls from the same URI as the local user (fd.o #33716) + +This is not supported in StreamedMedia channels, and an assertion +in tpsip_media_channel_receive_invite() sees to it. +--- + src/media-factory.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/src/media-factory.c b/src/media-factory.c +index 245d11d..19b0494 100644 +--- a/src/media-factory.c ++++ b/src/media-factory.c +@@ -357,6 +357,13 @@ tpsip_nua_i_invite_cb (TpBaseConnection *conn, + DEBUG("Got incoming invite from <%s>", + tp_handle_inspect (contact_repo, handle)); + ++ if (handle == conn->self_handle) ++ { ++ DEBUG("cannot handle calls from self"); ++ nua_respond (ev->nua_handle, 501, "Calls from self are not supported", TAG_END()); ++ return TRUE; ++ } ++ + channel = new_media_channel (fac, handle, handle, channel_flags); + + tpsip_media_channel_receive_invite (channel, ev->nua_handle); +-- +1.7.3.5 + diff --git a/telepathy-sofiasip.spec b/telepathy-sofiasip.spec index d5d375c..4429a3f 100644 --- a/telepathy-sofiasip.spec +++ b/telepathy-sofiasip.spec @@ -1,12 +1,13 @@ Name: telepathy-sofiasip Version: 0.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SIP connection manager for Telepathy
Group: Applications/Communications License: LGPLv2+ -URL: http://sourceforge.net/projects/tp-sofiasip -Source0: http://downloads.sourceforge.net/tp-sofiasip/%%7Bname%7D-%%7Bversion%7D.tar.... +URL: http://telepathy.freedesktop.org/wiki/Components +Source0: http://telepathy.freedesktop.org/releases/%%7Bname%7D/%%7Bname%7D-%%7Bversio... +Patch0: 0001-Reject-incoming-calls-from-the-same-URI-as-the-local.patch
BuildRequires: dbus-devel BuildRequires: dbus-glib-devel @@ -30,6 +31,7 @@ framework based on the SofiaSIP-stack.
%prep %setup -q +%patch0 -p1 -b .rejectcall
%build @@ -57,6 +59,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
%changelog +* Mon Jan 31 2011 Brian Pepple bpepple@fedoraproject.org - 0.6.5-2 +- Update url and source url. +- Add patch to prevent crash when receiving a call from user's own URI. (#668308) + * Fri Jan 28 2011 Brian Pepple bpepple@fedoraproject.org - 0.6.5-1 - Update to 0.6.5. - Add BR to run tests, and enable check.
scm-commits@lists.fedoraproject.org