Date: Thu, 15 Jul 2010 13:06:48 +0200 (CEST) From: Florian Smeets <flo@kasimir.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sobomax@FreeBSD.org Subject: ports/148630: [PATCH] net/asterisk16: fix asterisk16 compilation with sqlite Message-ID: <20100715110648.4135661CDD@mail.solomo.de> Resent-Message-ID: <201007151110.o6FBA6bS081898@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148630
>Category: ports
>Synopsis: [PATCH] net/asterisk16: fix asterisk16 compilation with sqlite
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 15 11:10:06 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Florian Smeets
>Release: FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD mail.solomo.de 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #13: Tue Jul 13 14:40:06 CEST 2010
>Description:
- rename the clashing function as done in later versions of asterisk 1.6.0.x
Added file(s):
- files/patch-cdr__cdr_sqlite3_custom.c
Port maintainer (sobomax@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- asterisk16-1.6.0.21_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/asterisk16.orig/files/patch-cdr__cdr_sqlite3_custom.c /usr/ports/net/asterisk16/files/patch-cdr__cdr_sqlite3_custom.c
--- /usr/ports/net/asterisk16.orig/files/patch-cdr__cdr_sqlite3_custom.c 1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net/asterisk16/files/patch-cdr__cdr_sqlite3_custom.c 2010-07-15 13:01:47.000000000 +0200
@@ -0,0 +1,20 @@
+--- ./cdr/cdr_sqlite3_custom.c.orig 2010-07-15 11:58:42.000000000 +0200
++++ ./cdr/cdr_sqlite3_custom.c 2010-07-15 11:58:42.000000000 +0200
+@@ -226,7 +226,7 @@
+ ast_free(value);
+ }
+
+-static int sqlite3_log(struct ast_cdr *cdr)
++static int write_cdr(struct ast_cdr *cdr)
+ {
+ int res = 0;
+ char *error = NULL;
+@@ -329,7 +329,7 @@
+ }
+ }
+
+- 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);
--- asterisk16-1.6.0.21_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100715110648.4135661CDD>