[Pkg-voip-commits] r6044 - in /asterisk/trunk/debian: changelog patches/fix_zap_no_timing_source patches/series

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Mon Aug 18 15:29:00 2008
New Revision: 6044

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6044
Log:
Patch fix_zap_no_timing_source: hopefully fixes 491310

Added:
    asterisk/trunk/debian/patches/fix_zap_no_timing_source
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=6044&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Aug 18 15:29:00 2008
@@ -1,5 +1,6 @@
 asterisk (1:1.4.21.2~dfsg-2) UNRELEASED; urgency=low
 
+  [ Victor Seva ]
   * Depend on debhelper >=5 on backport etch.
   * debian/rules:
     - support DEB_BUILD_OPTION noopt used to produce non-optimized builds.
@@ -14,7 +15,10 @@
   * debian/backports/etch.xorcom
     - remove imap rule. It's now included on etch script.
 
- -- Victor Seva <linuxmaniac at torreviejawireless.org>  Thu, 24 Jul 2008 21:00:20 +0200
+  [ Tzafrir Cohen ]
+  * Patch fix_zap_no_timing_source: hopefully fixes 491310
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 18 Aug 2008 13:56:26 +0300
 
 asterisk (1:1.4.21.2~dfsg-1) unstable; urgency=high
 

Added: asterisk/trunk/debian/patches/fix_zap_no_timing_source
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/fix_zap_no_timing_source?rev=6044&op=file
==============================================================================
--- asterisk/trunk/debian/patches/fix_zap_no_timing_source (added)
+++ asterisk/trunk/debian/patches/fix_zap_no_timing_source Mon Aug 18 15:29:00 2008
@@ -1,0 +1,18 @@
+Don't quit just because we don't have a good Zaptel timing source.
+See http://bugs.debian.org/491310 .
+
+Status: pending testing.
+
+--- a/main/asterisk.c
++++ b/main/asterisk.c
+@@ -2985,8 +2985,8 @@ int main(int argc, char *argv[])
+ 					"\n\t2. You only have to load Zaptel drivers if you want to take advantage of Zaptel services.  One option is to unload zaptel modules if you don't need them."
+ 					"\n\t3. If you need Zaptel services, you must correctly configure Zaptel."
+ 				};
+-				ast_log(LOG_ERROR, "%s\n", zaptel_timer_error);
+-				exit(1);
++				ast_log(LOG_WARNING, "%s\n", zaptel_timer_error);
++				ast_log(LOG_WARNING, "However, on Debian we don't quit that easily. See http://bugs.debian.org/491310\n");
+ 			}
+ 			close(fd);
+ 		}

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=6044&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Mon Aug 18 15:29:00 2008
@@ -81,3 +81,4 @@
 # bridging app backported from 1.6
 # it needs the above feature patches applied first.
 feature-bridge
+fix_zap_no_timing_source