diff options
| author | jnemeth <jnemeth> | 2010-06-16 08:04:44 +0000 |
|---|---|---|
| committer | jnemeth <jnemeth> | 2010-06-16 08:04:44 +0000 |
| commit | 50037d177107d0933ff4ce485e8608bd6dce1775 (patch) | |
| tree | 3b93f4962babf505380c606f334ff1a280846893 /comms | |
| parent | dad0f3516191857ff55300989e96b8ff679a97ff (diff) | |
| download | pkgsrc-50037d177107d0933ff4ce485e8608bd6dce1775.tar.gz | |
Update patches/patch-bd as per upstream. No significant difference in
functionality.
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/asterisk16/Makefile | 3 | ||||
| -rw-r--r-- | comms/asterisk16/distinfo | 4 | ||||
| -rw-r--r-- | comms/asterisk16/patches/patch-bd | 31 |
3 files changed, 31 insertions, 7 deletions
diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile index 6950a56dc6c..2a1c1431457 100644 --- a/comms/asterisk16/Makefile +++ b/comms/asterisk16/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2010/05/22 22:21:45 jnemeth Exp $ +# $NetBSD: Makefile,v 1.20 2010/06/16 08:04:44 jnemeth Exp $ # DISTNAME= asterisk-1.6.1.20 DIST_SUBDIR= ${PKGNAME_NOREV} +PKGREVISION= 1 EXTRACT_ONLY= ${DISTNAME}.tar.gz CATEGORIES= comms net audio MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo index 4e0c27979d9..a9331120cb5 100644 --- a/comms/asterisk16/distinfo +++ b/comms/asterisk16/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2010/05/22 22:21:45 jnemeth Exp $ +$NetBSD: distinfo,v 1.15 2010/06/16 08:04:44 jnemeth Exp $ SHA1 (asterisk-1.6.1.20/asterisk-1.6.1.20.tar.gz) = 7d92f9de5ed6de10e34c8e6039f91b45884e46f8 RMD160 (asterisk-1.6.1.20/asterisk-1.6.1.20.tar.gz) = ccb504292e9d5e93d79456ede212b1697e3c213e @@ -32,4 +32,4 @@ SHA1 (patch-az) = 917cc8868708ce9c022a0268debd90f51f88bdad SHA1 (patch-ba) = 2ea96529e0187a23d0b640c7cae69904d587c269 SHA1 (patch-bb) = 3b78ed3c8233e2db38d09ca81f1768d018ffd2e2 SHA1 (patch-bc) = 0efc99595d1ef82a879361e8bf3b2ef7fd84af62 -SHA1 (patch-bd) = f5760942987d9628a4799e512ab0f34368b984c7 +SHA1 (patch-bd) = b275b80e84cf6a34bd9fe064b2b53072f500b760 diff --git a/comms/asterisk16/patches/patch-bd b/comms/asterisk16/patches/patch-bd index 95a24221a05..0db249f8980 100644 --- a/comms/asterisk16/patches/patch-bd +++ b/comms/asterisk16/patches/patch-bd @@ -1,21 +1,44 @@ -$NetBSD: patch-bd,v 1.1 2010/05/07 03:40:24 jnemeth Exp $ +$NetBSD: patch-bd,v 1.2 2010/06/16 08:04:45 jnemeth Exp $ # reported upstream as https://issues.asterisk.org/view.php?id=17304 +# revised patch from upstream at https://issues.asterisk.org/file_download.php?file_id=26021&type=bug ---- cdr/cdr_odbc.c.orig 2008-11-20 18:23:03.000000000 +0000 +--- cdr/cdr_odbc.c.orig 2010-05-27 21:40:55.000000000 +0000 +++ cdr/cdr_odbc.c -@@ -220,9 +220,11 @@ static int odbc_load_module(int reload) +@@ -55,6 +55,7 @@ enum { + CONFIG_LOGUNIQUEID = 1 << 0, + CONFIG_USEGMTIME = 1 << 1, + CONFIG_DISPOSITIONSTRING = 1 << 2, ++ CONFIG_REGISTERED = 1 << 3, + }; + + static struct ast_flags config = { 0 }; +@@ -220,14 +221,24 @@ 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) { ++ if (!ast_test_flag(&config, CONFIG_REGISTERED)) { + 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"); ++ } else { ++ ast_set_flag(&config, CONFIG_REGISTERED); + } } } while (0); +- if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED) ++ if (ast_test_flag(&config, CONFIG_REGISTERED) && (!cfg || dsn == NULL || table == NULL)) { ++ ast_cdr_unregister(name); ++ ast_clear_flag(&config, CONFIG_REGISTERED); ++ } ++ ++ if (cfg && cfg != CONFIG_STATUS_FILEUNCHANGED) { + ast_config_destroy(cfg); ++ } + return res; + } + |