[Pkg-voip-commits] r8265 - in /asterisk/trunk/debian: changelog patches/series patches/sqlite3_func_rename

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Sat Apr 10 17:46:59 2010
New Revision: 8265

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8265
Log:
Patch sqlite3_func_rename: Avoid issues with the name sqlite3_log

Added:
    asterisk/trunk/debian/patches/sqlite3_func_rename
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=8265&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sat Apr 10 17:46:59 2010
@@ -15,8 +15,9 @@
   * Patch dahdi_fxs_false_ringing: Fix having Astribank FXS-s keep ringing if
     answered too soon. 
   * Patch followme_prompts: set proper vars when reading followme.conf
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 05 Apr 2010 20:29:21 +0300
+  * Patch sqlite3_func_rename: Avoid issues with the name sqlite3_log . 
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Sat, 10 Apr 2010 14:18:28 +0300
 
 asterisk (1:1.6.2.2-1) unstable; urgency=medium
 

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=8265&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sat Apr 10 17:46:59 2010
@@ -20,3 +20,4 @@
 settings_show_dirs
 dahdi_fxs_false_ringing
 followme_prompts
+sqlite3_func_rename

Added: asterisk/trunk/debian/patches/sqlite3_func_rename
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/sqlite3_func_rename?rev=8265&op=file
==============================================================================
--- asterisk/trunk/debian/patches/sqlite3_func_rename (added)
+++ asterisk/trunk/debian/patches/sqlite3_func_rename Sat Apr 10 17:46:59 2010
@@ -1,0 +1,32 @@
+Description: rename local sqlite3_log that is now included in libsqlite3
+Author: Sean Bright <sean at malleable.com>
+Bug: https://issues.asterisk.org/view.php?id=17017
+Origin: http://svn.digium.com/svn/asterisk/branches/1.6.2@252317 
+
+Fix building CDR and SQLite3 modules.
+
+They added a sqlite3_log() function which was conflicting with our function
+names.
+
+diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
+index a16648b..b1d317c 100644
+--- a/cdr/cdr_sqlite3_custom.c
++++ b/cdr/cdr_sqlite3_custom.c
+@@ -220,7 +220,7 @@ static void free_config(int reload)
+ 	}
+ }
+ 
+-static int sqlite3_log(struct ast_cdr *cdr)
++static int write_cdr(struct ast_cdr *cdr)
+ {
+ 	int res = 0;
+ 	char *error = NULL;
+@@ -321,7 +321,7 @@ static int load_module(void)
+ 		}
+ 	}
+ 
+-	res = ast_cdr_register(name, desc, sqlite3_log);
++	res = ast_cdr_register(name, desc, write_cdr);
+ 	if (res) {
+ 		ast_log(LOG_ERROR, "Unable to register custom SQLite3 CDR handling\n");
+ 		free_config(0);