[Pkg-voip-commits] r9964 - in /kamailio/trunk/debian/patches: ./ upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Mon Sep 17 08:44:26 UTC 2012
Author: maniac-guest
Date: Mon Sep 17 08:44:25 2012
New Revision: 9964
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9964
Log:
upstream fixes
Added:
kamailio/trunk/debian/patches/upstream/0052-kamctl-regeneration-of-sql-creation-scripts-for-pua-.patch
kamailio/trunk/debian/patches/upstream/0053-modules_k-usrloc-modified-syslog-messages-on-bad-and.patch
kamailio/trunk/debian/patches/upstream/0054-modules_k-rls-Fixed-segmentation-fault-in-RLS-when-a.patch
kamailio/trunk/debian/patches/upstream/0055-modules_k-rls-Fixed-race-condition-on-multi-server-s.patch
Modified:
kamailio/trunk/debian/patches/series
Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9964&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Mon Sep 17 08:44:25 2012
@@ -39,6 +39,10 @@
upstream/0049-modules_k-rls-Improved-check-for-expired-subscriptio.patch
upstream/0050-modules_k-rls-Fixed-segmentation-fault-when-uploadin.patch
upstream/0051-modules_k-pua-Adjusted-locking-for-dialog-insertion..patch
+upstream/0052-kamctl-regeneration-of-sql-creation-scripts-for-pua-.patch
+upstream/0053-modules_k-usrloc-modified-syslog-messages-on-bad-and.patch
+upstream/0054-modules_k-rls-Fixed-segmentation-fault-in-RLS-when-a.patch
+upstream/0055-modules_k-rls-Fixed-race-condition-on-multi-server-s.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
fix_export.patch
Added: kamailio/trunk/debian/patches/upstream/0052-kamctl-regeneration-of-sql-creation-scripts-for-pua-.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0052-kamctl-regeneration-of-sql-creation-scripts-for-pua-.patch?rev=9964&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0052-kamctl-regeneration-of-sql-creation-scripts-for-pua-.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0052-kamctl-regeneration-of-sql-creation-scripts-for-pua-.patch Mon Sep 17 08:44:25 2012
@@ -1,0 +1,93 @@
+From 7b40fba5cfc04781c60a849bcb0e240c4e34413a Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 14 Sep 2012 13:02:01 +0200
+Subject: [PATCH] kamctl: regeneration of sql creation scripts for pua table
+ updates
+
+---
+ utils/kamctl/db_sqlite/presence-create.sql | 4 ++--
+ utils/kamctl/mysql/presence-create.sql | 5 +++--
+ utils/kamctl/oracle/presence-create.sql | 4 ++--
+ utils/kamctl/postgres/presence-create.sql | 4 ++--
+ 4 files changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql
+index a9a9157..4e25d80 100644
+--- a/utils/kamctl/db_sqlite/presence-create.sql
++++ b/utils/kamctl/db_sqlite/presence-create.sql
+@@ -102,10 +102,10 @@ CREATE TABLE pua (
+ remote_contact VARCHAR(128) NOT NULL,
+ version INTEGER NOT NULL,
+ extra_headers TEXT NOT NULL,
+- CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag),
+- CONSTRAINT pua_expires_idx UNIQUE (expires)
++ CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
+ );
+
++CREATE INDEX pua_expires_idx ON pua (expires);
+ CREATE INDEX pua_dialog1_idx ON pua (call_id, from_tag, to_tag);
+ CREATE INDEX pua_dialog2_idx ON pua (pres_id, pres_uri);
+ CREATE INDEX pua_tmp_dlg1_idx ON pua (call_id, from_tag);
+diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql
+index 7f68249..928521e 100644
+--- a/utils/kamctl/mysql/presence-create.sql
++++ b/utils/kamctl/mysql/presence-create.sql
+@@ -102,13 +102,14 @@ CREATE TABLE pua (
+ remote_contact VARCHAR(128) NOT NULL,
+ version INT(11) NOT NULL,
+ extra_headers TEXT NOT NULL,
+- CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag),
++ CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
+ ) ENGINE=MyISAM;
+
++CREATE INDEX expires_idx ON pua (expires);
+ CREATE INDEX dialog1_idx ON pua (call_id, from_tag, to_tag);
+ CREATE INDEX dialog2_idx ON pua (pres_id, pres_uri);
+ CREATE INDEX tmp_dlg1_idx ON pua (call_id, from_tag);
+ CREATE INDEX tmp_dlg2_idx ON pua (pres_id, pres_uri, call_id, from_tag);
+ CREATE INDEX tmp_record1_idx ON pua (pres_id);
+ CREATE INDEX tmp_record2_idx ON pua (pres_id, etag);
+-CREATE INDEX expires_idx ON pua (expires);
++
+diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql
+index bffdba2..a1c5528 100644
+--- a/utils/kamctl/oracle/presence-create.sql
++++ b/utils/kamctl/oracle/presence-create.sql
+@@ -134,8 +134,7 @@ CREATE TABLE pua (
+ remote_contact VARCHAR2(128),
+ version NUMBER(10),
+ extra_headers CLOB,
+- CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag),
+- CONSTRAINT pua_expires_idx UNIQUE (expires)
++ CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
+ );
+
+ CREATE OR REPLACE TRIGGER pua_tr
+@@ -146,6 +145,7 @@ END pua_tr;
+ /
+ BEGIN map2users('pua'); END;
+ /
++CREATE INDEX pua_expires_idx ON pua (expires);
+ CREATE INDEX pua_dialog1_idx ON pua (call_id, from_tag, to_tag);
+ CREATE INDEX pua_dialog2_idx ON pua (pres_id, pres_uri);
+ CREATE INDEX pua_tmp_dlg1_idx ON pua (call_id, from_tag);
+diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql
+index 1aacd99..cf3fe17 100644
+--- a/utils/kamctl/postgres/presence-create.sql
++++ b/utils/kamctl/postgres/presence-create.sql
+@@ -102,10 +102,10 @@ CREATE TABLE pua (
+ remote_contact VARCHAR(128) NOT NULL,
+ version INTEGER NOT NULL,
+ extra_headers TEXT NOT NULL,
+- CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag),
+- CONSTRAINT pua_expires_idx UNIQUE (expires)
++ CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
+ );
+
++CREATE INDEX pua_expires_idx ON pua (expires);
+ CREATE INDEX pua_dialog1_idx ON pua (call_id, from_tag, to_tag);
+ CREATE INDEX pua_dialog2_idx ON pua (pres_id, pres_uri);
+ CREATE INDEX pua_tmp_dlg1_idx ON pua (call_id, from_tag);
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0053-modules_k-usrloc-modified-syslog-messages-on-bad-and.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0053-modules_k-usrloc-modified-syslog-messages-on-bad-and.patch?rev=9964&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0053-modules_k-usrloc-modified-syslog-messages-on-bad-and.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0053-modules_k-usrloc-modified-syslog-messages-on-bad-and.patch Mon Sep 17 08:44:25 2012
@@ -1,0 +1,37 @@
+From edad1981336f706c0ee7f1b724439adba72a9c71 Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Sun, 16 Sep 2012 17:20:38 +0300
+Subject: [PATCH] modules_k/usrloc: modified syslog messages on bad and
+ non-local sockets - Changed syslog message on non-local
+ socket from warning to debug, because non-local socket is
+ ok when nathelper obtains the contacts and overrides the
+ socket. - Corrected syslog messages on bad and non-local
+ sockets. (cherry picked from commit
+ 424d2cabbe2e20c7ed134f6c9bd463811f2de63f)
+
+---
+ modules_k/usrloc/dlist.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules_k/usrloc/dlist.c b/modules_k/usrloc/dlist.c
+index cb25871..9bcf004 100644
+--- a/modules_k/usrloc/dlist.c
++++ b/modules_k/usrloc/dlist.c
+@@ -201,12 +201,12 @@ static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags,
+ } else {
+ if (parse_phostport( p, &host.s, &host.len,
+ &port, &proto)!=0) {
+- LM_ERR("bad socket <%s>...ignoring\n", p);
++ LM_ERR("bad socket <%s>...set to 0\n", p);
+ sock = 0;
+ } else {
+ sock = grep_sock_info( &host, (unsigned short)port, proto);
+ if (sock==0) {
+- LM_WARN("non-local socket <%s>...ignoring\n", p);
++ LM_DBG("non-local socket <%s>...set to 0\n", p);
+ }
+ }
+ }
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0054-modules_k-rls-Fixed-segmentation-fault-in-RLS-when-a.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0054-modules_k-rls-Fixed-segmentation-fault-in-RLS-when-a.patch?rev=9964&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0054-modules_k-rls-Fixed-segmentation-fault-in-RLS-when-a.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0054-modules_k-rls-Fixed-segmentation-fault-in-RLS-when-a.patch Mon Sep 17 08:44:25 2012
@@ -1,0 +1,37 @@
+From d81bb6501c6b4de517a44af8fe9005dd128d0066 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Sun, 16 Sep 2012 23:47:20 +0100
+Subject: [PATCH] modules_k/rls: Fixed segmentation fault in RLS when a
+ resource-list is updated
+
+- Found and fixed by Hugh Waite @ Crocodile RCS
+(cherry picked from commit bde7e9465db9e7c9ecb485c57edabbd032f3b770)
+---
+ modules_k/rls/subscribe.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c
+index 8422f78..eabb3db 100644
+--- a/modules_k/rls/subscribe.c
++++ b/modules_k/rls/subscribe.c
+@@ -1058,15 +1058,13 @@ int resource_subscriptions(subs_t* subs, xmlNodePtr xmlnode)
+ {
+ LM_DBG("Removing subscription for %.*s\n", tmp_str->len, tmp_str->s);
+ s.expires = 0;
+- send_resource_subs(tmp_str->s, (void*)(&s));
++ send_resource_subs(tmp_str->s, params);
+ pkg_free(tmp_str->s);
+ pkg_free(tmp_str);
+ }
+ }
+- else
+- {
++ if (rls_contact_list != NULL)
+ list_free(&rls_contact_list);
+- }
+
+ pkg_free(wuri.s);
+ pkg_free(did_str.s);
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0055-modules_k-rls-Fixed-race-condition-on-multi-server-s.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0055-modules_k-rls-Fixed-race-condition-on-multi-server-s.patch?rev=9964&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0055-modules_k-rls-Fixed-race-condition-on-multi-server-s.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0055-modules_k-rls-Fixed-race-condition-on-multi-server-s.patch Mon Sep 17 08:44:25 2012
@@ -1,0 +1,43 @@
+From e9ccba247a1262c7b183fb66933d5ee06b765968 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Sun, 16 Sep 2012 23:46:07 +0100
+Subject: [PATCH] modules_k/rls: Fixed race-condition on multi-server systems
+ that can cause different NOTIFYs with the same CSeq
+
+- Found by Hugh Waite @ Crocodile RCS and fixed by Peter Dunkley @ Crocodile RCS
+(cherry picked from commit 67df57c984e040a948d01d2c6bf1a9461d271f8e)
+---
+ modules_k/rls/rls_db.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/modules_k/rls/rls_db.c b/modules_k/rls/rls_db.c
+index 0e72991..09140c7 100644
+--- a/modules_k/rls/rls_db.c
++++ b/modules_k/rls/rls_db.c
+@@ -856,8 +856,8 @@ int get_dialog_subscribe_rlsdb(subs_t *subs)
+
+ subs_t *get_dialog_notify_rlsdb(str callid, str to_tag, str from_tag)
+ {
+- db_key_t query_cols[3];
+- db_val_t query_vals[3];
++ db_key_t query_cols[4];
++ db_val_t query_vals[4];
+ db_key_t result_cols[22];
+ int n_query_cols = 0, n_result_cols=0;
+ int r_pres_uri_col,r_to_user_col,r_to_domain_col;
+@@ -905,6 +905,12 @@ subs_t *get_dialog_notify_rlsdb(str callid, str to_tag, str from_tag)
+ query_vals[n_query_cols].nul = 0;
+ query_vals[n_query_cols].val.str_val= from_tag;
+ n_query_cols++;
++
++ query_cols[n_query_cols] = &str_updated_col;
++ query_vals[n_query_cols].type = DB1_INT;
++ query_vals[n_query_cols].nul = 0;
++ query_vals[n_query_cols].val.int_val= NO_UPDATE_TYPE;
++ n_query_cols++;
+
+ result_cols[r_pres_uri_col=n_result_cols++] = &str_presentity_uri_col;
+ result_cols[r_to_user_col=n_result_cols++] = &str_to_user_col;
+--
+1.7.9.5
+
More information about the Pkg-voip-commits
mailing list