[Pkg-voip-commits] r10125 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Thu Mar 28 15:48:19 UTC 2013
Author: maniac-guest
Date: Thu Mar 28 15:48:19 2013
New Revision: 10125
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10125
Log:
Added upstream fixes
Added:
kamailio/trunk/debian/patches/upstream/0001-ims_icscf-fix-include-list-for-BSD.patch
kamailio/trunk/debian/patches/upstream/0002-modules-registrar-outbound_mode-1-fix.patch
kamailio/trunk/debian/patches/upstream/0003-modules-sca-fix-Waddress-warnings-caused-by-static-s.patch
kamailio/trunk/debian/patches/upstream/0004-modules-sca-cast-logging-of-time_t-to-long-int-to-qu.patch
kamailio/trunk/debian/patches/upstream/0005-modules-sca-seize-appearance-for-SCA-callee-answerin.patch
Removed:
kamailio/trunk/debian/patches/upstream/0005-dialog-fix-for-is_in_profile.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=10125&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Thu Mar 28 15:48:19 2013
@@ -1,4 +1,4 @@
-kamailio (4.0.0-1) UNRELEASED; urgency=low
+kamailio (4.0.0-1) unstable; urgency=low
* New upstream release (Closes: #704118)
* debian/control:
@@ -8,6 +8,7 @@
+ added ims outbound websocket modules
* debian/patches/upstream:
+ removed upstream fixes for the previous release.
+ + added new upstream fixes.
* debian/patches:
+ removed plumb_md5.patch and plumb_md5_fixes.patch
merged upstream ( Thanks miconda )
@@ -17,7 +18,7 @@
+ remove call to dpkg-buildflags
+ do not apply hardening_flags.patch
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Thu, 28 Mar 2013 10:33:45 +0100
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Thu, 28 Mar 2013 16:47:17 +0100
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=10125&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Thu Mar 28 15:48:19 2013
@@ -1,3 +1,8 @@
+upstream/0001-ims_icscf-fix-include-list-for-BSD.patch
+upstream/0002-modules-registrar-outbound_mode-1-fix.patch
+upstream/0003-modules-sca-fix-Waddress-warnings-caused-by-static-s.patch
+upstream/0004-modules-sca-cast-logging-of-time_t-to-long-int-to-qu.patch
+upstream/0005-modules-sca-seize-appearance-for-SCA-callee-answerin.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
fix_export.patch
Added: kamailio/trunk/debian/patches/upstream/0001-ims_icscf-fix-include-list-for-BSD.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0001-ims_icscf-fix-include-list-for-BSD.patch?rev=10125&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0001-ims_icscf-fix-include-list-for-BSD.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0001-ims_icscf-fix-include-list-for-BSD.patch Thu Mar 28 15:48:19 2013
@@ -1,0 +1,47 @@
+From 86f3f2755bcf63a97a8eabb8a72a06614c2dbf5a Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 15 Mar 2013 09:03:26 +0100
+Subject: [PATCH] ims_icscf: fix include list for BSD
+
+- patch by Victor V. Kustov
+(cherry picked from commit e930f94b71d2e5c40fa44d78738ce5efb747c5b1)
+---
+ modules/ims_icscf/cxdx_lir.c | 5 +++++
+ modules/ims_icscf/scscf_list.c | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c
+index faabd85..24686e7 100644
+--- a/modules/ims_icscf/cxdx_lir.c
++++ b/modules/ims_icscf/cxdx_lir.c
+@@ -51,6 +51,11 @@
+ #include "mod.h"
+ #include "location.h"
+
++#if defined (__OS_freebsd)
++#include "sys/limits.h"
++#define MAXINT INT_MAX
++#endif
++
+ //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable
+ int create_lia_return_code(int result) {
+ int rc;
+diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c
+index bd5216c..8b6b79c 100644
+--- a/modules/ims_icscf/scscf_list.c
++++ b/modules/ims_icscf/scscf_list.c
+@@ -47,6 +47,11 @@
+ #include "db.h"
+ #include "../../lib/ims/useful_defs.h"
+
++#if defined (__OS_freebsd)
++#include "sys/limits.h"
++#define MAXINT INT_MAX
++#endif
++
+ extern int scscf_entry_expiry; //time for scscf entries to remain the scscf_list
+
+ extern struct tm_binds tmb; //Structure with pointers to tm funcs
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0002-modules-registrar-outbound_mode-1-fix.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0002-modules-registrar-outbound_mode-1-fix.patch?rev=10125&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0002-modules-registrar-outbound_mode-1-fix.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0002-modules-registrar-outbound_mode-1-fix.patch Thu Mar 28 15:48:19 2013
@@ -1,0 +1,70 @@
+From e446aa58a89c60ef9449fc8f79492232c7ed6f7f Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Sat, 16 Mar 2013 06:33:13 +0200
+Subject: [PATCH] modules/registrar: outbound_mode=1 fix
+
+outbound_mode=1 now accepts REGISTER requests that either contain
+or do not contain a Supported: outbound header.
+
+a Supported: outbound header is always added to 200 OK reply and if
+request contained a Supported: outbound header, also a Require: outbound
+header is added.
+---
+ modules/registrar/doc/registrar_admin.xml | 14 +++++++++-----
+ modules/registrar/reply.c | 13 ++++++++++---
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml
+index 47e52d5..cb55218 100644
+--- a/modules/registrar/doc/registrar_admin.xml
++++ b/modules/registrar/doc/registrar_admin.xml
+@@ -731,11 +731,15 @@ modparam("registrar", "gruu_enabled", 0)
+ with the outbound options tag.
+ </para>
+ <para>
+- If set to 1 then this module will accept REGISTER requests
+- that do not contain a Supported: header with the outbound
+- options-tag. The 200 OK response to REGISTER requests that this
+- module generates will contain a Supported: header with the
+- outbound options tag.
++ If set to 1 this module will accept REGISTER requests that do
++ not contain a Supported: header with the outbound options-tag
++ and REGISTER requests that do contain a Supported: or a
++ Requires: header with the outbound options-tag. The 200 OK
++ response that this module generates, will contain a Supported:
++ header with the outbound options tag. The 200 OK response
++ will also contain a Require: header with the outbound options
++ tag if the REGISTER request contained a Supported:
++ header with the outbound options-tag.
+ </para>
+ <para>
+ If set to 2 then this module will reject REGISTER requests
+diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c
+index 5903710..7ed2a05 100644
+--- a/modules/registrar/reply.c
++++ b/modules/registrar/reply.c
+@@ -658,11 +658,18 @@ int reg_send_reply(struct sip_msg* _m)
+ if (add_flow_timer(_m) < 0)
+ return -1;
+ }
+- /* Fall-thru */
+- case REG_OUTBOUND_SUPPORTED:
+ if (add_supported(_m, &outbound_str) < 0)
+- return -1;
++ return -1;
+ break;
++ case REG_OUTBOUND_SUPPORTED:
++ if ((parse_supported(_m) == 0) &&
++ (((struct supported_body *)_m->supported->parsed)->supported_all & F_SUPPORTED_OUTBOUND)) {
++ if (add_require(_m, &outbound_str) < 0)
++ return -1;
++ }
++ if (add_supported(_m, &outbound_str) < 0)
++ return -1;
++ break;
+ }
+ break;
+ case R_OB_UNSUP:
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0003-modules-sca-fix-Waddress-warnings-caused-by-static-s.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0003-modules-sca-fix-Waddress-warnings-caused-by-static-s.patch?rev=10125&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0003-modules-sca-fix-Waddress-warnings-caused-by-static-s.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0003-modules-sca-fix-Waddress-warnings-caused-by-static-s.patch Thu Mar 28 15:48:19 2013
@@ -1,0 +1,112 @@
+From 6d61484c6302bfd2ad74b3b92621e541405c3240 Mon Sep 17 00:00:00 2001
+From: Andrew Mortensen <admorten at isc.upenn.edu>
+Date: Sat, 16 Mar 2013 16:35:29 -0400
+Subject: [PATCH] modules/sca: fix -Waddress warnings caused by static strs in
+ SCA_STR_EMPTY
+
+- Tested on Ubunut 12.04 LTS. Report from Konstantin Mosesov.
+---
+ modules/sca/sca_call_info.c | 40 +++++++++++++++++++---------------------
+ modules/sca/sca_common.h | 3 +--
+ modules/sca/sca_rpc.c | 4 +---
+ modules/sca/sca_subscribe.c | 2 +-
+ 4 files changed, 22 insertions(+), 27 deletions(-)
+
+diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c
+index bf8db04..43c7f56 100644
+--- a/modules/sca/sca_call_info.c
++++ b/modules/sca/sca_call_info.c
+@@ -686,29 +686,27 @@ sca_call_info_seize_held_call( sip_msg_t *msg, sca_call_info *call_info,
+ sca_hash_table_unlock_index( sca->appearances, slot_idx );
+ slot_idx = -1;
+
+- if ( !SCA_STR_EMPTY( &callee_aor )) {
+- if ( sca_uri_lock_if_shared_appearance( sca, &callee_aor, &slot_idx )) {
+- app = sca_appearance_for_tags_unsafe( sca, &callee_aor,
+- &prev_callid, &prev_totag, NULL, slot_idx );
+- if ( app == NULL ) {
+- LM_ERR( "sca_call_info_seize_held_call: failed to find "
+- "appearance of %.*s with dialog %.*s;%.*s",
+- STR_FMT( &callee_aor ), STR_FMT( &prev_callid ),
+- STR_FMT( &prev_totag ));
+- goto done;
+- }
++ if ( sca_uri_lock_if_shared_appearance( sca, &callee_aor, &slot_idx )) {
++ app = sca_appearance_for_tags_unsafe( sca, &callee_aor,
++ &prev_callid, &prev_totag, NULL, slot_idx );
++ if ( app == NULL ) {
++ LM_ERR( "sca_call_info_seize_held_call: failed to find "
++ "appearance of %.*s with dialog %.*s;%.*s",
++ STR_FMT( &callee_aor ), STR_FMT( &prev_callid ),
++ STR_FMT( &prev_totag ));
++ goto done;
++ }
+
+- app->flags |= SCA_APPEARANCE_FLAG_CALLEE_PENDING;
++ app->flags |= SCA_APPEARANCE_FLAG_CALLEE_PENDING;
+
+- if ( sca_appearance_update_callee_unsafe( app, contact_uri ) < 0 ) {
+- LM_ERR( "sca_call_info_seize_held_call: failed to update callee" );
+- goto done;
+- }
+- if ( sca_appearance_update_dialog_unsafe( app, &msg->callid->body,
+- &to->tag_value, &from->tag_value ) < 0 ) {
+- LM_ERR( "sca_call_info_seize_held_call: failed to update dialog" );
+- goto done;
+- }
++ if ( sca_appearance_update_callee_unsafe( app, contact_uri ) < 0 ) {
++ LM_ERR( "sca_call_info_seize_held_call: failed to update callee" );
++ goto done;
++ }
++ if ( sca_appearance_update_dialog_unsafe( app, &msg->callid->body,
++ &to->tag_value, &from->tag_value ) < 0 ) {
++ LM_ERR( "sca_call_info_seize_held_call: failed to update dialog" );
++ goto done;
+ }
+ }
+
+diff --git a/modules/sca/sca_common.h b/modules/sca/sca_common.h
+index c4c806f..daef534 100644
+--- a/modules/sca/sca_common.h
++++ b/modules/sca/sca_common.h
+@@ -93,8 +93,7 @@
+ memcmp((str1)->s, (str2)->s, (str1)->len) == 0)
+
+ #define SCA_STR_EMPTY( str1 ) \
+- (((str1) != NULL && ((str1)->s == NULL || (str1)->len <= 0 )) \
+- || (str1) == NULL )
++ ((str1) == NULL || ((str1)->s == NULL || (str1)->len <= 0 ))
+
+ #define SCA_HEADER_EMPTY( hdr1 ) \
+ ((hdr1) == NULL || SCA_STR_EMPTY( &(hdr1)->body ))
+diff --git a/modules/sca/sca_rpc.c b/modules/sca/sca_rpc.c
+index 0fc0f40..f0ee345 100644
+--- a/modules/sca/sca_rpc.c
++++ b/modules/sca/sca_rpc.c
+@@ -366,9 +366,7 @@ sca_rpc_update_appearance( rpc_t *rpc, void *ctx )
+ return;
+ }
+ if ( rpc->scan( ctx, "*S", &app_uri ) == 1 ) {
+- if ( !SCA_STR_EMPTY( &app_uri )) {
+- app_uri_p = &app_uri;
+- }
++ app_uri_p = &app_uri;
+ }
+
+ app_state = sca_appearance_state_from_str( &app_state_str );
+diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c
+index 36a4254..43c902f 100644
+--- a/modules/sca/sca_subscribe.c
++++ b/modules/sca/sca_subscribe.c
+@@ -1017,7 +1017,7 @@ sca_subscription_from_request( sca_mod *scam, sip_msg_t *msg, int event_type,
+ }
+
+ to_tag = to->tag_value;
+- if ( SCA_STR_EMPTY( &to_tag )) {
++ if ( to_tag.s == NULL ) {
+ /*
+ * XXX need hook to detect when we have a subscription and the
+ * subscriber sends an out-of-dialog SUBSCRIBE, which indicates the
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0004-modules-sca-cast-logging-of-time_t-to-long-int-to-qu.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0004-modules-sca-cast-logging-of-time_t-to-long-int-to-qu.patch?rev=10125&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0004-modules-sca-cast-logging-of-time_t-to-long-int-to-qu.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0004-modules-sca-cast-logging-of-time_t-to-long-int-to-qu.patch Thu Mar 28 15:48:19 2013
@@ -1,0 +1,37 @@
+From 65d3fc0ac958128d99448966951de64a01f72b58 Mon Sep 17 00:00:00 2001
+From: Andrew Mortensen <admorten at isc.upenn.edu>
+Date: Mon, 18 Mar 2013 10:32:45 -0400
+Subject: [PATCH] modules/sca: cast logging of time_t to long int to quiet
+ warnings.
+
+- Report from Olle Johansson. Latent Y2K38 problem, but that needs a
+ project-wide solution.
+---
+ modules/sca/sca_subscribe.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c
+index 43c902f..a2fe0ae 100644
+--- a/modules/sca/sca_subscribe.c
++++ b/modules/sca/sca_subscribe.c
+@@ -457,7 +457,7 @@ sca_subscription_db_delete_expired( db1_con_t *db_con )
+ if ( sca->db_api->delete( db_con, delete_columns, delete_ops,
+ delete_values, kv_count ) < 0 ) {
+ LM_ERR( "sca_subscription_db_delete_expired: failed to delete "
+- "subscriptions expired before %ld", now );
++ "subscriptions expired before %ld", (long int)now );
+ return( -1 );
+ }
+
+@@ -683,7 +683,7 @@ sca_subscription_print( void *value )
+ sca_event_name_from_type( sub->event ),
+ sub->event,
+ STR_FMT( &sub->subscriber ),
+- sub->expires, sub->index,
++ (long int)sub->expires, sub->index,
+ STR_FMT( &sub->dialog.call_id ),
+ STR_FMT( &sub->dialog.from_tag ),
+ STR_FMT( &sub->dialog.to_tag ),
+--
+1.7.10.4
+
Added: kamailio/trunk/debian/patches/upstream/0005-modules-sca-seize-appearance-for-SCA-callee-answerin.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0005-modules-sca-seize-appearance-for-SCA-callee-answerin.patch?rev=10125&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0005-modules-sca-seize-appearance-for-SCA-callee-answerin.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0005-modules-sca-seize-appearance-for-SCA-callee-answerin.patch Thu Mar 28 15:48:19 2013
@@ -1,0 +1,30 @@
+From a189e7fd3e6e4915c762dd6c429e68f3d9d6b49a Mon Sep 17 00:00:00 2001
+From: Andrew Mortensen <admorten at isc.upenn.edu>
+Date: Mon, 18 Mar 2013 15:03:24 -0400
+Subject: [PATCH] modules/sca: seize appearance for SCA callee answering w/o
+ Call-Info
+
+- Yealink firmware 7.70.0.130 doesn't include a Call-Info header with
+ 200 OK response to INVITE.
+---
+ modules/sca/sca_appearance.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/modules/sca/sca_appearance.c b/modules/sca/sca_appearance.c
+index 81e304c..0e454b6 100644
+--- a/modules/sca/sca_appearance.c
++++ b/modules/sca/sca_appearance.c
+@@ -362,6 +362,10 @@ sca_appearance_seize_index_unsafe( sca_mod *scam, str *aor, str *owner_uri,
+ goto done;
+ }
+
++ if ( app_idx <= 0 ) {
++ app_idx = sca_appearance_list_next_available_index_unsafe( app_list );
++ }
++
+ for ( app = app_list->appearances; app != NULL; app = app->next ) {
+ if ( app->index >= app_idx ) {
+ break;
+--
+1.7.10.4
+
More information about the Pkg-voip-commits
mailing list