[Pkg-voip-commits] r5235 - in /asterisk/trunk/debian: changelog patches/series patches/vpb_no_cards

[paravoid at alioth.debian.org]

Author: paravoid
Date: Thu Feb 28 11:44:18 2008
New Revision: 5235

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5235
Log:
* Backport upstream's patch for chan_vpb to avoid crashes when no
  VoiceTronix cards are present. (Closes: #466729)

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/patches/vpb_no_cards

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5235&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Thu Feb 28 11:44:18 2008
@@ -11,6 +11,8 @@
   * Switch asterisk-h323 to the new asterisk-1.4 dependency.
   * Remove libc-client-dev dependency since it is satisfied in etch by a
     version (2002) incompatible to the one that works. (Closes: #465524)
+  * Backport upstream's patch for chan_vpb to avoid crashes when no
+    VoiceTronix cards are present. (Closes: #466729)
 
   [ Tzafrir Cohen ]
   * New upstream release.
@@ -26,7 +28,7 @@
   * patch tos-libcap remeved: merged by upstream.
   * Adjusted patch bristuff/ast-device-state-CID to Asterisk 1.4.18.
 
- -- Faidon Liambotis <paravoid at debian.org>  Sun, 17 Feb 2008 11:17:17 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Thu, 28 Feb 2008 13:42:11 +0200
 
 asterisk (1:1.4.17~dfsg-2) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=5235&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Thu Feb 28 11:44:18 2008
@@ -17,6 +17,7 @@
 # for chan_vpb
 vpb-driver-4.2.18
 vpb-handle-nocards
+vpb_no_cards
 
 # for chan_misdn (even though it's not enabled yet)
 misdn_FOP

Modified: asterisk/trunk/debian/patches/vpb_no_cards
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/vpb_no_cards?rev=5235&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/vpb_no_cards (original)
+++ asterisk/trunk/debian/patches/vpb_no_cards Thu Feb 28 11:44:18 2008
@@ -1,21 +1,19 @@
-# On startup of Asterisk, if chan_vpb is loaded without any Voicetronix
-# cards in the system, it crashes Asterisk. The same also happens if
-# cards or ports are declared in vpb.conf that don't exist (or if the
-# appropriate vpb driver is not loaded).
-#
-# This patch checks the number of cards and ports. If there are no cards
-# detected, then chan_vpb declines to load so we get a warning rather than
-# a segfault. If there are cards and/or ports declared in
-# /etc/asterisk/vpb.conf that don't exist, then chan_vpb fails out of the
-# module load with a warning rather than a segfault.
-# 
-# Upstream bug: http://bugs.digium.com/12096
+On startup of Asterisk, if chan_vpb is loaded without any Voicetronix
+cards in the system, it crashes Asterisk. The same also happens if
+cards or ports are declared in vpb.conf that don't exist (or if the
+appropriate vpb driver is not loaded).
 
-Index: chan_vpb.cc
-===================================================================
---- asterisk/channels/chan_vpb.cc	(revision 104869)
-+++ asterisk/channels/chan_vpb.cc	(working copy)
-@@ -2706,6 +2706,18 @@
+This patch checks the number of cards and ports. If there are no cards
+detected, then chan_vpb declines to load so we get a warning rather than
+a segfault. If there are cards and/or ports declared in
+/etc/asterisk/vpb.conf that don't exist, then chan_vpb fails out of the
+module load with a warning rather than a segfault.
+
+Upstream bug: http://bugs.digium.com/12096
+
+--- a/channels/chan_vpb.cc
++++ b/channels/chan_vpb.cc
+@@ -2871,6 +2871,18 @@ static enum ast_module_load_result load_
  	int bal3 = -1;
  	char * callerid = NULL;
  
@@ -34,7 +32,7 @@
  	cfg = ast_config_load(config);
  
  	/* We *must* have a config file otherwise stop immediately */
-@@ -2768,6 +2780,11 @@
+@@ -2948,6 +2960,11 @@ static enum ast_module_load_result load_
  				UseNativeBridge = atoi(v->value);
  			} else if (strcasecmp(v->name, "channel") == 0) {
  				int channel = atoi(v->value);