[pkgsrc/trunk]: pkgsrc/comms/asterisk16 Fix bug when reloading cdr_odbc.so.

[jnemeth <jnemeth%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/501a7fa8daa0
branches:  trunk
changeset: 575255:501a7fa8daa0
user:      jnemeth <jnemeth%pkgsrc.org@localhost>
date:      Fri May 07 03:40:24 2010 +0000

description:
Fix bug when reloading cdr_odbc.so.

diffstat:

 comms/asterisk16/Makefile         |   4 ++--
 comms/asterisk16/distinfo         |   3 ++-
 comms/asterisk16/patches/patch-bd |  21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diffs (54 lines):

diff -r a842c1f11910 -r 501a7fa8daa0 comms/asterisk16/Makefile
--- a/comms/asterisk16/Makefile Fri May 07 03:16:47 2010 +0000
+++ b/comms/asterisk16/Makefile Fri May 07 03:40:24 2010 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.14 2010/05/06 20:10:17 jnemeth Exp $
+# $NetBSD: Makefile,v 1.15 2010/05/07 03:40:24 jnemeth Exp $
 #
 
 DISTNAME=      asterisk-1.6.1.17
 DIST_SUBDIR=   ${PKGNAME_NOREV}
-PKGREVISION=   1
+PKGREVISION=   2
 EXTRACT_ONLY=  ${DISTNAME}.tar.gz
 CATEGORIES=    comms net audio
 MASTER_SITES=  http://downloads.asterisk.org/pub/telephony/asterisk/ \
diff -r a842c1f11910 -r 501a7fa8daa0 comms/asterisk16/distinfo
--- a/comms/asterisk16/distinfo Fri May 07 03:16:47 2010 +0000
+++ b/comms/asterisk16/distinfo Fri May 07 03:40:24 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2010/05/06 20:10:17 jnemeth Exp $
+$NetBSD: distinfo,v 1.12 2010/05/07 03:40:24 jnemeth Exp $
 
 SHA1 (asterisk-1.6.1.17/asterisk-1.6.1.17.tar.gz) = 7af18a384f7832d8818e0548263681b3e839447f
 RMD160 (asterisk-1.6.1.17/asterisk-1.6.1.17.tar.gz) = 86c54a56b9d5c7565c9d3d54c0d6cd043e9decd3
@@ -32,3 +32,4 @@
 SHA1 (patch-ba) = 2ea96529e0187a23d0b640c7cae69904d587c269
 SHA1 (patch-bb) = 3b78ed3c8233e2db38d09ca81f1768d018ffd2e2
 SHA1 (patch-bc) = 0efc99595d1ef82a879361e8bf3b2ef7fd84af62
+SHA1 (patch-bd) = f5760942987d9628a4799e512ab0f34368b984c7
diff -r a842c1f11910 -r 501a7fa8daa0 comms/asterisk16/patches/patch-bd
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/asterisk16/patches/patch-bd Fri May 07 03:40:24 2010 +0000
@@ -0,0 +1,21 @@
+$NetBSD: patch-bd,v 1.1 2010/05/07 03:40:24 jnemeth Exp $
+
+# reported upstream as https://issues.asterisk.org/view.php?id=17304
+
+--- cdr/cdr_odbc.c.orig        2008-11-20 18:23:03.000000000 +0000
++++ cdr/cdr_odbc.c
+@@ -220,9 +220,11 @@ static int odbc_load_module(int reload)
+               ast_verb(3, "cdr_odbc: dsn is %s\n", dsn);
+               ast_verb(3, "cdr_odbc: table is %s\n", table);
+ 
+-              res = ast_cdr_register(name, ast_module_info->description, odbc_log);
+-              if (res) {
+-                      ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n");
++              if (!reload) {
++                      res = ast_cdr_register(name, ast_module_info->description, odbc_log);
++                      if (res) {
++                              ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n");
++                      }
+               }
+       } while (0);
+