[Pkg-voip-commits] r9677 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/

maniac-guest at alioth.debian.org maniac-guest at alioth.debian.org
Fri May 4 23:59:01 UTC 2012


Author: maniac-guest
Date: Fri May  4 23:59:00 2012
New Revision: 9677

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

Added:
    kamailio/trunk/debian/patches/upstream/0007-modules_k-dialog-Fixed-2-macros-for-dialog-state-wit.patch
Modified:
    kamailio/trunk/debian/changelog
    kamailio/trunk/debian/patches/series
    kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch
    kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch
    kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch
    kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch
    kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch
    kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch

Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9677&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Fri May  4 23:59:00 2012
@@ -24,7 +24,7 @@
   * debian/copyright
     + using copyright-format/1.0/
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Wed, 25 Apr 2012 16:30:38 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org>  Sat, 05 May 2012 01:57:55 +0200
 
 kamailio (1.5.1-2) unstable; urgency=low
 

Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9677&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Fri May  4 23:59:00 2012
@@ -4,6 +4,7 @@
 upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch
 upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch
 upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch
+upstream/0007-modules_k-dialog-Fixed-2-macros-for-dialog-state-wit.patch
 no_lib64_on_64_bits.patch
 no_INSTALL_file.patch
 spelling-errors.patch

Modified: kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch?rev=9677&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0001-xcap_client-set-table-version-to-4.patch Fri May  4 23:59:00 2012
@@ -7,7 +7,7 @@
 (cherry picked from commit ab36b2b10e2f99ab584ec916bccc2a40c4fa394f)
 ---
  modules_k/xcap_client/xcap_client.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/modules_k/xcap_client/xcap_client.c b/modules_k/xcap_client/xcap_client.c
 index 0551c67..c3f4049 100644
@@ -23,5 +23,5 @@
  static int mod_init(void);
  static int child_init(int rank);
 -- 
-1.7.5.4
+1.7.9.5
 

Modified: kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch?rev=9677&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0002-presence_xml-updates-to-docs-to-refer-to-embedded-xc.patch Fri May  4 23:59:00 2012
@@ -7,7 +7,7 @@
 
 ---
  modules_k/presence_xml/README                     |   29 +++++++++++----------
- modules_k/presence_xml/doc/presence_xml_admin.xml |   11 ++++---
+ modules_k/presence_xml/doc/presence_xml_admin.xml |   11 ++++----
  2 files changed, 21 insertions(+), 19 deletions(-)
 
 diff --git a/modules_k/presence_xml/README b/modules_k/presence_xml/README
@@ -116,5 +116,5 @@
  		instruct the presence_xml module to update states from the database
  		and, if needed, send NOTIFY updates.
 -- 
-1.7.5.4
+1.7.9.5
 

Modified: kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch?rev=9677&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0003-modules-db_postgres-Fixed-copy-and-paste-error-in-mo.patch Fri May  4 23:59:00 2012
@@ -37,5 +37,5 @@
  </programlisting>
  		</example>
 -- 
-1.7.5.4
+1.7.9.5
 

Modified: kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch?rev=9677&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0004-userblacklist-k-fix-some-doc-errors-pointed-out-from.patch Fri May  4 23:59:00 2012
@@ -74,5 +74,5 @@
  	exit;
  }
 -- 
-1.7.5.4
+1.7.9.5
 

Modified: kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch?rev=9677&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0005-modules-sipcapture-Fixed-crash-in-case-contact-was.patch Fri May  4 23:59:00 2012
@@ -5,7 +5,7 @@
 
 ---
  modules/sipcapture/sipcapture.c |   25 ++++++++++++++++++-------
- 1 files changed, 18 insertions(+), 7 deletions(-)
+ 1 file changed, 18 insertions(+), 7 deletions(-)
 
 diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c
 index 50f384e..bbebd28 100644
@@ -51,5 +51,5 @@
  
  	/* get header x-cid: */
 -- 
-1.7.5.4
+1.7.9.5
 

Modified: kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch?rev=9677&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch (original)
+++ kamailio/trunk/debian/patches/upstream/0006-modules_k-presence-Safety-check-for-malformed-Subscr.patch Fri May  4 23:59:00 2012
@@ -6,7 +6,7 @@
 	Subscribe with header 'Contact: *' caused crash in presence.
 ---
  modules_k/presence/subscribe.c |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
 
 diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c
 index 9db947e..b1405de 100644
@@ -26,5 +26,5 @@
  	
  	LM_DBG("subs->contact= %.*s - len = %d\n",subs->contact.len,
 -- 
-1.7.5.4
+1.7.9.5
 

Added: kamailio/trunk/debian/patches/upstream/0007-modules_k-dialog-Fixed-2-macros-for-dialog-state-wit.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0007-modules_k-dialog-Fixed-2-macros-for-dialog-state-wit.patch?rev=9677&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0007-modules_k-dialog-Fixed-2-macros-for-dialog-state-wit.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0007-modules_k-dialog-Fixed-2-macros-for-dialog-state-wit.patch Fri May  4 23:59:00 2012
@@ -1,0 +1,26 @@
+From d22d83bfca84f4e50169859eafb23f6b89a91350 Mon Sep 17 00:00:00 2001
+From: Anca Vamanu <anca.vamanu at 1and1.ro>
+Date: Fri, 4 May 2012 11:45:05 +0300
+Subject: [PATCH] modules_k/dialog Fixed 2 macros for dialog state with same
+ value
+
+---
+ modules_k/dialog/dlg_cb.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h
+index 8d364ba..2af9bc2 100644
+--- a/modules_k/dialog/dlg_cb.h
++++ b/modules_k/dialog/dlg_cb.h
+@@ -76,7 +76,7 @@ typedef str* (*get_dlg_variable_f)( struct dlg_cell* dlg,
+ #define DLGCB_RPC_CONTEXT     (1<<12)
+ #define DLGCB_DESTROY         (1<<13)
+ #define DLGCB_SPIRALED        (1<<14)
+-#define DLGCB_TERMINATED_CONFIRMED (1<<14)
++#define DLGCB_TERMINATED_CONFIRMED (1<<15)
+ 
+ struct dlg_callback {
+ 	int types;
+-- 
+1.7.9.5
+




More information about the Pkg-voip-commits mailing list