[Pkg-voip-commits] r10026 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Mon Nov 19 10:19:13 UTC 2012
Author: maniac-guest
Date: Mon Nov 19 10:19:12 2012
New Revision: 10026
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10026
Log:
upstream fixes. arm_fix applied upstream
Added:
kamailio/trunk/debian/patches/upstream/0008-Makefile.defs-arm-compiler-flags-update.patch
kamailio/trunk/debian/patches/upstream/0009-dialog-k-use-proper-scan-string-for-optional-headers.patch
kamailio/trunk/debian/patches/upstream/0010-modules_k-db_sqlite-fix-memory-leak-in-sqlops-query.patch
kamailio/trunk/debian/patches/upstream/0011-modules_k-db_sqlite-fix-crash-with-computed-fields-i.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=10026&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Mon Nov 19 10:19:12 2012
@@ -9,12 +9,13 @@
* debian/patches:
+ removed plumb_md5.patch and plumb_md5_fixes.patch
merged upstream ( Thanks miconda )
- + arm_fix.patch (Closes: #690388) Thanks Matthias Klose <doko at debian.org>
+ + arm_fix.patch applied upstream (Closes: #690388)
+ Thanks Matthias Klose <doko at debian.org>
* debian/backports/squeeze:
+ remove call to dpkg-buildflags
+ do not apply hardening_flags.patch
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Wed, 07 Nov 2012 16:52:19 +0100
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Mon, 19 Nov 2012 11:16:38 +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=10026&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Mon Nov 19 10:19:12 2012
@@ -1,7 +1,10 @@
upstream/0001-core-use-cloned-value-to-parse-pv-name-for-caching.patch
upstream/0006-allow-freeing-of-NULL-pointer-to-behave-like-standar.patch
upstream/0007-modules_k-siputils-Fix-memory-leak-in-uri_param-func.patch
+upstream/0008-Makefile.defs-arm-compiler-flags-update.patch
+upstream/0009-dialog-k-use-proper-scan-string-for-optional-headers.patch
+upstream/0010-modules_k-db_sqlite-fix-memory-leak-in-sqlops-query.patch
+upstream/0011-modules_k-db_sqlite-fix-crash-with-computed-fields-i.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
fix_export.patch
-arm_fix.patch
Added: kamailio/trunk/debian/patches/upstream/0008-Makefile.defs-arm-compiler-flags-update.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0008-Makefile.defs-arm-compiler-flags-update.patch?rev=10026&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0008-Makefile.defs-arm-compiler-flags-update.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0008-Makefile.defs-arm-compiler-flags-update.patch Mon Nov 19 10:19:12 2012
@@ -1,0 +1,28 @@
+From f860ed61a19a1119ff6612fa6b3ebdfa6dc2f0bd Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 9 Nov 2012 08:07:42 +0100
+Subject: [PATCH] Makefile.defs: arm compiler flags update
+
+- patch by Matthias Klose <doko at debian.org>,
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=690388
+(cherry picked from commit e916a4680d37f481167770fff27a710088cb5d3d)
+---
+ Makefile.defs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.defs b/Makefile.defs
+index 8957769..a1854a3 100644
+--- a/Makefile.defs
++++ b/Makefile.defs
+@@ -1186,7 +1186,7 @@ ifeq ($(ARCH), arm)
+ ifeq ($(CC_NAME), gcc)
+ C_DEFS+=-DCC_GCC_LIKE_ASM
+ #common stuff
+- CFLAGS=-O9 -funroll-loops -fsigned-char $(PROFILE)
++ CFLAGS=-marm -march=armv5t -O9 -funroll-loops -fsigned-char $(PROFILE)
+ #if gcc 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
+ CFLAGS+= -ftree-vectorize -fno-strict-overflow
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0009-dialog-k-use-proper-scan-string-for-optional-headers.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0009-dialog-k-use-proper-scan-string-for-optional-headers.patch?rev=10026&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0009-dialog-k-use-proper-scan-string-for-optional-headers.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0009-dialog-k-use-proper-scan-string-for-optional-headers.patch Mon Nov 19 10:19:12 2012
@@ -1,0 +1,37 @@
+From 78d4b145c57e5e93b70f7441ec2c7e63a2f9f2c0 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 9 Nov 2012 08:41:55 +0100
+Subject: [PATCH] dialog(k): use proper scan string for optional headers
+ parameter in rpc commands
+
+- credits to Kristofer Signer for report and troubleshooting
+(cherry picked from commit d5120187eb41e709c840b3cfbb0dc1803f61b036)
+---
+ modules_k/dialog/dialog.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c
+index 3a404d1..e25890d 100644
+--- a/modules_k/dialog/dialog.c
++++ b/modules_k/dialog/dialog.c
+@@ -1585,7 +1585,7 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) {
+ dlg_cell_t * dlg = NULL;
+ str rpc_extra_hdrs = {NULL,0};
+
+- if (rpc->scan(c, "ddS", &h_entry, &h_id, &rpc_extra_hdrs) < 2) return;
++ if (rpc->scan(c, "dd*S", &h_entry, &h_id, &rpc_extra_hdrs) < 2) return;
+
+ dlg = dlg_lookup(h_entry, h_id);
+ if(dlg){
+@@ -1622,7 +1622,7 @@ static void rpc_dlg_bridge(rpc_t *rpc, void *c) {
+ str to = {NULL,0};
+ str op = {NULL,0};
+
+- if (rpc->scan(c, "SSS", &from, &to, &op) < 2) return;
++ if (rpc->scan(c, "SS*S", &from, &to, &op) < 2) return;
+
+ dlg_bridge(&from, &to, &op);
+ }
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0010-modules_k-db_sqlite-fix-memory-leak-in-sqlops-query.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0010-modules_k-db_sqlite-fix-memory-leak-in-sqlops-query.patch?rev=10026&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0010-modules_k-db_sqlite-fix-memory-leak-in-sqlops-query.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0010-modules_k-db_sqlite-fix-memory-leak-in-sqlops-query.patch Mon Nov 19 10:19:12 2012
@@ -1,0 +1,38 @@
+From 8198f2dcc92127bc15ac13f71372f016b8c982d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras at iki.fi>
+Date: Wed, 17 Oct 2012 09:00:14 +0300
+Subject: [PATCH] modules_k/db_sqlite: fix memory leak in sqlops query
+
+Seems that most other database drivers release the database
+resource only at free_result time, which I some how missed.
+
+Since we are doing a deep copy in store_result(), we can
+just release the sqlite resources immediately raw_query().
+
+Reported-by: Pedro Antonio Vico Solano <pvsolano at amper.es>
+(cherry picked from commit ecf95eb0ada8bfacb93af7b82f39347c841229e4)
+---
+ modules_k/db_sqlite/dbase.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c
+index 0b32e07..c1d3b71 100644
+--- a/modules_k/db_sqlite/dbase.c
++++ b/modules_k/db_sqlite/dbase.c
+@@ -543,7 +543,12 @@ int db_sqlite_update(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o,
+
+ int db_sqlite_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r)
+ {
+- return db_do_raw_query(_h, _s, _r,
++ int rc;
++
++ rc = db_do_raw_query(_h, _s, _r,
+ db_sqlite_submit_query,
+ db_sqlite_store_result);
++ db_sqlite_cleanup_query(_h);
++
++ return rc;
+ }
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0011-modules_k-db_sqlite-fix-crash-with-computed-fields-i.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0011-modules_k-db_sqlite-fix-crash-with-computed-fields-i.patch?rev=10026&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0011-modules_k-db_sqlite-fix-crash-with-computed-fields-i.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0011-modules_k-db_sqlite-fix-crash-with-computed-fields-i.patch Mon Nov 19 10:19:12 2012
@@ -1,0 +1,69 @@
+From bab07e07858464d50d310bbb52431a0b171ee771 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras at iki.fi>
+Date: Thu, 15 Nov 2012 16:11:41 +0200
+Subject: [PATCH] modules_k/db_sqlite: fix crash with computed fields in
+ custom queries
+
+Computed fields do not have decltype available, so guess the proper
+field type based on the result type of the first row. This does not
+work if the first row has null type as result, but is the best we can
+do easily and fixes gives right result in most cases.
+
+Reported-by: Pedro Antonio Vico Solano <pvsolano at amper.es>
+(cherry picked from commit 09205865f98136e0354539f09f4961ca016a915b)
+---
+ modules_k/db_sqlite/dbase.c | 28 +++++++++++++++++++++++++++-
+ 1 file changed, 27 insertions(+), 1 deletion(-)
+
+diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c
+index c1d3b71..c4df4ce 100644
+--- a/modules_k/db_sqlite/dbase.c
++++ b/modules_k/db_sqlite/dbase.c
+@@ -288,6 +288,24 @@ static int decltype_to_dbtype(const char *decltype)
+ return DB1_INT;
+ }
+
++static int type_to_dbtype(int type)
++{
++ switch (type) {
++ case SQLITE_INTEGER:
++ return DB1_INT;
++ case SQLITE_FLOAT:
++ return DB1_DOUBLE;
++ case SQLITE_TEXT:
++ return DB1_STR;
++ case SQLITE_BLOB:
++ return DB1_BLOB;
++ default:
++ /* Unknown, or NULL column value. Assume this is a
++ * string. */
++ return DB1_STR;
++ }
++}
++
+ static str* str_dup(const char *_s)
+ {
+ str *s;
+@@ -348,10 +366,18 @@ int db_sqlite_store_result(const db1_con_t* _h, db1_res_t** _r)
+ RES_COL_N(res) = rc;
+
+ for (i = 0; i < RES_COL_N(res); i++) {
++ const char *decltype;
++ int dbtype;
++
+ RES_NAMES(res)[i] = str_dup(sqlite3_column_name(conn->stmt, i));
+ if (RES_NAMES(res)[i] == NULL)
+ goto no_mem;
+- RES_TYPES(res)[i] = decltype_to_dbtype(sqlite3_column_decltype(conn->stmt, i));
++ decltype = sqlite3_column_decltype(conn->stmt, i);
++ if (decltype != NULL)
++ dbtype = decltype_to_dbtype(decltype);
++ else
++ dbtype = type_to_dbtype(sqlite3_column_type(conn->stmt, i));
++ RES_TYPES(res)[i] = dbtype;
+ }
+ }
+ if (num_rows >= num_alloc) {
+--
+1.7.9.5
+
More information about the Pkg-voip-commits
mailing list