[Pkg-voip-commits] r9931 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Mon Aug 20 07:49:49 UTC 2012
Author: maniac-guest
Date: Mon Aug 20 07:49:48 2012
New Revision: 9931
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9931
Log:
upstream fixes for 3.3.1
Added:
kamailio/trunk/debian/patches/upstream/0007-modules_k-rls-Fixed-memory-leak-in-RLS.patch
kamailio/trunk/debian/patches/upstream/0008-rr-k-fixed-offset-in-building-new-route-header.patch
kamailio/trunk/debian/patches/upstream/0009-modules_k-rls-Fixed-memory-leak-in-rls.patch
kamailio/trunk/debian/patches/upstream/0010-modules_k-rls-Added-DB-transaction-code-around-rls_p.patch
kamailio/trunk/debian/patches/upstream/0011-modules_k-pua-Fixed-double-free-in-pua.patch
kamailio/trunk/debian/patches/upstream/0012-modules-lcr-modules_k-regex-Fix-stack-overflow-from-.patch
kamailio/trunk/debian/patches/upstream/0013-modules_k-rls-Fixed-memory-leak-in-rls-under-some-er.patch
kamailio/trunk/debian/patches/upstream/0014-modules_k-rls-Fixed-incorrect-table-version-check.patch
Removed:
kamailio/trunk/debian/patches/upstream/0002-pkg-kamailio-fedora-17-Fixed-typo-in-appliance-files.patch
kamailio/trunk/debian/patches/upstream/0003-pkg-kamailio-fedora-16-Updated-version-in-.spec-file.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=9931&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Mon Aug 20 07:49:48 2012
@@ -10,7 +10,7 @@
+ remove call to dpkg-buildflags
+ do not apply hardening_flags.patch
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Sun, 05 Aug 2012 10:55:39 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Mon, 20 Aug 2012 09:47:21 +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=9931&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Mon Aug 20 07:49:48 2012
@@ -1,6 +1,14 @@
upstream/0001-rr-k-add-missing-in-Route-header-for-strict-routing.patch
upstream/0004-modules_k-rls-Fixed-segmentation-fault-in-RLS.patch
upstream/0005-modules_k-dispatcher-Dispatcher-reload-MI-command-no.patch
+upstream/0007-modules_k-rls-Fixed-memory-leak-in-RLS.patch
+upstream/0008-rr-k-fixed-offset-in-building-new-route-header.patch
+upstream/0009-modules_k-rls-Fixed-memory-leak-in-rls.patch
+upstream/0010-modules_k-rls-Added-DB-transaction-code-around-rls_p.patch
+upstream/0011-modules_k-pua-Fixed-double-free-in-pua.patch
+upstream/0012-modules-lcr-modules_k-regex-Fix-stack-overflow-from-.patch
+upstream/0013-modules_k-rls-Fixed-memory-leak-in-rls-under-some-er.patch
+upstream/0014-modules_k-rls-Fixed-incorrect-table-version-check.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
plumb_md5.patch
Added: kamailio/trunk/debian/patches/upstream/0007-modules_k-rls-Fixed-memory-leak-in-RLS.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0007-modules_k-rls-Fixed-memory-leak-in-RLS.patch?rev=9931&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0007-modules_k-rls-Fixed-memory-leak-in-RLS.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0007-modules_k-rls-Fixed-memory-leak-in-RLS.patch Mon Aug 20 07:49:48 2012
@@ -1,0 +1,28 @@
+From 25c6efc8d245c339c77748f93c222188769a7be8 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Wed, 8 Aug 2012 12:05:44 +0100
+Subject: [PATCH] modules_k/rls: Fixed memory leak in RLS
+
+- Leak only happens when there is more than one Record-Route: header
+- Fixed by Hugh Waite @ Crocodile RCS
+(cherry picked from commit c1240aa21a534f1c1a5bdaaebd9c29fe4984a4bb)
+---
+ modules_k/rls/notify.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c
+index b923add..c8eb230 100644
+--- a/modules_k/rls/notify.c
++++ b/modules_k/rls/notify.c
+@@ -760,7 +760,7 @@ void rls_free_td(dlg_t* td)
+ pkg_free(td->rem_uri.s);
+
+ if(td->route_set)
+- pkg_free(td->route_set);
++ free_rr(&td->route_set);
+
+ pkg_free(td);
+ }
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0008-rr-k-fixed-offset-in-building-new-route-header.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0008-rr-k-fixed-offset-in-building-new-route-header.patch?rev=9931&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0008-rr-k-fixed-offset-in-building-new-route-header.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0008-rr-k-fixed-offset-in-building-new-route-header.patch Mon Aug 20 07:49:48 2012
@@ -1,0 +1,27 @@
+From 8db3e9c29b2cf1ff5c6f93411d3e9a90f7eb82ef Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Thu, 9 Aug 2012 08:50:20 +0200
+Subject: [PATCH] rr(k): fixed offset in building new route header
+
+- related to the previous fix done to strict routing intermediary hop
+(cherry picked from commit e154b2fb9f02d56d9c6a4b2d285791151ae0c8a3)
+---
+ modules_k/rr/loose.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c
+index 22360df..f5d869f 100644
+--- a/modules_k/rr/loose.c
++++ b/modules_k/rr/loose.c
+@@ -322,7 +322,7 @@ static inline int save_ruri(struct sip_msg* _m)
+ memcpy(s, RR_ROUTE_PREFIX, RR_ROUTE_PREFIX_LEN);
+ memcpy(s + RR_ROUTE_PREFIX_LEN, _m->first_line.u.request.uri.s,
+ _m->first_line.u.request.uri.len);
+- memcpy(s + ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len,
++ memcpy(s + RR_ROUTE_PREFIX_LEN + _m->first_line.u.request.uri.len,
+ ROUTE_SUFFIX, ROUTE_SUFFIX_LEN);
+
+ LM_DBG("New header: '%.*s'\n", len, ZSW(s));
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0009-modules_k-rls-Fixed-memory-leak-in-rls.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0009-modules_k-rls-Fixed-memory-leak-in-rls.patch?rev=9931&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0009-modules_k-rls-Fixed-memory-leak-in-rls.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0009-modules_k-rls-Fixed-memory-leak-in-rls.patch Mon Aug 20 07:49:48 2012
@@ -1,0 +1,51 @@
+From 52f1ea5eb0067e94207dcfaa461260d96b2635bc Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Mon, 13 Aug 2012 15:49:09 +0100
+Subject: [PATCH] modules_k/rls: Fixed memory leak in rls
+
+- Issue fixed by Paul Pankhurst and Peter Dunkley @ Crocodile RCS
+(cherry picked from commit c9628aa038ad7099a72af67f9284e5d0a9b78173)
+---
+ modules_k/rls/subscribe.c | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c
+index 7df5d40..66c295a 100644
+--- a/modules_k/rls/subscribe.c
++++ b/modules_k/rls/subscribe.c
+@@ -463,6 +463,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma
+ subs_t subs;
+ pres_ev_t* event = NULL;
+ int err_ret = -1;
++ int ret = to_presence_code;
+ str* contact = NULL;
+ xmlDocPtr doc = NULL;
+ xmlNodePtr service_node = NULL;
+@@ -743,6 +744,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma
+ remove_expired_rlsubs(&subs, hash_code);
+
+ done:
++ ret = 1;
++forpresence:
+ if(contact!=NULL)
+ {
+ if(contact->s!=NULL)
+@@ -758,14 +761,7 @@ done:
+ xmlFreeDoc(doc);
+ if (rlsubs_did.s != NULL)
+ pkg_free(rlsubs_did.s);
+- return 1;
+-
+-forpresence:
+- if(subs.pres_uri.s!=NULL)
+- pkg_free(subs.pres_uri.s);
+- if (rlsubs_did.s != NULL)
+- pkg_free(rlsubs_did.s);
+- return to_presence_code;
++ return ret;
+
+ bad_event:
+ err_ret = 0;
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0010-modules_k-rls-Added-DB-transaction-code-around-rls_p.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0010-modules_k-rls-Added-DB-transaction-code-around-rls_p.patch?rev=9931&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0010-modules_k-rls-Added-DB-transaction-code-around-rls_p.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0010-modules_k-rls-Added-DB-transaction-code-around-rls_p.patch Mon Aug 20 07:49:48 2012
@@ -1,0 +1,66 @@
+From 03f8f4d9c4304ac0a8f629e1c94230ab70b58917 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Mon, 13 Aug 2012 15:50:05 +0100
+Subject: [PATCH] modules_k/rls: Added DB transaction code around
+ rls_presentity insert/replace (cherry picked from commit
+ 65dcb2d0e72757d51b0ee51c457c5440278444bc)
+
+---
+ modules_k/rls/resource_notify.c | 27 ++++++++++++++++++++++++++-
+ 1 file changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/modules_k/rls/resource_notify.c b/modules_k/rls/resource_notify.c
+index bf9aa0d..8937131 100644
+--- a/modules_k/rls/resource_notify.c
++++ b/modules_k/rls/resource_notify.c
+@@ -767,6 +767,15 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2)
+ goto error;
+ }
+
++ if (dbmode == RLS_DB_ONLY && rlpres_dbf.start_transaction)
++ {
++ if (rlpres_dbf.start_transaction(rlpres_db) < 0)
++ {
++ LM_ERR("in start_transaction\n");
++ goto error;
++ }
++ }
++
+ if (rlpres_dbf.replace != NULL)
+ {
+ if(rlpres_dbf.replace(rlpres_db, query_cols, query_vals, n_query_cols,
+@@ -796,7 +805,16 @@ int rls_handle_notify(struct sip_msg* msg, char* c1, char* c2)
+ LM_DBG("Inserted in database table new record\n");
+ }
+ }
+-
++
++ if (dbmode == RLS_DB_ONLY && rlpres_dbf.end_transaction)
++ {
++ if (rlpres_dbf.end_transaction(rlpres_db) < 0)
++ {
++ LM_ERR("in end_transaction\n");
++ goto error;
++ }
++ }
++
+ LM_DBG("Updated rlpres_table\n");
+ /* reply 200OK */
+ done:
+@@ -831,6 +849,13 @@ error:
+ if (reason.s) pkg_free(reason.s);
+
+ free_to_params(&TO);
++
++ if (dbmode == RLS_DB_ONLY && rlpres_dbf.abort_transaction)
++ {
++ if (rlpres_dbf.abort_transaction(rlpres_db) < 0)
++ LM_ERR("in abort_transaction\n");
++ }
++
+ return -1;
+ }
+
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0011-modules_k-pua-Fixed-double-free-in-pua.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0011-modules_k-pua-Fixed-double-free-in-pua.patch?rev=9931&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0011-modules_k-pua-Fixed-double-free-in-pua.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0011-modules_k-pua-Fixed-double-free-in-pua.patch Mon Aug 20 07:49:48 2012
@@ -1,0 +1,25 @@
+From dd26ed0cc3233fcf64635a8d2ee27361352b711a Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Mon, 13 Aug 2012 15:48:18 +0100
+Subject: [PATCH] modules_k/pua: Fixed double-free in pua (cherry picked from
+ commit 5387288eac896a0710fb1c55cc4837e973e04946)
+
+---
+ modules_k/pua/send_subscribe.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules_k/pua/send_subscribe.c b/modules_k/pua/send_subscribe.c
+index cd089e6..89a8141 100644
+--- a/modules_k/pua/send_subscribe.c
++++ b/modules_k/pua/send_subscribe.c
+@@ -623,6 +623,7 @@ faked_error:
+ presentity->record_route.len= record_route.len;
+ size+= record_route.len;
+ pkg_free(record_route.s);
++ record_route.s = NULL;
+ }
+
+ presentity->contact.s= (char*)presentity + size;
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0012-modules-lcr-modules_k-regex-Fix-stack-overflow-from-.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0012-modules-lcr-modules_k-regex-Fix-stack-overflow-from-.patch?rev=9931&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0012-modules-lcr-modules_k-regex-Fix-stack-overflow-from-.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0012-modules-lcr-modules_k-regex-Fix-stack-overflow-from-.patch Mon Aug 20 07:49:48 2012
@@ -1,0 +1,45 @@
+From ff72de945a70b9eedb6eca08677b93e618faeb94 Mon Sep 17 00:00:00 2001
+From: Richard Fuchs <rfuchs at sipwise.com>
+Date: Mon, 13 Aug 2012 13:10:37 -0400
+Subject: [PATCH] modules/lcr, modules_k/regex: Fix stack overflow from
+ pcre_fullinfo(PCRE_INFO_SIZE)
+
+Fix instances where pcre_fullinfo(PCRE_INFO_SIZE) was given only an "int"
+argument, which results in stack overflow on some 64-bit platforms where
+an "int" is only 32 bits long. It expects a "size_t" argument, which is
+64 bits long.
+---
+ modules/lcr/lcr_mod.c | 3 ++-
+ modules_k/regex/regex_mod.c | 2 +-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c
+index 3bdcc98..d02d72f 100644
+--- a/modules/lcr/lcr_mod.c
++++ b/modules/lcr/lcr_mod.c
+@@ -758,7 +758,8 @@ static pcre *reg_ex_comp(const char *pattern)
+ {
+ pcre *re, *result;
+ const char *error;
+- int rc, size, err_offset;
++ int rc, err_offset;
++ size_t size;
+
+ re = pcre_compile(pattern, 0, &error, &err_offset, NULL);
+ if (re == NULL) {
+diff --git a/modules_k/regex/regex_mod.c b/modules_k/regex/regex_mod.c
+index 51665aa..eb9f744 100644
+--- a/modules_k/regex/regex_mod.c
++++ b/modules_k/regex/regex_mod.c
+@@ -260,7 +260,7 @@ static int load_pcres(int action)
+ char line[FILE_MAX_LINE];
+ char **patterns = NULL;
+ pcre *pcre_tmp = NULL;
+- int pcre_size;
++ size_t pcre_size;
+ int pcre_rc;
+ const char *pcre_error;
+ int pcre_erroffset;
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0013-modules_k-rls-Fixed-memory-leak-in-rls-under-some-er.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0013-modules_k-rls-Fixed-memory-leak-in-rls-under-some-er.patch?rev=9931&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0013-modules_k-rls-Fixed-memory-leak-in-rls-under-some-er.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0013-modules_k-rls-Fixed-memory-leak-in-rls-under-some-er.patch Mon Aug 20 07:49:48 2012
@@ -1,0 +1,47 @@
+From d94040eca0a9900fcf0b9f1140e3afeb38c9fcba Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Tue, 14 Aug 2012 15:52:37 +0100
+Subject: [PATCH] modules_k/rls: Fixed memory leak in rls under some error
+ conditions
+
+- Found and fixed by Hugh Waite @ Crocodile RCS
+(cherry picked from commit de8b241ea39284cce4c7e1850fcf3cef4c4c4a0a)
+---
+ modules_k/rls/subscribe.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c
+index 66c295a..f719754 100644
+--- a/modules_k/rls/subscribe.c
++++ b/modules_k/rls/subscribe.c
+@@ -657,7 +657,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma
+ LM_ERR("while sending reply\n");
+ goto error;
+ }
+- return 0;
++ ret = 0;
++ goto stop;
+ }
+
+ /* if correct reply with 200 OK */
+@@ -705,7 +706,8 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma
+ LM_ERR("while sending reply\n");
+ goto error;
+ }
+- return 0;
++ ret = 0;
++ goto stop;
+ }
+ }
+ if(rls_get_service_list(&subs.pres_uri, &subs.watcher_user,
+@@ -745,6 +747,7 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma
+
+ done:
+ ret = 1;
++stop:
+ forpresence:
+ if(contact!=NULL)
+ {
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0014-modules_k-rls-Fixed-incorrect-table-version-check.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0014-modules_k-rls-Fixed-incorrect-table-version-check.patch?rev=9931&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0014-modules_k-rls-Fixed-incorrect-table-version-check.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0014-modules_k-rls-Fixed-incorrect-table-version-check.patch Mon Aug 20 07:49:48 2012
@@ -1,0 +1,27 @@
+From 985f9382703a0f5a493f8a4594220304276c2bd4 Mon Sep 17 00:00:00 2001
+From: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
+Date: Tue, 14 Aug 2012 15:53:07 +0100
+Subject: [PATCH] modules_k/rls: Fixed incorrect table version check
+
+- Found by Hugh Waite @ Crocodile RCS
+(cherry picked from commit e22e5f83115d9f1e33c27ae437d93d7701330a8c)
+---
+ modules_k/rls/rls.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c
+index 06de4cb..08dedcf 100644
+--- a/modules_k/rls/rls.c
++++ b/modules_k/rls/rls.c
+@@ -510,7 +510,7 @@ static int mod_init(void)
+ }
+
+ /* verify table version */
+- if(db_check_table_version(&rlpres_dbf, rls_db, &rlpres_table, P_TABLE_VERSION) < 0) {
++ if(db_check_table_version(&rlpres_dbf, rlpres_db, &rlpres_table, P_TABLE_VERSION) < 0) {
+ LM_ERR("error during table version check.\n");
+ return -1;
+ }
+--
+1.7.9.5
+
More information about the Pkg-voip-commits
mailing list