[Pkg-voip-commits] r9914 - in /kamailio/trunk/debian: changelog patches/series patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch

[maniac-guest at alioth.debian.org]

Author: maniac-guest
Date: Tue Jul 17 14:52:22 2012
New Revision: 9914

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9914
Log:
upstream fix

Added:
    kamailio/trunk/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch
Modified:
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/patches/series

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9914&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Tue Jul 17 14:52:22 2012
@@ -10,7 +10,7 @@
   * debian/patches:
     + upstream fixes.
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Fri, 13 Jul 2012 08:18:05 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Tue, 17 Jul 2012 16:51:09 +0200
 
 kamailio (3.3.0-1) unstable; urgency=low
 

Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9914&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Tue Jul 17 14:52:22 2012
@@ -7,6 +7,7 @@
 upstream/0008-core-update-printing-of-socket-lists-to-show-the-adv.patch
 upstream/0009-modules-sl-Fixed-segmentation-fault-and-corrected-lo.patch
 upstream/0010-modules_k-registrar-Fixed-some-errors-in-module-docu.patch
+upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch
 multiarch_support.patch
 no_INSTALL_file.patch
 hardening_flags.patch

Added: kamailio/trunk/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch?rev=9914&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0012-Remove-duplicate-entry-of-default_domain-in-docs.patch Tue Jul 17 14:52:22 2012
@@ -1,0 +1,58 @@
+From 32e67eb8ebe8e1ef1190b03151962412ad41dbd3 Mon Sep 17 00:00:00 2001
+From: Carsten Bock <carsten at ng-voice.com>
+Date: Tue, 17 Jul 2012 10:15:46 -0400
+Subject: [PATCH] Remove duplicate entry of "default_domain" in docs. Remove
+ double occurance of the CSeq Attribute in the XML. (closes
+ FS#246 - pua_reginfo adds duplicate cseq field in XML body
+ on the Bugtracker)
+
+Thanks to Andrew Pogrebennyk (apogrebennyk at sipwise.com) for pointing this out.
+---
+ modules_k/pua_reginfo/doc/pua_reginfo_admin.xml |   14 --------------
+ modules_k/pua_reginfo/usrloc_cb.c               |    5 -----
+ 2 files changed, 19 deletions(-)
+
+diff --git a/modules_k/pua_reginfo/doc/pua_reginfo_admin.xml b/modules_k/pua_reginfo/doc/pua_reginfo_admin.xml
+index 797fc49..b651f44 100644
+--- a/modules_k/pua_reginfo/doc/pua_reginfo_admin.xml
++++ b/modules_k/pua_reginfo/doc/pua_reginfo_admin.xml
+@@ -105,20 +105,6 @@ modparam("pua_bla", "default_domain", "kamailio.org")
+ 		</example>
+ 	</section>
+ 	<section>
+-		<title><varname>default_domain</varname>(str)</title>
+-		<para>
+-		The domain to be used to publish information about a user.
+-		</para>
+-		<example>
+-		<title>Set <varname>default_domain</varname> parameter</title>
+-		<programlisting format="linespecific">
+-...
+-modparam("pua_reginfo", "default_domain", "kamailio.org")
+-...
+-</programlisting>
+-		</example>
+-	</section>
+-	<section>
+ 		<title><varname>publish_reginfo</varname>(int)</title>
+ 		<para>
+ 		Whether or not to generate PUBLISH requests.
+diff --git a/modules_k/pua_reginfo/usrloc_cb.c b/modules_k/pua_reginfo/usrloc_cb.c
+index 1833034..6b1a590 100644
+--- a/modules_k/pua_reginfo/usrloc_cb.c
++++ b/modules_k/pua_reginfo/usrloc_cb.c
+@@ -162,11 +162,6 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) {
+ 			memset(buf, 0, sizeof(buf));
+ 			buf_len = snprintf(buf, sizeof(buf), "%.*s", ptr->user_agent.len, ptr->user_agent.s);
+ 			xmlNewProp(contact_node, BAD_CAST "user_agent", BAD_CAST buf);
+-			
+-			/* CSeq Attribute */
+-			memset(buf, 0, sizeof(buf));
+-			buf_len = snprintf(buf, sizeof(buf), "%d", ptr->cseq);
+-			xmlNewProp(contact_node, BAD_CAST "cseq", BAD_CAST buf);
+ 
+ 			/* URI-Node */
+ 			memset(buf, 0, sizeof(buf));
+-- 
+1.7.9.5
+