[Pkg-voip-commits] r7420 - in /yxa/trunk/debian: changelog patches/00list patches/fix_resubscribe.dpatch

[mikma-guest at alioth.debian.org]

Author: mikma-guest
Date: Wed Jul 15 20:17:24 2009
New Revision: 7420

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7420
Log:
Fix Re-SUBSCRIBE handling in eventserver.

Added:
    yxa/trunk/debian/patches/fix_resubscribe.dpatch   (with props)
Modified:
    yxa/trunk/debian/changelog
    yxa/trunk/debian/patches/00list

Modified: yxa/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/changelog?rev=7420&op=diff
==============================================================================
--- yxa/trunk/debian/changelog (original)
+++ yxa/trunk/debian/changelog Wed Jul 15 20:17:24 2009
@@ -12,5 +12,6 @@
   * Fixed loop detection.
   * Fix build eldap error.
   * Fix CANCEL Via transport matching.
+  * Fix Re-SUBSCRIBE handling in eventserver.
 
  -- Mikael Magnusson <mikma at users.sourceforge.net>  Thu, 25 Jun 2009 22:14:02 +0200

Modified: yxa/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/00list?rev=7420&op=diff
==============================================================================
--- yxa/trunk/debian/patches/00list (original)
+++ yxa/trunk/debian/patches/00list Wed Jul 15 20:17:24 2009
@@ -13,3 +13,4 @@
 loop_fix_orig_uri
 fix_eldap_build
 fix_via_sentby_proto
+fix_resubscribe

Added: yxa/trunk/debian/patches/fix_resubscribe.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/yxa/trunk/debian/patches/fix_resubscribe.dpatch?rev=7420&op=file
==============================================================================
--- yxa/trunk/debian/patches/fix_resubscribe.dpatch (added)
+++ yxa/trunk/debian/patches/fix_resubscribe.dpatch Wed Jul 15 20:17:24 2009
@@ -1,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_resubscribe.dpatch by  <mikma at users.sourceforge.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix handling of Re-SUBSCRIBE in eventserver.
+## DP: Remove parameters in call to PackageM:is_allowed_subscribe.
+
+ at DPATCH@
+diff -urNad yxa-1.0+20090326~/src/event/subscription.erl yxa-1.0+20090326/src/event/subscription.erl
+--- yxa-1.0+20090326~/src/event/subscription.erl	2009-03-25 09:17:49.000000000 +0100
++++ yxa-1.0+20090326/src/event/subscription.erl	2009-07-15 22:11:55.000000000 +0200
+@@ -754,7 +754,7 @@
+ 		       "~p is allowed to re-subscribe to presentity ~p",
+ 		       [PackageS, PackageM, Subscriber, Presentity]),
+ 	    case PackageM:is_allowed_subscribe(PackageS, SubNum + 1, NewRequest, YxaCtx,
+-					       LogTag, THandler, Subscriber, Presentity,
++					       Subscriber, Presentity,
+ 					       PkgState) of
+ 		{ok, SubState1, Status, Reason, ExtraHeaders, Body, NewPkgState}
+ 		when SubState1 == active orelse SubState1 == pending orelse SubState1 == terminated,

Propchange: yxa/trunk/debian/patches/fix_resubscribe.dpatch
------------------------------------------------------------------------------
    svn:executable = *