[Pkg-voip-commits] r5007 - in /asterisk/trunk/debian: changelog patches/series patches/vpb-handle-nocards

[paravoid at alioth.debian.org]

Author: paravoid
Date: Mon Dec  3 18:16:02 2007
New Revision: 5007

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5007
Log:
Fix autoload with chan_vpb

Added:
    asterisk/trunk/debian/patches/vpb-handle-nocards
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=5007&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Dec  3 18:16:02 2007
@@ -34,7 +34,7 @@
   * Provide a custom sounds directory under /var/lib - user-modifieble at
     runtime and hence not under /usr. (Closes: #337209)
 
- -- Faidon Liambotis <paravoid at debian.org>  Mon, 03 Dec 2007 18:59:22 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 03 Dec 2007 20:15:27 +0200
 
 asterisk (1:1.4.13~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5007&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon Dec  3 18:16:02 2007
@@ -16,6 +16,7 @@
 
 # for chan_vpb
 vpb-driver-4.2.18
+vpb-handle-nocards
 
 ### bristuff
 bristuff/bristuff-notice

Added: asterisk/trunk/debian/patches/vpb-handle-nocards
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/vpb-handle-nocards?rev=5007&op=file
==============================================================================
--- asterisk/trunk/debian/patches/vpb-handle-nocards (added)
+++ asterisk/trunk/debian/patches/vpb-handle-nocards Mon Dec  3 18:16:02 2007
@@ -1,0 +1,34 @@
+Set cards=0 to the default configuration so that autoload can load it without
+stopping the startup process of Asterisk.
+Of course, a fix for the code was needed to bail-out on cards=0 :-)
+
+ -- Faidon Liambotis <paravoid at debian.org>
+
+--- asterisk-1.4.15~dfsg.orig/channels/chan_vpb.cc
++++ asterisk-1.4.15~dfsg/channels/chan_vpb.cc
+@@ -2883,7 +2883,13 @@ static enum ast_module_load_result load_
+ 		v = ast_variable_browse(cfg, "general");
+ 		while (v){
+ 			if (strcasecmp(v->name, "cards") == 0) {
+-				ast_log(LOG_NOTICE,"VPB Driver configured to use [%d] cards\n",atoi(v->value));
++				if (atoi(v->value) == 0) {
++					ast_log(LOG_ERROR,"VPB Driver not configured\n");
++					error = AST_MODULE_LOAD_DECLINE;
++					goto done;
++				} else {
++					ast_log(LOG_NOTICE,"VPB Driver configured to use [%d] cards\n",atoi(v->value));
++				}
+ 			}
+ 			else if (strcasecmp(v->name, "indication") == 0) {
+ 				use_ast_ind = 1;
+--- asterisk-1.4.15~dfsg.orig/configs/vpb.conf.sample
++++ asterisk-1.4.15~dfsg/configs/vpb.conf.sample
+@@ -8,7 +8,7 @@
+ ;
+ ; Total number of Voicetronix cards in this machine
+ ;
+-cards=1
++cards=0
+ 
+ ;
+ ; Which indication functions to use